Skip to content

GitLab

Unverified Commit b0839672 authored by IKEDA Soji's avatar IKEDA Soji Committed by GitHub
Browse files

Merge pull request #740 from ikedas/issue-738 by ikedas 

Pending lists not clearly shown as "pending" in the web GUI (#738)
parents c34ea0d3 12934efe
Hide whitespace changes
Inline Side-by-side
default/web_tt2/editsubscriber.tt2
View file @ b0839672
......@@ -96,7 +96,7 @@
</p>
[% IF current_subscriber.bounce %]
<h3 class="bg_color_error">[%|loc%]Bouncing address[%END%]</h3>
<h3 class="warning label">[%|loc%]Bouncing address[%END%]</h3>
[% IF current_subscriber.bounce_address %]
<label>[%|loc%]Address detected via VERP technology[%END%] </label>
......
default/web_tt2/list_panel.tt2
View file @ b0839672
<!-- list_panel.tt2 -->
[% IF list_status == 'closed' || list_status == 'family_closed' %]
[% IF list_status && list_status != 'open' ~%]
<li class="menuLinks">
<span class="bg_color_error">[%|loc%]Closed list[%END%]</span>
</li>
[% ELSIF list_status == 'pending' %]
<li class="menuLinks">
<span class="bg_color_error">[%|loc%]List not activated yet[%END%]</span>
</li>
[% ELSIF list_status == 'error_config' %]
<li class="menuLinks">
<span class="bg_color_error">[%|loc%]Erroneous configuration[%END%]</span>
<span class="warning label">[% list_status | optdesc('status:cap') %]</span>
</li>
[% END %]
......
default/web_tt2/my.tt2
View file @ b0839672
......@@ -13,7 +13,7 @@
[% END %]
<div class="item[% additional_class %]">
<div class="item_content">
<a class="item_title" href="[% 'info' | url_rel([l.key]) %]">
<a href="[% 'info' | url_rel([l.key]) %]">
[%|obfuscate(conf.spam_protection) %][% l.key %][% END %]
[% IF l.value.is_owner || l.value.is_editor || l.value.is_subscriber ~%]
<span class="highlighted">(
......@@ -34,6 +34,11 @@
)</span>
[% END %]
</a>
[%~ IF l.value.status && l.value.status != 'open' ~%]
<span class="warning label">
[% l.value.status | optdesc('status') %]
</span>
[%~ END %]
<p class="list_subject">[% l.value.subject %]</p>
[% IF l.value.listsuspend %]
[% IF l.value.listenddate %]
......
default/web_tt2/viewlogs.tt2
View file @ b0839672
......@@ -171,66 +171,62 @@
</th>
</tr>
[% FOREACH l = log_entries %]
[% IF dark == '1' %]
[% SET dark = 0 ~%]
[% FOREACH l = log_entries ~%]
[% IF l.status == 'error' ~%]
<tr class="alert callout">
[%~ ELSIF dark ~%]
<tr>
[% ELSE %]
[%~ ELSE ~%]
<tr class="color0">
[% END %]
[%~ END %]
[% IF l.status == 'error' %]
<tr class="bg_color_error">
[% END %]
<td>
[% l.date %]
</td>
<td>
[% l.date %]
</td>
[% IF is_listmaster || is_owner %]
<td>
[% l.list %]
</td>
[% END %]
<td>
[% l.action %]
</td>
<td>
[% l.parameters %]
</td>
<td>
[% l.target_email %]
</td>
<td>
[% IF l.msg_id %]
<a href="[% 'viewlogs' | url_rel([list,page,size,sortby],{type=>'all_actions',target_type=>'msg_id',target=>l.msg_id}) %]"
data-tooltip aria-haspopup="true"
title="[%|loc%]view other events related to this message id.[%END%]">
[%|loc%]Other events[%END%]
</a>
[% END %]
</td>
<td>
[% l.status %]
</td>
<td>
[% l.error_type %]
</td>
<td>
[% l.user_email %]</span>
</td>
<td>
[% l.action %]
</td>
<td>
[% l.parameters %]
</td>
<td>
[% l.target_email %]
</td>
<td>
[% IF l.msg_id %]
<a href="[% 'viewlogs' | url_rel([list,page,size,sortby],{type=>'all_actions',target_type=>'msg_id',target=>l.msg_id}) %]"
data-tooltip aria-haspopup="true"
title="[%|loc%]view other events related to this message id.[%END%]">
[%|loc%]Other events[%END%]
</a>
[% END %]
</td>
<td>
[% l.status %]
</td>
<td>
[% l.error_type %]
</td>
<td>
[% l.user_email %]</span>
</td>
[% IF is_listmaster || is_owner %]
<td>
[% l.client %]
</td>
[% END %]
<td>
[% l.daemon %]
</td>
</tr>
[% IF dark == '1' %]
[% SET dark = 0 %]
[% ELSE %]
[% SET dark = 1 %]
[% END %]
[% END %]
<td>
[% l.daemon %]
</td>
</tr>
[% SET dark = !dark ~%]
[%~ END %]
</table>
</div>
[% END %]
......
src/cgi/wwsympa.fcgi.in
View file @ b0839672
......@@ -14180,6 +14180,7 @@ sub _set_my_lists_info {
 
my $l = $list->{'name'};
$which->{$l}{'subject'} = $list->{'admin'}{'subject'};
$which->{$l}{'status'} = $list->{'admin'}{'status'}; # new 6.2.46
$which->{$l}{'is_subscriber'} = 1; # New on 6.2b.2.
# Compat. < 6.2b.2.
$which->{$l}{'info'} = 1;
......@@ -14236,6 +14237,7 @@ sub _set_my_lists_info {
my $l = $list->{'name'};
 
$which->{$l}{'subject'} = $list->{'admin'}{'subject'};
$which->{$l}{'status'} = $list->{'admin'}{'status'}; # new 6.2.46
$which->{$l}{'is_owner'} = 1; # New on 6.2b.2.
# Compat. < 6.2b.1.
$which->{$l}{'info'} = 1;
......@@ -14247,6 +14249,7 @@ sub _set_my_lists_info {
my $l = $list->{'name'};
 
$which->{$l}{'subject'} = $list->{'admin'}{'subject'};
$which->{$l}{'status'} = $list->{'admin'}{'status'}; # new 6.2.46
$which->{$l}{'is_editor'} = 1; # New on 6.2b.2.
# Compat. < 6.2b.1.
$which->{$l}{'info'} = 1;
......
src/lib/Sympa/ListOpt.pm
View file @ b0839672
......@@ -256,6 +256,14 @@ our %list_status = (
'closed' => {'gettext_id' => 'closed list'},
);
our %list_status_capital = (
'open' => {'gettext_id' => 'In operation'},
'pending' => {'gettext_id' => 'List not activated yet'},
'error_config' => {'gettext_id' => 'Erroneous configuration'},
'family_closed' => {'gettext_id' => 'Closed family instance'},
'closed' => {'gettext_id' => 'Closed list'},
);
# Deprecated: Moved to Sympa::Template::_get_option_description().
#sub get_option_description;
......
src/lib/Sympa/Template.pm
View file @ b0839672
......@@ -329,6 +329,7 @@ sub _get_option_description {
'reception' => \%Sympa::ListOpt::reception_mode,
'visibility' => \%Sympa::ListOpt::visibility_mode,
'status' => \%Sympa::ListOpt::list_status,
'status:cap' => \%Sympa::ListOpt::list_status_capital,
}->{$type}
|| \%Sympa::ListOpt::list_option;
my $t = $map->{$option} || {};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment