[Rt-commit] r3492 - in rt/branches/3.5-TESTING: . html/Elements

[trs at bestpractical.com]

Author: trs
Date: Sun Jul 17 19:22:47 2005
New Revision: 3492

Modified:
   rt/branches/3.5-TESTING/   (props changed)
   rt/branches/3.5-TESTING/html/Elements/Header
   rt/branches/3.5-TESTING/html/Elements/PageLayout
Log:
 r5165 at wintermute:  tom | 2005-07-17 14:53:39 -0400
 Changes that should have been included with the addition of $WebDefaultStylesheet


Modified: rt/branches/3.5-TESTING/html/Elements/Header
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/Header	(original)
+++ rt/branches/3.5-TESTING/html/Elements/Header	Sun Jul 17 19:22:47 2005
@@ -54,7 +54,7 @@
     <meta http-equiv="refresh" content="<%$Refresh%>" />
 % }
     <link rel="shortcut icon" href="<%$RT::WebImagesURL%>/favicon.png" type="image/png" />
-    <link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/css/main.css" type="text/css" media="all" />
+    <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/print.css" type="text/css" media="print" />
 % if ($RSSAutoDiscovery) {
     <link rel="alternate" href="<%$RSSAutoDiscovery%>" type="application/rss+xml" title="RSS RT Search" />

Modified: rt/branches/3.5-TESTING/html/Elements/PageLayout
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/PageLayout	(original)
+++ rt/branches/3.5-TESTING/html/Elements/PageLayout	Sun Jul 17 19:22:47 2005
@@ -60,7 +60,11 @@
 <& /Elements/Menu, toptabs => $toptabs, current_toptab => $current_toptab &>
 </div>
 
-<div id="header" style="padding-top: <% 1.2 * $menu_depth %>em; _padding-top: <% 0.55 * $menu_depth %>em;">
+<div id="header"
+% if ($RT::WebDefaultStylesheet eq '3.5-default') {
+     style="padding-top: <% 1.2 * $menu_depth %>em; _padding-top: <% 0.55 * $menu_depth %>em;"
+% }
+  >
   <div class="clear"></div>
   <h1><%$title%></h1>
 
@@ -175,19 +179,20 @@
   $AppName = loc("RT for [_1]", $RT::rtname);
 }
 
-my ($menu_depth, $almost_last) = @{$m->comp('.menu_recurse', data => $toptabs)};
-my $page_tabs;
+my ($menu_depth, $almost_last, $page_tabs);
 
-if (defined $almost_last->{subtabs} and %{$almost_last->{subtabs}}) {
-    $page_tabs = {
-        current_toptab => $almost_last->{current_subtab},
-        %{$almost_last->{subtabs}},
-    };
+if ($RT::WebDefaultStylesheet ne '3.4-compat') {
+    ($menu_depth, $almost_last) = @{$m->comp('.menu_recurse', data => $toptabs)};
 
-    delete $almost_last->{subtabs};
-    delete $almost_last->{current_subtab};
+    if (defined $almost_last->{subtabs} and %{$almost_last->{subtabs}}) {
+        $page_tabs = {
+            current_toptab => $almost_last->{current_subtab},
+            %{$almost_last->{subtabs}},
+        };
 
-#    $almost_last->{last_menu} = 1;
+        delete $almost_last->{subtabs};
+        delete $almost_last->{current_subtab};
+    }
 }
 </%INIT>