[freeside-commits] freeside/httemplate/elements header.html, 1.46, 1.47

Thu May 19 16:25:39 PDT 2011

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail.420.am:/tmp/cvs-serv32254/elements

Modified Files:
	header.html 
Log Message:
user pref to enable mobile menu, #11630

Index: header.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/header.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -w -d -r1.46 -r1.47

--- header.html	27 Apr 2011 08:31:01 -0000	1.46
+++ header.html	19 May 2011 23:25:37 -0000	1.47
@@ -190,13 +190,6 @@
   $head = @_ ? shift : ''; #$head is for things that go in the <HEAD> section
 }
 
-if ( !defined($mobile) ) {
-  $mobile = FS::UI::Web::is_mobile();
-}
-if ( $cgi->param('mobile') =~ /^(\d)$/ ) { # allow client to override
-  $mobile = $1;
-}
-
 my $conf = new FS::Conf;
 
 my $curuser = $FS::CurrentUser::CurrentUser;
@@ -204,6 +197,13 @@
 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;
 my @agentnums = $curuser->agentnums;
 if ( scalar(@agentnums) == 1 ) {

