From d98e4631640eaaf28b4c022efedd49b640a283c6 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Sun, 17 May 2015 02:14:43 -0700 Subject: [PATCH] customer view UI --- httemplate/elements/freeside.css | 36 +++---------------- httemplate/view/cust_main.cgi | 61 ++++++++++++--------------------- httemplate/view/cust_main/contacts.html | 2 +- httemplate/view/cust_main/menu.html | 55 +++++++++++++++++------------ httemplate/view/cust_main/notes.html | 9 ----- 5 files changed, 60 insertions(+), 103 deletions(-) diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css index 1919f526f..1e2574f6e 100644 --- a/httemplate/elements/freeside.css +++ b/httemplate/elements/freeside.css @@ -175,16 +175,7 @@ div.fstabcontainer { border-left:1px solid #7e0079; border-right:1px solid #7e0079; border-bottom:1px solid #7e0079; - -moz-border-radius-bottomleft:8px; - -moz-border-radius-bottomright:8px; - -webkit-border-radius-bottomleft:8px; - -webkit-border-radius-bottomright:8px; - border-bottom-left-radius:8px; - border-bottom-right-radius:8px; - -moz-box-shadow: #666666 1px 1px 2px; - -webkit-box-shadow: #666666 1px 1px 2px; - box-shadow: #666666 1px 1px 2px; - filter: progid:DXImageTransform.Microsoft.Shadow(color='#666666', Direction=135, Strength=2); + border-top:1px solid #7e0079; } .fscontainer { @@ -228,39 +219,20 @@ div.fstabcontainer { /* background-color:#cccccc; */ padding:2px; border: 1px solid #dddddd; - /* -moz-box-shadow: 1px 1px 2px #666666; - -webkit-box-shadow: 1px 1px 2px #666666; - box-shadow: 1px 1px 2px #666666; - filter: progid:DXImageTransform.Microsoft.Shadow(color='#666666', Direction=135, Strength=2); - */ + border-radius: 2px; } .fsinnerbox th { font-weight:normal; font-size:75%; valign: bottom; - color: #999999; + color: #666666; } .fsinnerbox-title { font-size:110%; font-weight:bold; - /*border-top: 1px solid #dddddd; - border-left: 1px solid #dddddd; - border-right: 1px solid #dddddd; */ - /* background-color:#cccccc; - padding:2px; - -moz-border-radius-topleft:8px; - -moz-border-radius-topright:8px; - -webkit-border-radius-topleft:8px; - -webkit-border-radius-topright:8px; - border-top-left-radius:8px; - border-top-right-radius:8px; - -moz-box-shadow: 1px 0px 1px #999999; - -webkit-box-shadow: 1px 0px 1px #999999; - box-shadow: 1px 0px 1px #999999; - filter: progid:DXImageTransform.Microsoft.Shadow(color='#999999', Direction=90, Strength=1); - */ + color: #333333; } .background { diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index 020c09dcf..b1bc7f52a 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -6,6 +6,7 @@ } &>
+ % my @part_tag = $cust_main->part_tag; % if ( $conf->config('cust_tag-location') eq 'top' && @part_tag ) { @@ -24,6 +25,8 @@ % } <& cust_main/menu.html, cust_main => $cust_main, show => $view &> +
+
<& /elements/init_overlib.html &> @@ -35,13 +38,13 @@ function areyousure(href, message) { } -

+
% ### % # Basics % ### -% if ( $view eq 'basics' || $view eq 'jumbo' ) { +% if ( $view eq 'basics' ) { % my $br = 0; % if ( $curuser->access_right('Order customer package') && $conf->exists('cust_main-enable_order_package') ) { @@ -69,7 +72,6 @@ function areyousure(href, message) {

% } -
@@ -89,6 +91,7 @@ function areyousure(href, message) {
+
% } @@ -96,30 +99,22 @@ function areyousure(href, message) { % ### % # Notes % ### - -% if ( $view eq 'notes' || $view eq 'jumbo' ) { - -<& cust_main/notes.html, 'cust_main' => $cust_main &> - +% if ( $view eq 'notes' ) { + <& cust_main/notes.html, 'cust_main' => $cust_main &> +
% } -% if ( $view eq 'jumbo' ) { -
-% } - -
- % ### % # Tickets % ### -% if ( $view eq 'tickets' || $view eq 'jumbo' ) { +% if ( $view eq 'tickets' ) { % if ( $conf->config('ticket_system') ) { <& cust_main/tickets.html, $cust_main &> % } -

+
% } @@ -127,13 +122,13 @@ function areyousure(href, message) { % # Appointments % ### -% if ( $view eq 'appointments' || $view eq 'jumbo' ) { +% if ( $view eq 'appointments' ) { % if ( $conf->config('ticket_system') % && $curuser->access_right('View appointments') ) { <& cust_main/appointments.html, $cust_main &> % } -

+
% } @@ -142,11 +137,7 @@ function areyousure(href, message) { % # Quotations % ### -% if ( $view eq 'jumbo' && $curuser->access_right('Generate quotation') ) { - <% mt('Quotations') |h %>
-% } - -% if ( $view eq 'quotations' || $view eq 'jumbo' ) { +% if ( $view eq 'quotations' ) { % if ( $curuser->access_right('Generate quotation') ) { <& cust_main/quotations.html, $cust_main &> @@ -159,16 +150,12 @@ function areyousure(href, message) { % # Packages % ### -% if ( $view eq 'jumbo' ) { #XXX enable me && $curuser->access_right('View customer packages') { - - <% mt('Packages') |h %>
-% } - -% if ( $view eq 'packages' || $view eq 'jumbo' ) { +% if ( $view eq 'packages' ) { % #XXX enable me# if ( $curuser->access_right('View customer packages') { <& cust_main/packages.html, $cust_main &> % #} +
% } @@ -177,15 +164,10 @@ function areyousure(href, message) { % # Payment History % ### -% if ( $view eq 'jumbo' ) { -

- <% mt('Payment History') |h %> -
-% } - -% if ( $view eq 'payment_history' || $view eq 'jumbo' ) { +% if ( $view eq 'payment_history' ) { <& cust_main/payment_history.html, $cust_main &> +
% } @@ -194,8 +176,9 @@ function areyousure(href, message) { % # Change History % ### -% if ( $view eq 'change_history' ) { # || $view eq 'jumbo' -<& cust_main/change_history.html, $cust_main &> +% if ( $view eq 'change_history' ) { +<& cust_main/change_history.html, $cust_main &> +
% } % if ( $view eq 'custom' ) { @@ -271,11 +254,11 @@ $views{emt('Change History')} = 'change_history' $views{$conf->config('cust_main-custom_title') || emt('Custom')} = 'custom' if $conf->config('cust_main-custom_link') || $conf->config('cust_main-custom_content'); -$views{emt('Jumbo')} = 'jumbo'; my %viewname = reverse %views; my $view = $cgi->param('show') || $curuser->default_customer_view; +$view = 'basics' if $view eq 'jumbo'; my $ie_compat = $conf->config('ie-compatibility_mode'); my $head = ''; diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html index 83a638026..22a7b9584 100644 --- a/httemplate/view/cust_main/contacts.html +++ b/httemplate/view/cust_main/contacts.html @@ -125,7 +125,7 @@ % foreach my $phone (qw(daytime night mobile)) { % next if !$cust_main->get($phone); - <% $phone_label{$phone} %> + <% $phone_label{$phone} %> <& /elements/phonenumber.html, $cust_main->get($phone), diff --git a/httemplate/view/cust_main/menu.html b/httemplate/view/cust_main/menu.html index 81ad959f6..baea3ad24 100644 --- a/httemplate/view/cust_main/menu.html +++ b/httemplate/view/cust_main/menu.html @@ -1,28 +1,43 @@ @@ -525,7 +536,7 @@ foreach my $submenu (@menu) { $a = qq[ {show} ) { - $a .= ' class="fstabselected"'; + $a .= ' class="current_show"'; } $a .= qq[>$label ]; diff --git a/httemplate/view/cust_main/notes.html b/httemplate/view/cust_main/notes.html index 7a19f8b38..62502002e 100755 --- a/httemplate/view/cust_main/notes.html +++ b/httemplate/view/cust_main/notes.html @@ -16,15 +16,6 @@ % my $notecount = scalar($cust_main->notes(0)); % if ( ! $conf->exists('cust_main-disable_notes') || $notecount) { -% unless ( $view eq 'notes' && $cust_main->comments !~ /[^\s\n\r]/ ) { -

- <% mt('Notes') |h %> -

- -% } - -
- % # actually display notes <& notes/notes.html, 'cust_main' => $cust_main &>
-- 2.11.0