Maybe we should discuss this and other threads related to the bootstrap dev branch in the related issues in JIRA.
Best regards, Pierre Smits *ORRTIZ.COM <http://www.orrtiz.com>* Services & Solutions for Cloud- Based Manufacturing, Professional Services and Retail & Trade http://www.orrtiz.com On Thu, Jun 4, 2015 at 10:59 AM, Julien NICOLAS <[email protected]> wrote: > Le 04/06/2015 10:50, Jacques Le Roux a écrit : > >> Le 04/06/2015 10:22, Julien NICOLAS a écrit : >> >>> Hi Jacques, >>> >>> Thanks for your feedback. >>> >>> Guillaume told me the same thing but he don't like yellow >>> >> >> I did not see yellow, where? >> > Big discussion... we've done an office survey and effectively where I see > Yellow, people see Orange... > You see Orange menu ? > >> >> and want bigger font for the 2nd level. >>> >> >> The current size is OK with me >> >> I will introduce font-awesome to help me in glyph management and to be >>> able to increase the app glyph easily. >>> >> >> Let's see >> >> Jacques >> >> >> >>> I test it only on GNU/Linux FF & Chromium so if you see something is >>> wrong, just told me :) >>> >>> Julien. >>> >>> >>> Le 04/06/2015 10:10, Jacques Le Roux a écrit : >>> >>>> Hi Julien >>>> >>>> I like the 2 levels menu like in Catalog/Shipping. I think we should >>>> try to use more of them. Even a 3rd level could be used sometimes... >>>> Just noticed that the Main menu button is a bit too small, no? (FF on >>>> Win7) >>>> >>>> Globally I begin to like this theme :) >>>> >>>> Jacques >>>> >>>> Le 03/06/2015 23:34, [email protected] a écrit : >>>> >>>>> Author: jnicolas >>>>> Date: Wed Jun 3 21:34:04 2015 >>>>> New Revision: 1683430 >>>>> >>>>> URL: http://svn.apache.org/r1683430 >>>>> Log: >>>>> Application menu and sub menu style modifications >>>>> - Fixed 2 levels menu >>>>> - Group in dropdown preferences menu >>>>> - Menu Style Sunshine >>>>> >>>>> Added: >>>>> ofbiz/branches/boostrap_theme/themes/bootstrap/webapp/bootstrap/images/Logo-OFBiz.svg >>>>> >>>>> Modified: >>>>> ofbiz/branches/boostrap_theme/themes/bootstrap/data/BootstrapThemeData.xml >>>>> >>>>> ofbiz/branches/boostrap_theme/themes/bootstrap/includes/appbar.ftl >>>>> ofbiz/branches/boostrap_theme/themes/bootstrap/includes/header.ftl >>>>> ofbiz/branches/boostrap_theme/themes/bootstrap/webapp/bootstrap/css/skins/tomahawk.css >>>>> >>>>> >>>>> Modified: >>>>> ofbiz/branches/boostrap_theme/themes/bootstrap/data/BootstrapThemeData.xml >>>>> URL: >>>>> http://svn.apache.org/viewvc/ofbiz/branches/boostrap_theme/themes/bootstrap/data/BootstrapThemeData.xml?rev=1683430&r1=1683429&r2=1683430&view=diff >>>>> ============================================================================== >>>>> >>>>> --- >>>>> ofbiz/branches/boostrap_theme/themes/bootstrap/data/BootstrapThemeData.xml >>>>> (original) >>>>> +++ >>>>> ofbiz/branches/boostrap_theme/themes/bootstrap/data/BootstrapThemeData.xml >>>>> Wed Jun 3 21:34:04 2015 >>>>> @@ -48,7 +48,7 @@ under the License. >>>>> <VisualThemeResource visualThemeId="BOOTSTRAP_TOMAHAWK" >>>>> resourceTypeEnumId="VT_FTR_JAVASCRIPT" >>>>> resourceValue="/bootstrap/js/bootified.js" sequenceId="01"/> >>>>> <VisualThemeResource visualThemeId="BOOTSTRAP_TOMAHAWK" >>>>> resourceTypeEnumId="VT_FTR_JAVASCRIPT" >>>>> resourceValue="/bootstrap/js/bootstrap.min.js" sequenceId="02"/> >>>>> <VisualThemeResource visualThemeId="BOOTSTRAP_TOMAHAWK" >>>>> resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" >>>>> sequenceId="01"/> >>>>> - <VisualThemeResource visualThemeId="BOOTSTRAP_TOMAHAWK" >>>>> resourceTypeEnumId="VT_HDR_IMAGE_URL" >>>>> resourceValue="/bootstrap/images/logo.png" sequenceId="01"/> >>>>> + <VisualThemeResource visualThemeId="BOOTSTRAP_TOMAHAWK" >>>>> resourceTypeEnumId="VT_HDR_IMAGE_URL" >>>>> resourceValue="/bootstrap/images/Logo-OFBiz.svg" sequenceId="01"/> >>>>> <VisualThemeResource visualThemeId="BOOTSTRAP_TOMAHAWK" >>>>> resourceTypeEnumId="VT_HDR_TMPLT_LOC" >>>>> resourceValue="component://bootstrap/includes/header.ftl" >>>>> sequenceId="01"/> >>>>> <VisualThemeResource visualThemeId="BOOTSTRAP_TOMAHAWK" >>>>> resourceTypeEnumId="VT_MSG_TMPLT_LOC" >>>>> resourceValue="component://common/webcommon/includes/messages.ftl" >>>>> sequenceId="01"/> >>>>> <VisualThemeResource visualThemeId="BOOTSTRAP_TOMAHAWK" >>>>> resourceTypeEnumId="VT_FTR_TMPLT_LOC" >>>>> resourceValue="component://bootstrap/includes/footer.ftl" >>>>> sequenceId="01"/> >>>>> >>>>> Modified: >>>>> ofbiz/branches/boostrap_theme/themes/bootstrap/includes/appbar.ftl >>>>> URL: >>>>> http://svn.apache.org/viewvc/ofbiz/branches/boostrap_theme/themes/bootstrap/includes/appbar.ftl?rev=1683430&r1=1683429&r2=1683430&view=diff >>>>> ============================================================================== >>>>> >>>>> --- ofbiz/branches/boostrap_theme/themes/bootstrap/includes/appbar.ftl >>>>> (original) >>>>> +++ ofbiz/branches/boostrap_theme/themes/bootstrap/includes/appbar.ftl >>>>> Wed Jun 3 21:34:04 2015 >>>>> @@ -22,86 +22,86 @@ under the License. >>>>> <#assign menus = modelMenus.keySet()> >>>>> <#assign menuItemList = appModelMenu.menuItemList> >>>>> <#if menuItemList?has_content> >>>>> - <nav class="navbar navbar-default" role="navigation" >>>>> id="app-navigation"> >>>>> - <ul class="nav navbar-nav"> >>>>> - <#list menuItemList as item> >>>>> - <#assign name = item.name> >>>>> - <#assign title = item.getTitle(context)> >>>>> - <#if (item.getLink().getTarget(context))?has_content> >>>>> - <#assign target = >>>>> item.getLink().getTarget(context)> >>>>> - <#else> >>>>> - <#if >>>>> item.getParentPortalPageId(context)?has_content> >>>>> - <#assign parentPortalPageId = >>>>> item.getParentPortalPageId(context)> >>>>> - <#assign portalPages = >>>>> Static["org.ofbiz.widget.PortalPageWorker"].getPortalPages(parentPortalPageId, >>>>> context)> >>>>> - <#list portalPages as portalPage> >>>>> - <#assign name = >>>>> portalPage.portalPageName> >>>>> - <#assign link = >>>>> "showPortalPage?portalPageId=${portalPage.portalPageId}"> >>>>> - <#if >>>>> portalPage.parentPortalPageId?has_content> >>>>> - <#assign target = >>>>> link+"&parentPortalPageId=${portalPage.parentPortalPageId?if_exists}"> >>>>> - <#else> >>>>> - <#assign target = link> >>>>> - </#if> >>>>> - <li> >>>>> - <a >>>>> href="<@ofbizUrl>${target?if_exists}</@ofbizUrl>">${portalPage.get("portalPageName",locale)}</a> >>>>> - </li> >>>>> - </#list> >>>>> - </#if> >>>>> - </#if> >>>>> - <#-- Get TabBar submenu based on menu name --> >>>>> - <#assign subMenuName = "${name}TabBar"> >>>>> - <#if menus?seq_contains("${subMenuName}")> >>>>> - <#assign subModelMenu = >>>>> Static["org.ofbiz.widget.menu.MenuFactory"].getMenuFromLocation(applicationMenuLocation,subMenuName)> >>>>> - <#if subModelMenu?has_content> >>>>> - <#assign subMenuItemList = >>>>> subModelMenu.menuItemList> >>>>> - <#if subMenuItemList?has_content> >>>>> - <li class="dropdown"> >>>>> - <a >>>>> href="<@ofbizUrl>${target?if_exists}</@ofbizUrl>" class="dropdown-toggle" >>>>> data-toggle="dropdown">${title?if_exists} <span class="caret"></span></a> >>>>> - <ul class="dropdown-menu"> >>>>> - <#list subMenuItemList as >>>>> subMenuItem> >>>>> - <#assign name = >>>>> subMenuItem.name> >>>>> - <#assign title = >>>>> subMenuItem.getTitle(context)> >>>>> - <#assign target = >>>>> subMenuItem.getLink().getTarget(context)> >>>>> - <li> >>>>> - <a >>>>> href="<@ofbizUrl>${target?if_exists}</@ofbizUrl>">${title?if_exists}</a> >>>>> - </li> >>>>> - </#list> >>>>> - </ul> >>>>> - </li> >>>>> - </#if> >>>>> - </#if> >>>>> - <#elseif >>>>> menus?seq_contains("${subMenuName?cap_first}")> >>>>> - <#assign subMenuName = "${subMenuName?cap_first}"> >>>>> - <#assign subModelMenu = >>>>> Static["org.ofbiz.widget.menu.MenuFactory"].getMenuFromLocation(applicationMenuLocation,subMenuName)> >>>>> - <#if subModelMenu?has_content> >>>>> - <#assign subMenuItemList = >>>>> subModelMenu.menuItemList> >>>>> - <#if subMenuItemList?has_content> >>>>> - <li class="dropdown"> >>>>> - <a >>>>> href="<@ofbizUrl>${target}</@ofbizUrl>" class="dropdown-toggle" >>>>> data-toggle="dropdown">${title?if_exists} <span class="caret"></span></a> >>>>> - <ul class="dropdown-menu"> >>>>> - <#list subMenuItemList as >>>>> subMenuItem> >>>>> - <#assign name = >>>>> subMenuItem.name> >>>>> - <#assign title = >>>>> subMenuItem.getTitle(context)> >>>>> - <#assign target = >>>>> subMenuItem.getLink().getTarget(context)> >>>>> - <li> >>>>> - <a >>>>> href="<@ofbizUrl>${target?if_exists}</@ofbizUrl>">${title?if_exists}</a> >>>>> - </li> >>>>> - </#list> >>>>> - </ul> >>>>> - </li> >>>>> - </#if> >>>>> - </#if> >>>>> - <#else> >>>>> - <#if name == "main"> >>>>> - <li class="menuTitle"> >>>>> - <a >>>>> href="<@ofbizUrl>${target?if_exists}</@ofbizUrl>">${applicationTitle} <span >>>>> class="glyphicon glyphicon-home"></span> </a> >>>>> - </li> >>>>> - <#else> >>>>> - <li> >>>>> - <a >>>>> href="<@ofbizUrl>${target?if_exists}</@ofbizUrl>">${title?if_exists}</a> >>>>> - </li> >>>>> - </#if> >>>>> - </#if> >>>>> - </#list> >>>>> - </ul> >>>>> - </nav> >>>>> + <a class="menuTitle" >>>>> href="<@ofbizUrl>${target?if_exists}</@ofbizUrl>">${applicationTitle}</a> >>>>> + <nav class="navbar navbar-default" role="navigation" >>>>> id="app-navigation"> >>>>> + <div class="container-fluid"> >>>>> + <ul class="nav navbar-nav"> >>>>> + <#list menuItemList as item> >>>>> + <#assign name = item.name> >>>>> + <#assign title = item.getTitle(context)> >>>>> + <#if >>>>> (item.getLink().getTarget(context))?has_content> >>>>> + <#assign target = >>>>> item.getLink().getTarget(context)> >>>>> + <#else> >>>>> + <#if >>>>> item.getParentPortalPageId(context)?has_content> >>>>> + <#assign parentPortalPageId = >>>>> item.getParentPortalPageId(context)> >>>>> + <#assign portalPages = >>>>> Static["org.ofbiz.widget.PortalPageWorker"].getPortalPages(parentPortalPageId, >>>>> context)> >>>>> + <#list portalPages as portalPage> >>>>> + <#assign name = >>>>> portalPage.portalPageName> >>>>> + <#assign link = >>>>> "showPortalPage?portalPageId=${portalPage.portalPageId}"> >>>>> + <#if >>>>> portalPage.parentPortalPageId?has_content> >>>>> + <#assign target = >>>>> link+"&parentPortalPageId=${portalPage.parentPortalPageId?if_exists}"> >>>>> + <#else> >>>>> + <#assign target = link> >>>>> + </#if> >>>>> + <li> >>>>> + <a >>>>> href="<@ofbizUrl>${target?if_exists}</@ofbizUrl>">${portalPage.get("portalPageName",locale)}</a> >>>>> + </li> >>>>> + </#list> >>>>> + </#if> >>>>> + </#if> >>>>> + <#-- Get TabBar submenu based on menu name --> >>>>> + <#assign subMenuName = "${name}TabBar"> >>>>> + <#if menus?seq_contains("${subMenuName}")> >>>>> + <#assign subModelMenu = >>>>> Static["org.ofbiz.widget.menu.MenuFactory"].getMenuFromLocation(applicationMenuLocation,subMenuName)> >>>>> + <#if subModelMenu?has_content> >>>>> + <#assign subMenuItemList = >>>>> subModelMenu.menuItemList> >>>>> + <#if subMenuItemList?has_content> >>>>> + <li class="dropdown"> >>>>> + <a >>>>> href="<@ofbizUrl>${target?if_exists}</@ofbizUrl>" class="dropdown-toggle" >>>>> data-toggle="dropdown">${title?if_exists} <span class="caret"></span></a> >>>>> + <ul class="dropdown-menu"> >>>>> + <#list subMenuItemList as >>>>> subMenuItem> >>>>> + <#assign name = >>>>> subMenuItem.name> >>>>> + <#assign title = >>>>> subMenuItem.getTitle(context)> >>>>> + <#assign target = >>>>> subMenuItem.getLink().getTarget(context)> >>>>> + <li> >>>>> + <a >>>>> href="<@ofbizUrl>${target?if_exists}</@ofbizUrl>">${title?if_exists}</a> >>>>> + </li> >>>>> + </#list> >>>>> + </ul> >>>>> + </li> >>>>> + </#if> >>>>> + </#if> >>>>> + <#elseif >>>>> menus?seq_contains("${subMenuName?cap_first}")> >>>>> + <#assign subMenuName = >>>>> "${subMenuName?cap_first}"> >>>>> + <#assign subModelMenu = >>>>> Static["org.ofbiz.widget.menu.MenuFactory"].getMenuFromLocation(applicationMenuLocation,subMenuName)> >>>>> + <#if subModelMenu?has_content> >>>>> + <#assign subMenuItemList = >>>>> subModelMenu.menuItemList> >>>>> + <#if subMenuItemList?has_content> >>>>> + <li class="dropdown"> >>>>> + <a >>>>> href="<@ofbizUrl>${target}</@ofbizUrl>" class="dropdown-toggle" >>>>> data-toggle="dropdown">${title?if_exists} <span class="caret"></span></a> >>>>> + <ul class="dropdown-menu"> >>>>> + <#list subMenuItemList as >>>>> subMenuItem> >>>>> + <#assign name = >>>>> subMenuItem.name> >>>>> + <#assign title = >>>>> subMenuItem.getTitle(context)> >>>>> + <#assign target = >>>>> subMenuItem.getLink().getTarget(context)> >>>>> + <li> >>>>> + <a >>>>> href="<@ofbizUrl>${target?if_exists}</@ofbizUrl>">${title?if_exists}</a> >>>>> + </li> >>>>> + </#list> >>>>> + </ul> >>>>> + </li> >>>>> + </#if> >>>>> + </#if> >>>>> + <#else> >>>>> + <#if name != "main"> >>>>> + <li> >>>>> + <a >>>>> href="<@ofbizUrl>${target?if_exists}</@ofbizUrl>">${title?if_exists}</a> >>>>> + </li> >>>>> + </#if> >>>>> + </#if> >>>>> + </#list> >>>>> + </ul> >>>>> + </div> >>>>> + </nav> >>>>> + <div class="container-fluid" style="height:15px"></div> >>>>> </#if> >>>>> \ No newline at end of file >>>>> >>>>> Modified: >>>>> ofbiz/branches/boostrap_theme/themes/bootstrap/includes/header.ftl >>>>> URL: >>>>> http://svn.apache.org/viewvc/ofbiz/branches/boostrap_theme/themes/bootstrap/includes/header.ftl?rev=1683430&r1=1683429&r2=1683430&view=diff >>>>> ============================================================================== >>>>> >>>>> --- ofbiz/branches/boostrap_theme/themes/bootstrap/includes/header.ftl >>>>> (original) >>>>> +++ ofbiz/branches/boostrap_theme/themes/bootstrap/includes/header.ftl >>>>> Wed Jun 3 21:34:04 2015 >>>>> @@ -42,11 +42,11 @@ under the License. >>>>> </#if> >>>>> <#assign organizationLogoLinkURL = >>>>> "${layoutSettings.organizationLogoLinkUrl?if_exists}"> >>>>> <#if layoutSettings.headerImageUrl?exists> >>>>> - <#assign headerImageUrl = layoutSettings.headerImageUrl> >>>>> - <#elseif layoutSettings.commonHeaderImageUrl?exists> >>>>> - <#assign headerImageUrl = layoutSettings.commonHeaderImageUrl> >>>>> - <#elseif layoutSettings.VT_HDR_IMAGE_URL?exists> >>>>> - <#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_URL.get(0)> >>>>> + <#assign headerImageUrl = layoutSettings.headerImageUrl> >>>>> + <#elseif layoutSettings.commonHeaderImageUrl?exists> >>>>> + <#assign headerImageUrl = layoutSettings.commonHeaderImageUrl> >>>>> + <#elseif layoutSettings.VT_HDR_IMAGE_URL?exists> >>>>> + <#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_URL.get(0)> >>>>> </#if> >>>>> <#-- Get AppBarWebInfos --> >>>>> <#if (requestAttributes.externalLoginKey)??><#assign >>>>> externalKeyParam = "?externalLoginKey=" + >>>>> requestAttributes.externalLoginKey!></#if> >>>>> @@ -140,196 +140,184 @@ under the License. >>>>> <div id="wait-spinner" style="display:none"> >>>>> <div id="wait-spinner-image"></div> >>>>> </div> >>>>> - <div class="container-fluid"> >>>>> + <#--<div class="container-fluid">--> >>>>> <div class="hidden"> >>>>> <a href="#column-container" >>>>> title="${uiLabelMap.CommonSkipNavigation}" accesskey="2"> >>>>> ${uiLabelMap.CommonSkipNavigation} >>>>> </a> >>>>> </div> >>>>> - <nav class="navbar navbar-default" role="navigation" >>>>> id="header-navigation"> >>>>> - <div class="container-fluid"> >>>>> - <div class="navbar-header"> >>>>> - <a class="navbar-brand" >>>>> href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"> >>>>> - <#if headerImageUrl?exists> >>>>> - <#if organizationLogoLinkURL?has_content> >>>>> - <img alt="${layoutSettings.companyName}" >>>>> src="<@ofbizContentUrl>${StringUtil.wrapString(organizationLogoLinkURL)}</@ofbizContentUrl>"> >>>>> - <#else> >>>>> - <img alt="${layoutSettings.companyName}" >>>>> src="<@ofbizContentUrl>${StringUtil.wrapString(headerImageUrl)}</@ofbizContentUrl>"> >>>>> - </#if> >>>>> - <#else> >>>>> - ${layoutSettings.companyName} >>>>> - </#if> >>>>> - </a> >>>>> - </div> >>>>> - <ul class="nav navbar-nav"> >>>>> - <#if userLogin?has_content> >>>>> - <li><#-- Primary Applications --> >>>>> - <div class="btn-group navbar-btn"> >>>>> - <button class="btn btn-default" >>>>> type="button"><span class="glyphicon glyphicon-cog >>>>> button-label"></span>${uiLabelMap.CommonApplications}</button> >>>>> - <button class="btn btn-default >>>>> dropdown-toggle" data-toggle="dropdown" type="button" >>>>> aria-expanded="false"> >>>>> - <span class="caret"></span> >>>>> - <span class="sr-only">Toggle >>>>> Dropdown</span> >>>>> - </button> >>>>> - <ul class="dropdown-menu" role="menu"> >>>>> - <#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))> >>>>> - <#-- 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 thisApp = >>>>> StringUtil.wrapString(thisApp)> >>>>> - <#assign thisURL = thisApp> >>>>> - <#if thisApp != "/"> >>>>> - <#assign thisURL = thisURL + >>>>> "/control/main"> >>>>> - </#if> >>>>> - <#if >>>>> layoutSettings.suppressTab?exists && display.name == >>>>> layoutSettings.suppressTab> >>>>> - <!-- do not display this >>>>> component--> >>>>> - <#else> >>>>> - <li<#if selected> >>>>> class="selected"</#if>><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> >>>>> - </#list> >>>>> - </ul> >>>>> - </div> <#-- btn-group ends --> >>>>> - </li><#-- Primary Applications dropdown ends--> >>>>> - <li class="dropdown"><#-- Secondary Applications --> >>>>> - <div class="btn-group navbar-btn"> >>>>> - <button class="btn btn-default" >>>>> type="button"><span class="glyphicon glyphicon-plus >>>>> button-label"></span>More Applications</button> >>>>> - <button class="btn btn-default >>>>> dropdown-toggle" data-toggle="dropdown" type="button" >>>>> aria-expanded="false"> >>>>> - <span class="caret"></span> >>>>> - <span class="sr-only">Toggle >>>>> Dropdown</span> >>>>> - </button> >>>>> - <#-- <a href="#" class="dropdown-toggle" >>>>> data-toggle="dropdown">More Applications <span class="caret"></span></a> >>>>> --> >>>>> - <ul class="dropdown-menu" role="menu"> >>>>> - <#list displaySecondaryApps 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))> >>>>> - <#-- 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 thisApp = >>>>> StringUtil.wrapString(thisApp)> >>>>> - <#assign thisURL = thisApp> >>>>> - <#if thisApp != "/"> >>>>> - <#assign thisURL = >>>>> thisURL + "/control/main"> >>>>> - </#if> >>>>> - <#if >>>>> layoutSettings.suppressTab?exists && display.name == >>>>> layoutSettings.suppressTab> >>>>> - <!-- do not display this >>>>> component--> >>>>> - <#else> >>>>> - <li<#if selected> >>>>> class="selected"</#if>><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> >>>>> - </#list> >>>>> - </ul> >>>>> - </div><#-- btn-group ends --> >>>>> - </li><#-- Secondary Applications ends --> >>>>> - <#--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 class="btn <#if pageAvail?has_content> >>>>> btn-default</#if> navbar-btn " >>>>> href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' >>>>> ,500,500);" title="${uiLabelMap.CommonHelp}"><span class="glyphicon >>>>> glyphicon-question-sign"></span></a></li> >>>>> - </#if> >>>>> - </#if> >>>>> - </ul> >>>>> - <ul class="nav navbar-nav navbar-right"> >>>>> - <#if userLogin?exists> >>>>> - <#if orgName?has_content> >>>>> - <li class="org">${orgName}</li> >>>>> - </#if> >>>>> - <#if userLogin.partyId?exists> >>>>> - <li> >>>>> - <div class="btn-group"> >>>>> - <button class="btn btn-default >>>>> navbar-btn" type="button" aria-expanded="false"> >>>>> - <span class="glyphicon >>>>> glyphicon-user"></span> >>>>> - </button> >>>>> - <a class="btn btn-default navbar-btn" >>>>> href="<@ofbizUrl>passwordChange</@ofbizUrl>">${userName}</a> >>>>> - </div> >>>>> - <#-- <a >>>>> href="<@ofbizUrl>passwordChange</@ofbizUrl>">${userName}</a> --> >>>>> - </li> >>>>> - <#else> >>>>> - <li class="user">${userName}</li> >>>>> - </#if> >>>>> - <li> >>>>> - <div class="btn-group"> >>>>> - <button class="btn btn-default navbar-btn" >>>>> type="button" aria-expanded="false"> >>>>> - <span class="glyphicon >>>>> glyphicon-off"></span> >>>>> - </button> >>>>> - <a class="btn btn-default navbar-btn" >>>>> href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a> >>>>> - </div> >>>>> - </li> >>>>> - <li> >>>>> - <a class="btn btn-default navbar-btn" >>>>> href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>"><span class="glyphicon >>>>> glyphicon-list button-label"></span> ${uiLabelMap.CommonVisualThemes}</a> >>>>> - </li> >>>>> - <#else> >>>>> - <li> >>>>> - <div class="btn-group"> >>>>> - <button class="btn btn-default navbar-btn" >>>>> type="button" aria-expanded="false"> >>>>> - <span class="glyphicon >>>>> glyphicon-off"></span> >>>>> - </button> >>>>> - <a class="btn btn-default navbar-btn" >>>>> href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a> >>>>> - </div> >>>>> - </li> >>>>> - </#if> >>>>> - <#if layoutSettings.middleTopMessage1?has_content && >>>>> layoutSettings.middleTopMessage1 != " "> >>>>> - <li class="dropdown"> >>>>> - <button class="btn btn-default navbar-btn >>>>> dropdown-toggle" data-toggle="dropdown" type="button" >>>>> aria-expanded="false"> >>>>> - <span class="glyphicon >>>>> glyphicon-envelope"> </span><span >>>>> class="badge">${layoutSettings.middleTopMessage1?size}</span> >>>>> - </button> >>>>> - <#-- <a href="#" class="dropdown-toggle" >>>>> data-toggle="dropdown">Messages <span class="caret"></span></a> --> >>>>> - <ul class="dropdown-menu" role="menu"> >>>>> - <li><a >>>>> href="${StringUtil.wrapString(layoutSettings.middleTopLink1!)}">${layoutSettings.middleTopMessage1?if_exists}</a></li> >>>>> - <li><a >>>>> href="${StringUtil.wrapString(layoutSettings.middleTopLink2!)}">${layoutSettings.middleTopMessage2?if_exists}</a></li> >>>>> - <li><a >>>>> href="${StringUtil.wrapString(layoutSettings.middleTopLink3!)}">${layoutSettings.middleTopMessage3?if_exists}</a></li> >>>>> - </ul> >>>>> - </li> >>>>> - </#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"/> >>>>> - </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"/> >>>>> - </form> >>>>> - </li> >>>>> - </#if> >>>>> - </#if> >>>>> - --> >>>>> - <li> >>>>> - <div class="btn-group"> >>>>> - <button class="btn btn-default navbar-btn" >>>>> type="button" aria-expanded="false"> >>>>> - <span class="glyphicon >>>>> glyphicon-globe"></span> >>>>> - </button> >>>>> - <a class="btn btn-default navbar-btn" >>>>> href="<@ofbizUrl>ListLocales</@ofbizUrl>">${uiLabelMap.CommonLanguageTitle}</a> >>>>> - </div> >>>>> - </li> >>>>> - </ul> >>>>> - </div> >>>>> + <nav class="navbar navbar-default navbar-fixed-top" >>>>> role="navigation" id="header-navigation"> >>>>> + <div class="container-fluid"> >>>>> + <div class="navbar-header"> >>>>> + <a class="navbar-brand" >>>>> href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"> >>>>> + <#if headerImageUrl?exists> >>>>> + <#if organizationLogoLinkURL?has_content> >>>>> + <img class="img-responsive" >>>>> alt="${layoutSettings.companyName}" >>>>> src="<@ofbizContentUrl>${StringUtil.wrapString(organizationLogoLinkURL)}</@ofbizContentUrl>"> >>>>> + <#else> >>>>> + <img alt="${layoutSettings.companyName}" >>>>> src="<@ofbizContentUrl>${StringUtil.wrapString(headerImageUrl)}</@ofbizContentUrl>"> >>>>> + </#if> >>>>> + <#else> >>>>> + ${layoutSettings.companyName} >>>>> + </#if> >>>>> + </a> >>>>> + </div> >>>>> + <ul class="nav navbar-nav application-navbar"> >>>>> + <#if userLogin?has_content> >>>>> + <li class="dropdown"><#-- Primary Applications --> >>>>> + <button class="button-navbar" >>>>> data-toggle="dropdown" type="button" aria-expanded="false" >>>>> title="${userName}"> >>>>> + <i class="glyphicon glyphicon-th"></i> >>>>> + </button> >>>>> + <ul class="dropdown-menu >>>>> dropdown-main-navbar" role="menu"> >>>>> + <#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))> >>>>> + <#-- 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 thisApp = >>>>> StringUtil.wrapString(thisApp)> >>>>> + <#assign thisURL = thisApp> >>>>> + <#if thisApp != "/"> >>>>> + <#assign thisURL = thisURL + >>>>> "/control/main"> >>>>> + </#if> >>>>> + <#if >>>>> layoutSettings.suppressTab?exists && display.name == >>>>> layoutSettings.suppressTab> >>>>> + <!-- do not display this >>>>> component--> >>>>> + <#else> >>>>> + <li<#if selected> >>>>> class="selected"</#if>><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> >>>>> + </#list> >>>>> + </ul> >>>>> + </li><#-- Primary Applications dropdown ends--> >>>>> + <li class="dropdown" >>>>> id="secondary-application-menu"><#-- Secondary Applications --> >>>>> + <div class="btn-group navbar-btn"> >>>>> + <button class="btn btn-default" >>>>> type="button"><span class="glyphicon glyphicon-plus >>>>> button-label"></span>More Applications</button> >>>>> + <button class="btn btn-default >>>>> dropdown-toggle" data-toggle="dropdown" type="button" >>>>> aria-expanded="false"> >>>>> + <span class="caret"></span> >>>>> + <span class="sr-only">Toggle >>>>> Dropdown</span> >>>>> + </button> >>>>> + <#-- <a href="#" class="dropdown-toggle" >>>>> data-toggle="dropdown">More Applications <span class="caret"></span></a> >>>>> --> >>>>> + <ul class="dropdown-menu" role="menu"> >>>>> + <#list displaySecondaryApps 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))> >>>>> + <#-- 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 thisApp = >>>>> StringUtil.wrapString(thisApp)> >>>>> + <#assign thisURL = thisApp> >>>>> + <#if thisApp != "/"> >>>>> + <#assign thisURL = >>>>> thisURL + "/control/main"> >>>>> + </#if> >>>>> + <#if >>>>> layoutSettings.suppressTab?exists && display.name == >>>>> layoutSettings.suppressTab> >>>>> + <!-- do not display this >>>>> component--> >>>>> + <#else> >>>>> + <li<#if selected> >>>>> class="selected"</#if>><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> >>>>> + </#list> >>>>> + </ul> >>>>> + </div><#-- btn-group ends --> >>>>> + </li><#-- Secondary Applications ends --> >>>>> + <#--if webSiteId?exists && >>>>> requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists--> >>>>> + </#if> >>>>> + </ul> >>>>> + <ul class="nav navbar-nav navbar-right"> >>>>> + <#if parameters.componentName?exists && >>>>> requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists> >>>>> + <#include >>>>> "component://common/webcommon/includes/helplink.ftl" /> >>>>> + <li> >>>>> + <button class="button-navbar" >>>>> data-toggle="dropdown" type="button" aria-expanded="false" >>>>> onclick="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' >>>>> ,500,500);" title="${uiLabelMap.CommonHelp}"> >>>>> + <i class="glyphicon >>>>> glyphicon-question-sign"></i> >>>>> + </button> >>>>> + </li> >>>>> + </#if> >>>>> + <#if layoutSettings.middleTopMessage1?has_content && >>>>> layoutSettings.middleTopMessage1 != " "> >>>>> + <li class="dropdown"> >>>>> + <button class="button-navbar" >>>>> data-toggle="dropdown" type="button" aria-expanded="false"> >>>>> + <i class="glyphicon glyphicon-envelope"></i> >>>>> + </button> >>>>> + <i >>>>> class="badge-red">${layoutSettings.middleTopMessage1?size}</i> >>>>> + <#-- <a href="#" class="dropdown-toggle" >>>>> data-toggle="dropdown">Messages <span class="caret"></span></a> --> >>>>> + <ul class="dropdown-menu dropdown-main-navbar" >>>>> role="menu"> >>>>> + <li><a >>>>> href="${StringUtil.wrapString(layoutSettings.middleTopLink1!)}">${layoutSettings.middleTopMessage1?if_exists}</a></li> >>>>> + <li><a >>>>> href="${StringUtil.wrapString(layoutSettings.middleTopLink2!)}">${layoutSettings.middleTopMessage2?if_exists}</a></li> >>>>> + <li><a >>>>> href="${StringUtil.wrapString(layoutSettings.middleTopLink3!)}">${layoutSettings.middleTopMessage3?if_exists}</a></li> >>>>> + </ul> >>>>> + </li> >>>>> + </#if> >>>>> + >>>>> + <#if userLogin?exists> >>>>> + <#if orgName?has_content> >>>>> + <li class="org">${orgName}</li> >>>>> + </#if> >>>>> + <#if userLogin.partyId?exists> >>>>> + <li class="dropdown"> >>>>> + <button class="button-navbar" >>>>> data-toggle="dropdown" type="button" aria-expanded="false" >>>>> title="${userName}"> >>>>> + <i class="glyphicon glyphicon-user"></i> >>>>> + </button> >>>>> + <ul class="dropdown-menu >>>>> dropdown-main-navbar" role="menu"> >>>>> + <li>${userName}</li> >>>>> + <li role="presentation" >>>>> class="divider"></li> >>>>> + <li><a >>>>> href="<@ofbizUrl>passwordChange</@ofbizUrl>"><i class="glyphicon >>>>> glyphicon-lock"></i> ${uiLabelMap.PartyChangePassword}</a></li> >>>>> + <li><a >>>>> href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>"><i class="glyphicon >>>>> glyphicon-list"></i> ${uiLabelMap.CommonVisualThemes}</a></li> >>>>> + <li><a >>>>> href="<@ofbizUrl>ListLocales</@ofbizUrl>"><i class="glyphicon >>>>> glyphicon-globe"></i> ${uiLabelMap.CommonLanguageTitle}</a></li> >>>>> + <li role="presentation" >>>>> class="divider"></li> >>>>> + <li><a >>>>> href="<@ofbizUrl>logout</@ofbizUrl>"><i class="glyphicon >>>>> glyphicon-off"></i> ${uiLabelMap.CommonLogout}</a></li> >>>>> + </ul> >>>>> + </li> >>>>> + <#else> >>>>> + <li class="user">${userName}</li> >>>>> + </#if> >>>>> + <#else> >>>>> + <li> >>>>> + <div class="btn-group"> >>>>> + <button class="btn btn-default navbar-btn" >>>>> type="button" aria-expanded="false"> >>>>> + <span class="glyphicon >>>>> glyphicon-off"></span> >>>>> + </button> >>>>> + <a class="btn btn-default navbar-btn" >>>>> href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a> >>>>> + </div> >>>>> + </li> >>>>> + </#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"/> >>>>> + </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"/> >>>>> + </form> >>>>> + </li> >>>>> + </#if> >>>>> + </#if> >>>>> + --> >>>>> + </ul> >>>>> + </div> <!-- container-fluid --> >>>>> </nav> >>>>> - >>>>> + <div style="height:60px"></div> >>>>> <#--<br class="clear" />--> >>>>> >>>>> Modified: >>>>> ofbiz/branches/boostrap_theme/themes/bootstrap/webapp/bootstrap/css/skins/tomahawk.css >>>>> URL: >>>>> http://svn.apache.org/viewvc/ofbiz/branches/boostrap_theme/themes/bootstrap/webapp/bootstrap/css/skins/tomahawk.css?rev=1683430&r1=1683429&r2=1683430&view=diff >>>>> ============================================================================== >>>>> >>>>> --- >>>>> ofbiz/branches/boostrap_theme/themes/bootstrap/webapp/bootstrap/css/skins/tomahawk.css >>>>> (original) >>>>> +++ >>>>> ofbiz/branches/boostrap_theme/themes/bootstrap/webapp/bootstrap/css/skins/tomahawk.css >>>>> Wed Jun 3 21:34:04 2015 >>>>> @@ -19,28 +19,92 @@ >>>>> /********************* Tomahawk skin styles *****************/ >>>>> html,body { >>>>> - background-color: #000; >>>>> + background-color: #ececec; >>>>> } >>>>> nav#header-navigation.navbar.navbar-default { >>>>> - background: url("../images/header_top_bg.gif"); >>>>> - border-color: #908F8F; >>>>> - } >>>>> - >>>>> + background: url("../images/header_top_bg.gif"); >>>>> + background-color: #fbc02d; >>>>> + border-radius: 0; >>>>> + border: none; >>>>> + z-index: 5; >>>>> +} >>>>> + >>>>> nav#app-navigation.navbar.navbar-default { >>>>> - background-image: linear-gradient(to bottom, #fff 0px, #e0e0e0 >>>>> 100%); >>>>> - box-shadow: 0 1px 0 rgba(255, 255, 255, 0.15) inset, 0 1px 5px >>>>> rgba(0, 0, 0, 0.075); >>>>> + border-radius: 0; >>>>> + z-index: 1; >>>>> + background: #fcd269; >>>>> + box-shadow: none; >>>>> + border: none; >>>>> +} >>>>> + >>>>> +#app-navigation { >>>>> + position: fixed; >>>>> + top: 50px; >>>>> + width:100%; >>>>> + margin:0; >>>>> >>>> >>>> + padding: 0; >>>>> } >>>>> nav.paginate-nav { >>>>> padding-bottom: 15px; >>>>> } >>>>> -.navbar-nav li.menuTitle { >>>>> - background-image: linear-gradient(to bottom, #E5B642 0px, #F0D532 >>>>> 100%); >>>>> - background-repeat: repeat-x; >>>>> - background-color: #E5B642; >>>>> + >>>>> +.menuTitle { >>>>> + position: fixed; >>>>> + top: 12px; >>>>> + left: 50px; >>>>> + color: #fff; >>>>> + font-size: 17px; >>>>> + font-weight: bold; >>>>> + z-index: 10; >>>>> +} >>>>> +.menuTitle:hover { >>>>> + text-decoration: none; >>>>> + color: #fff; >>>>> +} >>>>> +.main-containt { >>>>> + width: 80%; >>>>> +} >>>>> +.navbar-brand{ >>>>> + position: absolute; >>>>> + right: 47%; >>>>> +} >>>>> +.navbar-brand img { >>>>> + height: 40px; >>>>> +} >>>>> +#secondary-application-menu{ >>>>> + position: relative; >>>>> + left: 300px; >>>>> +} >>>>> +.button-navbar{ >>>>> + border:none; >>>>> + background-color: transparent; >>>>> + color: #fff; >>>>> + font-size: large; >>>>> + position: relative; >>>>> + top: 10px; >>>>> + padding-right: 10px; >>>>> +} >>>>> +.badge-red{ >>>>> + position: relative; >>>>> + left:-15px; >>>>> + border-radius:2px; >>>>> + background: #F44336 none repeat scroll 0% 0%; >>>>> + color: #fff; >>>>> + font-size: 10px; >>>>> + padding: 0 2px 0 2px; >>>>> } >>>>> .dropdown-menu { >>>>> - background-image: linear-gradient(to bottom, #fff 0px, #e0e0e0 >>>>> 100%); >>>>> + background-image: linear-gradient(to bottom, #fff 0px, #e0e0e0 >>>>> 100%); >>>>> +} >>>>> + >>>>> +.dropdown-main-navbar{ >>>>> + background-image: none; >>>>> + top: 51px; >>>>> + left: -17px; >>>>> + z-index: 20; >>>>> + border-radius: 0; >>>>> + border: none; >>>>> } >>>>> .panel-default > .panel-heading { >>>>> @@ -63,7 +127,7 @@ div.page-title { >>>>> color:#fff; >>>>> } >>>>> .nav.navbar-nav li.selected { >>>>> - background-color: #E6BB3F; >>>>> + background-color: #fbc02d; >>>>> border-color: #EFD233; >>>>> } >>>>> /********************* Button Styles ************************/ >>>>> >>>>> Added: >>>>> ofbiz/branches/boostrap_theme/themes/bootstrap/webapp/bootstrap/images/Logo-OFBiz.svg >>>>> URL: >>>>> http://svn.apache.org/viewvc/ofbiz/branches/boostrap_theme/themes/bootstrap/webapp/bootstrap/images/Logo-OFBiz.svg?rev=1683430&view=auto >>>>> ============================================================================== >>>>> >>>>> --- >>>>> ofbiz/branches/boostrap_theme/themes/bootstrap/webapp/bootstrap/images/Logo-OFBiz.svg >>>>> (added) >>>>> +++ >>>>> ofbiz/branches/boostrap_theme/themes/bootstrap/webapp/bootstrap/images/Logo-OFBiz.svg >>>>> Wed Jun 3 21:34:04 2015 >>>>> @@ -0,0 +1,760 @@ >>>>> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> >>>>> +<!-- Created with Inkscape (http://www.inkscape.org/) --> >>>>> + >>>>> +<svg >>>>> + xmlns:dc="http://purl.org/dc/elements/1.1/"; >>>>> + xmlns:cc="http://creativecommons.org/ns#"; >>>>> + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; >>>>> + xmlns:svg="http://www.w3.org/2000/svg"; >>>>> + xmlns="http://www.w3.org/2000/svg"; >>>>> + xmlns:xlink="http://www.w3.org/1999/xlink"; >>>>> + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; >>>>> + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; >>>>> + width="242" >>>>> + height="103" >>>>> + id="svg3617" >>>>> + version="1.1" >>>>> + inkscape:version="0.48.4 r9939" >>>>> + sodipodi:docname="Logo-OFBiz.svg" >>>>> + >>>>> inkscape:export-filename="/home/julien/Nomaka/OFBiz-France/Logo-OFBiz-France.png" >>>>> + inkscape:export-xdpi="303" >>>>> + inkscape:export-ydpi="303"> >>>>> + <defs >>>>> + id="defs3619"> >>>>> + <linearGradient >>>>> + id="linearGradient3937"> >>>>> + <stop >>>>> + id="stop3939" >>>>> + offset="0" >>>>> + style="stop-color:#84006b;stop-opacity:1;" /> >>>>> + <stop >>>>> + style="stop-color:#ff0054;stop-opacity:1;" >>>>> + offset="0.4564395" >>>>> + id="stop3941" /> >>>>> + <stop >>>>> + style="stop-color:#ff874e;stop-opacity:1;" >>>>> + offset="0.68263167" >>>>> + id="stop3943" /> >>>>> + <stop >>>>> + id="stop3945" >>>>> + offset="1" >>>>> + style="stop-color:#ffd600;stop-opacity:1;" /> >>>>> + </linearGradient> >>>>> + <linearGradient >>>>> + id="linearGradient4062"> >>>>> + <stop >>>>> + style="stop-color:#84006b;stop-opacity:1;" >>>>> + offset="0" >>>>> + id="stop4072" /> >>>>> + <stop >>>>> + id="stop4076" >>>>> + offset="0.38931903" >>>>> + style="stop-color:#fe2454;stop-opacity:1;" /> >>>>> + <stop >>>>> + id="stop4074" >>>>> + offset="0.66004133" >>>>> + style="stop-color:#ff874e;stop-opacity:1;" /> >>>>> + <stop >>>>> + style="stop-color:#ffd600;stop-opacity:1;" >>>>> + offset="1" >>>>> + id="stop4066" /> >>>>> + </linearGradient> >>>>> + <linearGradient >>>> >>>>
