Skip to content

Commit ed659b3

Browse files
iMattProiMattPro
authored
Merge pull request #349 from iMattPro/updates
Updates
2 parents b657af2 + d2ae7db commit ed659b3

4 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ This is the repository for the development of the phpBB Board Rules Extension.
3030
* Translations should be posted to the [Board Rules topic at phpBB.com](https://www.phpbb.com/customise/db/extension/boardrules/support/topic/130746). We accept pull requests for translation corrections, but we do not accept pull requests for new translations.
3131

3232
## License
33-
[GNU General Public License v2](http://opensource.org/licenses/GPL-2.0)
33+
[GNU General Public License v2](https://opensource.org/licenses/GPL-2.0)

‎acp/boardrules_module.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function main($id, $mode)
5656
$this->tpl_name = 'boardrules_settings';
5757

5858
// Set the page title for our ACP page
59-
$this->page_title = $lang->lang('ACP_BOARDRULES_SETTINGS');
59+
$this->page_title = 'ACP_BOARDRULES_SETTINGS';
6060

6161
// If the "Notify users" button was submitted
6262
if ($request->is_set_post('action_send_notification'))
@@ -74,14 +74,14 @@ public function main($id, $mode)
7474
$this->tpl_name = 'boardrules_manage';
7575

7676
// Set the page title for our ACP page
77-
$this->page_title = $lang->lang('ACP_BOARDRULES_MANAGE');
77+
$this->page_title = 'ACP_BOARDRULES_MANAGE';
7878

7979
// Perform any actions submitted by the user
8080
switch ($action)
8181
{
8282
case 'add':
8383
// Set the page title for our ACP page
84-
$this->page_title = $lang->lang('ACP_BOARDRULES_CREATE_RULE');
84+
$this->page_title = 'ACP_BOARDRULES_CREATE_RULE';
8585

8686
// Load the add rule handle in the admin controller
8787
$admin_controller->add_rule($language, $parent_id);
@@ -92,7 +92,7 @@ public function main($id, $mode)
9292

9393
case 'edit':
9494
// Set the page title for our ACP page
95-
$this->page_title = $lang->lang('ACP_BOARDRULES_EDIT_RULE');
95+
$this->page_title = 'ACP_BOARDRULES_EDIT_RULE';
9696

9797
// Load the edit rule handle in the admin controller
9898
$admin_controller->edit_rule($rule_id);

‎adm/style/boardrules_manage.html‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ <h3>{{ lang('WARNING') }}</h3>
5151
</select></dd>
5252
</dl>
5353
<dl>
54-
<dt><label for="rule_title">{{ lang('ACP_RULE_TITLE') ~ lang('COLON') }}</label><br /><span>{{ lang('ACP_RULE_TITLE_EXPLAIN') }}</span></dt>
55-
<dd><input class="text medium" type="text" id="rule_title" name="rule_title" value="{{ RULE_TITLE }}" maxlength="200" /></dd>
54+
<dt><label for="rule_title">{{ lang('ACP_RULE_TITLE') ~ lang('COLON') }}</label><br><span>{{ lang('ACP_RULE_TITLE_EXPLAIN') }}</span></dt>
55+
<dd><input class="text medium" type="text" id="rule_title" name="rule_title" value="{{ RULE_TITLE }}" maxlength="200"></dd>
5656
</dl>
5757
<dl>
58-
<dt><label for="rule_anchor">{{ lang('ACP_RULE_ANCHOR') ~ lang('COLON') }}</label><br /><span>{{ lang('ACP_RULE_ANCHOR_EXPLAIN') }}</span></dt>
59-
<dd><input class="text medium" type="text" id="rule_anchor" name="rule_anchor" value="{{ RULE_ANCHOR }}" maxlength="255" /></dd>
58+
<dt><label for="rule_anchor">{{ lang('ACP_RULE_ANCHOR') ~ lang('COLON') }}</label><br><span>{{ lang('ACP_RULE_ANCHOR_EXPLAIN') }}</span></dt>
59+
<dd><input class="text medium" type="text" id="rule_anchor" name="rule_anchor" value="{{ RULE_ANCHOR }}" maxlength="255"></dd>
6060
</dl>
6161
</fieldset>
6262

@@ -76,13 +76,13 @@ <h3>{{ lang('WARNING') }}</h3>
7676
</dd>
7777
<dd style="margin-{{ S_CONTENT_FLOW_BEGIN }}: 90px; margin-top: 5px;">
7878
{% if S_BBCODE_ALLOWED %}
79-
<label><input type="checkbox" class="radio" name="disable_bbcode"{% if S_BBCODE_DISABLE_CHECKED and (S_PREVIEW or not S_ADD_RULE) %} checked="checked"{% endif %} /> {{ lang('DISABLE_BBCODE') }}</label>
79+
<label><input type="checkbox" class="radio" name="disable_bbcode"{% if S_BBCODE_DISABLE_CHECKED and (S_PREVIEW or not S_ADD_RULE) %} checked="checked"{% endif %}> {{ lang('DISABLE_BBCODE') }}</label>
8080
{% endif %}
8181
{% if S_SMILIES_ALLOWED %}
82-
<label><input type="checkbox" class="radio" name="disable_smilies"{% if S_SMILIES_DISABLE_CHECKED and (S_PREVIEW or not S_ADD_RULE) %} checked="checked"{% endif %} /> {{ lang('DISABLE_SMILIES') }}</label>
82+
<label><input type="checkbox" class="radio" name="disable_smilies"{% if S_SMILIES_DISABLE_CHECKED and (S_PREVIEW or not S_ADD_RULE) %} checked="checked"{% endif %}> {{ lang('DISABLE_SMILIES') }}</label>
8383
{% endif %}
8484
{% if S_LINKS_ALLOWED %}
85-
<label><input type="checkbox" class="radio" name="disable_magic_url"{% if S_MAGIC_URL_DISABLE_CHECKED and (S_PREVIEW or not S_ADD_RULE) %} checked="checked"{% endif %} /> {{ lang('DISABLE_MAGIC_URL') }}</label>
85+
<label><input type="checkbox" class="radio" name="disable_magic_url"{% if S_MAGIC_URL_DISABLE_CHECKED and (S_PREVIEW or not S_ADD_RULE) %} checked="checked"{% endif %}> {{ lang('DISABLE_MAGIC_URL') }}</label>
8686
{% endif %}
8787
</dd>
8888
<dd style="margin-{{ S_CONTENT_FLOW_BEGIN }}: 90px; margin-top: 10px;"><strong>{{ lang('OPTIONS') ~ lang('COLON') }} </strong>{{ BBCODE_STATUS }} :: {{ IMG_STATUS }} :: {{ FLASH_STATUS }} :: {{ URL_STATUS }} :: {{ SMILIES_STATUS }}</dd>
@@ -91,8 +91,8 @@ <h3>{{ lang('WARNING') }}</h3>
9191
</fieldset>
9292

9393
<fieldset class="submit-buttons">
94-
<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
95-
{% if not S_IS_CATEGORY %}<input class="button2" type="submit" id="preview" name="preview" value="{{ lang('PREVIEW') }}" />{% endif %}
94+
<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}">&nbsp;
95+
{% if not S_IS_CATEGORY %}<input class="button2" type="submit" id="preview" name="preview" value="{{ lang('PREVIEW') }}">{% endif %}
9696
{{ S_FORM_TOKEN }}
9797
</fieldset>
9898
</form>
@@ -147,7 +147,7 @@ <h1>{{ lang('ACP_BOARDRULES_MANAGE') }}</h1>
147147

148148
{% if loops.rules|length %}
149149
<table class="table1 forums">
150-
<colgroup><col class="row1" /><col class="row1" /><col class="row2" /></colgroup>
150+
<colgroup><col class="row1"><col class="row1"><col class="row2"></colgroup>
151151
<thead>
152152
<tr>
153153
<th colspan="2">{{ lang('ACP_BOARDRULES') }}</th>
@@ -158,10 +158,10 @@ <h1>{{ lang('ACP_BOARDRULES_MANAGE') }}</h1>
158158
{% for rules in loops.rules %}
159159
<tr>
160160
<td class="folder">
161-
{% if rules.S_IS_CATEGORY %}<img src="images/icon_subfolder.gif" alt="{{ lang('ACP_BOARDRULES_CATEGORY') }}" />{% else %}<img src="images/icon_folder.gif" alt="{{ lang('ACP_BOARDRULES_RULE') }}" />{% endif %}
161+
{% if rules.S_IS_CATEGORY %}<img src="images/icon_subfolder.gif" width="27" height="27" alt="{{ lang('ACP_BOARDRULES_CATEGORY') }}">{% else %}<img src="images/icon_folder.gif" width="27" height="27" alt="{{ lang('ACP_BOARDRULES_RULE') }}">{% endif %}
162162
</td>
163163
<td class="forum-desc">
164-
<strong><a href="{{ rules.U_RULE }}">{{ rules.RULE_TITLE }}</a></strong>
164+
<strong>{% if rules.S_IS_CATEGORY %}<a href="{{ rules.U_RULE }}">{% endif %}{{ rules.RULE_TITLE }}{% if rules.S_IS_CATEGORY %}</a>{% endif %}</strong>
165165
</td>
166166
<td class="actions">
167167
<span class="up-disabled" style="display:none;">{{ ICON_MOVE_UP_DISABLED }}</span>
@@ -182,10 +182,10 @@ <h1>{{ lang('ACP_BOARDRULES_MANAGE') }}</h1>
182182
<fieldset class="quick">
183183
{{ lang('ACP_ADD_RULE') ~ lang('COLON') }}
184184
<label>
185-
<input type="text" name="rule_title" value="" maxlength="200" placeholder="{{ lang('ACP_RULE_TITLE') }}" />
185+
<input type="text" name="rule_title" value="" maxlength="200" placeholder="{{ lang('ACP_RULE_TITLE') }}">
186186
</label>
187-
<input type="submit" name="addrule" class="button2" value="{{ lang('SUBMIT') }}" />
188-
<input type="hidden" name="action" value="add" />
187+
<input type="submit" name="addrule" class="button2" value="{{ lang('SUBMIT') }}">
188+
<input type="hidden" name="action" value="add">
189189
{{ S_FORM_TOKEN }}
190190
</fieldset>
191191
</form>

‎adm/style/boardrules_settings.html‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,40 @@ <h3>{{ lang('WARNING') }}</h3>
1717
<legend>{{ lang('ACP_BOARDRULES_SETTINGS') }}</legend>
1818
<dl>
1919
<dt><label for="boardrules_enable">{{ lang('ACP_BOARDRULES_ENABLE') ~ lang('COLON') }}</label></dt>
20-
<dd><label><input type="radio" class="radio" id="boardrules_enable" name="boardrules_enable" value="1"{% if S_BOARDRULES_ENABLE %} checked="checked"{% endif %} /> {{ lang('YES') }}</label>
21-
<label><input type="radio" class="radio" name="boardrules_enable" value="0"{% if not S_BOARDRULES_ENABLE %} checked="checked"{% endif %} /> {{ lang('NO') }}</label></dd>
20+
<dd><label><input type="radio" class="radio" id="boardrules_enable" name="boardrules_enable" value="1"{% if S_BOARDRULES_ENABLE %} checked="checked"{% endif %}> {{ lang('YES') }}</label>
21+
<label><input type="radio" class="radio" name="boardrules_enable" value="0"{% if not S_BOARDRULES_ENABLE %} checked="checked"{% endif %}> {{ lang('NO') }}</label></dd>
2222
</dl>
2323
<dl>
2424
<dt><label for="boardrules_header_link">{{ lang('ACP_BOARDRULES_HEADER_LINK') ~ lang('COLON') }}</label></dt>
25-
<dd><label><input type="radio" class="radio" id="boardrules_header_link" name="boardrules_header_link" value="1"{% if S_BOARDRULES_HEADER_LINK %} checked="checked"{% endif %} /> {{ lang('YES') }}</label>
26-
<label><input type="radio" class="radio" name="boardrules_header_link" value="0"{% if not S_BOARDRULES_HEADER_LINK %} checked="checked"{% endif %} /> {{ lang('NO') }}</label></dd>
25+
<dd><label><input type="radio" class="radio" id="boardrules_header_link" name="boardrules_header_link" value="1"{% if S_BOARDRULES_HEADER_LINK %} checked="checked"{% endif %}> {{ lang('YES') }}</label>
26+
<label><input type="radio" class="radio" name="boardrules_header_link" value="0"{% if not S_BOARDRULES_HEADER_LINK %} checked="checked"{% endif %}> {{ lang('NO') }}</label></dd>
2727
</dl>
2828
<dl>
29-
<dt><label for="boardrules_font_icon">{{ lang('ACP_BOARDRULES_FONT_ICON') ~ lang('COLON') }}</label><br /><span>{{ lang('ACP_BOARDRULES_FONT_ICON_EXPLAIN', 'https://fontawesome.com/v4.7.0/icons/') }}</span></dt>
30-
<dd><input name="boardrules_font_icon" id="boardrules_font_icon" placeholder="book" type="text" size="15" maxlength="255" value="{{ BOARDRULES_FONT_ICON }}" /> <i style="font-size:14px" class="icon fa-{{ BOARDRULES_FONT_ICON }}"></i></dd>
29+
<dt><label for="boardrules_font_icon">{{ lang('ACP_BOARDRULES_FONT_ICON') ~ lang('COLON') }}</label><br><span>{{ lang('ACP_BOARDRULES_FONT_ICON_EXPLAIN', 'https://fontawesome.com/v4.7.0/icons/') }}</span></dt>
30+
<dd><input name="boardrules_font_icon" id="boardrules_font_icon" placeholder="book" type="text" size="15" maxlength="255" value="{{ BOARDRULES_FONT_ICON }}"> <i style="font-size:14px" class="icon fa-{{ BOARDRULES_FONT_ICON }}"></i></dd>
3131
</dl>
3232
<dl>
33-
<dt><label for="boardrules_list_style">{{ lang('ACP_BOARDRULES_LIST_STYLE') ~ lang('COLON') }}</label><br /><span>{{ lang('ACP_BOARDRULES_LIST_STYLE_EXPLAIN') }}</span></dt>
33+
<dt><label for="boardrules_list_style">{{ lang('ACP_BOARDRULES_LIST_STYLE') ~ lang('COLON') }}</label><br><span>{{ lang('ACP_BOARDRULES_LIST_STYLE_EXPLAIN') }}</span></dt>
3434
<dd><label for="boardrules_list_style"><select name="boardrules_list_style" id="boardrules_list_style">{{ BOARDRULES_LIST_STYLE }}</select></label></dd>
3535
</dl>
3636
<dl>
37-
<dt><label for="boardrules_require_at_registration">{{ lang('ACP_BOARDRULES_AT_REGISTRATION') ~ lang('COLON') }}</label><br /><span>{{ lang('ACP_BOARDRULES_AT_REGISTRATION_EXPLAIN') }}</span></dt>
38-
<dd><label><input type="radio" class="radio" id="boardrules_require_at_registration" name="boardrules_require_at_registration" value="1"{% if S_BOARDRULES_REQUIRE_AT_REGISTRATION %} checked="checked"{% endif %} /> {{ lang('YES') }}</label>
39-
<label><input type="radio" class="radio" name="boardrules_require_at_registration" value="0"{% if not S_BOARDRULES_REQUIRE_AT_REGISTRATION %} checked="checked"{% endif %} /> {{ lang('NO') }}</label></dd>
37+
<dt><label for="boardrules_require_at_registration">{{ lang('ACP_BOARDRULES_AT_REGISTRATION') ~ lang('COLON') }}</label><br><span>{{ lang('ACP_BOARDRULES_AT_REGISTRATION_EXPLAIN') }}</span></dt>
38+
<dd><label><input type="radio" class="radio" id="boardrules_require_at_registration" name="boardrules_require_at_registration" value="1"{% if S_BOARDRULES_REQUIRE_AT_REGISTRATION %} checked="checked"{% endif %}> {{ lang('YES') }}</label>
39+
<label><input type="radio" class="radio" name="boardrules_require_at_registration" value="0"{% if not S_BOARDRULES_REQUIRE_AT_REGISTRATION %} checked="checked"{% endif %}> {{ lang('NO') }}</label></dd>
4040
</dl>
4141
</fieldset>
4242

4343
<fieldset>
4444
<legend>{{ lang('NOTIFY') }}</legend>
4545
<dl>
46-
<dt><label for="action_send_notification">{{ lang('ACP_BOARDRULES_NOTIFY') ~ lang('COLON') }}</label><br /><span>{{ lang('ACP_BOARDRULES_NOTIFY_EXPLAIN') }}</span></dt>
47-
<dd><input class="button2" type="submit" id="action_send_notification" name="action_send_notification" value="{{ lang('ACP_BOARDRULES_NOTIFY') }}" /></dd>
46+
<dt><label for="action_send_notification">{{ lang('ACP_BOARDRULES_NOTIFY') ~ lang('COLON') }}</label><br><span>{{ lang('ACP_BOARDRULES_NOTIFY_EXPLAIN') }}</span></dt>
47+
<dd><input class="button2" type="submit" id="action_send_notification" name="action_send_notification" value="{{ lang('ACP_BOARDRULES_NOTIFY') }}"></dd>
4848
</dl>
4949
</fieldset>
5050

5151
<fieldset class="submit-buttons">
52-
<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
53-
<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}" />
52+
<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}">&nbsp;
53+
<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}">
5454
{{ S_FORM_TOKEN }}
5555
</fieldset>
5656
</form>

0 commit comments

Comments
 (0)