svn commit: r1308043 - in /incubator/bloodhound/trunk/bloodhound_theme/bhtheme: htdocs/bloodhound.css templates/bloodhound_theme.html

[gj...@apache.org]

Author: gjm
Date: Sun Apr  1 08:54:55 2012
New Revision: 1308043

URL: http://svn.apache.org/viewvc?rev=1308043&view=rev
Log:
Theme code import: Bug fixed: Exception in template when including text ctxtnav items. Precise position for mainnav and ctxtnav in Chrome

Modified:
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css?rev=1308043&r1=1308042&r2=1308043&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css Sun Apr  1 08:54:55 2012
@@ -78,6 +78,11 @@
   height: 30px;
 }
 
+.ui-tabs .ui-tabs-nav .navtext {
+  height: 23px !important;
+  padding: 7px 1em 0.5em 1em;
+}
+
 #main-wrapper {
   border: 1px solid #c9c9c9;
   border-top: none;
@@ -180,6 +185,7 @@ a.prev:hover, a.next:hover {
 #mainnav {
   border: none;
   background: none;
+  margin-top: 7px;
 }
 
 #mainnav ul {
@@ -275,7 +281,8 @@ a.prev:hover, a.next:hover {
 }
 
 #metanav :link, #metanav :visited, 
-#metanav :link:hover, #metanav :visited:hover {
+#metanav :link:hover, #metanav :visited:hover,
+#metanav li {
   color: #cccccc;
 }
 

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html?rev=1308043&r1=1308042&r2=1308043&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html Sun Apr  1 08:54:55 2012
@@ -71,8 +71,8 @@
               class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
             <li py:when="chrome.ctxtnav"
                 py:for="i, elm in enumerate(chrome.ctxtnav)"
-                py:with="is_active = str(elm.attrib.get('href')) == str(href(req.path_info + (req.query_string and '?' + req.query_string or '') ))"
-                class="${classes(first_last(i, chrome.ctxtnav), active=is_active)} ui-corner-top ui-state-default ${is_active and 'ui-tabs-selected ui-state-active' or None}">${elm}</li>
+                py:with="is_text = not hasattr(elm, 'attrib'); is_active = is_text or str(elm.attrib.get('href')) == str(href(req.path_info + (req.query_string and '?' + req.query_string or '') ))"
+                class="${classes(first_last(i, chrome.ctxtnav), active=is_active)} ui-corner-top ui-state-default ${is_active and 'ui-tabs-selected ui-state-active' or None} ${is_text and 'navtext' or None}">${elm}</li>
             <li py:otherwise="" 
                 class="icon icon_bh ui-corner-top ui-state-default ui-tabs-selected ui-state-active"></li>
           </ul>