Skip to content

Commit 9dc292f

Browse files
iMattProiMattPro
committed
Remove old html markup and fix markup errors
1 parent bd9b7a6 commit 9dc292f

2 files changed

Lines changed: 40 additions & 39 deletions

File tree

‎adm/style/manage_ads.html‎

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@ <h3>{{ lang('WARNING') }}</h3>
2828
<fieldset>
2929
<legend>{{ lang('AD_SETTINGS') }}</legend>
3030
<dl>
31-
<dt><label for="ad_name">{{ lang('AD_NAME') ~ lang('COLON') }}</label><br /><span>{{ lang('AD_NAME_EXPLAIN') }}</span></dt>
32-
<dd><input class="text medium" id="ad_name" name="ad_name" value="{{ AD_NAME }}" maxlength="255" /></dd>
31+
<dt><label for="ad_name">{{ lang('AD_NAME') ~ lang('COLON') }}</label><br><span>{{ lang('AD_NAME_EXPLAIN') }}</span></dt>
32+
<dd><input class="text medium" id="ad_name" name="ad_name" value="{{ AD_NAME }}" maxlength="255"></dd>
3333
</dl>
3434
<dl>
35-
<dt><label for="ad_enabled">{{ lang('AD_ENABLED') ~ lang('COLON') }}</label><br /><span>{{ lang('AD_ENABLED_EXPLAIN') }}</span></dt>
36-
<dd><label><input type="radio" class="radio" id="ad_enabled" name="ad_enabled" value="1"{% if AD_ENABLED %} checked{% endif %} /> {{ lang('ENABLED') }}</label>
37-
<label><input type="radio" class="radio" name="ad_enabled" value="0"{% if not AD_ENABLED %} checked{% endif %} /> {{ lang('DISABLED') }}</label></dd>
35+
<dt><label for="ad_enabled">{{ lang('AD_ENABLED') ~ lang('COLON') }}</label><br><span>{{ lang('AD_ENABLED_EXPLAIN') }}</span></dt>
36+
<dd><label><input type="radio" class="radio" id="ad_enabled" name="ad_enabled" value="1"{% if AD_ENABLED %} checked{% endif %}> {{ lang('ENABLED') }}</label>
37+
<label><input type="radio" class="radio" name="ad_enabled" value="0"{% if not AD_ENABLED %} checked{% endif %}> {{ lang('DISABLED') }}</label></dd>
3838
</dl>
3939
<dl>
40-
<dt><label for="ad_note">{{ lang('AD_NOTE') ~ lang('COLON') }}</label><br /><span>{{ lang('AD_NOTE_EXPLAIN') }}</span></dt>
40+
<dt><label for="ad_note">{{ lang('AD_NOTE') ~ lang('COLON') }}</label><br><span>{{ lang('AD_NOTE_EXPLAIN') }}</span></dt>
4141
<dd><textarea id="ad_note" name="ad_note" rows="5" cols="60" style="width: 95%;">{{ AD_NOTE }}</textarea></dd>
4242
</dl>
4343
<dl>
44-
<dt><label for="ad_code">{{ lang('AD_CODE') ~ lang('COLON') }}</label><br /><span>{{ lang('AD_CODE_EXPLAIN') }}</span></dt>
44+
<dt><label for="ad_code">{{ lang('AD_CODE') ~ lang('COLON') }}</label><br><span>{{ lang('AD_CODE_EXPLAIN') }}</span></dt>
4545
<dd>
4646
<textarea id="ad_code" name="ad_code" rows="20" cols="60" style="width: 95%;">{{ AD_CODE }}</textarea>
4747
<button class="button2 phpbb-ads-button" id="analyse_ad_code" name="analyse_ad_code"><i class="icon fa-fw fa-stethoscope"></i> <span>{{ lang('ANALYSE_AD_CODE') }}</span></button>
@@ -68,76 +68,78 @@ <h3>{{ lang('WARNING') }}</h3>
6868
<fieldset>
6969
<legend>{{ lang('AD_BANNER') }}</legend>
7070
<dl>
71-
<dt><label for="banner">{{ lang('BANNER') ~ lang('COLON') }}</label><br /><span>{{ lang('BANNER_EXPLAIN') }}</span></dt>
71+
<dt><label for="banner">{{ lang('BANNER') ~ lang('COLON') }}</label><br><span>{{ lang('BANNER_EXPLAIN') }}</span></dt>
7272
<dd>
73-
<input type="file" accept="image/*" class="inputbox autowidth" id="banner" name="banner" />
73+
<input type="file" accept="image/*" class="inputbox autowidth" id="banner" name="banner">
7474
<button class="button2 phpbb-ads-button" id="upload_banner" name="upload_banner"><i class="icon fa-fw fa-upload"></i> <span>{{ lang('BANNER_UPLOAD') }}</span></button>
7575
</dd>
7676
</dl>
7777
</fieldset>
7878
<fieldset>
7979
<legend>{{ lang('AD_PLACEMENT') }}</legend>
8080
<dl>
81-
<dt><label for="ad_locations">{{ lang('AD_LOCATIONS') ~ lang('COLON') }}</label><br />
81+
<dt><label for="ad_locations">{{ lang('AD_LOCATIONS') ~ lang('COLON') }}</label><br>
8282
<span>{{ lang('AD_LOCATIONS_EXPLAIN') }}<br><br>
8383
<a class="phpbb-ads-button" href="{{ U_ENABLE_VISUAL_DEMO }}" target="_blank">
8484
<i class="icon fa-fw fa-eye"></i> <span>{{ lang('AD_LOCATIONS_VISUAL_DEMO') }}</span>
8585
</a><br><br>{{ lang('VISUAL_DEMO_EXPLAIN') }}
8686
</span>
8787
</dt>
8888
<dd><select id="ad_locations" name="ad_locations[]" multiple size="10">
89+
{% set open_optgroup = false %}
8990
{% for location in loops.ad_locations %}
9091
{% if location.CATEGORY_NAME %}
91-
{% if not loop.first %}</optgroup>{% endif %}
92+
{% if open_optgroup %}</optgroup>{% endif %}
9293
<optgroup label="{{ location.CATEGORY_NAME }}" style="border:none;">
94+
{% set open_optgroup = true %}
9395
{% else %}
9496
<option value="{{ location.LOCATION_ID }}"{% if location.S_SELECTED %} selected{% endif %} title="{{ location.LOCATION_DESC }}">{{ location.LOCATION_NAME }}</option>
9597
{% endif %}
96-
</optgroup>
98+
{% if loop.last and open_optgroup %}</optgroup>{% endif %}
9799
{% endfor %}
98100
</select>
99101
</dd>
100102
</dl>
101103
<dl>
102-
<dt><label for="ad_priority">{{ lang('AD_PRIORITY') ~ lang('COLON') }}</label><br /><span>{{ lang('AD_PRIORITY_EXPLAIN') }}</span></dt>
103-
<dd><input type="number" id="ad_priority" name="ad_priority" value="{{ AD_PRIORITY ?: constant('\\phpbb\\ads\\ext::DEFAULT_PRIORITY') }}" min="1" max="10" /></dd>
104+
<dt><label for="ad_priority">{{ lang('AD_PRIORITY') ~ lang('COLON') }}</label><br><span>{{ lang('AD_PRIORITY_EXPLAIN') }}</span></dt>
105+
<dd><input type="number" id="ad_priority" name="ad_priority" value="{{ AD_PRIORITY ?: constant('\\phpbb\\ads\\ext::DEFAULT_PRIORITY') }}" min="1" max="10"></dd>
104106
</dl>
105107
<dl>
106-
<dt><label for="ad_content_only">{{ lang('AD_CONTENT_ONLY') ~ lang('COLON') }}</label><br /><span>{{ lang('AD_CONTENT_ONLY_EXPLAIN') }}</span></dt>
107-
<dd><label><input type="radio" class="radio" name="ad_content_only" value="1"{% if AD_CONTENT_ONLY %} checked{% endif %} /> {{ lang('YES') }}</label>
108-
<label><input type="radio" class="radio" id="ad_content_only" name="ad_content_only" value="0"{% if not AD_CONTENT_ONLY %} checked{% endif %} /> {{ lang('NO') }}</label></dd>
108+
<dt><label for="ad_content_only">{{ lang('AD_CONTENT_ONLY') ~ lang('COLON') }}</label><br><span>{{ lang('AD_CONTENT_ONLY_EXPLAIN') }}</span></dt>
109+
<dd><label><input type="radio" class="radio" name="ad_content_only" value="1"{% if AD_CONTENT_ONLY %} checked{% endif %}> {{ lang('YES') }}</label>
110+
<label><input type="radio" class="radio" id="ad_content_only" name="ad_content_only" value="0"{% if not AD_CONTENT_ONLY %} checked{% endif %}> {{ lang('NO') }}</label></dd>
109111
</dl>
110112
<dl>
111-
<dt><label for="ad_centering">{{ lang('AD_CENTERING') ~ lang('COLON') }}</label><br /><span>{{ lang('AD_CENTERING_EXPLAIN') }}</span></dt>
112-
<dd><label><input type="radio" class="radio" id="ad_centering" name="ad_centering" value="1"{% if AD_CENTERING %} checked{% endif %} /> {{ lang('YES') }}</label>
113-
<label><input type="radio" class="radio" name="ad_centering" value="0"{% if not AD_CENTERING %} checked{% endif %} /> {{ lang('NO') }}</label></dd>
113+
<dt><label for="ad_centering">{{ lang('AD_CENTERING') ~ lang('COLON') }}</label><br><span>{{ lang('AD_CENTERING_EXPLAIN') }}</span></dt>
114+
<dd><label><input type="radio" class="radio" id="ad_centering" name="ad_centering" value="1"{% if AD_CENTERING %} checked{% endif %}> {{ lang('YES') }}</label>
115+
<label><input type="radio" class="radio" name="ad_centering" value="0"{% if not AD_CENTERING %} checked{% endif %}> {{ lang('NO') }}</label></dd>
114116
</dl>
115117
</fieldset>
116118
<fieldset>
117119
<legend>{{ lang('AD_OPTIONS') }}</legend>
118120
<dl>
119-
<dt><label for="ad_owner">{{ lang('AD_OWNER') ~ lang('COLON') }}</label><br /><span>{{ lang('AD_OWNER_EXPLAIN') }}</span></dt>
120-
<dd><input class="text medium" id="ad_owner" name="ad_owner" value="{{ AD_OWNER }}" /></dd>
121+
<dt><label for="ad_owner">{{ lang('AD_OWNER') ~ lang('COLON') }}</label><br><span>{{ lang('AD_OWNER_EXPLAIN') }}</span></dt>
122+
<dd><input class="text medium" id="ad_owner" name="ad_owner" value="{{ AD_OWNER }}"></dd>
121123
<dd>[ <a href="{{ U_FIND_USERNAME }}" id="find-username">{{ lang('FIND_USERNAME') }}</a> ]</dd>
122124
</dl>
123125
<dl>
124-
<dt><label for="ad_views_limit">{{ lang('AD_VIEWS_LIMIT') ~ lang('COLON') }}</label><br /><span>{{ lang('AD_VIEWS_LIMIT_EXPLAIN') }}</span></dt>
125-
<dd><input class="text" type="number" id="ad_views_limit" name="ad_views_limit" value="{{ AD_VIEWS_LIMIT }}" size="20" min="0" /></dd>
126+
<dt><label for="ad_views_limit">{{ lang('AD_VIEWS_LIMIT') ~ lang('COLON') }}</label><br><span>{{ lang('AD_VIEWS_LIMIT_EXPLAIN') }}</span></dt>
127+
<dd><input class="text narrow" type="number" id="ad_views_limit" name="ad_views_limit" value="{{ AD_VIEWS_LIMIT }}" min="0"></dd>
126128
</dl>
127129
<dl>
128-
<dt><label for="ad_clicks_limit">{{ lang('AD_CLICKS_LIMIT') ~ lang('COLON') }}</label><br /><span>{{ lang('AD_CLICKS_LIMIT_EXPLAIN') }}</span></dt>
129-
<dd><input class="text" type="number" id="ad_clicks_limit" name="ad_clicks_limit" value="{{ AD_CLICKS_LIMIT }}" size="20" min="0" /></dd>
130+
<dt><label for="ad_clicks_limit">{{ lang('AD_CLICKS_LIMIT') ~ lang('COLON') }}</label><br><span>{{ lang('AD_CLICKS_LIMIT_EXPLAIN') }}</span></dt>
131+
<dd><input class="text narrow" type="number" id="ad_clicks_limit" name="ad_clicks_limit" value="{{ AD_CLICKS_LIMIT }}" min="0"></dd>
130132
</dl>
131133
<dl>
132-
<dt><label for="ad_start_date">{{ lang('AD_START_DATE') ~ lang('COLON') }}</label><br /><span>{{ lang('AD_START_DATE_EXPLAIN') }}</span></dt>
133-
<dd><input class="phpbb-ads-datepicker" id="ad_start_date" name="ad_start_date" type="date" min="{{ DATE_MINIMUM }}" value="{{ AD_START_DATE ? AD_START_DATE|date(constant('\\phpbb\\ads\\ext::DATE_FORMAT'), 'UTC') }}" size="20" maxlength="20" /></dd>
134+
<dt><label for="ad_start_date">{{ lang('AD_START_DATE') ~ lang('COLON') }}</label><br><span>{{ lang('AD_START_DATE_EXPLAIN') }}</span></dt>
135+
<dd><input class="phpbb-ads-datepicker" id="ad_start_date" name="ad_start_date" type="date" min="{{ DATE_MINIMUM }}" value="{{ AD_START_DATE ? AD_START_DATE|date(constant('\\phpbb\\ads\\ext::DATE_FORMAT'), 'UTC') }}"></dd>
134136
</dl>
135137
<dl>
136-
<dt><label for="ad_end_date">{{ lang('AD_END_DATE') ~ lang('COLON') }}</label><br /><span>{{ lang('AD_END_DATE_EXPLAIN') }}</span></dt>
137-
<dd><input class="phpbb-ads-datepicker" id="ad_end_date" name="ad_end_date" type="date" min="{{ DATE_MINIMUM }}" value="{{ AD_END_DATE ? AD_END_DATE|date(constant('\\phpbb\\ads\\ext::DATE_FORMAT'), 'UTC') }}" size="20" maxlength="20" /></dd>
138+
<dt><label for="ad_end_date">{{ lang('AD_END_DATE') ~ lang('COLON') }}</label><br><span>{{ lang('AD_END_DATE_EXPLAIN') }}</span></dt>
139+
<dd><input class="phpbb-ads-datepicker" id="ad_end_date" name="ad_end_date" type="date" min="{{ DATE_MINIMUM }}" value="{{ AD_END_DATE ? AD_END_DATE|date(constant('\\phpbb\\ads\\ext::DATE_FORMAT'), 'UTC') }}"></dd>
138140
</dl>
139141
<dl>
140-
<dt><label for="ad_groups">{{ lang('HIDE_GROUPS') ~ lang('COLON') }}</label><br /><span>{{ lang('HIDE_GROUPS_EXPLAIN') }}</span></dt>
142+
<dt><label for="ad_groups">{{ lang('HIDE_GROUPS') ~ lang('COLON') }}</label><br><span>{{ lang('HIDE_GROUPS_EXPLAIN') }}</span></dt>
141143
<dd><select id="ad_groups" name="ad_groups[]" multiple size="8">
142144
{% for group in loops.groups %}
143145
<option value="{{ group.ID }}"{% if group.S_SELECTED %} selected{% endif %}>{{ group.NAME }}</option>
@@ -147,14 +149,14 @@ <h3>{{ lang('WARNING') }}</h3>
147149
</dl>
148150
</fieldset>
149151
<fieldset class="submit-buttons">
150-
<input class="button1" type="submit" id="preview" name="preview" value="{{ lang('PREVIEW') }}" />&nbsp;
151-
<input class="button1" type="submit" id="submit" name="submit_{% if S_EDIT_AD %}edit{% else %}add{% endif %}" value="{{ lang('SUBMIT') }}" />&nbsp;
152-
<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}" />
152+
<input class="button1" type="submit" id="preview" name="preview" value="{{ lang('PREVIEW') }}">&nbsp;
153+
<input class="button1" type="submit" id="submit" name="submit_{% if S_EDIT_AD %}edit{% else %}add{% endif %}" value="{{ lang('SUBMIT') }}">&nbsp;
154+
<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}">
153155
{% if S_EDIT_AD %}
154-
<input type="hidden" name="id" value="{{ EDIT_ID }}" />
155-
<input type="hidden" name="action" value="edit" />
156+
<input type="hidden" name="id" value="{{ EDIT_ID }}">
157+
<input type="hidden" name="action" value="edit">
156158
{% else %}
157-
<input type="hidden" name="action" value="add" />
159+
<input type="hidden" name="action" value="add">
158160
{% endif %}
159161
{{ S_FORM_TOKEN }}
160162
</fieldset>
@@ -246,7 +248,7 @@ <h1>{{ lang('ACP_MANAGE_ADS_TITLE') }}</h1>
246248

247249
<form id="acp_phpbb_ads_quick_add" method="post" action="{{ U_ACTION_ADD }}">
248250
<fieldset class="quick">
249-
<input class="button2" type="submit" value="{{ lang('ACP_ADS_ADD') }}" />
251+
<input class="button2" type="submit" value="{{ lang('ACP_ADS_ADD') }}">
250252
{{ S_FORM_TOKEN }}
251253
</fieldset>
252254
</form>

‎config/services.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ services:
2020
- '@files.upload'
2121
- '@filesystem'
2222
- '%core.root_path%'
23-
- '%phpbb.ads.tables.ad_locations%'
2423

2524
phpbb.ads.helper:
2625
class: phpbb\ads\controller\helper

0 commit comments

Comments
 (0)