OFBiz › OFBiz - Commits

svn commit: r767635 - in /ofbiz/branches/release09.04: framework/widget/src/org/ofbiz/widget/html/ themes/bluelight/includes/ themes/bluelight/webapp/bluelight/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

adrianc

svn commit: r767635 - in /ofbiz/branches/release09.04: framework/widget/src/org/ofbiz/widget/html/ themes/bluelight/includes/ themes/bluelight/webapp/bluelight/

Author: adrianc
Date: Wed Apr 22 19:47:18 2009
New Revision: 767635

URL: http://svn.apache.org/viewvc?rev=767635&view=rev
Log:
Applied fixes from trunk revisions 767221 and 767629.

Modified:
ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
ofbiz/branches/release09.04/themes/bluelight/includes/appbar.ftl
ofbiz/branches/release09.04/themes/bluelight/includes/header.ftl
ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/dropdown.js
ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/style.css

Modified: ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java?rev=767635&r1=767634&r2=767635&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java (original)
+++ ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java Wed Apr 22 19:47:18 2009
@@ -239,17 +239,16 @@
}
writer.append(">");
appendWhitespace(writer);
- writer.append("<ul>");
- appendWhitespace(writer);
- writer.append("<li>");
String menuTitle = modelMenu.getTitle(context);
if (UtilValidate.isNotEmpty(menuTitle)) {
+ writer.append("<h2>" + menuTitle + "</h2>");
appendWhitespace(writer);
- writer.append(" <h2>" + menuTitle + "</h2>");
}
+ writer.append("<ul>");
+ appendWhitespace(writer);
+ writer.append("<li>");
appendWhitespace(writer);
writer.append(" <ul>");
-
appendWhitespace(writer);
}

@@ -264,12 +263,12 @@
//String menuContainerStyle = modelMenu.getMenuContainerStyle(context);
writer.append(" </ul>");
appendWhitespace(writer);
- writer.append(" <br class=\"clear\"/>");
- appendWhitespace(writer);
writer.append("</li>");
appendWhitespace(writer);
writer.append("</ul>");
appendWhitespace(writer);
+ writer.append(" <br class=\"clear\"/>");
+ appendWhitespace(writer);
writer.append("</div>");
appendWhitespace(writer);
renderEndingBoundaryComment(writer, "Menu Widget", modelMenu);

Modified: ofbiz/branches/release09.04/themes/bluelight/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/themes/bluelight/includes/appbar.ftl?rev=767635&r1=767634&r2=767635&view=diff
==============================================================================
--- ofbiz/branches/release09.04/themes/bluelight/includes/appbar.ftl (original)
+++ ofbiz/branches/release09.04/themes/bluelight/includes/appbar.ftl Wed Apr 22 19:47:18 2009
@@ -26,9 +26,9 @@
<div class="breadcrumbs">
<div class="breadcrumbs-start">
<div id="main-navigation">
+ <h2>${uiLabelMap.CommonHome}</h2>
<ul>
<li>
- <h2>${uiLabelMap.CommonHome}</h2>
<ul>
<#list displayApps as display>
<#assign thisApp = display.getContextRoot()>

Modified: ofbiz/branches/release09.04/themes/bluelight/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/themes/bluelight/includes/header.ftl?rev=767635&r1=767634&r2=767635&view=diff
==============================================================================
--- ofbiz/branches/release09.04/themes/bluelight/includes/header.ftl (original)
+++ ofbiz/branches/release09.04/themes/bluelight/includes/header.ftl Wed Apr 22 19:47:18 2009
@@ -1,4 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<#--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -26,6 +25,7 @@
<#if "ar.iw"?contains(docLangAttr?substring(0, 2))>
<#assign langDir = "rtl">
</#if>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@@ -146,24 +146,28 @@
<#if userLogin?exists>
<li><a href="<@ofbizUrl>LookupVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
<li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
+ <#else>
+ <li><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
</#if>
<#include "component://common/webcommon/includes/helplink.ftl" />

<#if userLogin?exists>
<#if (userPreferences.COMPACT_HEADER)?default("N") == "Y">
- <li class="collapsed"><a href="javascript:document.setUserPreferenceCompactHeaderN.submit()">  </a></li>
+ <li class="collapsed"><a href="javascript:document.setUserPreferenceCompactHeaderN.submit()">  </a>
<form name="setUserPreferenceCompactHeaderN" method="post" action="<@ofbizUrl>setUserPreference</@ofbizUrl>">
<input type="hidden" name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES">
<input type="hidden" name="userPrefTypeId" value="COMPACT_HEADER">
<input type="hidden" name="userPrefValue" value="N">
</form>
+ </li>
<#else>
- <li class="expanded"><a href="javascript:document.setUserPreferenceCompactHeaderY.submit()">  </a></li>
+ <li class="expanded"><a href="javascript:document.setUserPreferenceCompactHeaderY.submit()">  </a>
<form name="setUserPreferenceCompactHeaderY" method="post" action="<@ofbizUrl>setUserPreference</@ofbizUrl>">
<input type="hidden" name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES">
<input type="hidden" name="userPrefTypeId" value="COMPACT_HEADER">
<input type="hidden" name="userPrefValue" value="Y">
</form>
+ </li>
</#if>
</#if>
</ul>

Modified: ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/dropdown.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/dropdown.js?rev=767635&r1=767634&r2=767635&view=diff
==============================================================================
--- ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/dropdown.js (original)
+++ ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/dropdown.js Wed Apr 22 19:47:18 2009
@@ -1,18 +1,21 @@
var DropDownMenu = Class.create();
DropDownMenu.prototype = {
initialize: function(menuElement) {
- menuElement.childElements().each(function(node){
- // if there is a submenu
- var submenu = $A(node.getElementsByTagName("ul")).first();
- if(submenu != null){
- // make sub-menu invisible
- Element.extend(submenu).setStyle({display: 'none'});
- // toggle the visibility of the submenu
- node.onmouseover = node.onmouseout = function(){
- Element.toggle(submenu);
- }
- }
- });
+ var menuTitle = $A(menuElement.getElementsByTagName("h2")).first();
+ menuElement.childElements().each(function(node){
+ // if there is a submenu
+ var submenu = $A(node.getElementsByTagName("ul")).first();
+ if(submenu != null){
+ // make sub-menu invisible
+ Element.extend(submenu).setStyle({display: 'none'});
+ // toggle the visibility of the submenu
+ if (menuTitle != null) {
+ menuTitle.onmouseover = menuTitle.onmouseout = function(){Element.toggle(submenu);};
+ menuTitle = null;
+ }
+ node.onmouseover = node.onmouseout = function(){Element.toggle(submenu);};
+ }
+ });
}
};

@@ -21,7 +24,7 @@
});

document.observe('dom:loaded', function(){
- var mainmenu = new DropDownMenu($('main-navigation'));
+ var mainmenu = new DropDownMenu($('main-navigation'));
var appmenu = new DropDownMenu($('app-navigation'));
});

Modified: ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/style.css?rev=767635&r1=767634&r2=767635&view=diff
==============================================================================
--- ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/style.css Wed Apr 22 19:47:18 2009
@@ -635,6 +635,7 @@
background-color: #000000;
}

+/*
.apptitle {
background-color: #000099;
color: #FFFFFF;
@@ -643,7 +644,7 @@
font-weight: bold;
line-height: 2em;
width: 100%;
-}
+} */

DIV.row {
background-color: #B4B0AA;
@@ -1069,9 +1070,14 @@
font-size: 130%;
}

-#main-navigation ul li h2,
-#app-navigation ul li h2 {
+#app-navigation .clear {
+ clear: none;
+}
+
+#main-navigation h2,
+#app-navigation h2 {
color: #FFFFFF;
+ cursor: default;
font-size: 1.2em;
font-weight: bold;
margin-right: 1em;