[freeside-commits] freeside/rt/html/Elements Header, 1.15, 1.16 PageLayout, 1.14, 1.15 Tabs, 1.11, 1.12

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/rt/html/Elements
In directory wavetail.420.am:/tmp/cvs-serv10951/html/Elements

Modified Files:
	Header PageLayout Tabs 
Log Message:
merge in rt 3.6.6.  *gulp*!

Index: Tabs
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Elements/Tabs,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Tabs	3 Aug 2007 21:49:02 -0000	1.11
+++ Tabs	3 Mar 2008 23:12:43 -0000	1.12
@@ -53,7 +53,8 @@
     tabs => $tabs,
     actions => $actions,
     subactions => $subactions,
-    title => $Title
+    title => $Title,
+    show_menu => $show_menu,
 &>
 <a name="skipnav" id="skipnav" accesskey="8"></a>
 <%INIT>
@@ -132,4 +133,5 @@
 $actions => undef
 $subactions => undef
 $Title => undef
+$show_menu => 1
 </%ARGS>

Index: PageLayout
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Elements/PageLayout,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- PageLayout	4 Aug 2007 00:13:48 -0000	1.14
+++ PageLayout	3 Mar 2008 23:12:43 -0000	1.15
@@ -75,9 +75,11 @@
     <TR HEIGHT="100%">
       <TD>
 
+% if ( $show_menu ) {
 <div id="nav">
 <& /Elements/Menu, toptabs => $toptabs, current_toptab => $current_toptab &>
 </div>
+% }
 
 <div id="header">
   <h1><%$title%></h1>
@@ -250,4 +252,5 @@
 $subactions => undef
 $title => $m->callers(-1)->path
 $AppName => undef
+$show_menu => 1
 </%ARGS>

Index: Header
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Elements/Header,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Header	4 Aug 2007 01:57:56 -0000	1.15
+++ Header	3 Mar 2008 23:12:43 -0000	1.16
@@ -58,7 +58,7 @@
 % }
 
 <link rel="shortcut icon" href="<%$RT::WebImagesURL%>/favicon.png" type="image/png" />
-<link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/css/<% $RT::WebDefaultStylesheet %>/main.css" type="text/css" media="all" />
+<link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/css/<% $RT::WebDefaultStylesheet %>/main-squished.css" type="text/css" media="all" />
 <link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/css/print.css" type="text/css" media="print" />
 
 % if ( $RSSAutoDiscovery ) {