X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Fheader-full.html;h=5a5db962083552f70c996498cddcdf252aa7c1e4;hp=850eaed8c518d2f10ac3d0969f68c6fde2e5ac6f;hb=9cfa3648407dc2333fb549460fed278311c5393a;hpb=a2ecb1cf6a6c084c521710f1256da082f70ba9e5

diff --git a/httemplate/elements/header-full.html b/httemplate/elements/header-full.html
index 850eaed8c..5a5db9620 100644
--- a/httemplate/elements/header-full.html
+++ b/httemplate/elements/header-full.html
@@ -44,13 +44,20 @@ Example:
     %>
 
 %   unless ( $no_jquery ) {
-      <link rel="stylesheet" href="<% $fsurl %>elements/jquery-ui.min.css">
-      <SCRIPT SRC="<% $fsurl %>elements/jquery.js"></SCRIPT>
-      <SCRIPT SRC="<% $fsurl %>elements/jquery-ui.min.js"></SCRIPT>
+      <link rel="stylesheet" href="<% $fsurl %>elements/jquery-ui-1.12.1.min.css">
+      <SCRIPT SRC="<% $fsurl %>elements/jquery-3.3.1.js"></SCRIPT>
+      <SCRIPT SRC="<% $fsurl %>elements/jquery-migrate-3.0.1.min.js"></SCRIPT>
+      <SCRIPT SRC="<% $fsurl %>elements/jquery-ui-1.12.1.min.js"></SCRIPT>
+      <SCRIPT SRC="<% $fsurl %>elements/jquery.validate-1.17.0.min.js"></SCRIPT>
 %     if ( $FS::CurrentUser::CurrentUser->option('printtofit') ) {
       <SCRIPT SRC="<% $fsurl %>elements/printtofit.js"></SCRIPT>
 %     }
 %   }
+%   if ( $include_selectize ) {
+      <script src="<% $fsurl %>elements/selectize/selectize-0.12.6.min.js"></script>
+      <link href="<% $fsurl %>elements/selectize/selectize-0.12.6.css" type="text/css" rel="stylesheet">
+      <link href="<% $fsurl %>elements/selectize/selectize-freeside.css?v=<% $FS::VERSION %>" type="text/css" rel="stylesheet">
+% }
     <% include('init_overlib.html') |n %>
     <% include('rs_init_object.html') |n %>
     <script type="text/javascript" src="<% $fsurl %>elements/topreload.js"></script>
@@ -73,10 +80,18 @@ Example:
         <td align="right" BGCOLOR="#ffffff">
           <& notify-tickets.html &>
         </td>
-        <td align=right valign=top BGCOLOR="#ffffff"><FONT SIZE="-1">Logged in as <b><% $FS::CurrentUser::CurrentUser->username |h %>&nbsp;</b> <FONT SIZE="-2"><a href="<%$fsurl%>loginout/logout.html">logout</a></FONT><br></FONT><FONT SIZE="-2"><a href="<%$fsurl%>pref/pref.html" STYLE="color: #000000">Preferences</a>
+        <td align=right valign=top BGCOLOR="#ffffff">
+          <FONT SIZE="-1"><% mt('Logged in as') |h %>
+            <b><% $FS::CurrentUser::CurrentUser->username |h %>&nbsp;</b>
+            <FONT SIZE="-2"><a href="<%$fsurl%>loginout/logout.html">
+              <% mt('logout') |h %>
+            </a></FONT>
+          <br>
+          </FONT>
+          <FONT SIZE="-2"><a href="<%$fsurl%>pref/pref.html" STYLE="color: #000000"><% mt('Preferences') |h %></a>
 %         if ( $conf->config("ticket_system")
 %              && FS::TicketSystem->access_right(\%session, 'ModifySelf') ) {
-            | <a href="<%$fsurl%>rt/Prefs/Other.html" STYLE="color: #000000">Ticketing preferences</a>
+            | <a href="<%$fsurl%>rt/Prefs/Other.html" STYLE="color: #000000"><% mt('Ticketing preferences') |h %></a>
 %         }
           <BR></FONT>
         </td>
@@ -85,7 +100,7 @@ Example:
 
     <TABLE WIDTH="100%" CELLSPACING=0 CELLPADDING=0>
 
-<link href="<%$fsurl%>elements/freeside-menu.css" type="text/css" rel="stylesheet">
+<link href="<%$fsurl%>elements/freeside-menu.css?v=<% $FS::VERSION %>" type="text/css" rel="stylesheet">
 
 % if ( $menu_position eq 'top' ) {
 
@@ -185,6 +200,22 @@ Example:
             <% $title_noescape || encode_entities($title) %>
           </H1>
 
+% my %cookies = CGI::Cookie->fetch($r);
+% if ( $cookies{freeside_status} ) {
+    <BR>
+%   foreach my $status_msg ( $cookies{freeside_status}->value ) {
+%     my ($message, $type) = split /=/, $status_msg;
+%     $type ||= 'status';
+      <TABLE CLASS="fsinnerbox" STYLE="background-color:<% $status_color{$type} %>"><TR>
+        <TD><IMG SRC="<% $fsurl %><% $status_image{$type} %>"> <% $message |h %></TD>
+      </TR></TABLE>
+%   }
+    <script src="<% $fsurl %>elements/js.cookie.js"></script>
+    <SCRIPT TYPE="text/javascript">
+      Cookies.remove('freeside_status', { path: '/' });
+    </SCRIPT>
+% }
+
 % unless ( $nobr ) {
           <BR>
 % }
@@ -197,6 +228,7 @@ my( $title, $title_noescape, $menubar, $etc, $head ) = ( '', '', '', '', '' );
 my( $nobr, $nocss, $no_jquery ) = ( 0, 0, 0 );
 
 my $mobile;
+my $include_selectize;
 
 if ( ref($_[0]) ) {
   my $opt = shift;
@@ -209,6 +241,7 @@ if ( ref($_[0]) ) {
   $nocss      = $opt->{nocss};
   $mobile     = $opt->{mobile};
   $no_jquery  = $opt->{no_jquery};
+  $include_selectize = $opt->{include_selectize} ? 1 : 0;
 } else {
   ($title, $menubar) = ( shift, shift );
   $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc.
@@ -239,4 +272,8 @@ if ( scalar(@agentnums) == 1 ) {
   $company_url  = $conf->config('company_url');
 }
 
+## status->green(#eeffee), warning->yellow(#fdfd96), error->red(#f97c7c)
+my %status_color = ( 'status' => '#eeffee', 'warning' => '#fefbd0', 'error' => '#f97c7c', );
+my %status_image = ( 'status' => 'images/tick.png', 'warning' => 'images/tick.png', 'error' => 'images/error.png', );
+
 </%init>