svn commit: r819400 - in /ofbiz/trunk: framework/common/data/ framework/common/widget/ themes/bluelight/data/ themes/bluelight/includes/ themes/bluelight/webapp/blueli
Locked
svn commit: r819400 - in /ofbiz/trunk: framework/common/data/ framework/common/widget/ themes/bluelight/data/ themes/bluelight/includes/ themes/bluelight/webapp/blueli
 
|
Author: jleroux
Date: Sun Sep 27 20:41:40 2009 New Revision: 819400 URL: http://svn.apache.org/viewvc?rev=819400&view=rev Log: A patch from Bruno Busco "Bluelight theme does not support the new help system." (https://issues.apache.org/jira/browse/OFBIZ-2972) - OFBIZ-2972 The attached patch adds all the required files to the Bluelight theme to be compatible with the new help system. Few styles have also been changed to get Bluelight theme better. Added: ofbiz/trunk/themes/bluelight/includes/appbarClose.ftl ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl ofbiz/trunk/themes/bluelight/webapp/bluelight/docbook.css ofbiz/trunk/themes/bluelight/webapp/bluelight/help.css Modified: ofbiz/trunk/framework/common/data/CommonTypeData.xml ofbiz/trunk/framework/common/widget/CommonScreens.xml ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml 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/framework/common/data/CommonTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/CommonTypeData.xml?rev=819400&r1=819399&r2=819400&view=diff ============================================================================== --- ofbiz/trunk/framework/common/data/CommonTypeData.xml (original) +++ ofbiz/trunk/framework/common/data/CommonTypeData.xml Sun Sep 27 20:41:40 2009 @@ -109,18 +109,20 @@ <Enumeration enumId="VT_NAME" description="Visual Theme name" enumTypeId="VT_RES_TYPE" sequenceId="00"/> <Enumeration enumId="VT_STYLESHEET" description="Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="01"/> <Enumeration enumId="VT_HELPSTYLESHEET" description="Help Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="02"/> - <Enumeration enumId="VT_DOCBOOKSTYLESHEET" description="Docbook Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="02"/> - <Enumeration enumId="VT_RTL_STYLESHEET" description="Right-to-Left (RTL) Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="02"/> - <Enumeration enumId="VT_SHORTCUT_ICON" description="Shortcut Icon URL" enumTypeId="VT_RES_TYPE" sequenceId="03"/> - <Enumeration enumId="VT_EXTRA_HEAD" description="Additional <tt><head></tt> Element Markup" enumTypeId="VT_RES_TYPE" sequenceId="04"/> - <Enumeration enumId="VT_HDR_IMAGE_URL" description="Masthead/Branding Logo Image URL" enumTypeId="VT_RES_TYPE" sequenceId="05"/> - <Enumeration enumId="VT_HDR_TMPLT_LOC" description="Header Template Location" enumTypeId="VT_RES_TYPE" sequenceId="06"/> - <Enumeration enumId="VT_HDR_JAVASCRIPT" description="Header JavaScript File URL" enumTypeId="VT_RES_TYPE" sequenceId="07"/> - <Enumeration enumId="VT_FTR_TMPLT_LOC" description="Footer Template Location" enumTypeId="VT_RES_TYPE" sequenceId="08"/> - <Enumeration enumId="VT_FTR_JAVASCRIPT" description="Footer JavaScript File URL" enumTypeId="VT_RES_TYPE" sequenceId="09"/> - <Enumeration enumId="VT_NAV_TMPLT_LOC" description="Main Navigation Template Location" enumTypeId="VT_RES_TYPE" sequenceId="10"/> - <Enumeration enumId="VT_MSG_TMPLT_LOC" description="Main Messages Template Location" enumTypeId="VT_RES_TYPE" sequenceId="11"/> - <Enumeration enumId="VT_SCREENSHOT" description="Theme Preview Screenshot" enumTypeId="VT_RES_TYPE" sequenceId="12"/> + <Enumeration enumId="VT_DOCBOOKSTYLESHEET" description="Docbook Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="03"/> + <Enumeration enumId="VT_RTL_STYLESHEET" description="Right-to-Left (RTL) Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="04"/> + <Enumeration enumId="VT_SHORTCUT_ICON" description="Shortcut Icon URL" enumTypeId="VT_RES_TYPE" sequenceId="05"/> + <Enumeration enumId="VT_EXTRA_HEAD" description="Additional <tt><head></tt> Element Markup" enumTypeId="VT_RES_TYPE" sequenceId="06"/> + <Enumeration enumId="VT_HDR_IMAGE_URL" description="Masthead/Branding Logo Image URL" enumTypeId="VT_RES_TYPE" sequenceId="07"/> + <Enumeration enumId="VT_HDR_TMPLT_LOC" description="Header Template Location" enumTypeId="VT_RES_TYPE" sequenceId="08"/> + <Enumeration enumId="VT_HDR_JAVASCRIPT" description="Header JavaScript File URL" enumTypeId="VT_RES_TYPE" sequenceId="09"/> + <Enumeration enumId="VT_FTR_TMPLT_LOC" description="Footer Template Location" enumTypeId="VT_RES_TYPE" sequenceId="10"/> + <Enumeration enumId="VT_FTR_JAVASCRIPT" description="Footer JavaScript File URL" enumTypeId="VT_RES_TYPE" sequenceId="11"/> + <Enumeration enumId="VT_NAV_TMPLT_LOC" description="Main Navigation Template Location" enumTypeId="VT_RES_TYPE" sequenceId="12"/> + <Enumeration enumId="VT_NAV_OPEN_TMPLT" description="Opening Navigation Template Location" enumTypeId="VT_RES_TYPE" sequenceId="13"/> + <Enumeration enumId="VT_NAV_CLOSE_TMPLT" description="Closing Navigation Template Location" enumTypeId="VT_RES_TYPE" sequenceId="14"/> + <Enumeration enumId="VT_MSG_TMPLT_LOC" description="Main Messages Template Location" enumTypeId="VT_RES_TYPE" sequenceId="15"/> + <Enumeration enumId="VT_SCREENSHOT" description="Theme Preview Screenshot" enumTypeId="VT_RES_TYPE" sequenceId="16"/> <VisualThemeSet visualThemeSetId="BACKOFFICE" description="Themes to be used for backoffice applications"/> <VisualThemeSet visualThemeSetId="ECOMMERCE" description="Themes to be used for ECommerce applications"/> Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=819400&r1=819399&r2=819400&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Sun Sep 27 20:41:40 2009 @@ -132,6 +132,8 @@ <set field="headerTemplateLocation" from-field="layoutSettings.VT_HDR_TMPLT_LOC[0]"/> <set field="footerTemplateLocation" from-field="layoutSettings.VT_FTR_TMPLT_LOC[0]"/> <set field="appbarTemplateLocation" from-field="layoutSettings.VT_NAV_TMPLT_LOC[0]"/> + <set field="appbarOpenTemplateLocation" from-field="layoutSettings.VT_NAV_OPEN_TMPLT[0]"/> + <set field="appbarCloseTemplateLocation" from-field="layoutSettings.VT_NAV_CLOSE_TMPLT[0]"/> <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]"/> <property-map resource="CommonHelpUrls" map-name="helpUrlsMap" global="true"/> <script location="component://commonext/script/changeOrgPartyId.groovy"/> @@ -139,8 +141,19 @@ <widgets> <!-- render header --> <platform-specific><html><html-template location="${headerTemplateLocation}"/></html></platform-specific> - <!-- render appbar --> - <platform-specific><html><html-template location="${appbarTemplateLocation}"/></html></platform-specific> + + <!-- render appbar or its opening part --> + <section> + <condition> + <not><if-empty field="appbarOpenTemplateLocation"/></not> + </condition> + <widgets> + <platform-specific><html><html-template location="${appbarOpenTemplateLocation}"/></html></platform-specific> + </widgets> + <fail-widgets> + <platform-specific><html><html-template location="${appbarTemplateLocation}"/></html></platform-specific> + </fail-widgets> + </section> <!-- render appheader: both menu widget style and ftl template style menus are supported--> <section> @@ -156,7 +169,14 @@ <platform-specific><html><html-template location="${appheaderTemplate}"/></html></platform-specific> </widgets> <fail-widgets> - <label style="apptitle">${parameters.applicationTitle}</label> + <section> + <condition> + <not><if-empty field="parameters.applicationTitle"/></not> + </condition> + <widgets> + <label style="apptitle">${parameters.applicationTitle}</label> + </widgets> + </section> <include-menu name="${applicationMenuName}" location="${applicationMenuLocation}"/> </fail-widgets> </section> @@ -166,6 +186,16 @@ </fail-widgets> </section> + <!-- render the appbar closing part --> + <section> + <condition> + <not><if-empty field="appbarCloseTemplateLocation"/></not> + </condition> + <widgets> + <platform-specific><html><html-template location="${appbarCloseTemplateLocation}"/></html></platform-specific> + </widgets> + </section> + <!-- render messages --> <platform-specific><html><html-template location="${messagesTemplateLocation}"/></html></platform-specific> <container style="contentarea"> Modified: ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml?rev=819400&r1=819399&r2=819400&view=diff ============================================================================== --- ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml (original) +++ ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml Sun Sep 27 20:41:40 2009 @@ -20,13 +20,17 @@ <entity-engine-xml> <VisualTheme visualThemeId="BLUELIGHT" visualThemeSetId="BACKOFFICE" description="BlueLight Theme: Breadcrumbs, drop-down menus and rounded corners"/> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_NAME" resourceValue="BLUELIGHT" sequenceId="01"/> <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/bluelight/style.css" sequenceId="01"/> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/bluelight/help.css" sequenceId="01"/> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET" resourceValue="/bluelight/webapp/bluelight/docbook.css" sequenceId="01"/> <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/bluelight/dropdown.js" sequenceId="01"/> <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/> <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/> <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://bluelight/includes/header.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://bluelight/includes/footer.ftl" sequenceId="01"/> - <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://bluelight/includes/appbar.ftl" sequenceId="01"/> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_NAV_OPEN_TMPLT" resourceValue="component://bluelight/includes/appbarOpen.ftl" sequenceId="01"/> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_NAV_CLOSE_TMPLT" resourceValue="component://bluelight/includes/appbarClose.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://bluelight/includes/messages.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/bluelight/screenshot.jpg" sequenceId="01"/> </entity-engine-xml> Added: ofbiz/trunk/themes/bluelight/includes/appbarClose.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/appbarClose.ftl?rev=819400&view=auto ============================================================================== --- ofbiz/trunk/themes/bluelight/includes/appbarClose.ftl (added) +++ ofbiz/trunk/themes/bluelight/includes/appbarClose.ftl Sun Sep 27 20:41:40 2009 @@ -0,0 +1,30 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + </div> + </div> + <div class="breadcrumbs-sep"> + <#if titleProperty?exists> + ${uiLabelMap[titleProperty]} + </#if> + </div> + <div class="breadcrumbs-end"> + </div> +</div> +<div class="clear"> +</div> Added: ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl?rev=819400&view=auto ============================================================================== --- ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl (added) +++ ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl Sun Sep 27 20:41:40 2009 @@ -0,0 +1,70 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<#if (requestAttributes.externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if> +<#if (externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if> +<#assign ofbizServerName = application.getAttribute("_serverId")?default("default-server")> +<#assign contextPath = request.getContextPath()> +<#assign displayApps = Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName, "main")> + +<#assign showBreadcrumbs = true> + +<div class="tabbar"> + <div class="breadcrumbs"> + <div class="breadcrumbs-start"> + <div id="main-navigation"> + <h2>${uiLabelMap.CommonHome}</h2> + <ul> + <li> + <ul> + <#list displayApps as display> + <#assign thisApp = display.getContextRoot()> + <#assign permission = true> + <#assign selected = false> + <#assign permissions = display.getBasePermission()> + <#list permissions as perm> + <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session) && !authz.hasPermission(session, perm, requestParameters))> + <#-- User must have ALL permissions in the base-permission list --> + <#assign permission = false> + </#if> + </#list> + <#if permission == true> + <#if thisApp == contextPath || contextPath + "/" == thisApp> + <#assign selected = true> + </#if> + <#assign thisURL = thisApp> + <#if thisApp != "/"> + <#assign thisURL = thisURL + "/control/main"> + </#if> + <#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--> + <#-- Show OFBiz Setup component menu bar when the system not have an organization --> + <#if thisApp.equals("/ofbizsetup")> + <#if PartyAcctgPrefAndGroupList.size() == 0> + <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> + <#else> + <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> Modified: ofbiz/trunk/themes/bluelight/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=819400&r1=819399&r2=819400&view=diff ============================================================================== --- ofbiz/trunk/themes/bluelight/includes/header.ftl (original) +++ ofbiz/trunk/themes/bluelight/includes/header.ftl Sun Sep 27 20:41:40 2009 @@ -137,7 +137,9 @@ <#else> <li class="user">${userName}</li> </#if> - <li class="org">${orgName}</li> + <#if orgName?has_content> + <li class="org">${orgName}</li> + </#if> </#if> <li class="first"><a href="<@ofbizUrl>LookupLocales</@ofbizUrl>">${uiLabelMap.CommonLanguageTitle} : ${locale.getDisplayName(locale)}</a></li> <#if userLogin?exists> @@ -146,23 +148,29 @@ <#else> <li><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li> </#if> - <#include "component://common/webcommon/includes/helplink.ftl" /> - + <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists> + <#include "component://common/webcommon/includes/helplink.ftl" /> + <#if helpContent?has_content || helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalP")> + <li><a <#if pageAvail?has_content>class="alert"</#if> href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li> + <#else> + <li><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></li> + </#if> + </#if> <#if userLogin?exists> <#if (userPreferences.COMPACT_HEADER)?default("N") == "Y"> <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"> + <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> <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"> + <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> Modified: ofbiz/trunk/themes/bluelight/includes/messages.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/messages.ftl?rev=819400&r1=819399&r2=819400&view=diff ============================================================================== --- ofbiz/trunk/themes/bluelight/includes/messages.ftl (original) +++ ofbiz/trunk/themes/bluelight/includes/messages.ftl Sun Sep 27 20:41:40 2009 @@ -16,18 +16,6 @@ specific language governing permissions and limitations under the License. --> - </div> - </div> - <div class="breadcrumbs-sep"> - <#if titleProperty?exists> - ${uiLabelMap[titleProperty]} - </#if> - </div> - <div class="breadcrumbs-end"> - </div> -</div> -<div class="clear"> -</div> <#if (errorMessage?has_content || errorMessageList?has_content || eventMessage?has_content || eventMessageList?has_content)> <div id="messages-container"> Added: ofbiz/trunk/themes/bluelight/webapp/bluelight/docbook.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/docbook.css?rev=819400&view=auto ============================================================================== --- ofbiz/trunk/themes/bluelight/webapp/bluelight/docbook.css (added) +++ ofbiz/trunk/themes/bluelight/webapp/bluelight/docbook.css Sun Sep 27 20:41:40 2009 @@ -0,0 +1,38 @@ +/*********************************************** +APACHE OPEN FOR BUSINESS +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +***********************************************/ +body {background:transparent url(/images/ofbiz_logo.gif) no-repeat scroll left top; + color: #000; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size:.75em; + line-height:1.5em;padding:50px 0 0; +} + +a:hover { + color:#111111; + text-decoration:underline; +} +a:visited { + color:#000; + text-decoration:underline; +} +a { + color:#555; + text-decoration:underline; +} Added: ofbiz/trunk/themes/bluelight/webapp/bluelight/help.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/help.css?rev=819400&view=auto ============================================================================== --- ofbiz/trunk/themes/bluelight/webapp/bluelight/help.css (added) +++ ofbiz/trunk/themes/bluelight/webapp/bluelight/help.css Sun Sep 27 20:41:40 2009 @@ -0,0 +1,46 @@ +/*********************************************** +APACHE OPEN FOR BUSINESS +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +***********************************************/ +body { + background:none; + font-size=105%; +} + +.left-border { + float:left; + width:20em; +} + +div.contentarea { + margin: 10px 0 0 0.5em; + padding:0 0 0 0.5em; +} +.leftonly { + float:none; + min-height:25em; +} + +#column-container .leftonly { +margin-left:20em; +width:auto; +} + +div.screenlet-body { +border: none; +} \ No newline at end of file Modified: ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css?rev=819400&r1=819399&r2=819400&view=diff ============================================================================== --- ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css (original) +++ ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css Sun Sep 27 20:41:40 2009 @@ -38,7 +38,7 @@ } body { - line-height: 1; + line-height: 1.5em; color: black; background: white; }/* reset line height and baseline colors*/ @@ -1123,7 +1123,7 @@ #main-navigation ul li ul li a, #app-navigation ul li ul li a { display:block; -height:1.3em; +mheight:1.3em; padding:4px 16px 4px 16px; border: solid 1px #AFAFAF; border-top: none; @@ -1305,7 +1305,7 @@ /* ===== Button Bar Navigation Styles ===== */ /* ======================================== */ .button-bar { -margin: 0 1em 0 1em; +margin: 0 1em 1em 0; } .button-bar ul { @@ -1408,10 +1408,7 @@ .tab-bar ul li { background-color: #0366b0; - border-right: 0.1em solid #5f9fcf; - border-bottom: 0.1em solid #5f9fcf; margin: 0; - padding: 0; } .tab-bar ul a,.tab-bar ul a:visited { |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |