From 90eaa5512c9cd3ff34b34c9e2426ff2fa39e27dd Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Tue, 26 Apr 2016 12:10:43 -0700 Subject: more robust testing platform, #37340 --- httemplate/elements/error.html | 1 + httemplate/elements/errorpage.html | 5 +- httemplate/elements/header-full.html | 251 +++++++++++++++++++++++++++++++++++ httemplate/elements/header.html | 246 +--------------------------------- 4 files changed, 260 insertions(+), 243 deletions(-) create mode 100644 httemplate/elements/header-full.html (limited to 'httemplate/elements') diff --git a/httemplate/elements/error.html b/httemplate/elements/error.html index f65785d10..f9664bd65 100644 --- a/httemplate/elements/error.html +++ b/httemplate/elements/error.html @@ -1,4 +1,5 @@ % if ( $cgi->param('error') ) { +% $m->notes('error', $cgi->param('error')); <% mt("Error: [_1]", $cgi->param('error')) |h %>

% } diff --git a/httemplate/elements/errorpage.html b/httemplate/elements/errorpage.html index 0f9808da0..7d66e7ce0 100644 --- a/httemplate/elements/errorpage.html +++ b/httemplate/elements/errorpage.html @@ -1,10 +1,11 @@ +% my $error = shift; +% $m->notes('error', $error); <& /elements/header.html, mt("Error") &> % while (@_) { -

<% shift |h %> +

<% $error |h %> %} - % $m->flush_buffer(); % $HTML::Mason::Commands::m->abort(); diff --git a/httemplate/elements/header-full.html b/httemplate/elements/header-full.html new file mode 100644 index 000000000..9b2482859 --- /dev/null +++ b/httemplate/elements/header-full.html @@ -0,0 +1,251 @@ +<<<<<<< HEAD +<%doc> + +Example: + + include( '/elements/header.html', + { + 'title' => 'Title', + 'menubar' => \@menubar, + 'etc' => '', #included in tag, for things like onLoad= + 'head' => '', #included before closing tag + 'nobr' => 0, #1 for no

after the title + 'no_jquery' => #for use from RT, which loads its own + } + ); + + #old-style + include( '/elements/header.html', 'Title', $menubar, $etc, $head); + + + +%# +%# above is what RT declares, should we switch now? hopefully no glitches result +%# or just fuck it, XHTML died anyway, HTML 5 or bust? + + + + <% encode_entities($title) || $title_noescape |n %> + + + + + + + +% if ( $mobile ) { + +% } + + <% include('menu.html', 'freeside_baseurl' => $fsurl, + 'position' => $menu_position, + 'nocss' => $nocss, + 'mobile' => $mobile, + ) |n + %> + +% unless ( $no_jquery ) { + + + +% } + + <% include('init_overlib.html') |n %> + <% include('rs_init_object.html') |n %> + <% include('logout.html') |n %> +% my $timeout = $conf->config('logout-timeout'); +% if ( $timeout && $timeout =~ /^\s*\d+\s*$/ ) { + +% } + + <% $head |n %> + +%# announce our base path, and the Mason comp path of this page + + + + STYLE="margin-top:0; margin-bottom:0; margin-left:0px; margin-right:0px"> + + + + + + +
<% $company_url ? qq() : '' |n %>freeside<% $company_url ? '' : '' |n %> + <% $company_name || 'ExampleCo' %> + Logged in as <% getotaker %>  logout
Preferences +% if ( $conf->config("ticket_system") +% && FS::TicketSystem->access_right(\%session, 'ModifySelf') ) { + | Ticketing preferences +% } +
+
+ + + + + +% if ( $menu_position eq 'top' ) { + + + +% if ( $mobile ) { + + + + +% } else { + + + + + + + + + + + + + + + + + + +% } + + +
+ + + <% include('searchbar-combined.html') |n %> + + +
+ <% include('searchbar-prospect.html') |n %> + + <% include('searchbar-cust_main.html') |n %> + + <% include('searchbar-address2.html') |n %> + + <% include('searchbar-cust_bill.html') |n %> + + <% include('searchbar-cust_svc.html') |n %> + + <% include('searchbar-ticket.html') |n %> +
+ +% } else { #$menu_position eq 'left' + + + + + + + + +% } + + + + + + +% if ( $menu_position eq 'left' ) { + + + +% } +%# page content starts here + - - - - - -% } - - -
+ + +
+ <% include('searchbar-prospect.html') |n %> + <% include('searchbar-cust_main.html') |n %> + <% include('searchbar-address2.html') |n %> + <% include('searchbar-cust_bill.html') |n %> + <% include('searchbar-cust_svc.html') |n %> + <% include('searchbar-ticket.html') |n %> + + 		+ + + <% $title_noescape || encode_entities($title) %> + + +% unless ( $nobr ) { +

+% } + + <% $menubar !~ /^\s*$/ ? "$menubar

" : '' %> + +<%init> + +my( $title, $title_noescape, $menubar, $etc, $head ) = ( '', '', '', '', '' ); +my( $nobr, $nocss, $no_jquery ) = ( 0, 0, 0 ); + +my $mobile; + +if ( ref($_[0]) ) { + my $opt = shift; + $title = $opt->{title}; + $title_noescape = $opt->{title_noescape}; + $menubar = $opt->{menubar}; + $etc = $opt->{etc}; + $head = $opt->{head}; + $nobr = $opt->{nobr}; + $nocss = $opt->{nocss}; + $mobile = $opt->{mobile}; + $no_jquery = exists($opt->{no_jquery}) ? $opt->{no_jquery} : 1; #v3 only, 0 on v4+ +} else { + ($title, $menubar) = ( shift, shift ); + $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc. + $head = @_ ? shift : ''; #$head is for things that go in the section +} + +my $conf = new FS::Conf; + +my $curuser = $FS::CurrentUser::CurrentUser; + +my $menu_position = $curuser->option('menu_position') + || 'top'; #new default for 1.9 + +if ( !defined($mobile) ) { + $mobile = $curuser->option('mobile_menu',1) && FS::UI::Web::is_mobile(); +} +if ( $cgi->param('mobile') =~ /^(\d)$/ ) { # allow client to override + $mobile = $1; +} + +my($company_name, $company_url); +my @agentnums = $curuser->agentnums; +if ( scalar(@agentnums) == 1 ) { + $company_name = $conf->config('company_name', $agentnums[0] ); + $company_url = $conf->config('company_url', $agentnums[0] ); +} else { + $company_name = $conf->config('company_name'); + $company_url = $conf->config('company_url'); +} + + +======= +% # for testing, disable the page menus/search boxes +% if ( $FS::CurrentUser::CurrentUser->option('header-minimal') ) { +<& header-minimal.html, @_ &> +% } else { +<& header-full.html, @_ &> +% } +>>>>>>> cb6214a... more robust testing platform, #37340 diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index a67538d11..c6b10e301 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -1,242 +1,6 @@ -<%doc> - -Example: - - include( '/elements/header.html', - { - 'title' => 'Title', - 'menubar' => \@menubar, - 'etc' => '', #included in tag, for things like onLoad= - 'head' => '', #included before closing tag - 'nobr' => 0, #1 for no

after the title - 'no_jquery' => #for use from RT, which loads its own - } - ); - - #old-style - include( '/elements/header.html', 'Title', $menubar, $etc, $head); - - - -%# -%# above is what RT declares, should we switch now? hopefully no glitches result -%# or just fuck it, XHTML died anyway, HTML 5 or bust? - - - - <% encode_entities($title) || $title_noescape |n %> - - - - - - - -% if ( $mobile ) { - +% # for testing, disable the page menus/search boxes +% if ( $FS::CurrentUser::CurrentUser->option('header-minimal') ) { +<& header-minimal.html, @_ &> +% } else { +<& header-full.html, @_ &> % } - - <% include('menu.html', 'freeside_baseurl' => $fsurl, - 'position' => $menu_position, - 'nocss' => $nocss, - 'mobile' => $mobile, - ) |n - %> - -% unless ( $no_jquery ) { - - - -% } - - <% include('init_overlib.html') |n %> - <% include('rs_init_object.html') |n %> - <% include('logout.html') |n %> -% my $timeout = $conf->config('logout-timeout'); -% if ( $timeout && $timeout =~ /^\s*\d+\s*$/ ) { - -% } - - <% $head |n %> - -%# announce our base path, and the Mason comp path of this page - - - - STYLE="margin-top:0; margin-bottom:0; margin-left:0px; margin-right:0px"> - - - - - - -
<% $company_url ? qq() : '' |n %>freeside<% $company_url ? '' : '' |n %> - <% $company_name || 'ExampleCo' %> - Logged in as <% getotaker %>  logout
Preferences -% if ( $conf->config("ticket_system") -% && FS::TicketSystem->access_right(\%session, 'ModifySelf') ) { - | Ticketing preferences -% } -
-
- - - - - -% if ( $menu_position eq 'top' ) { - - - -% if ( $mobile ) { - - - - -% } else { - - - - - - - - - - - - - - - - - - -% } - - -
- - - <% include('searchbar-combined.html') |n %> - - -
- <% include('searchbar-prospect.html') |n %> - - <% include('searchbar-cust_main.html') |n %> - - <% include('searchbar-address2.html') |n %> - - <% include('searchbar-cust_bill.html') |n %> - - <% include('searchbar-cust_svc.html') |n %> - - <% include('searchbar-ticket.html') |n %> -
- -% } else { #$menu_position eq 'left' - -
-
- - - -% if ( $menu_position eq 'left' ) { - - - -% } -%# page content starts here -
- - -
- <% include('searchbar-prospect.html') |n %> - <% include('searchbar-cust_main.html') |n %> - <% include('searchbar-address2.html') |n %> - <% include('searchbar-cust_bill.html') |n %> - <% include('searchbar-cust_svc.html') |n %> - <% include('searchbar-ticket.html') |n %> - - 		- - - <% $title_noescape || encode_entities($title) %> - - -% unless ( $nobr ) { -

-% } - - <% $menubar !~ /^\s*$/ ? "$menubar

" : '' %> - -<%init> - -my( $title, $title_noescape, $menubar, $etc, $head ) = ( '', '', '', '', '' ); -my( $nobr, $nocss, $no_jquery ) = ( 0, 0, 0 ); - -my $mobile; - -if ( ref($_[0]) ) { - my $opt = shift; - $title = $opt->{title}; - $title_noescape = $opt->{title_noescape}; - $menubar = $opt->{menubar}; - $etc = $opt->{etc}; - $head = $opt->{head}; - $nobr = $opt->{nobr}; - $nocss = $opt->{nocss}; - $mobile = $opt->{mobile}; - $no_jquery = exists($opt->{no_jquery}) ? $opt->{no_jquery} : 1; #v3 only, 0 on v4+ -} else { - ($title, $menubar) = ( shift, shift ); - $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc. - $head = @_ ? shift : ''; #$head is for things that go in the section -} - -my $conf = new FS::Conf; - -my $curuser = $FS::CurrentUser::CurrentUser; - -my $menu_position = $curuser->option('menu_position') - || 'top'; #new default for 1.9 - -if ( !defined($mobile) ) { - $mobile = $curuser->option('mobile_menu',1) && FS::UI::Web::is_mobile(); -} -if ( $cgi->param('mobile') =~ /^(\d)$/ ) { # allow client to override - $mobile = $1; -} - -my($company_name, $company_url); -my @agentnums = $curuser->agentnums; -if ( scalar(@agentnums) == 1 ) { - $company_name = $conf->config('company_name', $agentnums[0] ); - $company_url = $conf->config('company_url', $agentnums[0] ); -} else { - $company_name = $conf->config('company_name'); - $company_url = $conf->config('company_url'); -} - - -- cgit v1.2.1