Improve generation of visual demo markup

Author: iMattPro

event/main_listener.php

@@ -189,9 +189,15 @@ public function visual_demo()
 			$all_locations = $this->location_manager->get_all_locations(false);
 			foreach ($this->location_manager->get_all_location_ids() as $location_id)
 			{
+				$ad_var = 'AD_' . strtoupper($location_id);
+
 				$this->template->assign_vars(array(
-					'AD_' . strtoupper($location_id) . '_ID'	=> $location_id,
-					'AD_' . strtoupper($location_id)			=> '<div class="phpbb-ads-visual-demo" title="' . $all_locations[$location_id]['desc'] . '">' . $all_locations[$location_id]['name'] . '</div>',
+					$ad_var . '_ID'	=> $location_id,
+					$ad_var			=> array(
+						'visual_demo'	=> true,
+						'name'			=> $all_locations[$location_id]['name'],
+						'desc'			=> $all_locations[$location_id]['desc'],
+					),
 				));
 			}
 

styles/all/template/event/overall_header_stylesheets_after.html

@@ -1,3 +1,5 @@
 {# begin ad location #}
-{{ AD_SCRIPTS }}
+{% if AD_SCRIPTS and AD_SCRIPTS is not iterable %}
+	{{ AD_SCRIPTS }}
+{% endif %}
 {# end ad location #}

styles/all/template/phpbb_ads_macro.html

@@ -1,7 +1,11 @@
 {% macro renderAds(PHPBB_ADS_CODE, PHPBB_ADS_ID, S_PHPBB_ADS_CENTER = false, PHPBB_ADS_STYLE = '') %}
 	{% if PHPBB_ADS_CODE %}
 		<div class="phpbb-ads{% if S_PHPBB_ADS_CENTER %} phpbb-ads-center{% endif %}" style="{{ PHPBB_ADS_STYLE }}" data-phpbb-ads-id="{{ PHPBB_ADS_ID|e('html_attr') }}">
-			{{ PHPBB_ADS_CODE }}
+			{% if PHPBB_ADS_CODE is iterable and PHPBB_ADS_CODE.visual_demo %}
+				<div class="phpbb-ads-visual-demo" title="{{ PHPBB_ADS_CODE.desc|e('html_attr') }}">{{ PHPBB_ADS_CODE.name|e }}</div>
+			{% else %}
+				{{ PHPBB_ADS_CODE }}
+			{% endif %}
 		</div>
 	{% endif %}
 {% endmacro %}