merged r5213, 5381, 5394, 5395, 5597-5602 from trunk:

debian/ngcp-www-admin.postinst

@@ -30,4 +30,7 @@ a2dissite default
 # generated by other debhelper scripts.
 #DEBHELPER#
 
+# reload perl and/or apache modules
+/etc/init.d/apache2 reload
+
 exit 0

lib/admin/Controller/billing.pm

@@ -711,6 +711,7 @@ sub show_peaktimes : Local {
                                                         { handle => $bilprof },
                                                         \$peaktimes
                                                       );
+    $peaktimes = {} unless $peaktimes;
     my @weekdays;
     for(0 .. 6) {
         $weekdays[$_] = { name => $WEEKDAYS[$_] };

lib/admin/Controller/subscriber.pm

@@ -641,7 +641,8 @@ sub update_preferences : Local {
     foreach my $db_pref (eval { @$db_prefs }) {
 
         next unless $$db_pref{usr_pref};
-        next if $$db_pref{read_only};
+        delete $$preferences{$$db_pref{preference}}, next
+            if $$db_pref{read_only};
 
         if($$db_pref{preference} eq 'cfu'
                 or $$db_pref{preference} eq 'cfb'

lib/admin/Model/Provisioning.pm

@@ -161,7 +161,7 @@ sub _get_admin {
         }
         return;
     }
-    my $return = { %$admin_obj, id => $login, store => $self };
+    my $return = { %$admin_obj, id => $login };
     if($Catalyst::Plugin::Authentication::VERSION < 0.10003) {
         return bless $return, "Catalyst::Plugin::Authentication::User::Hash";
     } else {

root/css/admin.css

@@ -299,13 +299,40 @@ ul.cleanlist li {
 	margin: 2px 0;
 }
 
-.pagination li.currentpage, .pagination li.disablepage {
+.pagination {
-	margin: 0 5px 0 0;
+    margin-top: 10px;
-}
+    padding: 2px;
-
+}
-#contentplace .pagination li.nextpage a:after {
+.pagination ul {
-	margin-left: 0px;
+    margin: 0;
-	content: "";
+    padding: 0;
+    text-align: center;
+}
+.pagination li {
+    display: inline;
+    list-style-type: none;
+    font-weight: bold;
+    color: #FFFFFF;
+    text-decoration: none;
+    margin-right: 5px;
+}
+.pagination li.currentpage {
+    padding: 3px 6px;
+    background-color: #54c000;
+}
+.pagination li.disablepage {
+    padding: 3px 6px;
+    background-color: #929292;
+}
+.pagination a, .pagination a:visited {
+    padding: 3px 6px;
+    background-color: #459e00;
+    color: #FFFFFF;
+}
+.pagination a:hover, .pagination a:active {
+    padding: 3px 6px;
+    background-color: #54c000;
+    color: #FFFFFF;
 }
 
 .hspace-20 {
@@ -319,6 +346,10 @@ ul.cleanlist li {
   width: 70px;
 }
 
+.imedium {
+  width: 140px;
+}
+
 .tooltip {
 display:none;
   background:url(../static/images/black_arrow_big.png);
@@ -332,3 +363,8 @@ display:none;
 .success {
   margin-top: 20px;
 }
+
+.content li.ui-state-quad {
+  height: 104px;
+  background: url("smooth/images/ui-bg_glass_75_e6e6e6_1x400.png") repeat-x scroll 50% 37% #E6E6E6;
+}

root/tt/subscriber.tt

@@ -76,15 +76,15 @@
 
             <ul class="cleanlist">
               <li class="ui-state-default">
-                <div class="span-6">SIP URI</div>
+                <div class="span-9">SIP URI</div>
                 <div class="span-2">Account ID</div>
-                <div class="span-6 last">Primary Number</div>
+                <div class="span-5 last">Primary Number</div>
               </li>
 
             [% FOREACH subscriber = subscriber_list %]
 
               <li class="ui-state-default">
-                <div class="span-6">
+                <div class="span-9">
                 [% IF subscriber.subscriber_id %]
                   <a href="/subscriber/detail?subscriber_id=[% subscriber.subscriber_id %]">
                     [% subscriber.username %]@[% subscriber.domain %]</a>
@@ -96,7 +96,7 @@
                   <a href="/account/detail?account_id=[% subscriber.account_id %]">
                     [% subscriber.account_id %]</a>
                 </div>
-                <div class="span-6 last">
+                <div class="span-5 last">
                   [% IF subscriber.sn %]
                     +[% subscriber.cc %] [% subscriber.ac %] [% subscriber.sn %]
                   [% END %]
@@ -104,7 +104,7 @@
               </li>
 
             [% END %]
-            </ul>
+            </ul><br clear="all" />
 
             [% IF pagination %]
             <div class="pagination">

root/tt/subscriber_detail.tt

@@ -67,11 +67,11 @@
             <input type="hidden" name="account_id" value="[% account_id %]" />
             <div class="hspace-20"></div>
             <ul class="cleanlist">
-              <li class="ui-state-default"><div class="span-6">Subscriber ID:</div><div class="span-10 last">[% subscriber.subscriber_id %]</div></li>
+              <li class="ui-state-default"><div class="span-5">Subscriber ID:</div><div class="span-11 last">[% subscriber.subscriber_id %]</div></li>
-              <li class="ui-state-default"><div class="span-6">Contract ID:</div><div class="span-10 last"><a href="/account/detail?account_id=[% subscriber.account_id || account_id %]">[% subscriber.account_id || account_id %]</a></div></li>
+              <li class="ui-state-default"><div class="span-5">Contract ID:</div><div class="span-11 last"><a href="/account/detail?account_id=[% subscriber.account_id || account_id %]">[% subscriber.account_id || account_id %]</a></div></li>
               <li class="ui-state-default">
-                <div class="span-6">Web User:</div>
+                <div class="span-5">Web User:</div>
-                <div class="span-10 last">
+                <div class="span-11 last">
                 [% IF edit_subscriber %]
                   <input type="text" name="webusername" value="[% subscriber.webusername %]"
                          title="the username (without domain) used for login at the SOAP and CSC interfaces, string" />
@@ -83,8 +83,8 @@
               </li>
               [% IF messages.webusername %]<div class="error">[% messages.webusername %]</div>[% END %]
               <li class="ui-state-default">
-                <div class="span-6">Web Password:</div>
+                <div class="span-5">Web Password:</div>
-                <div class="span-9">
+                <div class="span-10">
                 [% IF edit_subscriber %]
                   <input type="text" name="webpassword" id="edit_webpass" value="[% subscriber.edit_webpass %]"
                          title="the password used for login at the SOAP and CSC interfaces, string" />
@@ -106,22 +106,25 @@
               </li>
               [% IF messages.webpassword %]<div class="error">[% messages.webpassword %]</div>[% END %]
               <li class="ui-state-default">
-                <div class="span-6">E.164 Number:</div>
+                <div class="span-5">E.164 Number:</div>
                 [% IF edit_subscriber %]
-                  <div class="span-2">
+                  <div class="span-3">
+                  cc:
                   <input type="text" name="cc" class="ishort" value="[% subscriber.cc %]"
                          title="the country code of the E.164 number, integer" />
                   </div>
-                  <div class="span-2">
+                  <div class="span-3">
+                  ac:
                   <input type="text" name="ac" class="ishort" value="[% subscriber.ac %]"
                          title="the area code of the E.164 number, integer" />
                   </div>
-                  <div class="span-6 last">
+                  <div class="span-5 last">
-                  <input type="text" name="sn" value="[% subscriber.sn %]"
+                  sn:
+                  <input type="text" name="sn" class="imedium" value="[% subscriber.sn %]"
                          title="the subscriber part of the E.164 number, numeric string" />
                   </div>
                 [% ELSE %]
-                  <div class="span-10 last">
+                  <div class="span-11 last">
                   [% IF subscriber.sn %]
                     +[% subscriber.cc %] [% subscriber.ac %] [% subscriber.sn %]
                   [% ELSE %]
@@ -135,11 +138,11 @@
               [% IF messages.number_sn %]<div class="error">[% messages.number_sn %]</div>[% END %]
 
               [% IF subscriber.subscriber_id %]
-              <li class="ui-state-default"><div class="span-6">SIP URI:</div><div class="span-10 last">[% subscriber.username %]@[% subscriber.domain %]</div></li>
+              <li class="ui-state-default"><div class="span-5">SIP URI:</div><div class="span-11 last">[% subscriber.username %]@[% subscriber.domain %]</div></li>
               [% ELSE %]
               <li class="ui-state-default">
-                <div class="span-6">SIP URI:</div>
+                <div class="span-5">SIP URI:</div>
-                <div class="span-10 last">
+                <div class="span-11 last">
                   <input type="text" name="username" value="[% subscriber.username %]"
                          title="the local part of the SIP URI, string" />
                   @
@@ -152,14 +155,14 @@
               </li>
               [% END %]
               <li class="ui-state-default">
-                <div class="span-6">SIP password:</div>
+                <div class="span-5">SIP password:</div>
                 [% IF edit_subscriber %]
-                  <div class="span-10 last">
+                  <div class="span-11 last">
                     <input type="text" name="password" id="edit_pass" value="[% subscriber.edit_pass %]"
                          title="the password used for SIP authentication, string" />
                   </div>
                 [% ELSE %]
-                  <div class="span-9">
+                  <div class="span-10">
                     [% IF show_pass && Catalyst.session.admin.show_passwords %]
                     [% subscriber.password %]</div><div class="span-1 last"><a href="?subscriber_id=[% subscriber.subscriber_id %]"><span class="button-hide">Hide</span></a></div>
                   [% ELSE %]
@@ -176,16 +179,16 @@
               </li>
               [% IF messages.password %]<div class="error">[% messages.password %]</div>[% END %]
               <li class="ui-state-default">
-                <div class="span-6">Administrative:</div>
+                <div class="span-5">Administrative:</div>
-                <div class="span-10 last">
+                <div class="span-11 last">
                   <input type="checkbox" name="admin" class="checkbox" [% IF ! edit_subscriber %]disabled="disabled"[% END %]
                          title="if checked, the subscriber may create and edit other subscribers in the same VoIP account"
                   [% IF subscriber.admin %]checked="checked"[% END %] />
                 </div>
               </li>
-              <li class="ui-state-default"><div class="span-6">UUID:</div><div class="span-10 last">[% subscriber.uuid %]</div></li>
+              <li class="ui-state-default"><div class="span-5">UUID:</div><div class="span-11 last">[% subscriber.uuid %]</div></li>
-              <li class="ui-state-default"><div class="span-6">Created:</div><div class="span-10 last">[% subscriber.create_timestamp %]</div></li>
+              <li class="ui-state-default"><div class="span-5">Created:</div><div class="span-11 last">[% subscriber.create_timestamp %]</div></li>
-              <li class="ui-state-default"><div class="span-6">Modified:</div><div class="span-10 last">[% subscriber.modify_timestamp %]</div></li>
+              <li class="ui-state-default"><div class="span-5">Modified:</div><div class="span-11 last">[% subscriber.modify_timestamp %]</div></li>
           </ul>
           [% IF edit_subscriber %]
             <div class="hspace-20"></div>
@@ -200,28 +203,27 @@
 
         [% IF messages.contmsg %]<div class="success">[% messages.contmsg %]</div>[% END %]
 
-          <ul class="cleanlist">
+        [% IF subscriber.registered_contacts.0 %]
-          [% IF subscriber.registered_contacts.0 %]
+          [% FOREACH regcon = subscriber.registered_contacts %]
-              <li class="ui-state-default">
+            <ul class="cleanlist">
-                <div class="span-5">User Agent</div>
+              <li class="ui-state-default ui-state-quad">
+                <div class="span-5">User Agent:</div>
+                <div class="span-11 last"> [% regcon.user_agent %]</div>
                 <div class="span-5">Contact</div>
-                <div class="span-1">NAT</div>
+                <div class="span-11 last">[% regcon.contact %]</div>
-                <div class="span-4 append-1 last">Expires</div>
+                <div class="span-5">NAT</div>
+                <div class="span-11 last">[% IF regcon.nat %]yes[% ELSE %]no[% END %]</div>
+                <div class="span-5">Expires</div>
+                <div class="span-4">[% regcon.expires %]</div>
+                <div class="span-7 last"><a href="expire?subscriber_id=[% subscriber.subscriber_id %]&amp;contact_id=[% regcon.id %]"><span class="button-delete">Expire Now</span></a></div>
               </li>
-
+            </ul><br clear="all" /><br clear="all" />
-              [% FOREACH regcon = subscriber.registered_contacts %]
-                <li class="ui-state-default">
-                  <div class="span-5"> [% regcon.user_agent %]</div>
-                  <div class="span-5">[% regcon.contact %]</div>
-                  <div class="span-1">[% IF regcon.nat %]yes[% ELSE %]no[% END %]</div>
-                  <div class="span-4">[% regcon.expires %]</div>
-                  <div class="span-1 last"><a href="expire?subscriber_id=[% subscriber.subscriber_id %]&amp;contact_id=[% regcon.id %]"><span class="button-delete">Expire Now</span></a></div>
-                </li>
-              [% END %]
-          [% ELSE %]
-            <li class="ui-state-default"><div>None</div></li>
           [% END %]
+        [% ELSE %]
+          <ul class="cleanlist">
+            <li class="ui-state-default"><div>None</div></li>
           </ul>
+        [% END %]
 
         [% END %]