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

[trs at bestpractical.com]

Author: trs
Date: Mon Jul 25 06:26:07 2005
New Revision: 3527

Modified:
   rt/branches/3.5-TESTING/   (props changed)
   rt/branches/3.5-TESTING/html/Elements/Menu
   rt/branches/3.5-TESTING/html/Elements/PageLayout
Log:
 r5386 at wintermute:  tom | 2005-07-24 22:52:11 -0400
 Tag the last ul in the system menu with a class for planned future use in re-structuring the menu CSS


Modified: rt/branches/3.5-TESTING/html/Elements/Menu
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/Menu	(original)
+++ rt/branches/3.5-TESTING/html/Elements/Menu	Mon Jul 25 06:26:07 2005
@@ -89,7 +89,8 @@
 %     if ($toptabs->{$tab}->{'subtabs'}) {
           <& /Elements/Menu, level => $level+1, 
                              current_toptab => $toptabs->{$tab}->{'current_subtab'},
-                             toptabs => $toptabs->{$tab}->{'subtabs'} &>
+                             toptabs => $toptabs->{$tab}->{'subtabs'},
+                             last_level => $toptabs->{$tab}->{last_system_menu_level} &>
 %     }
   </li>
 %     if ($sep) {
@@ -105,8 +106,8 @@
 my ($tab, $class, $count);
 
 my @ul;
-#push @ul, 'last-menu'
-#    if $toptabs->{last_menu};
+push @ul, 'last-menu-level'
+    if $last_level;
 push @ul, 'odd'
     if $level % 2;
 my $menu_class = join ' ', @ul;
@@ -116,4 +117,5 @@
 $current_toptab => ""
 $toptabs => undef
 $level => 0
+$last_level => 0
 </%ARGS>

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	Mon Jul 25 06:26:07 2005
@@ -62,10 +62,9 @@
 
 <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;"
+     style="padding-top: <% 1.5 * $menu_depth %>em; _padding-top: <% 0.55 * $menu_depth %>em;"
 % }
   >
-  <div class="clear"></div>
   <h1><%$title%></h1>
 
 % my $sep       = 0;
@@ -206,19 +205,22 @@
 %# the last submenu (used for CSS calcs later (HACK)).
 <%def .menu_recurse>
   <%args>
-      $data  => { }
-      $pdata => { }
-      $level => 0
+      $data   => { }
+      $pdata  => { }
+      $ppdata => { }
+      $level  => 0
   </%args>
   <%init>
       for my $key (keys %$data) {
-          return $m->comp('.menu_recurse', data => $data->{$key}->{subtabs},
-                                           pdata => $data->{$key},
-                                           level => $level+1)
+          return $m->comp('.menu_recurse', data   => $data->{$key}->{subtabs},
+                                           pdata  => $data->{$key},
+                                           ppdata => $pdata,
+                                           level  => $level+1)
               if ref($data->{$key}) eq 'HASH'
                  and defined $data->{$key}->{subtabs}
                  and %{$data->{$key}->{subtabs}};
       }
+      $ppdata->{last_system_menu_level}++;
       return [$level, $pdata];
   </%init>
 </%def>