X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader-full.html;h=2e104748698a65af1417b98067b456203a7c34dd;hb=8a25843377c336b59696ba5d809fbccc7e2fd102;hp=9b24828590bfe24916a6592ae16f653f0e3df971;hpb=90eaa5512c9cd3ff34b34c9e2426ff2fa39e27dd;p=freeside.git

diff --git a/httemplate/elements/header-full.html b/httemplate/elements/header-full.html
index 9b2482859..2e1047486 100644
--- a/httemplate/elements/header-full.html
+++ b/httemplate/elements/header-full.html
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <%doc>
 
 Example:
@@ -48,6 +47,9 @@ Example:
       <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>
+%     if ( $FS::CurrentUser::CurrentUser->option('printtofit') ) {
+      <SCRIPT SRC="<% $fsurl %>elements/printtofit.js"></SCRIPT>
+%     }
 %   }
 
     <% include('init_overlib.html') |n %>
@@ -76,6 +78,9 @@ Example:
         <td align=left BGCOLOR="#ffffff"> <!-- valign="top" -->
           <font size=6><% $company_name || 'ExampleCo' %></font>
         </td>
+        <td align="right" BGCOLOR="#ffffff">
+          <& notify-tickets.html &>
+        </td>
         <td align=right valign=top BGCOLOR="#ffffff"><FONT SIZE="-1">Logged in as <b><% getotaker %>&nbsp;</b> <FONT SIZE="-2"><a href="javascript:void(0);" onClick="logout();">logout</a></FONT><br></FONT><FONT SIZE="-2"><a href="<%$fsurl%>pref/pref.html" STYLE="color: #000000">Preferences</a>
 %         if ( $conf->config("ticket_system")
 %              && FS::TicketSystem->access_right(\%session, 'ModifySelf') ) {
@@ -241,11 +246,3 @@ if ( scalar(@agentnums) == 1 ) {
 }
 
 </%init>
-=======
-% # 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