Skip to content

Commit

Permalink
Merge pull request #352 from ldidry/remove-tabs by ldidry
Browse files Browse the repository at this point in the history
Remove tabs in default tt2 templates + some indentation changes
  • Loading branch information
ikedas authored Jun 30, 2018
2 parents b08ac9f + aea9862 commit 6864055
Show file tree
Hide file tree
Showing 60 changed files with 2,981 additions and 2,978 deletions.
56 changes: 28 additions & 28 deletions default/mhonarc-ressources.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ CALENDAR
<div>
<ul class="calendar">
<li class="calendarLinksInactive">($tag$% year.key %$tag$)</li>
($tag$% FOREACH month = ['01' '02' '03' '04' '05' '06' '07' '08' '09' '10' '11' '12'] %$tag$)
($tag$% FOREACH month = ['01' '02' '03' '04' '05' '06' '07' '08' '09' '10' '11' '12'] %$tag$)
($tag$% IF year.value.item(month) %$tag$)
($tag$% IF year.key == '$yyyy$' && month == '$mois$'%$tag$) <li class="calendarLinksCurrentPage"><a href="($tag$% path_cgi %$tag$)/arc/($tag$% list %$tag$)/($tag$% year.key %$tag$)-($tag$% month %$tag$)/" title="($tag$%|loc(year.value.item(month))%$tag$)%1 message(s)($tag$%END%$tag$)">($tag$% month %$tag$)</a></li>
($tag$% ELSE %$tag$)<li class="calendarLinks"><a href="($tag$% path_cgi %$tag$)/arc/($tag$% list %$tag$)/($tag$% year.key %$tag$)-($tag$% month %$tag$)/" title="($tag$%|loc(year.value.item(month))%$tag$)%1 message(s)($tag$%END%$tag$)">($tag$% month %$tag$)</a></li>
($tag$% END %$tag$)
($tag$% IF year.key == '$yyyy$' && month == '$mois$'%$tag$) <li class="calendarLinksCurrentPage"><a href="($tag$% path_cgi %$tag$)/arc/($tag$% list %$tag$)/($tag$% year.key %$tag$)-($tag$% month %$tag$)/" title="($tag$%|loc(year.value.item(month))%$tag$)%1 message(s)($tag$%END%$tag$)">($tag$% month %$tag$)</a></li>
($tag$% ELSE %$tag$)<li class="calendarLinks"><a href="($tag$% path_cgi %$tag$)/arc/($tag$% list %$tag$)/($tag$% year.key %$tag$)-($tag$% month %$tag$)/" title="($tag$%|loc(year.value.item(month))%$tag$)%1 message(s)($tag$%END%$tag$)">($tag$% month %$tag$)</a></li>
($tag$% END %$tag$)
($tag$% ELSE %$tag$)<li class="calendarLinksInactive">($tag$% month %$tag$)</li>
($tag$% END %$tag$)
($tag$% END %$tag$)
Expand All @@ -36,22 +36,22 @@ CALENDAR

<DefineVar>
SEARCH_FORM
<div class="search_form">
<form method="post" action="($tag$% path_cgi %$tag$)">
<input name="list" type="hidden" value="($tag$% list %$tag$)" />
<input name="archive_name" type="hidden" value="($tag$% archive_name %$tag$)" />
<input name="how" type="hidden" value="phrase" />
<input name="age" type="hidden" value="new" />
<input name="case" type="hidden" value="off" />
<input name="match" type="hidden" value="partial" />
<input name="limit" type="hidden" value="10" />
<input name="body" type="hidden" value="true" />
<input name="subj" type="hidden" value="true" />
<input id="key_word" name="key_word" type="text" size="12" />
<input name="action" type="hidden" value="arcsearch" />
<input type="submit" class="MainMenuLinks disableIfEmpty" data-selector="#key_word" name="action_arcsearch" value="($tag$%|loc%$tag$)Search($tag$%END%$tag$)" />
<input type="submit" class="MainMenuLinks" name="action_arcsearch_form" value="($tag$%|loc%$tag$)Advanced search($tag$%END%$tag$)" />
</form>
<div class="search_form">
<form method="post" action="($tag$% path_cgi %$tag$)">
<input name="list" type="hidden" value="($tag$% list %$tag$)" />
<input name="archive_name" type="hidden" value="($tag$% archive_name %$tag$)" />
<input name="how" type="hidden" value="phrase" />
<input name="age" type="hidden" value="new" />
<input name="case" type="hidden" value="off" />
<input name="match" type="hidden" value="partial" />
<input name="limit" type="hidden" value="10" />
<input name="body" type="hidden" value="true" />
<input name="subj" type="hidden" value="true" />
<input id="key_word" name="key_word" type="text" size="12" />
<input name="action" type="hidden" value="arcsearch" />
<input type="submit" class="MainMenuLinks disableIfEmpty" data-selector="#key_word" name="action_arcsearch" value="($tag$%|loc%$tag$)Search($tag$%END%$tag$)" />
<input type="submit" class="MainMenuLinks" name="action_arcsearch_form" value="($tag$%|loc%$tag$)Advanced search($tag$%END%$tag$)" />
</form>
</div>
</DefineVar>

Expand Down Expand Up @@ -469,7 +469,7 @@ $POWERED_BY$
($tag$% IF list_conf.reply_to_header.value == 'all' %$tag$)
<input type="hidden" name="to" value="$FROMADDRNAME:J$ $FROMADDRDOMAIN$,($tag$% list %$tag$) ($tag$% domain %$tag$)" />
($tag$% ELSIF list_conf.reply_to_header.value == 'other_email' %$tag$)
($tag$% SET oemail = list_conf.reply_to_header.other_email %$tag$)
($tag$% SET oemail = list_conf.reply_to_header.other_email %$tag$)
<input type="hidden" name="to" value="($tag$% oemail.replace('@',' ') %$tag$)" />
($tag$% ELSIF list_conf.reply_to_header.value == 'list' %$tag$)
<input type="hidden" name="to" value="($tag$% list %$tag$) ($tag$% domain %$tag$)" />
Expand All @@ -480,21 +480,21 @@ $POWERED_BY$
($tag$%|loc%$tag$)Reply to($tag$%END%$tag$)
<input id="to_sender" type="radio" name="to"
value="$FROMADDRNAME:J$ $FROMADDRDOMAIN$"
($tag$% IF list_conf.reply_to_header.value == 'sender' %$tag$)
checked
($tag$%END%$tag$) />
($tag$% IF list_conf.reply_to_header.value == 'sender' %$tag$)
checked
($tag$%END%$tag$) />
<label class="inlineLabel" for="to_sender">($tag$%|loc%$tag$)sender($tag$%END%$tag$)</label>
<input id="to_list" type="radio" name="to"
value="($tag$% list %$tag$) ($tag$% domain %$tag$)"
($tag$% IF list_conf.reply_to_header.value == 'list' %$tag$)
checked
($tag$%END%$tag$) />
checked
($tag$%END%$tag$) />
<label class="inlineLabel" for="to_list">($tag$%|loc%$tag$)list($tag$%END%$tag$)</label>
<input id="to_both" type="radio" name="to"
value="$FROMADDRNAME:J$ $FROMADDRDOMAIN$,($tag$% list %$tag$) ($tag$% domain %$tag$)"
($tag$% IF list_conf.reply_to_header.value == 'all' %$tag$)
checked
($tag$%END%$tag$) />
checked
($tag$%END%$tag$) />
<label class="inlineLabel" for="to_both">($tag$%|loc%$tag$)both($tag$%END%$tag$)</label>
($tag$% END %$tag$)
<input class="MainMenuLinks" type="submit" name="action_compose_mail" value="($tag$%|loc%$tag$)Reply($tag$%END%$tag$)" /><br />
Expand Down
18 changes: 9 additions & 9 deletions default/web_tt2/active_lists.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@

<h2 class="block"> <strong>
[% IF count %]
[%|loc(count)%] The %1 most active lists [%END%]
[%|loc(count)%] The %1 most active lists [%END%]
[% ELSE %]
[%|loc%] Active lists [%END%]
[%|loc%] Active lists [%END%]
[% END %]

[% IF for %]
[%|loc(for)%] for %1 days [%END%]
[%|loc(for)%] for %1 days [%END%]
[% END %]
</strong> </h2>
</strong> </h2>

<br />
<br />

<table class="responsive listOfItems" >
<caption>[%|loc(count)%] The %1 most active lists [%END%][%|loc(for)%] for %1 days [%END%]</caption>
<tr class="color_light">
<th id="list_name"><strong>[%|loc%]List name[%END%]</strong></th>
<th id="message"><strong>[%|loc%]Number of messages[%END%]</strong></th>
<th id="message"><strong>[%|loc%]Number of messages[%END%]</strong></th>
<th id="average"><strong>[%|loc%]Average by day[%END%]</strong></th>
<th id="date"><strong>[%|loc%]Creation date[%END%]</strong></th>
<th id="subject"><strong>[%|loc%]Subject[%END%]</strong></th>
Expand All @@ -36,9 +36,9 @@
<td headers="date"> [% l.date %] </td>
<td headers="subject"> [% l.subject %] </td>
</tr>
[% END %]

[% END %]

</table>

<!-- end active_lists.tt2 -->
4 changes: 2 additions & 2 deletions default/web_tt2/admin.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<h2>[%|loc%]Casual administration[%END%]</h2>
<ul>
[% IF is_listmaster || is_owner %]
<li><strong><a href="[% 'edit_list_request' | url_rel([list]) %]">[%|loc%]Edit List Config:[%END%]</a></strong> [%|loc%]It must be used with care. It allows you to modify some of the list parameters. The list of parameters you can modify depends on your privilege.[%END%]</li>
<li><strong><a href="[% 'edit_list_request' | url_rel([list]) %]">[%|loc%]Edit List Config:[%END%]</a></strong> [%|loc%]It must be used with care. It allows you to modify some of the list parameters. The list of parameters you can modify depends on your privilege.[%END%]</li>
[% END %]
[% IF is_listmaster || is_owner || may_del %]
<li><strong><a href="[% 'review' | url_rel([list]) %]">[%|loc%]Manage Subscribers:[%END%]</a></strong> [%|loc%]Allows you to add or delete list members, moderate subscriptions, and so on.[%END%]</li>
[% IF conf.use_blacklist != 'none' %]
<li><strong><a href="[% 'blacklist' | url_rel([list]) %]" >[%|loc%]Blacklist:[%END%]</a></strong> [%|loc%]Handles the set of black-listed mail addresses for this list.[%END%]</li>
<li><strong><a href="[% 'blacklist' | url_rel([list]) %]" >[%|loc%]Blacklist:[%END%]</a></strong> [%|loc%]Handles the set of black-listed mail addresses for this list.[%END%]</li>
[% END %]
[% END %]
[% IF is_listmaster || is_owner %]
Expand Down
38 changes: 19 additions & 19 deletions default/web_tt2/arcsearch.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,33 @@
<em>

[% IF how == 'phrase' %]
[%|loc%](This sentence,[%END%]
[%|loc%](This sentence,[%END%]
[% ELSIF how == 'any' %]
[%|loc%](All of these words,[%END%]
[%|loc%](All of these words,[%END%]
[% ELSE %]
[%|loc%](Each of these words,[%END%]
[%|loc%](Each of these words,[%END%]
[% END %]

[% IF case == 'off' %]
[%|loc%]case insensitive[%END%]
[%|loc%]case insensitive[%END%]
[% ELSE %]
[%|loc%]case sensitive[%END%]
[%|loc%]case sensitive[%END%]
[% END %]

[% IF match == 'partial' %]
[%|loc%]and checking on part of word)[%END%]
[%|loc%]and checking on part of word)[%END%]
[% ELSE %]
[%|loc%]and checking on entire word)[%END%]
[%|loc%]and checking on entire word)[%END%]
[% END %]
</em>
</p>

<hr />

[% IF age == 'new' %]
<p><strong>[%|loc%]Newest messages first[%END%]</strong></p>
<p><strong>[%|loc%]Newest messages first[%END%]</strong></p>
[% ELSE %]
<p><strong>[%|loc%]Oldest messages first[%END%]</strong></p>
<p><strong>[%|loc%]Oldest messages first[%END%]</strong></p>
[% END %]

<dl>
Expand Down Expand Up @@ -76,19 +76,19 @@
<dl>

[% IF body %]
<dd>[%|loc(body_count)%]%1 hits on message Body[%END%]<br /></dd>
<dd>[%|loc(body_count)%]%1 hits on message Body[%END%]<br /></dd>
[% END %]

[% IF subj %]
<dd>[%|loc(subj_count)%]%1 hits on message Subject field[%END%]<br /></dd>
<dd>[%|loc(subj_count)%]%1 hits on message Subject field[%END%]<br /></dd>
[% END %]

[% IF from %]
<dd>[%|loc(from_count)%] %1 hits on message From field[%END%]<br /></dd>
<dd>[%|loc(from_count)%] %1 hits on message From field[%END%]<br /></dd>
[% END %]

[% IF date %]
<dd>[%|loc(date_count)%]%1 hits on message Date field[%END%]<br /></dd>
<dd>[%|loc(date_count)%]%1 hits on message Date field[%END%]<br /></dd>
[% END %]

</dl>
Expand All @@ -110,27 +110,27 @@
<input type="hidden" name="previous" value="[% searched %]" />

[% IF body %]
<input type="hidden" name="body" value="[% body %]" />
<input type="hidden" name="body" value="[% body %]" />
[% END %]

[% IF subj %]
<input type="hidden" name="subj" value="[% subj %]" />
<input type="hidden" name="subj" value="[% subj %]" />
[% END %]

[% IF from %]
<input type="hidden" name="from" value="[% from %]" />
<input type="hidden" name="from" value="[% from %]" />
[% END %]

[% IF date %]
<input type="hidden" name="date" value="[% date %]" />
<input type="hidden" name="date" value="[% date %]" />
[% END %]

[% FOREACH u = directories %]
<input type="hidden" name="directories" value="[% u %]" />
<input type="hidden" name="directories" value="[% u %]" />
[% END %]

[% IF continue %]
<input class="MainMenuLinks" name="action_arcsearch" type="submit" value="[%|loc%]Continue search[%END%]" />
<input class="MainMenuLinks" name="action_arcsearch" type="submit" value="[%|loc%]Continue search[%END%]" />
[% END %]
<p class="text_center" >
<input style="padding:0.1em 5em!important;" class="MainMenuLinks" name="action_arcsearch_form" type="submit" value="[%|loc%]New search[%END%]" />
Expand Down
Loading

0 comments on commit 6864055

Please sign in to comment.