diff --git a/debian/ngcp-www-admin.postinst b/debian/ngcp-www-admin.postinst index 45ca042..6648d6c 100644 --- a/debian/ngcp-www-admin.postinst +++ b/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 diff --git a/lib/admin/Controller/billing.pm b/lib/admin/Controller/billing.pm index 942a224..60ed361 100644 --- a/lib/admin/Controller/billing.pm +++ b/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[$_] }; diff --git a/lib/admin/Controller/subscriber.pm b/lib/admin/Controller/subscriber.pm index 6494ee8..e798956 100644 --- a/lib/admin/Controller/subscriber.pm +++ b/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' diff --git a/lib/admin/Model/Provisioning.pm b/lib/admin/Model/Provisioning.pm index c2c934e..8717fa2 100644 --- a/lib/admin/Model/Provisioning.pm +++ b/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 { diff --git a/root/css/admin.css b/root/css/admin.css index 0885205..4155455 100644 --- a/root/css/admin.css +++ b/root/css/admin.css @@ -299,13 +299,40 @@ ul.cleanlist li { margin: 2px 0; } -.pagination li.currentpage, .pagination li.disablepage { - margin: 0 5px 0 0; -} - -#contentplace .pagination li.nextpage a:after { - margin-left: 0px; - content: ""; +.pagination { + margin-top: 10px; + padding: 2px; +} +.pagination ul { + margin: 0; + 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; +} diff --git a/root/tt/subscriber.tt b/root/tt/subscriber.tt index f0a3f1e..cdc8355 100644 --- a/root/tt/subscriber.tt +++ b/root/tt/subscriber.tt @@ -76,15 +76,15 @@ +
[% IF pagination %]