[freeside-commits] branch master updated. d98e4631640eaaf28b4c022efedd49b640a283c6
Ivan
ivan at 420.am
Sun May 17 02:15:03 PDT 2015
The branch, master has been updated
via d98e4631640eaaf28b4c022efedd49b640a283c6 (commit)
from ff828e261210e8d4f1ddf51600d99e2cb1a914cd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d98e4631640eaaf28b4c022efedd49b640a283c6
Author: Ivan Kohler <ivan at freeside.biz>
Date: Sun May 17 02:14:43 2015 -0700
customer view UI
diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css
index 1919f52..1e2574f 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 020c09d..b1bc7f5 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -6,6 +6,7 @@
}
&>
<BR>
+
% my @part_tag = $cust_main->part_tag;
% if ( $conf->config('cust_tag-location') eq 'top' && @part_tag ) {
<TABLE STYLE="margin-bottom:8px" CELLSPACING=2>
@@ -24,6 +25,8 @@
% }
<& cust_main/menu.html, cust_main => $cust_main, show => $view &>
+<BR>
+
<DIV CLASS="fstabcontainer">
<& /elements/init_overlib.html &>
@@ -35,13 +38,13 @@ function areyousure(href, message) {
}
</SCRIPT>
-<br><br>
+<br>
% ###
% # 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) {
<BR><BR>
% }
-<A NAME="cust_main"></A>
<TABLE BORDER=0>
<TR>
<TD VALIGN="top">
@@ -89,6 +91,7 @@ function areyousure(href, message) {
</TD>
</TR>
</TABLE>
+<BR>
% }
@@ -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 &>
+ <BR>
% }
-% if ( $view eq 'jumbo' ) {
- <BR>
-% }
-
-<BR>
-
% ###
% # Tickets
% ###
-% if ( $view eq 'tickets' || $view eq 'jumbo' ) {
+% if ( $view eq 'tickets' ) {
% if ( $conf->config('ticket_system') ) {
<& cust_main/tickets.html, $cust_main &>
% }
- <BR><BR>
+ <BR>
% }
@@ -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 &>
% }
- <BR><BR>
+ <BR>
% }
@@ -142,11 +137,7 @@ function areyousure(href, message) {
% # Quotations
% ###
-% if ( $view eq 'jumbo' && $curuser->access_right('Generate quotation') ) {
- <A NAME="quotations"><FONT SIZE="+2"><% mt('Quotations') |h %></FONT></A><BR>
-% }
-
-% 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') {
-
- <A NAME="cust_pkg"><FONT SIZE="+2"><% mt('Packages') |h %></FONT></A><BR>
-% }
-
-% 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 &>
% #}
+<BR>
% }
@@ -177,15 +164,10 @@ function areyousure(href, message) {
% # Payment History
% ###
-% if ( $view eq 'jumbo' ) {
- <BR><BR>
- <A NAME="history"><FONT SIZE="+2"><% mt('Payment History') |h %></FONT></A>
- <BR>
-% }
-
-% if ( $view eq 'payment_history' || $view eq 'jumbo' ) {
+% if ( $view eq 'payment_history' ) {
<& cust_main/payment_history.html, $cust_main &>
+<BR>
% }
@@ -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 &>
+<BR>
% }
% 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 83a6380..22a7b95 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);
<TR>
- <TD ALIGN="right"><% $phone_label{$phone} %></TD>
+ <TH ALIGN="right"><% $phone_label{$phone} %></TD>
<TD COLSPAN=3>
<& /elements/phonenumber.html,
$cust_main->get($phone),
diff --git a/httemplate/view/cust_main/menu.html b/httemplate/view/cust_main/menu.html
index 81ad959..baea3ad 100644
--- a/httemplate/view/cust_main/menu.html
+++ b/httemplate/view/cust_main/menu.html
@@ -1,28 +1,43 @@
<style type="text/css">
#menu_ul {
padding: 0;
- margin: 0 auto;
+ margin: 0px 0px 18px 0px;
}
#menu_ul li {
float: left;
list-style: none;
position: relative;
- border-right: 4px solid #e8e8e8;
}
#menu_ul a {
+ background: #dddddd;
display: block;
padding: 6px 8px;
+ margin: 8px 8px 8px 0px;
+/* margin: 0px 0px 8px 0px; */
color: #525151;
font-size: 13px;
font-weight: bold;
white-space: nowrap;
- background: #cccccc;
- -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;
+ border-top-left-radius:2px;
+ border-top-right-radius:2px;
+}
+#menu_ul a.current_show {
+ background: #ffffff;
+ border-top: 1px solid #7e007f;
+ border-left: 1px solid #7e007f;
+ border-right: 1px solid #7e007f;
+ border-bottom: 1px solid #ffffff;
+
+ display: block;
+ padding: 6px 8px;
+ margin: 8px 8px 8px 0px;
+/* margin: 0px 0px 8px 0px; */
+ color: #525151;
+ font-size: 13px;
+ font-weight: bold;
+ white-space: nowrap;
+ border-top-left-radius:2px;
+ border-top-right-radius:2px;
}
#menu_ul ul {
@@ -32,8 +47,8 @@
position: absolute;
top: 100%;
left: -1px;
- background: #ae2099;
- border: 1px solid #ffffff;
+ background: #ffffff;
+ border: 1px solid #7e007f;
}
#menu_ul ul li {
@@ -44,25 +59,21 @@
}
#menu_ul ul a {
- padding: 4px 10px;
- color: #ffffff;
- font-size: 12px;
+ padding: 0px 10px;
+ color: #333333;
+ font-size: 13px;
font-weight: normal;
background: transparent;
}
#menu_ul ul a:hover {
- background: #7e0079;
- -moz-border-radius-topleft:0px;
- -moz-border-radius-topright:0px;
- -webkit-border-radius-topleft:0px;
- -webkit-border-radius-topright:0px;
+ color: #7e0079;
+ background: #fff8fb; /* ?? too pink? */
border-top-left-radius:0px;
border-top-right-radius:0px;
}
#menu_ul a.current_menu, #menu_ul a.hover {
- color: #ffffff;
- background: #7e0079;
+ color: #7e0079;
}
</style>
<script src="<% $p %>elements/jquery.js"></script>
@@ -525,7 +536,7 @@ foreach my $submenu (@menu) {
$a = qq[ <A HREF="$target"];
if ( $opt{'show'} eq $entry->{show} ) {
- $a .= ' class="fstabselected"';
+ $a .= ' class="current_show"';
}
$a .= qq[>$label</A> ];
diff --git a/httemplate/view/cust_main/notes.html b/httemplate/view/cust_main/notes.html
index 7a19f8b..6250200 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]/ ) {
-<P>
- <A NAME="cust_main_note"><FONT SIZE="+2"><% mt('Notes') |h %></FONT></A>
-</P>
-
-% }
-
-<BR>
-
% # actually display notes
<& notes/notes.html, 'cust_main' => $cust_main &>
<BR>
-----------------------------------------------------------------------
Summary of changes:
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(-)
More information about the freeside-commits
mailing list