Author: buscob
Date: Sun Mar 15 18:34:44 2009
New Revision: 754715
URL: http://svn.apache.org/viewvc?rev=754715&view=rev
Log:
- Fixed some issues when no userLogin. This is something that happens if the
bluelight theme is set as default theme.
- Better rendering of eventMessages
Modified:
ofbiz/trunk/themes/bluelight/includes/appbar.ftl
ofbiz/trunk/themes/bluelight/includes/header.ftl
ofbiz/trunk/themes/bluelight/includes/messages.ftl
ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
Modified: ofbiz/trunk/themes/bluelight/includes/appbar.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/appbar.ftl?rev=754715&r1=754714&r2=754715&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/appbar.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/appbar.ftl Sun Mar 15 18:34:44 2009
@@ -22,7 +22,6 @@
<#assign contextPath = request.getContextPath()>
<#assign displayApps =
Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName,
"main")>
-<#if userLogin?has_content>
<div class="tabbar">
<div class="breadcrumbs">
<div class="breadcrumbs-start">
@@ -50,13 +49,12 @@
<#if thisApp != "/">
<#assign thisURL = thisURL + "/control/main">
</#if>
-<!-- <#if !selected>-->
+<#-- <#if !selected>-->
<li><a href="${thisURL + externalKeyParam}" <#if
uiLabelMap?exists>
title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else>
title="${display.description}">${display.title}</#if></a></li>
-<!-- </#if>-->
+<#-- </#if>-->
</#if>
</#list>
</ul>
</li>
</ul>
</div>
-</#if>
Modified: ofbiz/trunk/themes/bluelight/includes/header.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=754715&r1=754714&r2=754715&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/header.ftl Sun Mar 15 18:34:44 2009
@@ -92,8 +92,10 @@
<#assign userName = person.firstName?if_exists + " " +
person.middleName?if_exists + " " + person.lastName?if_exists>
<#elseif partyGroup?has_content>
<#assign userName = partyGroup.groupName?if_exists>
-<#else>
+<#elseif userLogin?exists>
<#assign userName = userLogin.userLoginId>
+<#else>
+ <#assign userName = "">
</#if>
<#if defaultOrganizationPartyGroupName?has_content>
@@ -132,8 +134,10 @@
<li class="control-area">
<ul id="preferences-menu">
- <li class="user"><a
href="/partymgr/control/viewprofile?partyId=${userLogin.partyId}">${userName}</a></li>
- <li class="org">${orgName}</li>
+ <#if userLogin?exists>
+ <li class="user"><a
href="/partymgr/control/viewprofile?partyId=${userLogin.partyId}">${userName}</a></li>
+ <li class="org">${orgName}</li>
+ </#if>
<li class="first"><a
href="<@ofbizUrl>LookupLocales</@ofbizUrl>">${uiLabelMap.CommonLanguageTitle} :
${locale.getDisplayName(locale)}</a></li>
<#if userLogin?exists>
<li><a
href="<@ofbizUrl>LookupVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
Modified: ofbiz/trunk/themes/bluelight/includes/messages.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/messages.ftl?rev=754715&r1=754714&r2=754715&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/messages.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/messages.ftl Sun Mar 15 18:34:44 2009
@@ -16,19 +16,18 @@
specific language governing permissions and limitations
under the License.
-->
-<#if userLogin?has_content>
</div>
</div>
<div class="breadcrumbs-sep">
<#if titleProperty?exists>
${uiLabelMap[titleProperty]}
</#if>
- </div>
+ </div>
<div class="breadcrumbs-end">
</div>
</div>
<div class="clear">
-</div>
-</#if>
-
+</div>
+<div id="messages-container">
<#include "component://common/webcommon/includes/messages.ftl" />
+</div>
Modified: ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css?rev=754715&r1=754714&r2=754715&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css Sun Mar 15 18:34:44
2009
@@ -436,21 +436,29 @@
border: 0.1em solid #999999;
}
-.eventMessage,.errorMessage {
- background-color: #FFFFEE;
- border: solid #000000 0.1em;
- font-size: 1.1em;
- font-weight: bold;
- margin: 1em;
- padding: 1em;
+#messages-container {
+background-color: #FFFFFF;
+margin: 0 7px 0 7px;
+padding-bottom: 1em;
+}
+
+.eventMessage,
+.errorMessage {
+background-color: #B8DFFC;
+font-size: 1.3em;
+font-weight: bold;
+margin: 0 1em 0 1em;
+padding: 0 1em 0 1em;
}
.eventMessage {
- color: #000099;
+color: #000099;
+border: solid 3px #000099;
}
.errorMessage {
- color: #ff0000;
+color: #FF0000;
+border: solid 3px #FF0000;
}
.mediumSubmit,.largeSubmit,.loginButton {
