Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Late changes on svn repo #2

Merged
merged 10 commits into from
Mar 28, 2017
Merged

Late changes on svn repo #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
110f92e
[bug] wwsympa: Virtual robots in serveradmin/vhosts and rename_list_r…
ikedas Mar 12, 2017
eb14f5b
[-bug] wwsympa: "vhost" menu in serveradmin page may not be shown if …
ikedas Mar 12, 2017
1feb3e3
[bug] If originator address in message contains upper-case letters, "…
ikedas Mar 12, 2017
f2166c4
[-dev] Cleanup some unused stuff.
ikedas Mar 12, 2017
87b2058
[-dev] Updating translation catalog templates.
ikedas Mar 12, 2017
b24cb7c
[-dev] Updating translation catalog.
ikedas Mar 12, 2017
f776cd1
[-dev] Updating translation catalog.
ikedas Mar 12, 2017
980bda7
[-dev] Updating translation catalog.
ikedas Mar 12, 2017
bda1f4d
[-dev] Updating translation catalog.
ikedas Mar 12, 2017
299b431
Updating ChangeLog.
ikedas Mar 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24,871 changes: 13,181 additions & 11,690 deletions ChangeLog
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions default/mhonarc-ressources.tt2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,9 +503,13 @@ $POWERED_BY$
<input type="hidden" name="month" value="$mois$" />
<input type="hidden" name="msgid" value="$MSGID$" />
<input type="hidden" name="action" value="" />
($tag$% IF user.email == '$FROMADDRNAME:J$@$FROMADDRDOMAIN$' || is_owner %$tag$)
<input class="MainMenuLinks" type="submit" name="action_remove_arc" value="($tag$%|loc%$tag$)tag this mail for deletion($tag$%END%$tag$)" />
($tag$% END %$tag$)
($tag$% from_addr = BLOCK ~%$tag$)
($tag$% '$FROMADDRNAME:J$@$FROMADDRDOMAIN$' | canonic_email %$tag$)
($tag$%~ END ~%$tag$)
($tag$% IF user.email == from_addr || is_owner ~%$tag$)
<input class="MainMenuLinks" type="submit" name="action_remove_arc"
value="($tag$%|loc%$tag$)tag this mail for deletion($tag$%END%$tag$)" />
($tag$%~ END %$tag$)
($tag$% IF is_owner %$tag$)
<br /><input class="MainMenuLinks" type="submit" name="action_view_source" value="($tag$%|loc%$tag$)view source($tag$%END%$tag$)" />
($tag$% END %$tag$)
Expand Down
29 changes: 19 additions & 10 deletions default/web_tt2/edit_config.tt2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,26 @@
[% END %]
</td>
<td>
[% IF confparam.vhost == '1' %]
[% IF confparam.vhost == '1' ~%]
[% IF confparam.edit == '1' && removethistesttoenblefeature == '1' %]
<select name="robot">
[% FOREACH vr = robots %]<option value="[% vr.key %]" [% IF vr.key == robot %] selected="selected" [% END %]>[% vr.key %]</option>[% END %]
</select>
[% ELSE %]
[% robot %]
[% END %]
[% ELSE %]
[%|loc%]main conf[%END%]
[% END %]
[%~ IF robots ~%]
<select name="robot">
[% FOREACH vr = robots ~%]
<option value="[% vr.key %]"
[%~ IF vr.key == robot %] selected="selected" [% END ~%]
>[% vr.key %]</option>
[% END %]
</select>
[%~ ELSE ~%]
<input type="hidden" name="robot" value="[% robot %] />
[%~ robot %]
[%~ END %]
[%~ ELSE ~%]
[% robot %]
[%~ END %]
[%~ ELSE ~%]
[%|loc%]main conf[%END%]
[%~ END %]
</td>
<td>[% confparam.default %]</td>
</form>
Expand Down
10 changes: 6 additions & 4 deletions default/web_tt2/nav.tt2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,14 @@
<li class="[% class %]"><a href="[% 'serveradmin/templates' | url_rel %]">[%|loc%]Templates[%END%]</a></li>
[% IF action == 'skinsedit' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
<li class="[% class %]"><a href="[% 'skinsedit' | url_rel %]">[%|loc%]Skins, CSS and colors[%END%]</a></li>
[% IF main_robot %]
[% IF subaction == 'vhosts' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
[% IF main_robot && robots ~%]
[% IF subaction == 'vhosts' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
<li class="[% class %]"><a href="[% 'serveradmin/vhosts' | url_rel %]">[%|loc%]Virtual Robots[%END%]</a></li>
[% IF action == 'edit_config' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
[%~ END %]
[% IF main_robot ~%]
[% IF action == 'edit_config' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
<li class="[% class %]"><a href="[% 'edit_config' | url_rel %]">[%|loc%]Edit Robot Config[%END%]</a></li>
[% END %]
[%~ END %]
[% IF families -%]
[% IF subaction == 'families' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
<li class="[% class %]"><a href="[% 'serveradmin/families' | url_rel %]">[%|loc%]Families[%END%]</a></li>
Expand Down
Loading