From 6b2efead792683e84e26ab4765362af0f1717541 Mon Sep 17 00:00:00 2001
From: Daniel Tiefnig <dtiefnig@sipwise.com>
Date: Mon, 10 Nov 2008 20:39:42 +0000
Subject: [PATCH] added some epxlanation and the current status to the list
 edit page

---
 lib/admin/Controller/subscriber.pm |  6 +++++
 root/css/admin.css                 | 10 ++++++++
 root/tt/subscriber_edit_list.tt    | 41 ++++++++++++++++++++++++++++--
 3 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/lib/admin/Controller/subscriber.pm b/lib/admin/Controller/subscriber.pm
index 2a04124..1272eba 100644
--- a/lib/admin/Controller/subscriber.pm
+++ b/lib/admin/Controller/subscriber.pm
@@ -746,6 +746,12 @@ sub edit_list : Local {
     $c->stash->{subscriber} = $c->session->{subscriber};
     $c->stash->{subscriber_id} = $subscriber_id;
     $c->stash->{list_name} = $list;
+
+    my $list_mode = $list;
+    $list_mode =~ s/list$/mode/;
+    $c->stash->{list_mode} = $$preferences{$list_mode};
+    $c->stash->{block_in_clir} = $$preferences{$list_mode};
+
     if(defined $c->session->{blockaddtxt}) {
         $c->stash->{blockaddtxt} = $c->session->{blockaddtxt};
         delete $c->session->{blockaddtxt};
diff --git a/root/css/admin.css b/root/css/admin.css
index 9b33ed8..4a85910 100644
--- a/root/css/admin.css
+++ b/root/css/admin.css
@@ -292,3 +292,13 @@ h3 {
 #contentplace .search_subscriber input {
 	margin: 3px 0;
 }
+
+/* increase spacing around list explanation text */
+#contentplace .list_explanation {
+	margin-bottom: 10px;
+}
+
+/* strikeout deactivated entries in list edit */
+#contentplace .listentry_disabled {
+	text-decoration: line-through;
+}
diff --git a/root/tt/subscriber_edit_list.tt b/root/tt/subscriber_edit_list.tt
index db647f0..8ec4f0d 100644
--- a/root/tt/subscriber_edit_list.tt
+++ b/root/tt/subscriber_edit_list.tt
@@ -4,16 +4,53 @@
         </h3>
 
         <div class="actions">
-          <a href="detail?subscriber_id=[% subscriber_id %]" class="aaction">back</a>
+          <a href="detail?subscriber_id=[% subscriber_id %]&amp;#userprefs" class="aaction">back</a>
         </div>
         <div class="p1">
           [% IF messages.nummsg %]<div class="goodmsg">[% messages.nummsg %]</div>[% END %]
           [% IF messages.numerr %]<div class="errormsg">[% messages.numerr %]</div>[% END %]
 
+          <div class="list_explanation">
+          [% IF list_name == 'block_in_list' %]
+            [% IF list_mode %]
+              [% IF list_data %]
+                All incoming calls are blocked by default, only the following callers are allowed.<br />
+              [% ELSE %]
+                All incoming calls are currently blocked, exceptions may be added below.<br />
+              [% END %]
+            [% ELSE %]
+              [% IF list_data %]
+                All incoming calls are accepted by default, only the following callers are blocked.<br />
+              [% ELSE %]
+                All incoming calls are currently accepted, exceptions may be added below.<br />
+              [% END %]
+            [% END %]
+            [% IF block_in_clir %]
+              Anonymous calls (CLIR) are currently blocked!<br />
+            [% ELSE %]
+              Anonymous calls (CLIR) are currently accepted!<br />
+            [% END %]
+          [% ELSE %]
+            [% IF list_mode %]
+              [% IF list_data %]
+                All outgoing calls are blocked by default, only the following destinations are allowed.<br />
+              [% ELSE %]
+                All outgoing calls are currently blocked, exceptions may be added below.<br />
+              [% END %]
+            [% ELSE %]
+              [% IF list_data %]
+                All outgoing calls are allowed by default, only the following destinations are blocked.<br />
+              [% ELSE %]
+                All outgoing calls are currently allowed, exceptions may be added below.<br />
+              [% END %]
+            [% END %]
+          [% END %]
+          </div>
+
           <table>
             [% FOREACH blockentry = list_data %]
               <tr class="[% blockentry.background %]">
-                <td > [% blockentry.number %] </td>
+                <td [% IF blockentry.active == 0 %]class="listentry_disabled"[% END %]> [% blockentry.number %] </td>
                 <form action="do_edit_list" method="post">
                   <td >
                     <input type="hidden" name="subscriber_id" value="[% subscriber_id %]" />