Skip to content

Commit 192eb2f

Browse files
Crizz0Crizz0
authored
Merge pull request #43 from Crizz0/twig-template
Convert to Twig syntax
2 parents 4bfb07a + 4f6c771 commit 192eb2f

File tree

4 files changed

+55
-55
lines changed

4 files changed

+55
-55
lines changed

‎adm/style/acp_aboutus.html‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- INCLUDE overall_header.html -->
1+
{% include 'overall_header.html' %}
22

33
<script type="text/javascript">
44
// <![CDATA[
@@ -14,77 +14,77 @@
1414

1515
<a id="maincontent"></a>
1616

17-
<h1>{L_ACP_ABOUTUS_SETTINGS}</h1>
17+
<h1>{{ lang('ACP_ABOUTUS_SETTINGS') }}</h1>
1818

19-
<p>{L_ACP_ABOUTUS_SETTINGS_EXPLAIN}</p>
19+
<p>{{ lang('ACP_ABOUTUS_SETTINGS_EXPLAIN') }}</p>
2020

21-
<form id="acp_aboutus" method="post" action="{U_ACTION}">
22-
<!-- IF ACP_ABOUTUS_INFO_PREVIEW -->
21+
<form id="acp_aboutus" method="post" action="{{ U_ACTION }}">
22+
{% if ACP_ABOUTUS_INFO_PREVIEW %}
2323
<fieldset>
24-
<legend>{L_ACP_ABOUTUS_INFO_PREVIEW}</legend>
25-
<p>{ACP_ABOUTUS_INFO_PREVIEW}</p>
24+
<legend>{{ lang('ACP_ABOUTUS_INFO_PREVIEW') }}</legend>
25+
<p>{{ ACP_ABOUTUS_INFO_PREVIEW }}</p>
2626
</fieldset>
27-
<!-- ENDIF -->
27+
{% endif %}
2828

2929
<fieldset>
30-
<legend>{L_ACP_ABOUTUS_INFO}</legend>
31-
<p>{L_ACP_ABOUTUS_INFO_EXPLAIN}</p>
30+
<legend>{{ lang('ACP_ABOUTUS_INFO') }}</legend>
31+
<p>{{ lang('ACP_ABOUTUS_INFO_EXPLAIN') }}</p>
3232

33-
<!-- INCLUDE acp_posting_buttons.html -->
33+
{% include 'acp_posting_buttons.html' %}
3434

3535
<dl class="responsive-columns">
3636
<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
3737
</dt>
3838

39-
<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;">
40-
<textarea name="aboutus_info" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{ACP_ABOUTUS_INFO}</textarea>
39+
<dd style="margin-{{ S_CONTENT_FLOW_BEGIN }}: 90px;">
40+
<textarea name="aboutus_info" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{{ ACP_ABOUTUS_INFO }}</textarea>
4141
</dd>
4242

4343
<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
44-
<!-- IF S_BBCODE_ALLOWED -->
45-
<label><input type="checkbox" class="radio" name="disable_bbcode"<!-- IF S_BBCODE_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_BBCODE}</label>
46-
<!-- ENDIF -->
47-
<!-- IF S_SMILIES_ALLOWED -->
48-
<label><input type="checkbox" class="radio" name="disable_smilies"<!-- IF S_SMILIES_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_SMILIES}</label>
49-
<!-- ENDIF -->
50-
<!-- IF S_LINKS_ALLOWED -->
51-
<label><input type="checkbox" class="radio" name="disable_magic_url"<!-- IF S_MAGIC_URL_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_MAGIC_URL}</label>
52-
<!-- ENDIF -->
44+
{% if S_BBCODE_ALLOWED %}
45+
<label><input type="checkbox" class="radio" name="disable_bbcode"{% if S_BBCODE_DISABLE_CHECKED %} checked="checked"{% endif %} /> {{ lang('DISABLE_BBCODE') }}</label>
46+
{% endif %}
47+
{% if S_SMILIES_ALLOWED %}
48+
<label><input type="checkbox" class="radio" name="disable_smilies"{% if S_SMILIES_DISABLE_CHECKED %} checked="checked"{% endif %} /> {{ lang('DISABLE_SMILIES') }}</label>
49+
{% endif %}
50+
{% if S_LINKS_ALLOWED %}
51+
<label><input type="checkbox" class="radio" name="disable_magic_url"{% if S_MAGIC_URL_DISABLE_CHECKED %} checked="checked"{% endif %} /> {{ lang('DISABLE_MAGIC_URL') }}</label>
52+
{% endif %}
5353
</dd>
54-
<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
54+
<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>
5555
</dl>
5656
</fieldset>
5757

5858
<fieldset>
59-
<legend>{L_GENERAL_OPTIONS}</legend>
59+
<legend>{{ lang('GENERAL_OPTIONS') }}</legend>
6060
<dl>
61-
<dt><label for="acp_aboutus_termsofuse_enable">{L_ACP_TERMS_OF_USE_ENABLE}{L_COLON}</label><br /><span>{L_ACP_TERMS_OF_USE_ENABLE_EXPLAIN}</span></dt>
61+
<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>
6262
<dd>
63-
<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 --> /> {L_YES}</label>
64-
<label><input type="radio" class="radio" name="acp_aboutus_termsofuse_enable" value="0"<!-- IF not TERMS_OF_USE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
63+
<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>
64+
<label><input type="radio" class="radio" name="acp_aboutus_termsofuse_enable" value="0"{% if not TERMS_OF_USE %} checked="checked"{% endif %} /> {{ lang('NO') }}</label>
6565
</dd>
6666
</dl>
6767
<dl>
68-
<dt><label for="acp_aboutus_privacy_enable">{L_ACP_PRIVACY_ENABLE}{L_COLON}</label><br /><span>{L_ACP_PRIVACY_ENABLE_EXPLAIN}</span></dt>
68+
<dt><label for="acp_aboutus_privacy_enable">{{ lang('ACP_PRIVACY_ENABLE') }}{{ lang('COLON') }}</label><br /><span>{{ lang('ACP_PRIVACY_ENABLE_EXPLAIN') }}</span></dt>
6969
<dd>
70-
<label><input type="radio" class="radio" id="acp_aboutus_privacy_enable" name="acp_aboutus_privacy_enable" value="1"<!-- IF PRIVACY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
71-
<label><input type="radio" class="radio" name="acp_aboutus_privacy_enable" value="0"<!-- IF not PRIVACY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
70+
<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>
71+
<label><input type="radio" class="radio" name="acp_aboutus_privacy_enable" value="0"{% if not PRIVACY %} checked="checked"{% endif %} /> {{ lang('NO') }}</label>
7272
</dd>
7373
</dl>
7474
<dl>
75-
<dt><label for="acp_aboutus_enable">{L_ACP_ABOUTUS_ENABLE}{L_COLON}</label><br /><span>{L_ACP_ABOUTUS_ENABLE_EXPLAIN}</span></dt>
75+
<dt><label for="acp_aboutus_enable">{{ lang('ACP_ABOUTUS_ENABLE') }}{{ lang('COLON') }}</label><br /><span>{{ lang('ACP_ABOUTUS_ENABLE_EXPLAIN') }}</span></dt>
7676
<dd>
77-
<label><input type="radio" class="radio" id="acp_aboutus_enable" name="acp_aboutus_enable" value="1"<!-- IF ABOUTUS_ENABLE -->checked="checked"<!-- ENDIF --> /> {L_YES} </label>
78-
<label><input type="radio" class="radio" name="acp_aboutus_enable" value="0"<!-- IF not ABOUTUS_ENABLE -->checked="checked"<!-- ENDIF --> /> {L_NO} </label>
77+
<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>
78+
<label><input type="radio" class="radio" name="acp_aboutus_enable" value="0"{% if not ABOUTUS_ENABLE %}checked="checked"{% endif %} /> {{ lang('NO') }} </label>
7979
</dd>
8080
</dl>
8181
</fieldset>
8282

8383
<fieldset class="submit-buttons">
84-
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
85-
<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
86-
{S_FORM_TOKEN}
84+
<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
85+
<input class="button2" type="submit" name="preview" value="{{ lang('PREVIEW') }}" />
86+
{{ S_FORM_TOKEN }}
8787
</fieldset>
8888
</form>
8989

90-
<!-- INCLUDE overall_footer.html -->
90+
{% include 'overall_footer.html' %}

‎styles/prosilver/template/aboutus.html‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
<!-- INCLUDE overall_header.html -->
1+
{% include 'overall_header.html' %}
22

3-
<h2>{L_ABOUTUS}</h2>
3+
<h2>{{ lang('ABOUTUS') }}</h2>
44

55
<div class="panel aboutus">
66
<div class="inner">
77
<div class="content">
8-
{ABOUTUS_OUTPUT}
8+
{{ ABOUTUS_OUTPUT }}
99
</div>
10-
<!-- IF TERMS_OF_USE or PRIVACY -->
11-
<!-- IF TERMS_OF_USE and PRIVACY -->
12-
<h2>{L_TERMS_USE} {L_ABOUTUS_AND} {L_PRIVACY}</h2>
13-
<p>{L_DESCRIPTION_PRIVACY_TERMS_OF_USE} <a href="{U_TERMS_USE}">{L_TERMS_USE}</a> {L_ABOUTUS_AND} <a href="{U_PRIVACY}">{L_PRIVACY}</a></p>
14-
<!-- ELSEIF PRIVACY -->
15-
<h2>{L_PRIVACY}</h2>
16-
<p>{L_DESCRIPTION_PRIVACY} <a href="{U_PRIVACY}">{L_PRIVACY}</a></p>
17-
<!-- ELSEIF TERMS_OF_USE -->
18-
<h2>{L_TERMS_USE}</h2>
19-
<p>{L_DESCRIPTION_TERMS_OF_USE} <a href="{U_TERMS_USE}">{L_TERMS_USE}</a></p>
20-
<!-- ENDIF -->
21-
<!-- ENDIF -->
10+
{% if TERMS_OF_USE or PRIVACY %}
11+
{% if TERMS_OF_USE and PRIVACY %}
12+
<h2>{{ lang('TERMS_USE') }} {{ lang('ABOUTUS_AND') }} {{ lang('PRIVACY') }}</h2>
13+
<p>{{ lang('DESCRIPTION_PRIVACY_TERMS_OF_USE') }} <a href="{{ U_TERMS_USE }}">{{ lang('TERMS_USE') }}</a> {{ lang('ABOUTUS_AND') }} <a href="{{ U_PRIVACY }}">{{ lang('PRIVACY') }}</a></p>
14+
{% elseif PRIVACY %}
15+
<h2>{{ lang('PRIVACY') }}</h2>
16+
<p>{{ lang('DESCRIPTION_PRIVACY') }} <a href="{{ U_PRIVACY }}">{{ lang('PRIVACY') }}</a></p>
17+
{% elseif TERMS_OF_USE %}
18+
<h2>{{ lang('TERMS_USE') }}</h2>
19+
<p>{{ lang('DESCRIPTION_TERMS_OF_USE') }} <a href="{{ U_TERMS_USE }}">{{ lang('TERMS_USE') }}</a></p>
20+
{% endif %}
21+
{% endif %}
2222
</div>
2323
</div>
2424

25-
<!-- INCLUDE overall_footer.html -->
25+
{% include 'overall_footer.html' %}

‎styles/prosilver/template/event/overall_footer_teamlink_after.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!-- IF ABOUTUS_ENABLE --><li class="small-icon icon-team rightside" data-last-responsive="true"><a href="{U_ABOUTUS}">{L_ABOUTUS}</a></li><!-- ENDIF -->
1+
{% if ABOUTUS_ENABLE %}<li class="small-icon icon-team rightside" data-last-responsive="true"><a href="{{ U_ABOUTUS }}">{{ lang('ABOUTUS') }}</a></li>{% endif %}

‎styles/prosilver/template/event/overall_header_head_append.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!-- INCLUDECSS @crizzo_aboutus/aboutus.css -->
1+
{% INCLUDECSS '@crizzo_aboutus/aboutus.css' %}

0 commit comments

Comments
 (0)