Skip to content

Commit 04d1437

Browse files
Crizz0Crizz0
authored
Merge pull request #58 from Crizz0/update-html-code
Remove XHTML, draft new version
2 parents dc54ae5 + 8574a62 commit 04d1437

File tree

4 files changed

+22
-26
lines changed

4 files changed

+22
-26
lines changed

‎acp/acp_aboutus_info.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function module()
1717
return array(
1818
'filename' => '\crizzo\aboutus\acp\acp_aboutus_module',
1919
'title' => 'ACP_ABOUTUS_SETTINGS',
20-
'version' => '2.1.4-dev',
20+
'version' => '2.1.5',
2121
'modes' => array(
2222
'config_aboutus' => array('title' => 'ACP_ABOUTUS_SETTINGS', 'auth' => 'ext_crizzo/aboutus && acl_a_board', 'cat' => array('ACP_ABOUTUS_SETTINGS')),
2323
),

‎adm/style/acp_aboutus.html‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
{% include 'overall_header.html' %}
22

33
<script type="text/javascript">
4-
// <![CDATA[
5-
64
var form_name = 'acp_aboutus';
75
var text_name = 'aboutus_info';
86
var load_draft = false;
97
var upload = false;
108
var imageTag = false;
11-
12-
// ]]>
139
</script>
1410

1511
<a id="maincontent"></a>
@@ -22,34 +18,34 @@ <h1>{{ lang('ACP_ABOUTUS_SETTINGS') }}</h1>
2218
<fieldset>
2319
<legend>{{ lang('GENERAL_OPTIONS') }}</legend>
2420
<dl>
25-
<dt><label for="acp_aboutus_enable">{{ lang('ACP_ABOUTUS_ENABLE') }}{{ lang('COLON') }}</label><br /><span>{{ lang('ACP_ABOUTUS_ENABLE_EXPLAIN') }}</span></dt>
21+
<dt><label for="acp_aboutus_enable">{{ lang('ACP_ABOUTUS_ENABLE') }}{{ lang('COLON') }}</label><br><span>{{ lang('ACP_ABOUTUS_ENABLE_EXPLAIN') }}</span></dt>
2622
<dd>
27-
<label><input type="radio" class="radio" id="acp_aboutus_enable" name="acp_aboutus_enable" value="1"{% if ABOUTUS_ENABLE %} checked="checked"{% endif %} /> {{ lang('YES') }} </label>
28-
<label><input type="radio" class="radio" name="acp_aboutus_enable" value="0"{% if not ABOUTUS_ENABLE %} checked="checked"{% endif %} /> {{ lang('NO') }} </label>
23+
<label><input type="radio" class="radio" id="acp_aboutus_enable" name="acp_aboutus_enable" value="1"{% if ABOUTUS_ENABLE %} checked {% endif %}> {{ lang('YES') }} </label>
24+
<label><input type="radio" class="radio" name="acp_aboutus_enable" value="0"{% if not ABOUTUS_ENABLE %} checked {% endif %}> {{ lang('NO') }} </label>
2925
</dd>
3026
</dl>
3127

3228
<dl>
33-
<dt><label for="acp_aboutus_termsofuse_enable">{{ lang('ACP_TERMS_OF_USE_ENABLE') }}{{ lang('COLON') }}</label><br /><span>{{ lang('ACP_TERMS_OF_USE_ENABLE_EXPLAIN') }}</span></dt>
29+
<dt><label for="acp_aboutus_termsofuse_enable">{{ lang('ACP_TERMS_OF_USE_ENABLE') }}{{ lang('COLON') }}</label><br><span>{{ lang('ACP_TERMS_OF_USE_ENABLE_EXPLAIN') }}</span></dt>
3430
<dd>
35-
<label><input type="radio" class="radio" id="acp_aboutus_termsofuse_enable" name="acp_aboutus_termsofuse_enable" value="1"{% if TERMS_OF_USE %} checked="checked"{% endif %} /> {{ lang('YES') }}</label>
36-
<label><input type="radio" class="radio" name="acp_aboutus_termsofuse_enable" value="0"{% if not TERMS_OF_USE %} checked="checked"{% endif %} /> {{ lang('NO') }}</label>
31+
<label><input type="radio" class="radio" id="acp_aboutus_termsofuse_enable" name="acp_aboutus_termsofuse_enable" value="1"{% if TERMS_OF_USE %} checked {% endif %}> {{ lang('YES') }}</label>
32+
<label><input type="radio" class="radio" name="acp_aboutus_termsofuse_enable" value="0"{% if not TERMS_OF_USE %} checked {% endif %}> {{ lang('NO') }}</label>
3733
</dd>
3834
</dl>
3935

4036
<dl>
41-
<dt><label for="acp_aboutus_privacy_enable">{{ lang('ACP_PRIVACY_ENABLE') }}{{ lang('COLON') }}</label><br /><span>{{ lang('ACP_PRIVACY_ENABLE_EXPLAIN') }}</span></dt>
37+
<dt><label for="acp_aboutus_privacy_enable">{{ lang('ACP_PRIVACY_ENABLE') }}{{ lang('COLON') }}</label><br><span>{{ lang('ACP_PRIVACY_ENABLE_EXPLAIN') }}</span></dt>
4238
<dd>
43-
<label><input type="radio" class="radio" id="acp_aboutus_privacy_enable" name="acp_aboutus_privacy_enable" value="1"{% if PRIVACY %} checked="checked"{% endif %} /> {{ lang('YES') }}</label>
44-
<label><input type="radio" class="radio" name="acp_aboutus_privacy_enable" value="0"{% if not PRIVACY %} checked="checked"{% endif %} /> {{ lang('NO') }}</label>
39+
<label><input type="radio" class="radio" id="acp_aboutus_privacy_enable" name="acp_aboutus_privacy_enable" value="1"{% if PRIVACY %} checked {% endif %}> {{ lang('YES') }}</label>
40+
<label><input type="radio" class="radio" name="acp_aboutus_privacy_enable" value="0"{% if not PRIVACY %} checked {% endif %}> {{ lang('NO') }}</label>
4541
</dd>
4642
</dl>
4743

4844
<dl>
49-
<dt><label for="acp_aboutus_meta_noindex">{{ lang('ACP_META_NOINDEX_ENABLE') }}{{ lang('COLON') }}</label><br /><span>{{ lang('ACP_META_NOINDEX_ENABLE_EXPLAIN') }}</span></dt>
45+
<dt><label for="acp_aboutus_meta_noindex">{{ lang('ACP_META_NOINDEX_ENABLE') }}{{ lang('COLON') }}</label><br><span>{{ lang('ACP_META_NOINDEX_ENABLE_EXPLAIN') }}</span></dt>
5046
<dd>
51-
<label><input type="radio" class="radio" id="acp_aboutus_meta_noindex" name="acp_aboutus_meta_noindex" value="1"{% if META_NOINDEX %} checked="checked"{% endif %} /> {{ lang('YES') }}</label>
52-
<label><input type="radio" class="radio" name="acp_aboutus_meta_noindex" value="0"{% if not META_NOINDEX %} checked="checked"{% endif %} /> {{ lang('NO') }}</label>
47+
<label><input type="radio" class="radio" id="acp_aboutus_meta_noindex" name="acp_aboutus_meta_noindex" value="1"{% if META_NOINDEX %} checked {% endif %}> {{ lang('YES') }}</label>
48+
<label><input type="radio" class="radio" name="acp_aboutus_meta_noindex" value="0"{% if not META_NOINDEX %} checked {% endif %}> {{ lang('NO') }}</label>
5349
</dd>
5450
</dl>
5551
</fieldset>
@@ -77,22 +73,22 @@ <h1>{{ lang('ACP_ABOUTUS_SETTINGS') }}</h1>
7773

7874
<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
7975
{% if S_BBCODE_ALLOWED %}
80-
<label><input type="checkbox" class="radio" name="disable_bbcode"{% if S_BBCODE_DISABLE_CHECKED %} checked="checked"{% endif %} /> {{ lang('DISABLE_BBCODE') }}</label>
76+
<label><input type="checkbox" class="radio" name="disable_bbcode"{% if S_BBCODE_DISABLE_CHECKED %} checked {% endif %}> {{ lang('DISABLE_BBCODE') }}</label>
8177
{% endif %}
8278
{% if S_SMILIES_ALLOWED %}
83-
<label><input type="checkbox" class="radio" name="disable_smilies"{% if S_SMILIES_DISABLE_CHECKED %} checked="checked"{% endif %} /> {{ lang('DISABLE_SMILIES') }}</label>
79+
<label><input type="checkbox" class="radio" name="disable_smilies"{% if S_SMILIES_DISABLE_CHECKED %} checked {% endif %}> {{ lang('DISABLE_SMILIES') }}</label>
8480
{% endif %}
8581
{% if S_LINKS_ALLOWED %}
86-
<label><input type="checkbox" class="radio" name="disable_magic_url"{% if S_MAGIC_URL_DISABLE_CHECKED %} checked="checked"{% endif %} /> {{ lang('DISABLE_MAGIC_URL') }}</label>
82+
<label><input type="checkbox" class="radio" name="disable_magic_url"{% if S_MAGIC_URL_DISABLE_CHECKED %} checked {% endif %}> {{ lang('DISABLE_MAGIC_URL') }}</label>
8783
{% endif %}
8884
</dd>
8985
<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>
9086
</dl>
9187
</fieldset>
9288

9389
<fieldset class="submit-buttons">
94-
<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
95-
<input class="button2" type="submit" name="preview" value="{{ lang('PREVIEW') }}" />
90+
<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}">&nbsp;
91+
<input class="button2" type="submit" name="preview" value="{{ lang('PREVIEW') }}">
9692
{{ S_FORM_TOKEN }}
9793
</fieldset>
9894
</form>

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"type": "phpbb-extension",
44
"description": "About us is an extension which adds to phpBB 3.2/3.3 an about us or legal notice-page, where you can add your contact details and more.",
55
"homepage": "https://github.com/Crizz0/phpbb3-about-us",
6-
"version": "2.1.4",
7-
"time": "2023-12-21",
6+
"version": "2.1.5",
7+
"time": "2023-12-31",
88
"license": "GPL-2.0-only",
99
"authors": [{
1010
"name": "Christian Schnegelberger",
@@ -13,7 +13,7 @@
1313
"role": "Developer/Founder"
1414
}],
1515
"require": {
16-
"php": ">=5.4.7,<=8.3"
16+
"php": ">=7.2,<=8.3"
1717
},
1818
"require-dev": {
1919
"phpbb/translation-validator": "1.5.*"

‎controller/main.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function base()
8787
'TERMS_OF_USE' => $this->config['acp_aboutus_termsofuse_enable'],
8888
'PRIVACY' => $this->config['acp_aboutus_privacy_enable'],
8989

90-
'META' => ($this->config['acp_aboutus_meta_noindex']) ? '<meta name="robots" content="noindex" />' : '',
90+
'META' => ($this->config['acp_aboutus_meta_noindex']) ? '<meta name="robots" content="noindex">' : '',
9191

9292
'ABOUTUS_ENABLE' => $this->config['acp_aboutus_enable'],
9393
));

0 commit comments

Comments
 (0)