svn commit: r1000331 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt: css/pelt.screen.css html/nav-section-round-bottom.contract.xml panels/pelt-html.nav-main.panel.xml

Author: gmcdonald
Date: Thu Sep 23 05:58:14 2010
New Revision: 1000331

URL: http://svn.apache.org/viewvc?rev=1000331&view=rev
Log:
Move the level 2 tabs links from the right of the main tabs to underneath, in the published strip area where they belong

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/css/pelt.screen.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/nav-section-round-bottom.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.nav-main.panel.xml

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/css/pelt.screen.css
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/css/pelt.screen.css?rev=1000331&r1=1000330&r2=1000331&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/css/pelt.screen.css (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/css/pelt.screen.css Thu Sep 23 05:58:14 2010
@@ -287,6 +287,7 @@ table caption {
     float:left;
     position:relative;
     background-color: #4A6D8C ;
+    z-index: 25;
 }
 #level2tabs a {padding-right: 5px;
 background-color: #CFDCED;
@@ -324,6 +325,7 @@ padding-left : 6px;
     background-image: url(../themes/images/roundcorner-b-r-15-bgFFFFFF-stroke4A6D8C-fg4A6D8C.png);
     background-repeat: no-repeat;
     background-position: top right;
+    padding-top: 10px;
 }
 
 #roundbottomLeft {

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/nav-section-round-bottom.contract.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/nav-section-round-bottom.contract.xml?rev=1000331&r1=1000330&r2=1000331&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/nav-section-round-bottom.contract.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/html/nav-section-round-bottom.contract.xml Thu Sep 23 05:58:14 2010
@@ -37,7 +37,7 @@ xmlns:forrest="http://apache.org/forrest
                 <img class="corner" src="{$skin-img-dir}/spacer.gif"
                 alt="spacer" />
               </div>
-            </div>
+      </div>
           </forrest:part>
         </forrest:content>
       </xsl:template>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.nav-main.panel.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.nav-main.panel.xml?rev=1000331&r1=1000330&r2=1000331&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.nav-main.panel.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.nav-main.panel.xml Thu Sep 23 05:58:14 2010
@@ -27,9 +27,9 @@ xmlns:jx="http://apache.org/cocoon/templ
   <forrest:hook name="nav-main-hook">
     <forrest:contract name="nav-main"
     dataURI="cocoon://#{$getRequest}.navigation.xml" />
-    <forrest:contract name="nav-main-sub"
-    dataURI="cocoon://#{$getRequest}.navigation.xml" />
     <forrest:hook name="publishedStrip" nbsp="true">
+      <forrest:contract name="nav-main-sub"
+      dataURI="cocoon://#{$getRequest}.navigation.xml" />
       <forrest:contract name="siteinfo-last-published" />
     </forrest:hook>
   </forrest:hook>