X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=61d031376a8c30ee8a34afa4550574a340373cbf;hb=ea3ce8d7f076e7fecff4be7ae63bc413adb0adf5;hp=c83529e2b186bc2e9dcd6167dde1c1fc88c04142;hpb=f936f59edf460c72f4e4c4da4d701b99f4456890;p=freeside.git

diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index c83529e2b..61d031376 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -28,10 +28,14 @@ Example:
     <META HTTP-Equiv="Cache-Control" Content="no-cache">
     <META HTTP-Equiv="Pragma" Content="no-cache">
     <META HTTP-Equiv="Expires" Content="0"> 
+% if ( $mobile ) {
+    <META NAME="viewport" content="width=device-width height=device-height user-scalable=yes">
+% }
 
     <% include('menu.html', 'freeside_baseurl' => $fsurl,
                             'position'         => $menu_position,
                             'nocss'            => $nocss,
+                            'mobile'           => $mobile,
               ) |n
     %>
 
@@ -67,6 +71,19 @@ Example:
 
       <TR>
 
+%       if ( $mobile ) {
+
+        <TD STYLE="padding:1px 0px 0px 0px;border-top: 1px solid #7e0079;width:auto" BGCOLOR="#cccccc">
+          <SCRIPT TYPE="text/javascript">
+            document.write(myBar.toString());
+          </SCRIPT>
+        </TD>
+        <TD STYLE="padding:1px 0px 0px 0px;border-top: 1px solid #7e0079;width:auto" BGCOLOR="#cccccc">
+            <% include('searchbar-combined.html') |n %>
+        </TD>
+
+%       } else {
+
         <TD COLSPAN="7" WIDTH="100%" STYLE="padding:1px 0px 0px 0px;border-top: 1px solid #7e0079" BGCOLOR="#cccccc">
           <SCRIPT TYPE="text/javascript">
             document.write(myBar);
@@ -100,6 +117,7 @@ Example:
         <TD COLSPAN=1 BGCOLOR="#cccccc" ALIGN="right" STYLE="padding-left:2px;padding-right:2px">
           <% include('searchbar-ticket.html') |n %>
         </TD>
+%       }
 
       </TR>
     </TABLE>
@@ -154,6 +172,9 @@ Example:
 
 my( $title, $menubar, $etc, $head ) = ( '', '', '', '' );
 my( $nobr, $nocss ) = ( 0, 0 );
+
+my $mobile;
+
 if ( ref($_[0]) ) {
   my $opt = shift;
   $title   = $opt->{title};
@@ -162,6 +183,7 @@ if ( ref($_[0]) ) {
   $head    = $opt->{head};
   $nobr    = $opt->{nobr};
   $nocss   = $opt->{nocss};
+  $mobile  = $opt->{mobile};
 } else {
   ($title, $menubar) = ( shift, shift );
   $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc.
@@ -175,6 +197,13 @@ 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;
 my @agentnums = $curuser->agentnums;
 if ( scalar(@agentnums) == 1 ) {
@@ -182,5 +211,4 @@ if ( scalar(@agentnums) == 1 ) {
 } else {
   $company_name = $conf->config('company_name');
 }
-
 </%init>