svn commit: r1206094 - in /ofbiz/trunk/themes: droppingcrumbs/webapp/droppingcrumbs/css/style.css flatgrey/includes/header.ftl flatgrey/webapp/flatgrey/maincss.css tomahawk/webapp/tomahawk/css/style.css

[hansbak-2]

Author: hansbak
Date: Fri Nov 25 09:39:43 2011
New Revision: 1206094

URL: http://svn.apache.org/viewvc?rev=1206094&view=rev
Log:
only allow space depending on the top logo's width, add system messages to the flatgrey theme

Modified:
    ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
    ofbiz/trunk/themes/flatgrey/includes/header.ftl
    ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
    ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css

Modified: ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=1206094&r1=1206093&r2=1206094&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original)
+++ ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Fri Nov 25 09:39:43 2011
@@ -940,7 +940,7 @@ height:50px;
 }
 
 #org-logo-area {
-width:260px;
+width:auto;
 height:50px;
 }
 

Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=1206094&r1=1206093&r2=1206094&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Fri Nov 25 09:39:43 2011
@@ -117,29 +117,43 @@ under the License.
             <li class="logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${StringUtil.wrapString(headerImageUrl)}</@ofbizContentUrl>"/></a></li>
         </#if>
       </#if>
-      <#if userLogin?exists>
-        <#if layoutSettings.topLines?has_content>
-          <#list layoutSettings.topLines as topLine>
-            <#if topLine.text?exists>
-              <li>${topLine.text}<a href="${StringUtil.wrapString(topLine.url?if_exists)}&amp;externalLoginKey=${externalLoginKey}">${topLine.urlText?if_exists}</a></li>
-            <#elseif topLine.dropDownList?exists>
-              <li><#include "component://common/webcommon/includes/insertDropDown.ftl"/></li>
+      <#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">
+        <li>
+        <div class="last-system-msg">
+        <center>${layoutSettings.middleTopHeader?if_exists}</center>
+        <a href="${layoutSettings.middleTopLink1?if_exists}">${layoutSettings.middleTopMessage1?if_exists}</a><br/>
+        <a href="${layoutSettings.middleTopLink2?if_exists}">${layoutSettings.middleTopMessage2?if_exists}</a><br/>
+        <a href="${layoutSettings.middleTopLink3?if_exists}">${layoutSettings.middleTopMessage3?if_exists}</a>
+        </div>
+        </li>
+      </#if>
+      <li class="preference-area">
+          <ul>
+          <#if userLogin?exists>
+            <#if layoutSettings.topLines?has_content>
+              <#list layoutSettings.topLines as topLine>
+                <#if topLine.text?exists>
+                  <li>${topLine.text}<a href="${StringUtil.wrapString(topLine.url?if_exists)}&amp;externalLoginKey=${externalLoginKey}">${topLine.urlText?if_exists}</a></li>
+                <#elseif topLine.dropDownList?exists>
+                  <li><#include "component://common/webcommon/includes/insertDropDown.ftl"/></li>
+                <#else>
+                  <li>${topLine?if_exists}</li>
+                </#if>
+              </#list>
             <#else>
-              <li>${topLine?if_exists}</li>
+              <li>${userLogin.userLoginId}</li>
             </#if>
-          </#list>
-        <#else>
-          <li>${userLogin.userLoginId}</li>
-        </#if>
-        <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
-      <#else/>
-        <li>${uiLabelMap.CommonWelcome}! <a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
-      </#if>
-      <#---if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists-->
-      <#if parameters.componentName?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
-        <#include "component://common/webcommon/includes/helplink.ftl" />
-        <li><a <#if pageAvail?has_content>class="alert"</#if> href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li>
-      </#if>
+            <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
+          <#else/>
+            <li>${uiLabelMap.CommonWelcome}! <a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
+          </#if>
+          <#---if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists-->
+          <#if parameters.componentName?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
+            <#include "component://common/webcommon/includes/helplink.ftl" />
+            <li><a <#if pageAvail?has_content>class="alert"</#if> href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li>
+          </#if>
+          </ul>
+      </li>
     </ul>
   </div>
   <#--<br class="clear" />-->

Modified: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css?rev=1206094&r1=1206093&r2=1206094&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css (original)
+++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css Fri Nov 25 09:39:43 2011
@@ -259,7 +259,7 @@ color: #ccc;
 font-size: 1em;
 font-weight: normal;
 min-height: 26px; /* Setting must be in px */
-height: 2.6em;
+height: auto;
 overflow: auto;
 }
 
@@ -273,6 +273,16 @@ color: #ccc;
 font-weight: normal;
 }
 
+.last-system-msg{
+color: #FFFFFF;
+font-size: 0.9em;
+padding-left:10px;
+}
+
+.preference-area{
+float: right !important;
+}
+
 #masthead ul .logo-area {
 padding: 0.1em 0.8em;
 }
@@ -282,7 +292,7 @@ padding: 0.1em 0.8em;
 }
 
 #masthead ul .org-logo-area img{
-width: 50px;
+width: auto;
 height: 22px;
 }
 

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=1206094&r1=1206093&r2=1206094&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css Fri Nov 25 09:39:43 2011
@@ -957,7 +957,7 @@ height:100%;
 }
 
 #org-logo-area {
-width:385px;
+width:auto;
 height:50px;
 }
 
@@ -2137,7 +2137,7 @@ display: none;
 #masthead ul li.last-system-msg{
 color:#FFFFFF;
 padding-left:10px;
-float: right;
+float: left;
 margin-right: 20px;
 }