Author: buscob
Date: Sun Jan 30 10:14:01 2011
New Revision: 1065243
URL: http://svn.apache.org/viewvc?rev=1065243&view=rev
Log:
No functional changes, only clean-up for Tomahawk theme.
Changed some theme-defined style names so that now they describe items function
and not how items appear on the screen.
Simplified the navigation tree structure.
Modified:
ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl
ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl
ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
Modified: ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl?rev=1065243&r1=1065242&r2=1065243&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl Sun Jan 30 10:14:01
2011
@@ -34,7 +34,7 @@ under the License.
<#if appModelMenu.getModelMenuItemByName(headerItem)?exists>
<#if headerItem!="main">
- <div class="breadcrumbs-sep">
+ <div id="app-nav-selected-item">
${appModelMenu.getModelMenuItemByName(headerItem).getTitle(context)}
</div>
</#if>
@@ -44,7 +44,7 @@ under the License.
<#assign findMap =
Static["org.ofbiz.base.util.UtilMisc"].toMap("portalPageId",
parameters.portalPageId)>
<#assign portalPage = delegator.findByPrimaryKeyCache("PortalPage",
findMap)>
<#if portalPage?has_content>
- <div class="breadcrumbs-sep">
+ <div id="app-nav-selected-item">
${portalPage.portalPageName?if_exists}
</div>
</#if>
@@ -95,7 +95,6 @@ under the License.
</ul>
</div>
</div>
-</div>
<div class="clear">
</div>
Modified: ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl?rev=1065243&r1=1065242&r2=1065243&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl Sun Jan 30 10:14:01 2011
@@ -35,8 +35,7 @@ under the License.
<#assign show_last_menu = true>
</#if>
-<div class="tabbar">
- <div class="breadcrumbs<#if show_last_menu?exists> menu_selected</#if>">
+<div id="navigation" <#if show_last_menu?exists>class="menu_selected"</#if>>
<#if userLogin?has_content>
<div id="main-navigation">
<h2>${uiLabelMap.CommonApplications}</h2>
Modified: ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1065243&r1=1065242&r2=1065243&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css Sun Jan 30
10:14:01 2011
@@ -942,23 +942,6 @@ vertical-align: top;
text-align: center;
}
-.tabbar {
-background: url(../images/header_top_bg_btm.gif) repeat-x;
-height: 30px;
-width: 100%;
-}
-
-.tabbar .breadcrumbs-sep {
-color: #262626;
-float: left;
-height: 22px;
-background: url(../images/appbar.png) no-repeat right -90px;
-padding: 8px 20px 0px 10px;
-font-size: 1.5em;
-font-weight: bold;
-}
-
-
/* ==================================== */
/* ===== Masthead (Header) Styles ===== */
/* ==================================== */
@@ -1089,9 +1072,15 @@ color: #aa9f63;
font-weight:normal;
}
-/* ================================================== */
-/* ===== Main Navigation (App Menu) Styles ========== */
-/* ================================================== */
+/* =========================================== */
+/* ===== Main Navigation Bar Styles ========== */
+/* =========================================== */
+#navigation {
+background: url(../images/header_top_bg_btm.gif) repeat-x;
+height: 30px;
+width: 100%;
+}
+
#main-navigation,#app-navigation {
height:30px;
float: left;
@@ -1200,6 +1189,16 @@ background-color:#403f40;
display:none;
}
+#app-nav-selected-item {
+color: #262626;
+float: left;
+height: 22px;
+background: url(../images/appbar.png) no-repeat right -90px;
+padding: 8px 20px 0px 10px;
+font-size: 1.5em;
+font-weight: bold;
+}
+
/* ============================ */
/* ===== Screenlet Styles ===== */
/* ============================ */
