X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=2e8d74625cedd795542c6e2bcf601e2b5367a5f5;hp=af611bbbd76e6e697fcdfe6cda0c90704c3d80d9;hb=51f97ec141f77064ca020634e7eccd85d9ead753;hpb=50b038e338455c5d20f48f99767767b70c515c31 diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index af611bbbd..2e8d74625 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -1,51 +1,4 @@ -<& /elements/header.html, { - 'title' => $title, - 'title_noescape' => $title_noescape, - 'head' => $head, - 'nobr' => 1, - } -&> - -% my @part_tag = $cust_main->part_tag; -% if ( $conf->config('cust_tag-location') eq 'top' && @part_tag ) { - -% foreach my $part_tag ( @part_tag ) { - - - -% } -
- tagcolor) - ? 'STYLE="background-color:#'.$part_tag->tagcolor.'"' - : '' - %>><% $part_tag->tagname.': '. $part_tag->tagdesc |h %> -
-% } - -<& cust_main/menu.html, cust_main => $cust_main, show => $view &> -
- -
- -<& /elements/init_overlib.html &> - - - -
+<& /elements/header-cust_main.html, view=>$view, cust_main=>$cust_main &> % ### % # Basics @@ -54,9 +7,6 @@ function areyousure_popup(message, action, actionlabel) { % if ( $view eq 'basics' ) { % my $br = 0; -% if ( $curuser->access_right('Order customer package') && $conf->exists('cust_main-enable_order_package') ) { - | <& /elements/order_pkg_link.html, 'cust_main'=>$cust_main &> -% } % if ( $conf->config('cust_main-external_links') ) { <% $br++ ? ' | ' : '' %> @@ -198,8 +148,7 @@ function areyousure_popup(message, action, actionlabel) { % } % } -
-<& /elements/footer.html &> +<& /elements/footer-cust_main.html &> <%init> my $curuser = $FS::CurrentUser::CurrentUser; @@ -228,18 +177,6 @@ my $cust_main = qsearchs( { }); die "Customer not found!" unless $cust_main; -my $title = mt("Customer").' #'. $cust_main->display_custnum. ': '. - encode_entities($cust_main->name); - -if ( $curuser->num_agents ) { - $title = encode_entities($cust_main->agent->agent). " $title"; -} - -my $status = $cust_main->status_label; -$status .= ' (Cancelled)' if $cust_main->is_status_delay_cancel; -my $title_noescape = $title. ' ('. $status. ')'; -$title .= " ($status)"; - #false laziness w/pref/pref.html and Conf.pm (cust_main-default_view) tie my %views, 'Tie::IxHash', emt('Basics') => 'basics', @@ -262,12 +199,15 @@ $views{$conf->config('cust_main-custom_title') || emt('Custom')} = 'custom' 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 = ''; -if ( $ie_compat ) { - $head = qq(); +if ($view eq 'last') { + # something took us away from the page and is now bouncing back + $view = get_page_pref('last_view', $custnum); +} else { + # remember which view is open so we _can_ bounce back + set_page_pref('last_view', $custnum, $view); } +$view = 'basics' if $view eq 'jumbo'; +