OFBiz › OFBiz - Dev

Re: svn commit: r1683430 - in /ofbiz/branches/boostrap_theme/themes/bootstrap: data/BootstrapThemeData.xml includes/appbar.ftl includes/header.ftl webapp/bootstrap/css/skins/tomahawk.css webapp/bootstrap/images/Logo-OFBiz.svg

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

6 messages Options

Jacques Le Roux

Re: svn commit: r1683430 - in /ofbiz/branches/boostrap_theme/themes/bootstrap: data/BootstrapThemeData.xml includes/appbar.ftl includes/header.ftl webapp/bootstrap/css/skins/tomahawk.css webapp/bootstrap/images/Logo-OFBiz.svg

Administrator

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, [hidden email] 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>
> - 
> - <#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>
> - 
> - <#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>
> + 
> + <#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>
> + 
> + <#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> 
> </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"?>
> +
> +
> +<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
> + id="linearGradient4042">
> + <stop
> + style="stop-color:#ea0359;stop-opacity:1;"
> + offset="0"
> + id="stop4052" />
> + <stop
> + style="stop-color:#ea0377;stop-opacity:1"
> + offset="1"
> + id="stop4046" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4032">
> + <stop
> + style="stop-color:#ff0000;stop-opacity:1;"
> + offset="0"
> + id="stop4034" />
> + <stop
> + style="stop-color:#fdfbd6;stop-opacity:1"
> + offset="1"
> + id="stop4036" />
> + </linearGradient>
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect5021"
> + is_visible="true"
> + pattern="m 265.71429,6.7857142 c 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 0,2.76 -2.24,4.9999998 -5,4.9999998 -2.76,0 -5,-2.2399998 -5,-4.9999998 z"
> + copytype="single_stretched"
> + prop_scale="1"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="spiro"
> + id="path-effect5019"
> + is_visible="true" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect5015"
> + is_visible="true"
> + pattern="M 0,5 C 0,2.24 2.24,0 5,0 7.76,0 10,2.24 10,5 10,7.76 7.76,10 5,10 2.24,10 0,7.76 0,5 z"
> + copytype="single_stretched"
> + prop_scale="1"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="spiro"
> + id="path-effect5013"
> + is_visible="true" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect4994"
> + is_visible="true"
> + pattern="M 0,5 C 0,2.24 2.24,0 5,0 7.76,0 10,2.24 10,5 10,7.76 7.76,10 5,10 2.24,10 0,7.76 0,5 z"
> + copytype="single_stretched"
> + prop_scale="1"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613"
> + is_visible="true"
> + pattern="M 0,0 0,10 10,5 z"
> + copytype="single_stretched"
> + prop_scale="0.07"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2"
> + is_visible="true"
> + pattern="M 0,0 0,10 10,5 z"
> + copytype="single_stretched"
> + prop_scale="0.07"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-7"
> + is_visible="true"
> + pattern="M 0,0 0,10 10,5 z"
> + copytype="single_stretched"
> + prop_scale="0.07"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-7-2"
> + is_visible="true"
> + pattern="M 0,0 0,10 10,5 z"
> + copytype="single_stretched"
> + prop_scale="0.07"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-7-2-2"
> + is_visible="true"
> + pattern="M 0,0 0,10 10,5 z"
> + copytype="single_stretched"
> + prop_scale="0.07"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-7-2-2-1"
> + is_visible="true"
> + pattern="M 0,0 0,10 10,5 z"
> + copytype="single_stretched"
> + prop_scale="0.07"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-7-2-2-1-9"
> + is_visible="true"
> + pattern="m 156.08125,211.61936 0,10 10,-5 z"
> + copytype="single_stretched"
> + prop_scale="0.07"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-7-2-2-1-9-5"
> + is_visible="true"
> + pattern="M 0,0 0,10 10,5 z"
> + copytype="single_stretched"
> + prop_scale="0.07"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-7-2-2-1-9-5-6"
> + is_visible="true"
> + pattern="M 0,0 0,10 10,5 z"
> + copytype="single_stretched"
> + prop_scale="0.07"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-3"
> + is_visible="true"
> + pattern="M 0,0 0,10 10,5 z"
> + copytype="single_stretched"
> + prop_scale="0.07"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-3-9"
> + is_visible="true"
> + pattern="M 0,0 0,10 10,5 z"
> + copytype="single_stretched"
> + prop_scale="0.07"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-3-9-6"
> + is_visible="true"
> + pattern="M 0,0 0,10 10,5 z"
> + copytype="single_stretched"
> + prop_scale="0.07"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-7-2-24"
> + is_visible="true"
> + pattern="M 0,0 0,10 10,5 z"
> + copytype="single_stretched"
> + prop_scale="0.07"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-7-2-24-3"
> + is_visible="true"
> + pattern="m -56.428571,100.71429 0,10 10,-5 z"
> + copytype="single_stretched"
> + prop_scale="0.07"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-7-2-24-9"
> + is_visible="true"
> + pattern="M 0,0 0,10 10,5 z"
> + copytype="single_stretched"
> + prop_scale="0.07"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-7-2-0"
> + is_visible="true"
> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
> + copytype="single_stretched"
> + prop_scale="0.05"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4062"
> + id="linearGradient4068"
> + x1="251.11844"
> + y1="932.42859"
> + x2="311.44434"
> + y2="853.43036"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4062"
> + id="linearGradient4082"
> + gradientUnits="userSpaceOnUse"
> + x1="251.11844"
> + y1="932.42859"
> + x2="311.44434"
> + y2="853.43036" />
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4062"
> + id="linearGradient4086"
> + gradientUnits="userSpaceOnUse"
> + x1="251.11844"
> + y1="932.42859"
> + x2="311.44434"
> + y2="853.43036"
> + gradientTransform="translate(15.799636,-19.869239)" />
> + <path
> + sodipodi:type="arc"
> + style="fill:none;stroke:none"
> + id="path3246-2"
> + sodipodi:cx="404.31357"
> + sodipodi:cy="556.62982"
> + sodipodi:rx="43.689098"
> + sodipodi:ry="43.689098"
> + d="m 448.00267,556.62982 a 43.689098,43.689098 0 1 1 -87.3782,0 43.689098,43.689098 0 1 1 87.3782,0 z"
> + transform="matrix(2.0143715,1.9655455,-1.9655455,2.0143715,758.27155,-1351.7418)" />
> + <linearGradient
> + id="linearGradient3937-3">
> + <stop
> + id="stop3939-2"
> + offset="0"
> + style="stop-color:#84006b;stop-opacity:1;" />
> + <stop
> + style="stop-color:#ff0054;stop-opacity:1;"
> + offset="0.4564395"
> + id="stop3941-5" />
> + <stop
> + style="stop-color:#ff874e;stop-opacity:1;"
> + offset="0.68263167"
> + id="stop3943-4" />
> + <stop
> + id="stop3945-7"
> + offset="1"
> + style="stop-color:#ffd600;stop-opacity:1;" />
> + </linearGradient>
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-7-2-0-9"
> + is_visible="true"
> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
> + copytype="single_stretched"
> + prop_scale="0.05"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <linearGradient
> + id="linearGradient3937-9">
> + <stop
> + id="stop3939-6"
> + offset="0"
> + style="stop-color:#84006b;stop-opacity:1;" />
> + <stop
> + style="stop-color:#ff0054;stop-opacity:1;"
> + offset="0.4564395"
> + id="stop3941-9" />
> + <stop
> + style="stop-color:#ff874e;stop-opacity:1;"
> + offset="0.68263167"
> + id="stop3943-1" />
> + <stop
> + id="stop3945-8"
> + offset="1"
> + style="stop-color:#ffd600;stop-opacity:1;" />
> + </linearGradient>
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-7-2-0-2"
> + is_visible="true"
> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
> + copytype="single_stretched"
> + prop_scale="0.05"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <linearGradient
> + id="linearGradient3937-7">
> + <stop
> + id="stop3939-63"
> + offset="0"
> + style="stop-color:#84006b;stop-opacity:1;" />
> + <stop
> + style="stop-color:#ff0054;stop-opacity:1;"
> + offset="0.4564395"
> + id="stop3941-2" />
> + <stop
> + style="stop-color:#ff874e;stop-opacity:1;"
> + offset="0.68263167"
> + id="stop3943-6" />
> + <stop
> + id="stop3945-79"
> + offset="1"
> + style="stop-color:#ffd600;stop-opacity:1;" />
> + </linearGradient>
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-7-2-0-93"
> + is_visible="true"
> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
> + copytype="single_stretched"
> + prop_scale="0.05"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <path
> + sodipodi:type="arc"
> + style="fill:none;stroke:none"
> + id="path3246-7"
> + sodipodi:cx="404.31357"
> + sodipodi:cy="556.62982"
> + sodipodi:rx="43.689098"
> + sodipodi:ry="43.689098"
> + d="m 448.00267,556.62982 a 43.689098,43.689098 0 1 1 -87.3782,0 43.689098,43.689098 0 1 1 87.3782,0 z"
> + transform="matrix(-1.6401893,1.4273244,1.4417801,1.6638529,21.095744,-856.12693)" />
> + <linearGradient
> + id="linearGradient3937-7-3">
> + <stop
> + id="stop3939-63-8"
> + offset="0"
> + style="stop-color:#84006b;stop-opacity:1;" />
> + <stop
> + style="stop-color:#ff0054;stop-opacity:1;"
> + offset="0.4564395"
> + id="stop3941-2-5" />
> + <stop
> + style="stop-color:#ff874e;stop-opacity:1;"
> + offset="0.68263167"
> + id="stop3943-6-4" />
> + <stop
> + id="stop3945-79-7"
> + offset="1"
> + style="stop-color:#ffd600;stop-opacity:1;" />
> + </linearGradient>
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-7-2-0-93-6"
> + is_visible="true"
> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
> + copytype="single_stretched"
> + prop_scale="0.05"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <path
> + transform="matrix(2.0143715,1.9655455,-1.9655455,2.0143715,758.27155,-1351.7418)"
> + d="m 448.00267,556.62982 a 43.689098,43.689098 0 1 1 -87.3782,0 43.689098,43.689098 0 1 1 87.3782,0 z"
> + sodipodi:ry="43.689098"
> + sodipodi:rx="43.689098"
> + sodipodi:cy="556.62982"
> + sodipodi:cx="404.31357"
> + id="path3246-1"
> + style="fill:#ffffff;stroke:none"
> + sodipodi:type="arc" />
> + <linearGradient
> + id="linearGradient3937-4">
> + <stop
> + id="stop3939-8"
> + offset="0"
> + style="stop-color:#84006b;stop-opacity:1;" />
> + <stop
> + style="stop-color:#ff0054;stop-opacity:1;"
> + offset="0.4564395"
> + id="stop3941-3" />
> + <stop
> + style="stop-color:#ff874e;stop-opacity:1;"
> + offset="0.68263167"
> + id="stop3943-13" />
> + <stop
> + id="stop3945-4"
> + offset="1"
> + style="stop-color:#ffd600;stop-opacity:1;" />
> + </linearGradient>
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-7-2-0-8"
> + is_visible="true"
> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
> + copytype="single_stretched"
> + prop_scale="0.05"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient3937-4"
> + id="linearGradient4434"
> + gradientUnits="userSpaceOnUse"
> + gradientTransform="translate(15.799636,-19.869239)"
> + x1="251.11844"
> + y1="932.42859"
> + x2="311.44434"
> + y2="853.43036" />
> + <linearGradient
> + id="linearGradient3937-4-8">
> + <stop
> + id="stop3939-8-2"
> + offset="0"
> + style="stop-color:#84006b;stop-opacity:1;" />
> + <stop
> + style="stop-color:#ff0054;stop-opacity:1;"
> + offset="0.4564395"
> + id="stop3941-3-6" />
> + <stop
> + style="stop-color:#ff874e;stop-opacity:1;"
> + offset="0.68263167"
> + id="stop3943-13-0" />
> + <stop
> + id="stop3945-4-5"
> + offset="1"
> + style="stop-color:#ffd600;stop-opacity:1;" />
> + </linearGradient>
> + <inkscape:path-effect
> + effect="skeletal"
> + id="path-effect3613-2-7-2-0-8-2"
> + is_visible="true"
> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
> + copytype="single_stretched"
> + prop_scale="0.05"
> + scale_y_rel="false"
> + spacing="0"
> + normal_offset="0"
> + tang_offset="0"
> + prop_units="false"
> + vertical_pattern="false"
> + fuse_tolerance="0" />
> + <path
> + transform="matrix(-1.6401893,1.4273244,1.4417801,1.6638529,21.095744,-856.12693)"
> + d="m 448.00267,556.62982 a 43.689098,43.689098 0 1 1 -87.3782,0 43.689098,43.689098 0 1 1 87.3782,0 z"
> + sodipodi:ry="43.689098"
> + sodipodi:rx="43.689098"
> + sodipodi:cy="556.62982"
> + sodipodi:cx="404.31357"
> + id="path3246-9"
> + style="fill:none;stroke:none"
> + sodipodi:type="arc" />
> + <path
> + sodipodi:type="arc"
> + style="opacity:0.52325583;fill:#ff0000;stroke:none"
> + id="path4578-2"
> + sodipodi:cx="148.62184"
> + sodipodi:cy="647.12219"
> + sodipodi:rx="87.683502"
> + sodipodi:ry="87.683502"
> + d="m 236.30534,647.12219 a 87.683502,87.683502 0 1 1 -175.367001,0 87.683502,87.683502 0 1 1 175.367001,0 z"
> + transform="matrix(-0.99647677,0.49346663,0.49346663,0.99647677,-9.4098434,-69.007821)" />
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient3937-7"
> + id="linearGradient4680"
> + gradientUnits="userSpaceOnUse"
> + gradientTransform="translate(15.799636,-19.869239)"
> + x1="251.11844"
> + y1="932.42859"
> + x2="311.44434"
> + y2="853.43036" />
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient3937-4-8"
> + id="linearGradient4682"
> + gradientUnits="userSpaceOnUse"
> + gradientTransform="translate(15.799636,-19.869239)"
> + x1="251.11844"
> + y1="932.42859"
> + x2="311.44434"
> + y2="853.43036" />
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient3937-4-8"
> + id="linearGradient3258"
> + gradientUnits="userSpaceOnUse"
> + gradientTransform="translate(15.799636,-19.869239)"
> + x1="251.11844"
> + y1="932.42859"
> + x2="311.44434"
> + y2="853.43036" />
> + </defs>
> + <sodipodi:namedview
> + id="base"
> + pagecolor="#ffffff"
> + bordercolor="#666666"
> + borderopacity="1.0"
> + inkscape:pageopacity="0.0"
> + inkscape:pageshadow="2"
> + inkscape:zoom="2.8284271"
> + inkscape:cx="140.28115"
> + inkscape:cy="51.274541"
> + inkscape:document-units="px"
> + inkscape:current-layer="g3159-19"
> + showgrid="false"
> + inkscape:window-width="1920"
> + inkscape:window-height="1014"
> + inkscape:window-x="0"
> + inkscape:window-y="27"
> + inkscape:window-maximized="1" />
> + <metadata
> + id="metadata3622">
> + <rdf:RDF>
> + <cc:Work
> + rdf:about="">
> + <dc:format>image/svg+xml</dc:format>
> + <dc:type
> + rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
> + <dc:title />
> + </cc:Work>
> + </rdf:RDF>
> + </metadata>
> + <g
> + inkscape:label="Calque 1"
> + inkscape:groupmode="layer"
> + id="layer1"
> + transform="translate(0,-949.36218)">
> + <path
> + sodipodi:type="arc"
> + style="opacity:0.52325583;fill:none;stroke:none"
> + id="path4619"
> + sodipodi:cx="148.62184"
> + sodipodi:cy="647.12219"
> + sodipodi:rx="87.683502"
> + sodipodi:ry="87.683502"
> + d="m 236.30534,647.12219 c 0,48.42626 -39.25724,87.6835 -87.6835,87.6835 -48.42626,0 -87.683501,-39.25724 -87.683501,-87.6835 0,-48.42626 39.257241,-87.6835 87.683501,-87.6835 48.42626,0 87.6835,39.25724 87.6835,87.6835 z"
> + transform="matrix(-1.0183226,0.44664768,0.44664768,1.0183226,-32.11227,-609.65199)" />
> + <g
> + id="g3159-19"
> + transform="matrix(1.2352163,0,0,1.2352163,-606.5521,240.78373)">
> + <g
> + id="g3083">
> + <path
> + sodipodi:nodetypes="ssscccscccccsscsccsssssscscscccsccssssssccsssssssssccssscccsscccccsccssscscsssscsccscscccscccssssssccccscssscssccccscccscscccsccssccsssccsccc"
> + inkscape:connector-curvature="0"
> + id="path5269-3-3-7-1-7-9-0"
> + d="m 536.69763,655.64671 c -0.47541,-0.0893 -0.93295,-0.34032 -1.01645,-0.55806 -0.66388,-1.73043 0.88083,-8.13365 1.97209,-8.17456 1.9798,-0.0743 6.66894,-0.67975 7.58065,-0.97894 1.37989,-0.45292 2.82951,-2.10011 3.34932,-2.58638 0.73,-0.8807 2.31717,-4.89066 2.84519,-6.94914 1.26742,-5.06511 4.1797,-17.96751 6.38008,-28.26613 3.13357,-14.66661 3.80662,-17.10614 5.76495,-20.89934 0.54732,-1.06034 1.5739,-2.5771 2.28098,-3.37057 1.40184,-1.68467 1.51285,-1.70825 2.69291,-2.68838 0.5828,-0.53494 1.14483,-0.89996 1.84298,-1.29711 2.17962,-1.2387 1.77686,-0.90778 2.87801,-1.38454 2.04545,-0.93215 5.14427,-1.78064 7.97064,-2.18244 2.50106,-0.35557 9.34544,-0.33399 10.23303,0.0323 0.39432,0.16266 0.78019,0.28481 0.85766,0.27142 0.42569,-0.0736 -0.68946,6.21094 -1.30676,7.36426 -0.31686,0.5924 -1.51985,0.93479 -3.92704,1.11786 -1.7952,0.22853 -2.73249,0.0625 -4.48884,0.68135 -0.33519,0.2003 -1.39725,0.57449 -2.62486,1.73561 -1.67454,1.58361 -2.42239,3.18739 -3.5846,7.!
> 68718 -0.
> 73193,2.83322 -3.68934,15.57009 -3.68934,15.88847 0,0.0548 1.52154,0.0997 3.38117,0.0997 4.3409,0 4.51297,0.0963 4.51297,2.52758 0,0.95412 -0.18582,2.75245 -0.41194,3.9963 -0.22684,1.24385 -0.43486,2.4652 -0.46261,2.71413 -0.10136,0.91171 -1.00921,1.18038 -5.21546,1.54432 -2.26312,0.19571 -4.14664,0.39955 -4.18598,0.45279 -0.0386,0.0533 -0.73097,3.06738 -1.53722,6.69807 -1.68105,7.57168 -2.87367,11.89152 -3.9186,14.19627 -0.40204,0.8864 -0.93198,1.70195 -0.97011,1.84201 -0.44235,0.74009 -0.89289,1.41907 -1.32003,1.99226 -1.52009,2.04364 -2.8172,3.22697 -4.91453,4.48327 -4.36697,2.61569 -6.64023,3.3084 -15.3761,4.12364 -2.55053,0.11559 -3.81096,-0.0326 -5.59216,-0.11318 z m -26.25129,-9.17904 c -4.90415,-0.77566 -8.90841,-2.77692 -12.22659,-6.11057 -1.57439,-1.58184 -3.21611,-3.44816 -3.03318,-3.44816 0.0579,0 -0.2365,-0.55333 -0.65326,-1.22961 -3.50521,-5.69675 -4.02092,-16.15759 -1.20758,-24.49004 0.78768,-2.33274 3.51631,-7.13798 5.26541,-9.27279 1.86205,-2.27243 4.55158,!
> -4.83303
> 6.57652,-6.2611 1.04806,-0.78063 1.83115,-1.24347 2.59928,-1.77836 1.15159,-0.82003 5.74251,-2.94551 8.02711,-3.71636 3.47359,-1.17208 7.55242,-1.88861 11.71378,-2.05773 6.87648,-0.27948 10.6358,0.58885 14.9463,3.45231 2.98299,1.98157 4.79001,4.022 6.22684,7.03102 3.85537,8.07356 2.8838,20.73125 -2.3261,30.30567 -2.35917,4.33557 -6.17448,8.92132 -9.34762,11.23548 -6.44765,4.70219 -12.83522,6.74419 -20.92024,6.68765 -1.98198,-0.0145 -4.52021,-0.17013 -5.64067,-0.34741 z m 72.57528,-1.58746 c -2.04931,-0.18486 -3.64662,-0.62298 -4.10055,-1.12447 -0.44572,-0.49242 -0.44717,-0.61783 -0.0386,-3.01658 0.97808,-5.73189 7.11925,-33.74241 9.89277,-45.12283 0.91051,-3.73616 1.42598,-5.39016 1.77975,-5.7102 0.81664,-0.7391 3.38576,-1.13054 8.51361,-1.2972 4.2299,-0.13756 4.94735,-0.10353 5.66601,0.26808 0.47238,0.22994 0.95026,0.64221 1.03021,1.07835 0.0663,0.50763 0.0458,0.57315 -0.15204,1.44919 -0.29301,1.29747 -4.39351,16.9667 -4.77456,18.25683 -0.0989,0.33457 0.76861,0.37116 6.987!
> 97,0.2948
> 6.60234,-0.0811 7.49354,-0.0292 10.20939,0.59399 1.94106,0.54607 3.69563,1.41926 4.94129,2.25974 2.93979,1.95942 4.81778,4.55687 5.78283,7.31325 0.47709,1.36229 0.57386,2.18474 0.58231,4.94455 -0.16169,2.99735 -0.27825,3.32654 -0.77609,5.26744 -0.43245,1.07632 -1.24643,2.63114 -1.80896,3.45514 -1.75296,2.56803 -5.61364,5.83329 -8.19072,7.05607 -1.48268,0.77344 -2.37944,1.10308 -4.2229,1.76201 -3.62514,1.29125 -7.03261,1.93061 -11.71402,2.19806 -3.8573,0.22033 -17.41793,0.27139 -19.60793,0.0738 z m 20.06909,-10.0422 c 1.81258,-0.30498 3.76777,-1.32377 4.43068,-1.78313 1.07606,-0.68306 2.44629,-1.65139 3.20935,-2.52558 1.10477,-1.29076 1.44479,-2.34138 1.44673,-4.47079 0,-1.45553 -0.13997,-1.91796 -0.92306,-2.895 -0.76234,-0.95136 -1.14532,-1.4439 -2.41419,-1.84771 -1.49306,-0.47514 -1.76045,-0.57714 -5.6163,-0.57714 -2.19386,0 -4.07472,0.0854 -4.17898,0.18968 -0.15444,0.1542 -2.20303,9.16482 -2.5042,11.01491 -0.0458,0.28013 -0.14962,0.68121 -0.23167,0.89128 -0.082,0.21019 -!
> 0.20029,0
> .74737 -0.26376,1.19399 -0.0869,0.56201 -0.1641,0.71791 -0.29417,1.10234 0.1641,0.32716 4.80738,0.13321 7.33957,-0.29285 z m 44.76964,9.61547 c -0.20195,-0.34127 -0.53984,-0.89215 -0.53984,-1.28041 0,-0.61928 1.01428,-2.14273 1.97595,-3.41645 0.48675,-0.63465 0.58304,-0.7077 0.744,-0.96587 3.18111,-4.33538 3.3259,-4.3799 5.95197,-7.85451 0.89386,-0.88655 1.41729,-1.66817 2.00611,-2.52732 0.28187,-0.41134 1.02514,-1.59635 2.51869,-3.472 2.34348,-3.26401 0.43775,-0.56351 2.17914,-2.98866 l 1.93806,-2.61017 -5.17975,0 c -6.38225,0 -6.1624,0.1197 -5.95776,-3.24248 0.19306,-3.14918 0.6897,-5.52258 1.32582,-6.32042 0.40953,-0.51351 0.88831,-0.73736 1.92913,-0.90189 2.26602,-0.35822 16.79531,-0.80025 23.1042,-0.70293 5.42131,0.0835 5.9054,0.12863 6.42232,0.59629 0.83642,0.757 0.40952,1.94713 -1.182,4.66012 -0.66702,0.72773 -0.862,1.31755 -1.61541,2.60085 -0.78285,1.04976 -3.58798,4.98416 -3.87998,5.33393 -0.68222,0.76323 -1.27008,1.76785 -1.92913,2.65068 -0.35161,0.4792 -1.73415,2!
> .13817 -3
> .72699,4.82621 l -3.62369,4.88735 7.2375,0.12742 c 9.10798,0.16024 8.56501,-0.24552 7.16558,5.35405 -0.43679,1.7472 -0.81808,3.40593 -0.84728,3.68603 -0.029,0.28013 -0.41459,0.75404 -0.85573,1.05313 -0.75558,0.51197 -1.20975,0.55268 -7.74717,0.69431 -3.81965,0.0828 -11.42903,0.20368 -16.90946,0.26891 l -9.84989,0.11713 c -0.38581,0.0217 -0.48811,-0.2746 -0.65439,-0.5733 z m -12.89023,0.16578 c -0.28018,-0.0717 -0.79588,-0.33358 -1.14604,-0.58194 -0.34871,-0.29297 -0.36874,-0.24963 -0.96336,-0.76297 -0.45899,-0.50448 -0.38732,-0.41305 -0.62165,-0.76318 -1.18706,-1.77423 -1.36828,-3.60247 -1.08574,-6.6209 l 0.62986,-4.18934 1.35505,-8.41584 c 1.87292,-11.63219 3.0393,-12.65642 3.94683,-13.03008 14.10312,-0.58324 0.0684,0.0168 14.11639,-0.6264 1.83129,2.9e-4 1.51695,-0.2997 -2.48297,16.07566 -2.78582,11.40408 -3.7096,15.37571 -4.14664,17.8255 l -0.20512,1.14591 -4.44854,0.0369 c -2.44676,0.0193 -4.67779,-0.0217 -4.95772,-0.0934 z m 9.03993,-42.69064 c -2.47017,-0.71943 -4.1582!
> 2,-2.1758
> 8 -4.47435,-3.86022 -0.30986,-1.65197 -0.002,-3.57265 0.72686,-4.52754 0.56855,-0.87325 0.83425,-0.95878 1.35816,-1.48348 1.64437,-1.36992 5.10349,-2.5134 8.24092,-2.5134 3.12971,0 5.91915,1.07664 7.02489,2.7114 0.64868,0.95885 0.58159,4.12316 0.0628,5.31006 -0.61876,1.41622 -1.31304,2.05428 -2.42867,2.74673 -0.88493,0.64274 -1.82054,0.86316 -2.7436,1.20149 -1.89872,0.69962 -6.03137,0.92043 -7.76696,0.41496 z"
> + style="fill:#ffffff;fill-opacity:1" />
> + <g
> + id="g4106-5"
> + transform="translate(227.38698,-258.89584)">
> + <path
> + style="fill:url(#linearGradient3258);fill-opacity:1;stroke:none"
> + d="m 274.4202,915.83816 c -0.57022,-0.5701 0.12725,-5.7981 1.3807,-10.3461 0.31753,-1.1525 1.16983,-3.7056 1.89397,-5.6735 1.43464,-3.8983 1.59401,-4.86 0.80655,-4.86 -1.12196,0 -2.45752,-1.1724 -3.358,-2.9483 -0.84048,-1.6576 -0.92774,-2.1304 -0.92774,-5.0389 0,-10.2837 6.65933,-24.67072 16.05068,-34.67716 4.73112,-5.04105 15.17111,-11.68326 23.19872,-14.75984 7.48224,-2.86755 11.08323,-3.96154 12.99385,-3.94748 l 1.94911,0.0151 -1.43857,1.17101 c -3.79248,3.08658 -8.5533,9.22483 -11.14049,14.36281 -2.21029,4.38984 -5.05108,12.23644 -7.56162,20.88541 -2.66658,9.1869 -3.83702,12.4257 -6.14456,17.0055 -3.10984,6.1713 -5.55039,9.0032 -9.5083,11.0335 -2.17756,1.117 -5.05077,0.9365 -7.97004,-0.5007 -1.11893,-0.5509 -2.19574,-1.0016 -2.39268,-1.0016 -0.19694,0 -1.28891,1.8577 -2.42692,4.1283 -1.99001,3.9717 -3.27982,7.9065 -4.32997,13.2109 -0.3551,1.7935 -0.66415,2.3521 -1.07469,1.9418 z"
> + id="path5333-2-0-0-8-0-0"
> + inkscape:connector-curvature="0" />
> + <path
> + sodipodi:nodetypes="cc"
> + inkscape:connector-curvature="0"
> + inkscape:original-d="m 293.31501,866.36406 c 0,0 6.29839,-23.02314 33.92737,-32.42467"
> + inkscape:path-effect="#path-effect3613-2-7-2-0-8-2"
> + id="path3611-1-3-8-9-9"
> + d="m 293.075,866.29409 0.48004,0.13988 c 0.002,-0.006 0.003,-0.0119 0.005,-0.0179 0.005,-0.0167 0.009,-0.0334 0.0141,-0.0501 0.0185,-0.0648 0.0378,-0.12966 0.0575,-0.1946 0,-1e-5 0,-1e-5 0,-1e-5 0.0756,-0.24869 0.15714,-0.49642 0.24215,-0.74378 0.31727,-0.92326 0.68052,-1.83208 1.07312,-2.72925 0,0 0,0 0,0 1.37731,-3.14725 3.11649,-6.13655 5.12397,-8.93212 0,0 0,0 0,0 6.6322,-9.23764 16.38661,-16.09495 27.17154,-19.82681 -10.82274,3.62075 -20.67946,10.38748 -27.45648,19.61995 0,0 0,0 0,0 -2.04968,2.79284 -3.83397,5.78812 -5.25823,8.95292 0,0 0,0 0,0 -0.40597,0.90207 -0.78333,1.81896 -1.11555,2.75396 0,10e-6 0,10e-6 0,10e-6 -0.089,0.25049 -0.17495,0.50294 -0.2554,0.75803 0,0 0,0 0,0 -0.0208,0.0661 -0.0414,0.13258 -0.0613,0.19948 -0.005,0.0172 -0.0102,0.0345 -0.0152,0.0518 -0.002,0.006 -0.004,0.0123 -0.005,0.0185 z"
> + style="fill:#000000;fill-opacity:0.53571424;fill-rule:evenodd;stroke:none" />
> + </g>
> + </g>
> + </g>
> + <text
> + xml:space="preserve"
> + style="font-size:29.00352478px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#034460;fill-opacity:1;stroke:none;font-family:Sans"
> + id="text3248-0-4"
> + sodipodi:linespacing="125%"
> + transform="translate(-430.59109,-502.35325)"><textPath
> + xlink:href="#path4619"
> + id="textPath4636"
> + style="font-size:16px">CommunautÃ© francophone</textPath></text>
> + </g>
> +</svg>
>
>
>

JulienNicolas

Re: svn commit: r1683430 - in /ofbiz/branches/boostrap_theme/themes/bootstrap: data/BootstrapThemeData.xml includes/appbar.ftl includes/header.ftl webapp/bootstrap/css/skins/tomahawk.css webapp/bootstrap/images/Logo-OFBiz.svg

Hi Jacques,

Thanks for your feedback.

Guillaume told me the same thing but he don't like yellow and want
bigger font for the 2nd level.
I will introduce font-awesome to help me in glyph management and to be
able to increase the app glyph easily.

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, [hidden email] 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>
>> - 
>> - <#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>
>> - 
>> - <#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>
>> + 
>> + <#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>
>> + 
>> + <#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> 
>> </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"?>
>> +
>> +
>> +<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
>> + id="linearGradient4042">
>> + <stop
>> + style="stop-color:#ea0359;stop-opacity:1;"
>> + offset="0"
>> + id="stop4052" />
>> + <stop
>> + style="stop-color:#ea0377;stop-opacity:1"
>> + offset="1"
>> + id="stop4046" />
>> + </linearGradient>
>> + <linearGradient
>> + id="linearGradient4032">
>> + <stop
>> + style="stop-color:#ff0000;stop-opacity:1;"
>> + offset="0"
>> + id="stop4034" />
>> + <stop
>> + style="stop-color:#fdfbd6;stop-opacity:1"
>> + offset="1"
>> + id="stop4036" />
>> + </linearGradient>
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect5021"
>> + is_visible="true"
>> + pattern="m 265.71429,6.7857142 c 0,-2.76 2.24,-5 5,-5 2.76,0
>> 5,2.24 5,5 0,2.76 -2.24,4.9999998 -5,4.9999998 -2.76,0 -5,-2.2399998
>> -5,-4.9999998 z"
>> + copytype="single_stretched"
>> + prop_scale="1"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="spiro"
>> + id="path-effect5019"
>> + is_visible="true" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect5015"
>> + is_visible="true"
>> + pattern="M 0,5 C 0,2.24 2.24,0 5,0 7.76,0 10,2.24 10,5
>> 10,7.76 7.76,10 5,10 2.24,10 0,7.76 0,5 z"
>> + copytype="single_stretched"
>> + prop_scale="1"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="spiro"
>> + id="path-effect5013"
>> + is_visible="true" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect4994"
>> + is_visible="true"
>> + pattern="M 0,5 C 0,2.24 2.24,0 5,0 7.76,0 10,2.24 10,5
>> 10,7.76 7.76,10 5,10 2.24,10 0,7.76 0,5 z"
>> + copytype="single_stretched"
>> + prop_scale="1"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613"
>> + is_visible="true"
>> + pattern="M 0,0 0,10 10,5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.07"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2"
>> + is_visible="true"
>> + pattern="M 0,0 0,10 10,5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.07"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-7"
>> + is_visible="true"
>> + pattern="M 0,0 0,10 10,5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.07"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-7-2"
>> + is_visible="true"
>> + pattern="M 0,0 0,10 10,5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.07"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-7-2-2"
>> + is_visible="true"
>> + pattern="M 0,0 0,10 10,5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.07"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-7-2-2-1"
>> + is_visible="true"
>> + pattern="M 0,0 0,10 10,5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.07"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-7-2-2-1-9"
>> + is_visible="true"
>> + pattern="m 156.08125,211.61936 0,10 10,-5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.07"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-7-2-2-1-9-5"
>> + is_visible="true"
>> + pattern="M 0,0 0,10 10,5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.07"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-7-2-2-1-9-5-6"
>> + is_visible="true"
>> + pattern="M 0,0 0,10 10,5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.07"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-3"
>> + is_visible="true"
>> + pattern="M 0,0 0,10 10,5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.07"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-3-9"
>> + is_visible="true"
>> + pattern="M 0,0 0,10 10,5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.07"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-3-9-6"
>> + is_visible="true"
>> + pattern="M 0,0 0,10 10,5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.07"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-7-2-24"
>> + is_visible="true"
>> + pattern="M 0,0 0,10 10,5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.07"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-7-2-24-3"
>> + is_visible="true"
>> + pattern="m -56.428571,100.71429 0,10 10,-5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.07"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-7-2-24-9"
>> + is_visible="true"
>> + pattern="M 0,0 0,10 10,5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.07"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-7-2-0"
>> + is_visible="true"
>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.05"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <linearGradient
>> + inkscape:collect="always"
>> + xlink:href="#linearGradient4062"
>> + id="linearGradient4068"
>> + x1="251.11844"
>> + y1="932.42859"
>> + x2="311.44434"
>> + y2="853.43036"
>> + gradientUnits="userSpaceOnUse" />
>> + <linearGradient
>> + inkscape:collect="always"
>> + xlink:href="#linearGradient4062"
>> + id="linearGradient4082"
>> + gradientUnits="userSpaceOnUse"
>> + x1="251.11844"
>> + y1="932.42859"
>> + x2="311.44434"
>> + y2="853.43036" />
>> + <linearGradient
>> + inkscape:collect="always"
>> + xlink:href="#linearGradient4062"
>> + id="linearGradient4086"
>> + gradientUnits="userSpaceOnUse"
>> + x1="251.11844"
>> + y1="932.42859"
>> + x2="311.44434"
>> + y2="853.43036"
>> + gradientTransform="translate(15.799636,-19.869239)" />
>> + <path
>> + sodipodi:type="arc"
>> + style="fill:none;stroke:none"
>> + id="path3246-2"
>> + sodipodi:cx="404.31357"
>> + sodipodi:cy="556.62982"
>> + sodipodi:rx="43.689098"
>> + sodipodi:ry="43.689098"
>> + d="m 448.00267,556.62982 a 43.689098,43.689098 0 1 1
>> -87.3782,0 43.689098,43.689098 0 1 1 87.3782,0 z"
>> +
>> transform="matrix(2.0143715,1.9655455,-1.9655455,2.0143715,758.27155,-1351.7418)"
>> />
>> + <linearGradient
>> + id="linearGradient3937-3">
>> + <stop
>> + id="stop3939-2"
>> + offset="0"
>> + style="stop-color:#84006b;stop-opacity:1;" />
>> + <stop
>> + style="stop-color:#ff0054;stop-opacity:1;"
>> + offset="0.4564395"
>> + id="stop3941-5" />
>> + <stop
>> + style="stop-color:#ff874e;stop-opacity:1;"
>> + offset="0.68263167"
>> + id="stop3943-4" />
>> + <stop
>> + id="stop3945-7"
>> + offset="1"
>> + style="stop-color:#ffd600;stop-opacity:1;" />
>> + </linearGradient>
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-7-2-0-9"
>> + is_visible="true"
>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.05"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <linearGradient
>> + id="linearGradient3937-9">
>> + <stop
>> + id="stop3939-6"
>> + offset="0"
>> + style="stop-color:#84006b;stop-opacity:1;" />
>> + <stop
>> + style="stop-color:#ff0054;stop-opacity:1;"
>> + offset="0.4564395"
>> + id="stop3941-9" />
>> + <stop
>> + style="stop-color:#ff874e;stop-opacity:1;"
>> + offset="0.68263167"
>> + id="stop3943-1" />
>> + <stop
>> + id="stop3945-8"
>> + offset="1"
>> + style="stop-color:#ffd600;stop-opacity:1;" />
>> + </linearGradient>
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-7-2-0-2"
>> + is_visible="true"
>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.05"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <linearGradient
>> + id="linearGradient3937-7">
>> + <stop
>> + id="stop3939-63"
>> + offset="0"
>> + style="stop-color:#84006b;stop-opacity:1;" />
>> + <stop
>> + style="stop-color:#ff0054;stop-opacity:1;"
>> + offset="0.4564395"
>> + id="stop3941-2" />
>> + <stop
>> + style="stop-color:#ff874e;stop-opacity:1;"
>> + offset="0.68263167"
>> + id="stop3943-6" />
>> + <stop
>> + id="stop3945-79"
>> + offset="1"
>> + style="stop-color:#ffd600;stop-opacity:1;" />
>> + </linearGradient>
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-7-2-0-93"
>> + is_visible="true"
>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.05"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <path
>> + sodipodi:type="arc"
>> + style="fill:none;stroke:none"
>> + id="path3246-7"
>> + sodipodi:cx="404.31357"
>> + sodipodi:cy="556.62982"
>> + sodipodi:rx="43.689098"
>> + sodipodi:ry="43.689098"
>> + d="m 448.00267,556.62982 a 43.689098,43.689098 0 1 1
>> -87.3782,0 43.689098,43.689098 0 1 1 87.3782,0 z"
>> +
>> transform="matrix(-1.6401893,1.4273244,1.4417801,1.6638529,21.095744,-856.12693)"
>> />
>> + <linearGradient
>> + id="linearGradient3937-7-3">
>> + <stop
>> + id="stop3939-63-8"
>> + offset="0"
>> + style="stop-color:#84006b;stop-opacity:1;" />
>> + <stop
>> + style="stop-color:#ff0054;stop-opacity:1;"
>> + offset="0.4564395"
>> + id="stop3941-2-5" />
>> + <stop
>> + style="stop-color:#ff874e;stop-opacity:1;"
>> + offset="0.68263167"
>> + id="stop3943-6-4" />
>> + <stop
>> + id="stop3945-79-7"
>> + offset="1"
>> + style="stop-color:#ffd600;stop-opacity:1;" />
>> + </linearGradient>
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-7-2-0-93-6"
>> + is_visible="true"
>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.05"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <path
>> +
>> transform="matrix(2.0143715,1.9655455,-1.9655455,2.0143715,758.27155,-1351.7418)"
>> + d="m 448.00267,556.62982 a 43.689098,43.689098 0 1 1
>> -87.3782,0 43.689098,43.689098 0 1 1 87.3782,0 z"
>> + sodipodi:ry="43.689098"
>> + sodipodi:rx="43.689098"
>> + sodipodi:cy="556.62982"
>> + sodipodi:cx="404.31357"
>> + id="path3246-1"
>> + style="fill:#ffffff;stroke:none"
>> + sodipodi:type="arc" />
>> + <linearGradient
>> + id="linearGradient3937-4">
>> + <stop
>> + id="stop3939-8"
>> + offset="0"
>> + style="stop-color:#84006b;stop-opacity:1;" />
>> + <stop
>> + style="stop-color:#ff0054;stop-opacity:1;"
>> + offset="0.4564395"
>> + id="stop3941-3" />
>> + <stop
>> + style="stop-color:#ff874e;stop-opacity:1;"
>> + offset="0.68263167"
>> + id="stop3943-13" />
>> + <stop
>> + id="stop3945-4"
>> + offset="1"
>> + style="stop-color:#ffd600;stop-opacity:1;" />
>> + </linearGradient>
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-7-2-0-8"
>> + is_visible="true"
>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.05"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <linearGradient
>> + inkscape:collect="always"
>> + xlink:href="#linearGradient3937-4"
>> + id="linearGradient4434"
>> + gradientUnits="userSpaceOnUse"
>> + gradientTransform="translate(15.799636,-19.869239)"
>> + x1="251.11844"
>> + y1="932.42859"
>> + x2="311.44434"
>> + y2="853.43036" />
>> + <linearGradient
>> + id="linearGradient3937-4-8">
>> + <stop
>> + id="stop3939-8-2"
>> + offset="0"
>> + style="stop-color:#84006b;stop-opacity:1;" />
>> + <stop
>> + style="stop-color:#ff0054;stop-opacity:1;"
>> + offset="0.4564395"
>> + id="stop3941-3-6" />
>> + <stop
>> + style="stop-color:#ff874e;stop-opacity:1;"
>> + offset="0.68263167"
>> + id="stop3943-13-0" />
>> + <stop
>> + id="stop3945-4-5"
>> + offset="1"
>> + style="stop-color:#ffd600;stop-opacity:1;" />
>> + </linearGradient>
>> + <inkscape:path-effect
>> + effect="skeletal"
>> + id="path-effect3613-2-7-2-0-8-2"
>> + is_visible="true"
>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>> + copytype="single_stretched"
>> + prop_scale="0.05"
>> + scale_y_rel="false"
>> + spacing="0"
>> + normal_offset="0"
>> + tang_offset="0"
>> + prop_units="false"
>> + vertical_pattern="false"
>> + fuse_tolerance="0" />
>> + <path
>> +
>> transform="matrix(-1.6401893,1.4273244,1.4417801,1.6638529,21.095744,-856.12693)"
>> + d="m 448.00267,556.62982 a 43.689098,43.689098 0 1 1
>> -87.3782,0 43.689098,43.689098 0 1 1 87.3782,0 z"
>> + sodipodi:ry="43.689098"
>> + sodipodi:rx="43.689098"
>> + sodipodi:cy="556.62982"
>> + sodipodi:cx="404.31357"
>> + id="path3246-9"
>> + style="fill:none;stroke:none"
>> + sodipodi:type="arc" />
>> + <path
>> + sodipodi:type="arc"
>> + style="opacity:0.52325583;fill:#ff0000;stroke:none"
>> + id="path4578-2"
>> + sodipodi:cx="148.62184"
>> + sodipodi:cy="647.12219"
>> + sodipodi:rx="87.683502"
>> + sodipodi:ry="87.683502"
>> + d="m 236.30534,647.12219 a 87.683502,87.683502 0 1 1
>> -175.367001,0 87.683502,87.683502 0 1 1 175.367001,0 z"
>> +
>> transform="matrix(-0.99647677,0.49346663,0.49346663,0.99647677,-9.4098434,-69.007821)"
>> />
>> + <linearGradient
>> + inkscape:collect="always"
>> + xlink:href="#linearGradient3937-7"
>> + id="linearGradient4680"
>> + gradientUnits="userSpaceOnUse"
>> + gradientTransform="translate(15.799636,-19.869239)"
>> + x1="251.11844"
>> + y1="932.42859"
>> + x2="311.44434"
>> + y2="853.43036" />
>> + <linearGradient
>> + inkscape:collect="always"
>> + xlink:href="#linearGradient3937-4-8"
>> + id="linearGradient4682"
>> + gradientUnits="userSpaceOnUse"
>> + gradientTransform="translate(15.799636,-19.869239)"
>> + x1="251.11844"
>> + y1="932.42859"
>> + x2="311.44434"
>> + y2="853.43036" />
>> + <linearGradient
>> + inkscape:collect="always"
>> + xlink:href="#linearGradient3937-4-8"
>> + id="linearGradient3258"
>> + gradientUnits="userSpaceOnUse"
>> + gradientTransform="translate(15.799636,-19.869239)"
>> + x1="251.11844"
>> + y1="932.42859"
>> + x2="311.44434"
>> + y2="853.43036" />
>> + </defs>
>> + <sodipodi:namedview
>> + id="base"
>> + pagecolor="#ffffff"
>> + bordercolor="#666666"
>> + borderopacity="1.0"
>> + inkscape:pageopacity="0.0"
>> + inkscape:pageshadow="2"
>> + inkscape:zoom="2.8284271"
>> + inkscape:cx="140.28115"
>> + inkscape:cy="51.274541"
>> + inkscape:document-units="px"
>> + inkscape:current-layer="g3159-19"
>> + showgrid="false"
>> + inkscape:window-width="1920"
>> + inkscape:window-height="1014"
>> + inkscape:window-x="0"
>> + inkscape:window-y="27"
>> + inkscape:window-maximized="1" />
>> + <metadata
>> + id="metadata3622">
>> + <rdf:RDF>
>> + <cc:Work
>> + rdf:about="">
>> + <dc:format>image/svg+xml</dc:format>
>> + <dc:type
>> + rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
>> + <dc:title />
>> + </cc:Work>
>> + </rdf:RDF>
>> + </metadata>
>> + <g
>> + inkscape:label="Calque 1"
>> + inkscape:groupmode="layer"
>> + id="layer1"
>> + transform="translate(0,-949.36218)">
>> + <path
>> + sodipodi:type="arc"
>> + style="opacity:0.52325583;fill:none;stroke:none"
>> + id="path4619"
>> + sodipodi:cx="148.62184"
>> + sodipodi:cy="647.12219"
>> + sodipodi:rx="87.683502"
>> + sodipodi:ry="87.683502"
>> + d="m 236.30534,647.12219 c 0,48.42626 -39.25724,87.6835
>> -87.6835,87.6835 -48.42626,0 -87.683501,-39.25724 -87.683501,-87.6835
>> 0,-48.42626 39.257241,-87.6835 87.683501,-87.6835 48.42626,0
>> 87.6835,39.25724 87.6835,87.6835 z"
>> +
>> transform="matrix(-1.0183226,0.44664768,0.44664768,1.0183226,-32.11227,-609.65199)"
>> />
>> + <g
>> + id="g3159-19"
>> + transform="matrix(1.2352163,0,0,1.2352163,-606.5521,240.78373)">
>> + <g
>> + id="g3083">
>> + <path
>> +
>> sodipodi:nodetypes="ssscccscccccsscsccsssssscscscccsccssssssccsssssssssccssscccsscccccsccssscscsssscsccscscccscccssssssccccscssscssccccscccscscccsccssccsssccsccc"
>> + inkscape:connector-curvature="0"
>> + id="path5269-3-3-7-1-7-9-0"
>> + d="m 536.69763,655.64671 c -0.47541,-0.0893
>> -0.93295,-0.34032 -1.01645,-0.55806 -0.66388,-1.73043
>> 0.88083,-8.13365 1.97209,-8.17456 1.9798,-0.0743 6.66894,-0.67975
>> 7.58065,-0.97894 1.37989,-0.45292 2.82951,-2.10011 3.34932,-2.58638
>> 0.73,-0.8807 2.31717,-4.89066 2.84519,-6.94914 1.26742,-5.06511
>> 4.1797,-17.96751 6.38008,-28.26613 3.13357,-14.66661
>> 3.80662,-17.10614 5.76495,-20.89934 0.54732,-1.06034 1.5739,-2.5771
>> 2.28098,-3.37057 1.40184,-1.68467 1.51285,-1.70825 2.69291,-2.68838
>> 0.5828,-0.53494 1.14483,-0.89996 1.84298,-1.29711 2.17962,-1.2387
>> 1.77686,-0.90778 2.87801,-1.38454 2.04545,-0.93215 5.14427,-1.78064
>> 7.97064,-2.18244 2.50106,-0.35557 9.34544,-0.33399 10.23303,0.0323
>> 0.39432,0.16266 0.78019,0.28481 0.85766,0.27142 0.42569,-0.0736
>> -0.68946,6.21094 -1.30676,7.36426 -0.31686,0.5924 -1.51985,0.93479
>> -3.92704,1.11786 -1.7952,0.22853 -2.73249,0.0625 -4.48884,0.68135
>> -0.33519,0.2003 -1.39725,0.57449 -2.62486,1.73561 -1.67454,1.58361
>> -2.42239,3.18739 -3.5846,7.!
>> 68718 -0.
>> 73193,2.83322 -3.68934,15.57009 -3.68934,15.88847 0,0.0548
>> 1.52154,0.0997 3.38117,0.0997 4.3409,0 4.51297,0.0963 4.51297,2.52758
>> 0,0.95412 -0.18582,2.75245 -0.41194,3.9963 -0.22684,1.24385
>> -0.43486,2.4652 -0.46261,2.71413 -0.10136,0.91171 -1.00921,1.18038
>> -5.21546,1.54432 -2.26312,0.19571 -4.14664,0.39955 -4.18598,0.45279
>> -0.0386,0.0533 -0.73097,3.06738 -1.53722,6.69807 -1.68105,7.57168
>> -2.87367,11.89152 -3.9186,14.19627 -0.40204,0.8864 -0.93198,1.70195
>> -0.97011,1.84201 -0.44235,0.74009 -0.89289,1.41907 -1.32003,1.99226
>> -1.52009,2.04364 -2.8172,3.22697 -4.91453,4.48327 -4.36697,2.61569
>> -6.64023,3.3084 -15.3761,4.12364 -2.55053,0.11559 -3.81096,-0.0326
>> -5.59216,-0.11318 z m -26.25129,-9.17904 c -4.90415,-0.77566
>> -8.90841,-2.77692 -12.22659,-6.11057 -1.57439,-1.58184
>> -3.21611,-3.44816 -3.03318,-3.44816 0.0579,0 -0.2365,-0.55333
>> -0.65326,-1.22961 -3.50521,-5.69675 -4.02092,-16.15759
>> -1.20758,-24.49004 0.78768,-2.33274 3.51631,-7.13798 5.26541,-9.27279
>> 1.86205,-2.27243 4.55158,!
>> -4.83303
>> 6.57652,-6.2611 1.04806,-0.78063 1.83115,-1.24347 2.59928,-1.77836
>> 1.15159,-0.82003 5.74251,-2.94551 8.02711,-3.71636 3.47359,-1.17208
>> 7.55242,-1.88861 11.71378,-2.05773 6.87648,-0.27948 10.6358,0.58885
>> 14.9463,3.45231 2.98299,1.98157 4.79001,4.022 6.22684,7.03102
>> 3.85537,8.07356 2.8838,20.73125 -2.3261,30.30567 -2.35917,4.33557
>> -6.17448,8.92132 -9.34762,11.23548 -6.44765,4.70219 -12.83522,6.74419
>> -20.92024,6.68765 -1.98198,-0.0145 -4.52021,-0.17013
>> -5.64067,-0.34741 z m 72.57528,-1.58746 c -2.04931,-0.18486
>> -3.64662,-0.62298 -4.10055,-1.12447 -0.44572,-0.49242
>> -0.44717,-0.61783 -0.0386,-3.01658 0.97808,-5.73189 7.11925,-33.74241
>> 9.89277,-45.12283 0.91051,-3.73616 1.42598,-5.39016 1.77975,-5.7102
>> 0.81664,-0.7391 3.38576,-1.13054 8.51361,-1.2972 4.2299,-0.13756
>> 4.94735,-0.10353 5.66601,0.26808 0.47238,0.22994 0.95026,0.64221
>> 1.03021,1.07835 0.0663,0.50763 0.0458,0.57315 -0.15204,1.44919
>> -0.29301,1.29747 -4.39351,16.9667 -4.77456,18.25683 -0.0989,0.33457
>> 0.76861,0.37116 6.987!
>> 97,0.2948
>> 6.60234,-0.0811 7.49354,-0.0292 10.20939,0.59399 1.94106,0.54607
>> 3.69563,1.41926 4.94129,2.25974 2.93979,1.95942 4.81778,4.55687
>> 5.78283,7.31325 0.47709,1.36229 0.57386,2.18474 0.58231,4.94455
>> -0.16169,2.99735 -0.27825,3.32654 -0.77609,5.26744 -0.43245,1.07632
>> -1.24643,2.63114 -1.80896,3.45514 -1.75296,2.56803 -5.61364,5.83329
>> -8.19072,7.05607 -1.48268,0.77344 -2.37944,1.10308 -4.2229,1.76201
>> -3.62514,1.29125 -7.03261,1.93061 -11.71402,2.19806 -3.8573,0.22033
>> -17.41793,0.27139 -19.60793,0.0738 z m 20.06909,-10.0422 c
>> 1.81258,-0.30498 3.76777,-1.32377 4.43068,-1.78313 1.07606,-0.68306
>> 2.44629,-1.65139 3.20935,-2.52558 1.10477,-1.29076 1.44479,-2.34138
>> 1.44673,-4.47079 0,-1.45553 -0.13997,-1.91796 -0.92306,-2.895
>> -0.76234,-0.95136 -1.14532,-1.4439 -2.41419,-1.84771
>> -1.49306,-0.47514 -1.76045,-0.57714 -5.6163,-0.57714 -2.19386,0
>> -4.07472,0.0854 -4.17898,0.18968 -0.15444,0.1542 -2.20303,9.16482
>> -2.5042,11.01491 -0.0458,0.28013 -0.14962,0.68121 -0.23167,0.89128
>> -0.082,0.21019 -!
>> 0.20029,0
>> .74737 -0.26376,1.19399 -0.0869,0.56201 -0.1641,0.71791
>> -0.29417,1.10234 0.1641,0.32716 4.80738,0.13321 7.33957,-0.29285 z m
>> 44.76964,9.61547 c -0.20195,-0.34127 -0.53984,-0.89215
>> -0.53984,-1.28041 0,-0.61928 1.01428,-2.14273 1.97595,-3.41645
>> 0.48675,-0.63465 0.58304,-0.7077 0.744,-0.96587 3.18111,-4.33538
>> 3.3259,-4.3799 5.95197,-7.85451 0.89386,-0.88655 1.41729,-1.66817
>> 2.00611,-2.52732 0.28187,-0.41134 1.02514,-1.59635 2.51869,-3.472
>> 2.34348,-3.26401 0.43775,-0.56351 2.17914,-2.98866 l 1.93806,-2.61017
>> -5.17975,0 c -6.38225,0 -6.1624,0.1197 -5.95776,-3.24248
>> 0.19306,-3.14918 0.6897,-5.52258 1.32582,-6.32042 0.40953,-0.51351
>> 0.88831,-0.73736 1.92913,-0.90189 2.26602,-0.35822 16.79531,-0.80025
>> 23.1042,-0.70293 5.42131,0.0835 5.9054,0.12863 6.42232,0.59629
>> 0.83642,0.757 0.40952,1.94713 -1.182,4.66012 -0.66702,0.72773
>> -0.862,1.31755 -1.61541,2.60085 -0.78285,1.04976 -3.58798,4.98416
>> -3.87998,5.33393 -0.68222,0.76323 -1.27008,1.76785 -1.92913,2.65068
>> -0.35161,0.4792 -1.73415,2!
>> .13817 -3
>> .72699,4.82621 l -3.62369,4.88735 7.2375,0.12742 c 9.10798,0.16024
>> 8.56501,-0.24552 7.16558,5.35405 -0.43679,1.7472 -0.81808,3.40593
>> -0.84728,3.68603 -0.029,0.28013 -0.41459,0.75404 -0.85573,1.05313
>> -0.75558,0.51197 -1.20975,0.55268 -7.74717,0.69431 -3.81965,0.0828
>> -11.42903,0.20368 -16.90946,0.26891 l -9.84989,0.11713 c
>> -0.38581,0.0217 -0.48811,-0.2746 -0.65439,-0.5733 z m
>> -12.89023,0.16578 c -0.28018,-0.0717 -0.79588,-0.33358
>> -1.14604,-0.58194 -0.34871,-0.29297 -0.36874,-0.24963
>> -0.96336,-0.76297 -0.45899,-0.50448 -0.38732,-0.41305
>> -0.62165,-0.76318 -1.18706,-1.77423 -1.36828,-3.60247
>> -1.08574,-6.6209 l 0.62986,-4.18934 1.35505,-8.41584 c
>> 1.87292,-11.63219 3.0393,-12.65642 3.94683,-13.03008
>> 14.10312,-0.58324 0.0684,0.0168 14.11639,-0.6264 1.83129,2.9e-4
>> 1.51695,-0.2997 -2.48297,16.07566 -2.78582,11.40408 -3.7096,15.37571
>> -4.14664,17.8255 l -0.20512,1.14591 -4.44854,0.0369 c -2.44676,0.0193
>> -4.67779,-0.0217 -4.95772,-0.0934 z m 9.03993,-42.69064 c
>> -2.47017,-0.71943 -4.1582!
>> 2,-2.1758
>> 8 -4.47435,-3.86022 -0.30986,-1.65197 -0.002,-3.57265
>> 0.72686,-4.52754 0.56855,-0.87325 0.83425,-0.95878 1.35816,-1.48348
>> 1.64437,-1.36992 5.10349,-2.5134 8.24092,-2.5134 3.12971,0
>> 5.91915,1.07664 7.02489,2.7114 0.64868,0.95885 0.58159,4.12316
>> 0.0628,5.31006 -0.61876,1.41622 -1.31304,2.05428 -2.42867,2.74673
>> -0.88493,0.64274 -1.82054,0.86316 -2.7436,1.20149 -1.89872,0.69962
>> -6.03137,0.92043 -7.76696,0.41496 z"
>> + style="fill:#ffffff;fill-opacity:1" />
>> + <g
>> + id="g4106-5"
>> + transform="translate(227.38698,-258.89584)">
>> + <path
>> + style="fill:url(#linearGradient3258);fill-opacity:1;stroke:none"
>> + d="m 274.4202,915.83816 c -0.57022,-0.5701
>> 0.12725,-5.7981 1.3807,-10.3461 0.31753,-1.1525 1.16983,-3.7056
>> 1.89397,-5.6735 1.43464,-3.8983 1.59401,-4.86 0.80655,-4.86
>> -1.12196,0 -2.45752,-1.1724 -3.358,-2.9483 -0.84048,-1.6576
>> -0.92774,-2.1304 -0.92774,-5.0389 0,-10.2837 6.65933,-24.67072
>> 16.05068,-34.67716 4.73112,-5.04105 15.17111,-11.68326
>> 23.19872,-14.75984 7.48224,-2.86755 11.08323,-3.96154
>> 12.99385,-3.94748 l 1.94911,0.0151 -1.43857,1.17101 c
>> -3.79248,3.08658 -8.5533,9.22483 -11.14049,14.36281 -2.21029,4.38984
>> -5.05108,12.23644 -7.56162,20.88541 -2.66658,9.1869 -3.83702,12.4257
>> -6.14456,17.0055 -3.10984,6.1713 -5.55039,9.0032 -9.5083,11.0335
>> -2.17756,1.117 -5.05077,0.9365 -7.97004,-0.5007 -1.11893,-0.5509
>> -2.19574,-1.0016 -2.39268,-1.0016 -0.19694,0 -1.28891,1.8577
>> -2.42692,4.1283 -1.99001,3.9717 -3.27982,7.9065 -4.32997,13.2109
>> -0.3551,1.7935 -0.66415,2.3521 -1.07469,1.9418 z"
>> + id="path5333-2-0-0-8-0-0"
>> + inkscape:connector-curvature="0" />
>> + <path
>> + sodipodi:nodetypes="cc"
>> + inkscape:connector-curvature="0"
>> + inkscape:original-d="m 293.31501,866.36406 c 0,0
>> 6.29839,-23.02314 33.92737,-32.42467"
>> + inkscape:path-effect="#path-effect3613-2-7-2-0-8-2"
>> + id="path3611-1-3-8-9-9"
>> + d="m 293.075,866.29409 0.48004,0.13988 c 0.002,-0.006
>> 0.003,-0.0119 0.005,-0.0179 0.005,-0.0167 0.009,-0.0334
>> 0.0141,-0.0501 0.0185,-0.0648 0.0378,-0.12966 0.0575,-0.1946 0,-1e-5
>> 0,-1e-5 0,-1e-5 0.0756,-0.24869 0.15714,-0.49642 0.24215,-0.74378
>> 0.31727,-0.92326 0.68052,-1.83208 1.07312,-2.72925 0,0 0,0 0,0
>> 1.37731,-3.14725 3.11649,-6.13655 5.12397,-8.93212 0,0 0,0 0,0
>> 6.6322,-9.23764 16.38661,-16.09495 27.17154,-19.82681
>> -10.82274,3.62075 -20.67946,10.38748 -27.45648,19.61995 0,0 0,0 0,0
>> -2.04968,2.79284 -3.83397,5.78812 -5.25823,8.95292 0,0 0,0 0,0
>> -0.40597,0.90207 -0.78333,1.81896 -1.11555,2.75396 0,10e-6 0,10e-6
>> 0,10e-6 -0.089,0.25049 -0.17495,0.50294 -0.2554,0.75803 0,0 0,0 0,0
>> -0.0208,0.0661 -0.0414,0.13258 -0.0613,0.19948 -0.005,0.0172
>> -0.0102,0.0345 -0.0152,0.0518 -0.002,0.006 -0.004,0.0123
>> -0.005,0.0185 z"
>> +
>> style="fill:#000000;fill-opacity:0.53571424;fill-rule:evenodd;stroke:none"
>> />
>> + </g>
>> + </g>
>> + </g>
>> + <text
>> + xml:space="preserve"
>> +
>> style="font-size:29.00352478px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#034460;fill-opacity:1;stroke:none;font-family:Sans"
>> + id="text3248-0-4"
>> + sodipodi:linespacing="125%"
>> + transform="translate(-430.59109,-502.35325)"><textPath
>> + xlink:href="#path4619"
>> + id="textPath4636"
>> + style="font-size:16px">CommunautÃ©
>> francophone</textPath></text>
>> + </g>
>> +</svg>
>>
>>
>>
>

Jacques Le Roux

Re: svn commit: r1683430 - in /ofbiz/branches/boostrap_theme/themes/bootstrap: data/BootstrapThemeData.xml includes/appbar.ftl includes/header.ftl webapp/bootstrap/css/skins/tomahawk.css webapp/bootstrap/images/Logo-OFBiz.svg

Administrator

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?

> 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, [hidden email] 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>
>>> - 
>>> - <#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>
>>> - 
>>> - <#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>
>>> + 
>>> + <#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>
>>> + 
>>> + <#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> 
>>> </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"?>
>>> +
>>> +
>>> +<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
>>> + id="linearGradient4042">
>>> + <stop
>>> + style="stop-color:#ea0359;stop-opacity:1;"
>>> + offset="0"
>>> + id="stop4052" />
>>> + <stop
>>> + style="stop-color:#ea0377;stop-opacity:1"
>>> + offset="1"
>>> + id="stop4046" />
>>> + </linearGradient>
>>> + <linearGradient
>>> + id="linearGradient4032">
>>> + <stop
>>> + style="stop-color:#ff0000;stop-opacity:1;"
>>> + offset="0"
>>> + id="stop4034" />
>>> + <stop
>>> + style="stop-color:#fdfbd6;stop-opacity:1"
>>> + offset="1"
>>> + id="stop4036" />
>>> + </linearGradient>
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect5021"
>>> + is_visible="true"
>>> + pattern="m 265.71429,6.7857142 c 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 0,2.76 -2.24,4.9999998 -5,4.9999998 -2.76,0 -5,-2.2399998
>>> -5,-4.9999998 z"
>>> + copytype="single_stretched"
>>> + prop_scale="1"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="spiro"
>>> + id="path-effect5019"
>>> + is_visible="true" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect5015"
>>> + is_visible="true"
>>> + pattern="M 0,5 C 0,2.24 2.24,0 5,0 7.76,0 10,2.24 10,5 10,7.76 7.76,10 5,10 2.24,10 0,7.76 0,5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="1"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="spiro"
>>> + id="path-effect5013"
>>> + is_visible="true" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect4994"
>>> + is_visible="true"
>>> + pattern="M 0,5 C 0,2.24 2.24,0 5,0 7.76,0 10,2.24 10,5 10,7.76 7.76,10 5,10 2.24,10 0,7.76 0,5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="1"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613"
>>> + is_visible="true"
>>> + pattern="M 0,0 0,10 10,5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.07"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2"
>>> + is_visible="true"
>>> + pattern="M 0,0 0,10 10,5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.07"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-7"
>>> + is_visible="true"
>>> + pattern="M 0,0 0,10 10,5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.07"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-7-2"
>>> + is_visible="true"
>>> + pattern="M 0,0 0,10 10,5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.07"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-7-2-2"
>>> + is_visible="true"
>>> + pattern="M 0,0 0,10 10,5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.07"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-7-2-2-1"
>>> + is_visible="true"
>>> + pattern="M 0,0 0,10 10,5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.07"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-7-2-2-1-9"
>>> + is_visible="true"
>>> + pattern="m 156.08125,211.61936 0,10 10,-5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.07"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-7-2-2-1-9-5"
>>> + is_visible="true"
>>> + pattern="M 0,0 0,10 10,5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.07"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-7-2-2-1-9-5-6"
>>> + is_visible="true"
>>> + pattern="M 0,0 0,10 10,5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.07"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-3"
>>> + is_visible="true"
>>> + pattern="M 0,0 0,10 10,5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.07"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-3-9"
>>> + is_visible="true"
>>> + pattern="M 0,0 0,10 10,5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.07"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-3-9-6"
>>> + is_visible="true"
>>> + pattern="M 0,0 0,10 10,5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.07"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-7-2-24"
>>> + is_visible="true"
>>> + pattern="M 0,0 0,10 10,5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.07"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-7-2-24-3"
>>> + is_visible="true"
>>> + pattern="m -56.428571,100.71429 0,10 10,-5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.07"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-7-2-24-9"
>>> + is_visible="true"
>>> + pattern="M 0,0 0,10 10,5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.07"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-7-2-0"
>>> + is_visible="true"
>>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.05"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <linearGradient
>>> + inkscape:collect="always"
>>> + xlink:href="#linearGradient4062"
>>> + id="linearGradient4068"
>>> + x1="251.11844"
>>> + y1="932.42859"
>>> + x2="311.44434"
>>> + y2="853.43036"
>>> + gradientUnits="userSpaceOnUse" />
>>> + <linearGradient
>>> + inkscape:collect="always"
>>> + xlink:href="#linearGradient4062"
>>> + id="linearGradient4082"
>>> + gradientUnits="userSpaceOnUse"
>>> + x1="251.11844"
>>> + y1="932.42859"
>>> + x2="311.44434"
>>> + y2="853.43036" />
>>> + <linearGradient
>>> + inkscape:collect="always"
>>> + xlink:href="#linearGradient4062"
>>> + id="linearGradient4086"
>>> + gradientUnits="userSpaceOnUse"
>>> + x1="251.11844"
>>> + y1="932.42859"
>>> + x2="311.44434"
>>> + y2="853.43036"
>>> + gradientTransform="translate(15.799636,-19.869239)" />
>>> + <path
>>> + sodipodi:type="arc"
>>> + style="fill:none;stroke:none"
>>> + id="path3246-2"
>>> + sodipodi:cx="404.31357"
>>> + sodipodi:cy="556.62982"
>>> + sodipodi:rx="43.689098"
>>> + sodipodi:ry="43.689098"
>>> + d="m 448.00267,556.62982 a 43.689098,43.689098 0 1 1 -87.3782,0 43.689098,43.689098 0 1 1 87.3782,0 z"
>>> + transform="matrix(2.0143715,1.9655455,-1.9655455,2.0143715,758.27155,-1351.7418)" />
>>> + <linearGradient
>>> + id="linearGradient3937-3">
>>> + <stop
>>> + id="stop3939-2"
>>> + offset="0"
>>> + style="stop-color:#84006b;stop-opacity:1;" />
>>> + <stop
>>> + style="stop-color:#ff0054;stop-opacity:1;"
>>> + offset="0.4564395"
>>> + id="stop3941-5" />
>>> + <stop
>>> + style="stop-color:#ff874e;stop-opacity:1;"
>>> + offset="0.68263167"
>>> + id="stop3943-4" />
>>> + <stop
>>> + id="stop3945-7"
>>> + offset="1"
>>> + style="stop-color:#ffd600;stop-opacity:1;" />
>>> + </linearGradient>
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-7-2-0-9"
>>> + is_visible="true"
>>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.05"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <linearGradient
>>> + id="linearGradient3937-9">
>>> + <stop
>>> + id="stop3939-6"
>>> + offset="0"
>>> + style="stop-color:#84006b;stop-opacity:1;" />
>>> + <stop
>>> + style="stop-color:#ff0054;stop-opacity:1;"
>>> + offset="0.4564395"
>>> + id="stop3941-9" />
>>> + <stop
>>> + style="stop-color:#ff874e;stop-opacity:1;"
>>> + offset="0.68263167"
>>> + id="stop3943-1" />
>>> + <stop
>>> + id="stop3945-8"
>>> + offset="1"
>>> + style="stop-color:#ffd600;stop-opacity:1;" />
>>> + </linearGradient>
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-7-2-0-2"
>>> + is_visible="true"
>>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.05"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <linearGradient
>>> + id="linearGradient3937-7">
>>> + <stop
>>> + id="stop3939-63"
>>> + offset="0"
>>> + style="stop-color:#84006b;stop-opacity:1;" />
>>> + <stop
>>> + style="stop-color:#ff0054;stop-opacity:1;"
>>> + offset="0.4564395"
>>> + id="stop3941-2" />
>>> + <stop
>>> + style="stop-color:#ff874e;stop-opacity:1;"
>>> + offset="0.68263167"
>>> + id="stop3943-6" />
>>> + <stop
>>> + id="stop3945-79"
>>> + offset="1"
>>> + style="stop-color:#ffd600;stop-opacity:1;" />
>>> + </linearGradient>
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-7-2-0-93"
>>> + is_visible="true"
>>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.05"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <path
>>> + sodipodi:type="arc"
>>> + style="fill:none;stroke:none"
>>> + id="path3246-7"
>>> + sodipodi:cx="404.31357"
>>> + sodipodi:cy="556.62982"
>>> + sodipodi:rx="43.689098"
>>> + sodipodi:ry="43.689098"
>>> + d="m 448.00267,556.62982 a 43.689098,43.689098 0 1 1 -87.3782,0 43.689098,43.689098 0 1 1 87.3782,0 z"
>>> + transform="matrix(-1.6401893,1.4273244,1.4417801,1.6638529,21.095744,-856.12693)" />
>>> + <linearGradient
>>> + id="linearGradient3937-7-3">
>>> + <stop
>>> + id="stop3939-63-8"
>>> + offset="0"
>>> + style="stop-color:#84006b;stop-opacity:1;" />
>>> + <stop
>>> + style="stop-color:#ff0054;stop-opacity:1;"
>>> + offset="0.4564395"
>>> + id="stop3941-2-5" />
>>> + <stop
>>> + style="stop-color:#ff874e;stop-opacity:1;"
>>> + offset="0.68263167"
>>> + id="stop3943-6-4" />
>>> + <stop
>>> + id="stop3945-79-7"
>>> + offset="1"
>>> + style="stop-color:#ffd600;stop-opacity:1;" />
>>> + </linearGradient>
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-7-2-0-93-6"
>>> + is_visible="true"
>>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.05"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <path
>>> + transform="matrix(2.0143715,1.9655455,-1.9655455,2.0143715,758.27155,-1351.7418)"
>>> + d="m 448.00267,556.62982 a 43.689098,43.689098 0 1 1 -87.3782,0 43.689098,43.689098 0 1 1 87.3782,0 z"
>>> + sodipodi:ry="43.689098"
>>> + sodipodi:rx="43.689098"
>>> + sodipodi:cy="556.62982"
>>> + sodipodi:cx="404.31357"
>>> + id="path3246-1"
>>> + style="fill:#ffffff;stroke:none"
>>> + sodipodi:type="arc" />
>>> + <linearGradient
>>> + id="linearGradient3937-4">
>>> + <stop
>>> + id="stop3939-8"
>>> + offset="0"
>>> + style="stop-color:#84006b;stop-opacity:1;" />
>>> + <stop
>>> + style="stop-color:#ff0054;stop-opacity:1;"
>>> + offset="0.4564395"
>>> + id="stop3941-3" />
>>> + <stop
>>> + style="stop-color:#ff874e;stop-opacity:1;"
>>> + offset="0.68263167"
>>> + id="stop3943-13" />
>>> + <stop
>>> + id="stop3945-4"
>>> + offset="1"
>>> + style="stop-color:#ffd600;stop-opacity:1;" />
>>> + </linearGradient>
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-7-2-0-8"
>>> + is_visible="true"
>>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.05"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <linearGradient
>>> + inkscape:collect="always"
>>> + xlink:href="#linearGradient3937-4"
>>> + id="linearGradient4434"
>>> + gradientUnits="userSpaceOnUse"
>>> + gradientTransform="translate(15.799636,-19.869239)"
>>> + x1="251.11844"
>>> + y1="932.42859"
>>> + x2="311.44434"
>>> + y2="853.43036" />
>>> + <linearGradient
>>> + id="linearGradient3937-4-8">
>>> + <stop
>>> + id="stop3939-8-2"
>>> + offset="0"
>>> + style="stop-color:#84006b;stop-opacity:1;" />
>>> + <stop
>>> + style="stop-color:#ff0054;stop-opacity:1;"
>>> + offset="0.4564395"
>>> + id="stop3941-3-6" />
>>> + <stop
>>> + style="stop-color:#ff874e;stop-opacity:1;"
>>> + offset="0.68263167"
>>> + id="stop3943-13-0" />
>>> + <stop
>>> + id="stop3945-4-5"
>>> + offset="1"
>>> + style="stop-color:#ffd600;stop-opacity:1;" />
>>> + </linearGradient>
>>> + <inkscape:path-effect
>>> + effect="skeletal"
>>> + id="path-effect3613-2-7-2-0-8-2"
>>> + is_visible="true"
>>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>>> + copytype="single_stretched"
>>> + prop_scale="0.05"
>>> + scale_y_rel="false"
>>> + spacing="0"
>>> + normal_offset="0"
>>> + tang_offset="0"
>>> + prop_units="false"
>>> + vertical_pattern="false"
>>> + fuse_tolerance="0" />
>>> + <path
>>> + transform="matrix(-1.6401893,1.4273244,1.4417801,1.6638529,21.095744,-856.12693)"
>>> + d="m 448.00267,556.62982 a 43.689098,43.689098 0 1 1 -87.3782,0 43.689098,43.689098 0 1 1 87.3782,0 z"
>>> + sodipodi:ry="43.689098"
>>> + sodipodi:rx="43.689098"
>>> + sodipodi:cy="556.62982"
>>> + sodipodi:cx="404.31357"
>>> + id="path3246-9"
>>> + style="fill:none;stroke:none"
>>> + sodipodi:type="arc" />
>>> + <path
>>> + sodipodi:type="arc"
>>> + style="opacity:0.52325583;fill:#ff0000;stroke:none"
>>> + id="path4578-2"
>>> + sodipodi:cx="148.62184"
>>> + sodipodi:cy="647.12219"
>>> + sodipodi:rx="87.683502"
>>> + sodipodi:ry="87.683502"
>>> + d="m 236.30534,647.12219 a 87.683502,87.683502 0 1 1 -175.367001,0 87.683502,87.683502 0 1 1 175.367001,0 z"
>>> + transform="matrix(-0.99647677,0.49346663,0.49346663,0.99647677,-9.4098434,-69.007821)" />
>>> + <linearGradient
>>> + inkscape:collect="always"
>>> + xlink:href="#linearGradient3937-7"
>>> + id="linearGradient4680"
>>> + gradientUnits="userSpaceOnUse"
>>> + gradientTransform="translate(15.799636,-19.869239)"
>>> + x1="251.11844"
>>> + y1="932.42859"
>>> + x2="311.44434"
>>> + y2="853.43036" />
>>> + <linearGradient
>>> + inkscape:collect="always"
>>> + xlink:href="#linearGradient3937-4-8"
>>> + id="linearGradient4682"
>>> + gradientUnits="userSpaceOnUse"
>>> + gradientTransform="translate(15.799636,-19.869239)"
>>> + x1="251.11844"
>>> + y1="932.42859"
>>> + x2="311.44434"
>>> + y2="853.43036" />
>>> + <linearGradient
>>> + inkscape:collect="always"
>>> + xlink:href="#linearGradient3937-4-8"
>>> + id="linearGradient3258"
>>> + gradientUnits="userSpaceOnUse"
>>> + gradientTransform="translate(15.799636,-19.869239)"
>>> + x1="251.11844"
>>> + y1="932.42859"
>>> + x2="311.44434"
>>> + y2="853.43036" />
>>> + </defs>
>>> + <sodipodi:namedview
>>> + id="base"
>>> + pagecolor="#ffffff"
>>> + bordercolor="#666666"
>>> + borderopacity="1.0"
>>> + inkscape:pageopacity="0.0"
>>> + inkscape:pageshadow="2"
>>> + inkscape:zoom="2.8284271"
>>> + inkscape:cx="140.28115"
>>> + inkscape:cy="51.274541"
>>> + inkscape:document-units="px"
>>> + inkscape:current-layer="g3159-19"
>>> + showgrid="false"
>>> + inkscape:window-width="1920"
>>> + inkscape:window-height="1014"
>>> + inkscape:window-x="0"
>>> + inkscape:window-y="27"
>>> + inkscape:window-maximized="1" />
>>> + <metadata
>>> + id="metadata3622">
>>> + <rdf:RDF>
>>> + <cc:Work
>>> + rdf:about="">
>>> + <dc:format>image/svg+xml</dc:format>
>>> + <dc:type
>>> + rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
>>> + <dc:title />
>>> + </cc:Work>
>>> + </rdf:RDF>
>>> + </metadata>
>>> + <g
>>> + inkscape:label="Calque 1"
>>> + inkscape:groupmode="layer"
>>> + id="layer1"
>>> + transform="translate(0,-949.36218)">
>>> + <path
>>> + sodipodi:type="arc"
>>> + style="opacity:0.52325583;fill:none;stroke:none"
>>> + id="path4619"
>>> + sodipodi:cx="148.62184"
>>> + sodipodi:cy="647.12219"
>>> + sodipodi:rx="87.683502"
>>> + sodipodi:ry="87.683502"
>>> + d="m 236.30534,647.12219 c 0,48.42626 -39.25724,87.6835 -87.6835,87.6835 -48.42626,0 -87.683501,-39.25724 -87.683501,-87.6835 0,-48.42626
>>> 39.257241,-87.6835 87.683501,-87.6835 48.42626,0 87.6835,39.25724 87.6835,87.6835 z"
>>> + transform="matrix(-1.0183226,0.44664768,0.44664768,1.0183226,-32.11227,-609.65199)" />
>>> + <g
>>> + id="g3159-19"
>>> + transform="matrix(1.2352163,0,0,1.2352163,-606.5521,240.78373)">
>>> + <g
>>> + id="g3083">
>>> + <path
>>> +
>>> sodipodi:nodetypes="ssscccscccccsscsccsssssscscscccsccssssssccsssssssssccssscccsscccccsccssscscsssscsccscscccscccssssssccccscssscssccccscccscscccsccssccsssccsccc"
>>> + inkscape:connector-curvature="0"
>>> + id="path5269-3-3-7-1-7-9-0"
>>> + d="m 536.69763,655.64671 c -0.47541,-0.0893 -0.93295,-0.34032 -1.01645,-0.55806 -0.66388,-1.73043 0.88083,-8.13365 1.97209,-8.17456
>>> 1.9798,-0.0743 6.66894,-0.67975 7.58065,-0.97894 1.37989,-0.45292 2.82951,-2.10011 3.34932,-2.58638 0.73,-0.8807 2.31717,-4.89066 2.84519,-6.94914
>>> 1.26742,-5.06511 4.1797,-17.96751 6.38008,-28.26613 3.13357,-14.66661 3.80662,-17.10614 5.76495,-20.89934 0.54732,-1.06034 1.5739,-2.5771
>>> 2.28098,-3.37057 1.40184,-1.68467 1.51285,-1.70825 2.69291,-2.68838 0.5828,-0.53494 1.14483,-0.89996 1.84298,-1.29711 2.17962,-1.2387
>>> 1.77686,-0.90778 2.87801,-1.38454 2.04545,-0.93215 5.14427,-1.78064 7.97064,-2.18244 2.50106,-0.35557 9.34544,-0.33399 10.23303,0.0323
>>> 0.39432,0.16266 0.78019,0.28481 0.85766,0.27142 0.42569,-0.0736 -0.68946,6.21094 -1.30676,7.36426 -0.31686,0.5924 -1.51985,0.93479
>>> -3.92704,1.11786 -1.7952,0.22853 -2.73249,0.0625 -4.48884,0.68135 -0.33519,0.2003 -1.39725,0.57449 -2.62486,1.73561 -1.67454,1.58361
>>> -2.42239,3.18739 -3.5846,7.!
>>> 68718 -0.
>>> 73193,2.83322 -3.68934,15.57009 -3.68934,15.88847 0,0.0548 1.52154,0.0997 3.38117,0.0997 4.3409,0 4.51297,0.0963 4.51297,2.52758 0,0.95412
>>> -0.18582,2.75245 -0.41194,3.9963 -0.22684,1.24385 -0.43486,2.4652 -0.46261,2.71413 -0.10136,0.91171 -1.00921,1.18038 -5.21546,1.54432
>>> -2.26312,0.19571 -4.14664,0.39955 -4.18598,0.45279 -0.0386,0.0533 -0.73097,3.06738 -1.53722,6.69807 -1.68105,7.57168 -2.87367,11.89152
>>> -3.9186,14.19627 -0.40204,0.8864 -0.93198,1.70195 -0.97011,1.84201 -0.44235,0.74009 -0.89289,1.41907 -1.32003,1.99226 -1.52009,2.04364
>>> -2.8172,3.22697 -4.91453,4.48327 -4.36697,2.61569 -6.64023,3.3084 -15.3761,4.12364 -2.55053,0.11559 -3.81096,-0.0326 -5.59216,-0.11318 z m
>>> -26.25129,-9.17904 c -4.90415,-0.77566 -8.90841,-2.77692 -12.22659,-6.11057 -1.57439,-1.58184 -3.21611,-3.44816 -3.03318,-3.44816 0.0579,0
>>> -0.2365,-0.55333 -0.65326,-1.22961 -3.50521,-5.69675 -4.02092,-16.15759 -1.20758,-24.49004 0.78768,-2.33274 3.51631,-7.13798 5.26541,-9.27279
>>> 1.86205,-2.27243 4.55158,!
>>> -4.83303
>>> 6.57652,-6.2611 1.04806,-0.78063 1.83115,-1.24347 2.59928,-1.77836 1.15159,-0.82003 5.74251,-2.94551 8.02711,-3.71636 3.47359,-1.17208
>>> 7.55242,-1.88861 11.71378,-2.05773 6.87648,-0.27948 10.6358,0.58885 14.9463,3.45231 2.98299,1.98157 4.79001,4.022 6.22684,7.03102 3.85537,8.07356
>>> 2.8838,20.73125 -2.3261,30.30567 -2.35917,4.33557 -6.17448,8.92132 -9.34762,11.23548 -6.44765,4.70219 -12.83522,6.74419 -20.92024,6.68765
>>> -1.98198,-0.0145 -4.52021,-0.17013 -5.64067,-0.34741 z m 72.57528,-1.58746 c -2.04931,-0.18486 -3.64662,-0.62298 -4.10055,-1.12447
>>> -0.44572,-0.49242 -0.44717,-0.61783 -0.0386,-3.01658 0.97808,-5.73189 7.11925,-33.74241 9.89277,-45.12283 0.91051,-3.73616 1.42598,-5.39016
>>> 1.77975,-5.7102 0.81664,-0.7391 3.38576,-1.13054 8.51361,-1.2972 4.2299,-0.13756 4.94735,-0.10353 5.66601,0.26808 0.47238,0.22994 0.95026,0.64221
>>> 1.03021,1.07835 0.0663,0.50763 0.0458,0.57315 -0.15204,1.44919 -0.29301,1.29747 -4.39351,16.9667 -4.77456,18.25683 -0.0989,0.33457 0.76861,0.37116
>>> 6.987!
>>> 97,0.2948
>>> 6.60234,-0.0811 7.49354,-0.0292 10.20939,0.59399 1.94106,0.54607 3.69563,1.41926 4.94129,2.25974 2.93979,1.95942 4.81778,4.55687
>>> 5.78283,7.31325 0.47709,1.36229 0.57386,2.18474 0.58231,4.94455 -0.16169,2.99735 -0.27825,3.32654 -0.77609,5.26744 -0.43245,1.07632
>>> -1.24643,2.63114 -1.80896,3.45514 -1.75296,2.56803 -5.61364,5.83329 -8.19072,7.05607 -1.48268,0.77344 -2.37944,1.10308 -4.2229,1.76201
>>> -3.62514,1.29125 -7.03261,1.93061 -11.71402,2.19806 -3.8573,0.22033 -17.41793,0.27139 -19.60793,0.0738 z m 20.06909,-10.0422 c 1.81258,-0.30498
>>> 3.76777,-1.32377 4.43068,-1.78313 1.07606,-0.68306 2.44629,-1.65139 3.20935,-2.52558 1.10477,-1.29076 1.44479,-2.34138 1.44673,-4.47079 0,-1.45553
>>> -0.13997,-1.91796 -0.92306,-2.895 -0.76234,-0.95136 -1.14532,-1.4439 -2.41419,-1.84771 -1.49306,-0.47514 -1.76045,-0.57714 -5.6163,-0.57714
>>> -2.19386,0 -4.07472,0.0854 -4.17898,0.18968 -0.15444,0.1542 -2.20303,9.16482 -2.5042,11.01491 -0.0458,0.28013 -0.14962,0.68121 -0.23167,0.89128
>>> -0.082,0.21019 -!
>>> 0.20029,0
>>> .74737 -0.26376,1.19399 -0.0869,0.56201 -0.1641,0.71791 -0.29417,1.10234 0.1641,0.32716 4.80738,0.13321 7.33957,-0.29285 z m 44.76964,9.61547 c
>>> -0.20195,-0.34127 -0.53984,-0.89215 -0.53984,-1.28041 0,-0.61928 1.01428,-2.14273 1.97595,-3.41645 0.48675,-0.63465 0.58304,-0.7077 0.744,-0.96587
>>> 3.18111,-4.33538 3.3259,-4.3799 5.95197,-7.85451 0.89386,-0.88655 1.41729,-1.66817 2.00611,-2.52732 0.28187,-0.41134 1.02514,-1.59635
>>> 2.51869,-3.472 2.34348,-3.26401 0.43775,-0.56351 2.17914,-2.98866 l 1.93806,-2.61017 -5.17975,0 c -6.38225,0 -6.1624,0.1197 -5.95776,-3.24248
>>> 0.19306,-3.14918 0.6897,-5.52258 1.32582,-6.32042 0.40953,-0.51351 0.88831,-0.73736 1.92913,-0.90189 2.26602,-0.35822 16.79531,-0.80025
>>> 23.1042,-0.70293 5.42131,0.0835 5.9054,0.12863 6.42232,0.59629 0.83642,0.757 0.40952,1.94713 -1.182,4.66012 -0.66702,0.72773 -0.862,1.31755
>>> -1.61541,2.60085 -0.78285,1.04976 -3.58798,4.98416 -3.87998,5.33393 -0.68222,0.76323 -1.27008,1.76785 -1.92913,2.65068 -0.35161,0.4792 -1.73415,2!
>>> .13817 -3
>>> .72699,4.82621 l -3.62369,4.88735 7.2375,0.12742 c 9.10798,0.16024 8.56501,-0.24552 7.16558,5.35405 -0.43679,1.7472 -0.81808,3.40593
>>> -0.84728,3.68603 -0.029,0.28013 -0.41459,0.75404 -0.85573,1.05313 -0.75558,0.51197 -1.20975,0.55268 -7.74717,0.69431 -3.81965,0.0828
>>> -11.42903,0.20368 -16.90946,0.26891 l -9.84989,0.11713 c -0.38581,0.0217 -0.48811,-0.2746 -0.65439,-0.5733 z m -12.89023,0.16578 c
>>> -0.28018,-0.0717 -0.79588,-0.33358 -1.14604,-0.58194 -0.34871,-0.29297 -0.36874,-0.24963 -0.96336,-0.76297 -0.45899,-0.50448 -0.38732,-0.41305
>>> -0.62165,-0.76318 -1.18706,-1.77423 -1.36828,-3.60247 -1.08574,-6.6209 l 0.62986,-4.18934 1.35505,-8.41584 c 1.87292,-11.63219 3.0393,-12.65642
>>> 3.94683,-13.03008 14.10312,-0.58324 0.0684,0.0168 14.11639,-0.6264 1.83129,2.9e-4 1.51695,-0.2997 -2.48297,16.07566 -2.78582,11.40408
>>> -3.7096,15.37571 -4.14664,17.8255 l -0.20512,1.14591 -4.44854,0.0369 c -2.44676,0.0193 -4.67779,-0.0217 -4.95772,-0.0934 z m 9.03993,-42.69064 c
>>> -2.47017,-0.71943 -4.1582!
>>> 2,-2.1758
>>> 8 -4.47435,-3.86022 -0.30986,-1.65197 -0.002,-3.57265 0.72686,-4.52754 0.56855,-0.87325 0.83425,-0.95878 1.35816,-1.48348 1.64437,-1.36992
>>> 5.10349,-2.5134 8.24092,-2.5134 3.12971,0 5.91915,1.07664 7.02489,2.7114 0.64868,0.95885 0.58159,4.12316 0.0628,5.31006 -0.61876,1.41622
>>> -1.31304,2.05428 -2.42867,2.74673 -0.88493,0.64274 -1.82054,0.86316 -2.7436,1.20149 -1.89872,0.69962 -6.03137,0.92043 -7.76696,0.41496 z"
>>> + style="fill:#ffffff;fill-opacity:1" />
>>> + <g
>>> + id="g4106-5"
>>> + transform="translate(227.38698,-258.89584)">
>>> + <path
>>> + style="fill:url(#linearGradient3258);fill-opacity:1;stroke:none"
>>> + d="m 274.4202,915.83816 c -0.57022,-0.5701 0.12725,-5.7981 1.3807,-10.3461 0.31753,-1.1525 1.16983,-3.7056 1.89397,-5.6735
>>> 1.43464,-3.8983 1.59401,-4.86 0.80655,-4.86 -1.12196,0 -2.45752,-1.1724 -3.358,-2.9483 -0.84048,-1.6576 -0.92774,-2.1304 -0.92774,-5.0389
>>> 0,-10.2837 6.65933,-24.67072 16.05068,-34.67716 4.73112,-5.04105 15.17111,-11.68326 23.19872,-14.75984 7.48224,-2.86755 11.08323,-3.96154
>>> 12.99385,-3.94748 l 1.94911,0.0151 -1.43857,1.17101 c -3.79248,3.08658 -8.5533,9.22483 -11.14049,14.36281 -2.21029,4.38984 -5.05108,12.23644
>>> -7.56162,20.88541 -2.66658,9.1869 -3.83702,12.4257 -6.14456,17.0055 -3.10984,6.1713 -5.55039,9.0032 -9.5083,11.0335 -2.17756,1.117 -5.05077,0.9365
>>> -7.97004,-0.5007 -1.11893,-0.5509 -2.19574,-1.0016 -2.39268,-1.0016 -0.19694,0 -1.28891,1.8577 -2.42692,4.1283 -1.99001,3.9717 -3.27982,7.9065
>>> -4.32997,13.2109 -0.3551,1.7935 -0.66415,2.3521 -1.07469,1.9418 z"
>>> + id="path5333-2-0-0-8-0-0"
>>> + inkscape:connector-curvature="0" />
>>> + <path
>>> + sodipodi:nodetypes="cc"
>>> + inkscape:connector-curvature="0"
>>> + inkscape:original-d="m 293.31501,866.36406 c 0,0 6.29839,-23.02314 33.92737,-32.42467"
>>> + inkscape:path-effect="#path-effect3613-2-7-2-0-8-2"
>>> + id="path3611-1-3-8-9-9"
>>> + d="m 293.075,866.29409 0.48004,0.13988 c 0.002,-0.006 0.003,-0.0119 0.005,-0.0179 0.005,-0.0167 0.009,-0.0334 0.0141,-0.0501
>>> 0.0185,-0.0648 0.0378,-0.12966 0.0575,-0.1946 0,-1e-5 0,-1e-5 0,-1e-5 0.0756,-0.24869 0.15714,-0.49642 0.24215,-0.74378 0.31727,-0.92326
>>> 0.68052,-1.83208 1.07312,-2.72925 0,0 0,0 0,0 1.37731,-3.14725 3.11649,-6.13655 5.12397,-8.93212 0,0 0,0 0,0 6.6322,-9.23764 16.38661,-16.09495
>>> 27.17154,-19.82681 -10.82274,3.62075 -20.67946,10.38748 -27.45648,19.61995 0,0 0,0 0,0 -2.04968,2.79284 -3.83397,5.78812 -5.25823,8.95292 0,0 0,0
>>> 0,0 -0.40597,0.90207 -0.78333,1.81896 -1.11555,2.75396 0,10e-6 0,10e-6 0,10e-6 -0.089,0.25049 -0.17495,0.50294 -0.2554,0.75803 0,0 0,0 0,0
>>> -0.0208,0.0661 -0.0414,0.13258 -0.0613,0.19948 -0.005,0.0172 -0.0102,0.0345 -0.0152,0.0518 -0.002,0.006 -0.004,0.0123 -0.005,0.0185 z"
>>> + style="fill:#000000;fill-opacity:0.53571424;fill-rule:evenodd;stroke:none" />
>>> + </g>
>>> + </g>
>>> + </g>
>>> + <text
>>> + xml:space="preserve"
>>> +
>>> style="font-size:29.00352478px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#034460;fill-opacity:1;stroke:none;font-family:Sans"
>>> + id="text3248-0-4"
>>> + sodipodi:linespacing="125%"
>>> + transform="translate(-430.59109,-502.35325)"><textPath
>>> + xlink:href="#path4619"
>>> + id="textPath4636"
>>> + style="font-size:16px">CommunautÃ© francophone</textPath></text>
>>> + </g>
>>> +</svg>
>>>
>>>
>>>
>>
>
>

JulienNicolas

Re: svn commit: r1683430 - in /ofbiz/branches/boostrap_theme/themes/bootstrap: data/BootstrapThemeData.xml includes/appbar.ftl includes/header.ftl webapp/bootstrap/css/skins/tomahawk.css webapp/bootstrap/images/Logo-OFBiz.svg

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, [hidden email] 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>
>>>> - 
>>>> - <#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>
>>>> - 
>>>> - <#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>
>>>> + 
>>>> + <#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>
>>>> + 
>>>> + <#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> 
>>>> </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"?>
>>>> +
>>>> +
>>>> +<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
>>>> + id="linearGradient4042">
>>>> + <stop
>>>> + style="stop-color:#ea0359;stop-opacity:1;"
>>>> + offset="0"
>>>> + id="stop4052" />
>>>> + <stop
>>>> + style="stop-color:#ea0377;stop-opacity:1"
>>>> + offset="1"
>>>> + id="stop4046" />
>>>> + </linearGradient>
>>>> + <linearGradient
>>>> + id="linearGradient4032">
>>>> + <stop
>>>> + style="stop-color:#ff0000;stop-opacity:1;"
>>>> + offset="0"
>>>> + id="stop4034" />
>>>> + <stop
>>>> + style="stop-color:#fdfbd6;stop-opacity:1"
>>>> + offset="1"
>>>> + id="stop4036" />
>>>> + </linearGradient>
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect5021"
>>>> + is_visible="true"
>>>> + pattern="m 265.71429,6.7857142 c 0,-2.76 2.24,-5 5,-5
>>>> 2.76,0 5,2.24 5,5 0,2.76 -2.24,4.9999998 -5,4.9999998 -2.76,0
>>>> -5,-2.2399998 -5,-4.9999998 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="1"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="spiro"
>>>> + id="path-effect5019"
>>>> + is_visible="true" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect5015"
>>>> + is_visible="true"
>>>> + pattern="M 0,5 C 0,2.24 2.24,0 5,0 7.76,0 10,2.24 10,5
>>>> 10,7.76 7.76,10 5,10 2.24,10 0,7.76 0,5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="1"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="spiro"
>>>> + id="path-effect5013"
>>>> + is_visible="true" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect4994"
>>>> + is_visible="true"
>>>> + pattern="M 0,5 C 0,2.24 2.24,0 5,0 7.76,0 10,2.24 10,5
>>>> 10,7.76 7.76,10 5,10 2.24,10 0,7.76 0,5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="1"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613"
>>>> + is_visible="true"
>>>> + pattern="M 0,0 0,10 10,5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.07"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2"
>>>> + is_visible="true"
>>>> + pattern="M 0,0 0,10 10,5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.07"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-7"
>>>> + is_visible="true"
>>>> + pattern="M 0,0 0,10 10,5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.07"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-7-2"
>>>> + is_visible="true"
>>>> + pattern="M 0,0 0,10 10,5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.07"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-7-2-2"
>>>> + is_visible="true"
>>>> + pattern="M 0,0 0,10 10,5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.07"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-7-2-2-1"
>>>> + is_visible="true"
>>>> + pattern="M 0,0 0,10 10,5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.07"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-7-2-2-1-9"
>>>> + is_visible="true"
>>>> + pattern="m 156.08125,211.61936 0,10 10,-5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.07"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-7-2-2-1-9-5"
>>>> + is_visible="true"
>>>> + pattern="M 0,0 0,10 10,5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.07"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-7-2-2-1-9-5-6"
>>>> + is_visible="true"
>>>> + pattern="M 0,0 0,10 10,5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.07"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-3"
>>>> + is_visible="true"
>>>> + pattern="M 0,0 0,10 10,5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.07"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-3-9"
>>>> + is_visible="true"
>>>> + pattern="M 0,0 0,10 10,5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.07"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-3-9-6"
>>>> + is_visible="true"
>>>> + pattern="M 0,0 0,10 10,5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.07"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-7-2-24"
>>>> + is_visible="true"
>>>> + pattern="M 0,0 0,10 10,5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.07"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-7-2-24-3"
>>>> + is_visible="true"
>>>> + pattern="m -56.428571,100.71429 0,10 10,-5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.07"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-7-2-24-9"
>>>> + is_visible="true"
>>>> + pattern="M 0,0 0,10 10,5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.07"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-7-2-0"
>>>> + is_visible="true"
>>>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.05"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <linearGradient
>>>> + inkscape:collect="always"
>>>> + xlink:href="#linearGradient4062"
>>>> + id="linearGradient4068"
>>>> + x1="251.11844"
>>>> + y1="932.42859"
>>>> + x2="311.44434"
>>>> + y2="853.43036"
>>>> + gradientUnits="userSpaceOnUse" />
>>>> + <linearGradient
>>>> + inkscape:collect="always"
>>>> + xlink:href="#linearGradient4062"
>>>> + id="linearGradient4082"
>>>> + gradientUnits="userSpaceOnUse"
>>>> + x1="251.11844"
>>>> + y1="932.42859"
>>>> + x2="311.44434"
>>>> + y2="853.43036" />
>>>> + <linearGradient
>>>> + inkscape:collect="always"
>>>> + xlink:href="#linearGradient4062"
>>>> + id="linearGradient4086"
>>>> + gradientUnits="userSpaceOnUse"
>>>> + x1="251.11844"
>>>> + y1="932.42859"
>>>> + x2="311.44434"
>>>> + y2="853.43036"
>>>> + gradientTransform="translate(15.799636,-19.869239)" />
>>>> + <path
>>>> + sodipodi:type="arc"
>>>> + style="fill:none;stroke:none"
>>>> + id="path3246-2"
>>>> + sodipodi:cx="404.31357"
>>>> + sodipodi:cy="556.62982"
>>>> + sodipodi:rx="43.689098"
>>>> + sodipodi:ry="43.689098"
>>>> + d="m 448.00267,556.62982 a 43.689098,43.689098 0 1 1
>>>> -87.3782,0 43.689098,43.689098 0 1 1 87.3782,0 z"
>>>> +
>>>> transform="matrix(2.0143715,1.9655455,-1.9655455,2.0143715,758.27155,-1351.7418)"
>>>> />
>>>> + <linearGradient
>>>> + id="linearGradient3937-3">
>>>> + <stop
>>>> + id="stop3939-2"
>>>> + offset="0"
>>>> + style="stop-color:#84006b;stop-opacity:1;" />
>>>> + <stop
>>>> + style="stop-color:#ff0054;stop-opacity:1;"
>>>> + offset="0.4564395"
>>>> + id="stop3941-5" />
>>>> + <stop
>>>> + style="stop-color:#ff874e;stop-opacity:1;"
>>>> + offset="0.68263167"
>>>> + id="stop3943-4" />
>>>> + <stop
>>>> + id="stop3945-7"
>>>> + offset="1"
>>>> + style="stop-color:#ffd600;stop-opacity:1;" />
>>>> + </linearGradient>
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-7-2-0-9"
>>>> + is_visible="true"
>>>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.05"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <linearGradient
>>>> + id="linearGradient3937-9">
>>>> + <stop
>>>> + id="stop3939-6"
>>>> + offset="0"
>>>> + style="stop-color:#84006b;stop-opacity:1;" />
>>>> + <stop
>>>> + style="stop-color:#ff0054;stop-opacity:1;"
>>>> + offset="0.4564395"
>>>> + id="stop3941-9" />
>>>> + <stop
>>>> + style="stop-color:#ff874e;stop-opacity:1;"
>>>> + offset="0.68263167"
>>>> + id="stop3943-1" />
>>>> + <stop
>>>> + id="stop3945-8"
>>>> + offset="1"
>>>> + style="stop-color:#ffd600;stop-opacity:1;" />
>>>> + </linearGradient>
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-7-2-0-2"
>>>> + is_visible="true"
>>>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.05"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <linearGradient
>>>> + id="linearGradient3937-7">
>>>> + <stop
>>>> + id="stop3939-63"
>>>> + offset="0"
>>>> + style="stop-color:#84006b;stop-opacity:1;" />
>>>> + <stop
>>>> + style="stop-color:#ff0054;stop-opacity:1;"
>>>> + offset="0.4564395"
>>>> + id="stop3941-2" />
>>>> + <stop
>>>> + style="stop-color:#ff874e;stop-opacity:1;"
>>>> + offset="0.68263167"
>>>> + id="stop3943-6" />
>>>> + <stop
>>>> + id="stop3945-79"
>>>> + offset="1"
>>>> + style="stop-color:#ffd600;stop-opacity:1;" />
>>>> + </linearGradient>
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-7-2-0-93"
>>>> + is_visible="true"
>>>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.05"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <path
>>>> + sodipodi:type="arc"
>>>> + style="fill:none;stroke:none"
>>>> + id="path3246-7"
>>>> + sodipodi:cx="404.31357"
>>>> + sodipodi:cy="556.62982"
>>>> + sodipodi:rx="43.689098"
>>>> + sodipodi:ry="43.689098"
>>>> + d="m 448.00267,556.62982 a 43.689098,43.689098 0 1 1
>>>> -87.3782,0 43.689098,43.689098 0 1 1 87.3782,0 z"
>>>> +
>>>> transform="matrix(-1.6401893,1.4273244,1.4417801,1.6638529,21.095744,-856.12693)"
>>>> />
>>>> + <linearGradient
>>>> + id="linearGradient3937-7-3">
>>>> + <stop
>>>> + id="stop3939-63-8"
>>>> + offset="0"
>>>> + style="stop-color:#84006b;stop-opacity:1;" />
>>>> + <stop
>>>> + style="stop-color:#ff0054;stop-opacity:1;"
>>>> + offset="0.4564395"
>>>> + id="stop3941-2-5" />
>>>> + <stop
>>>> + style="stop-color:#ff874e;stop-opacity:1;"
>>>> + offset="0.68263167"
>>>> + id="stop3943-6-4" />
>>>> + <stop
>>>> + id="stop3945-79-7"
>>>> + offset="1"
>>>> + style="stop-color:#ffd600;stop-opacity:1;" />
>>>> + </linearGradient>
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-7-2-0-93-6"
>>>> + is_visible="true"
>>>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.05"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <path
>>>> +
>>>> transform="matrix(2.0143715,1.9655455,-1.9655455,2.0143715,758.27155,-1351.7418)"
>>>> + d="m 448.00267,556.62982 a 43.689098,43.689098 0 1 1
>>>> -87.3782,0 43.689098,43.689098 0 1 1 87.3782,0 z"
>>>> + sodipodi:ry="43.689098"
>>>> + sodipodi:rx="43.689098"
>>>> + sodipodi:cy="556.62982"
>>>> + sodipodi:cx="404.31357"
>>>> + id="path3246-1"
>>>> + style="fill:#ffffff;stroke:none"
>>>> + sodipodi:type="arc" />
>>>> + <linearGradient
>>>> + id="linearGradient3937-4">
>>>> + <stop
>>>> + id="stop3939-8"
>>>> + offset="0"
>>>> + style="stop-color:#84006b;stop-opacity:1;" />
>>>> + <stop
>>>> + style="stop-color:#ff0054;stop-opacity:1;"
>>>> + offset="0.4564395"
>>>> + id="stop3941-3" />
>>>> + <stop
>>>> + style="stop-color:#ff874e;stop-opacity:1;"
>>>> + offset="0.68263167"
>>>> + id="stop3943-13" />
>>>> + <stop
>>>> + id="stop3945-4"
>>>> + offset="1"
>>>> + style="stop-color:#ffd600;stop-opacity:1;" />
>>>> + </linearGradient>
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-7-2-0-8"
>>>> + is_visible="true"
>>>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.05"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <linearGradient
>>>> + inkscape:collect="always"
>>>> + xlink:href="#linearGradient3937-4"
>>>> + id="linearGradient4434"
>>>> + gradientUnits="userSpaceOnUse"
>>>> + gradientTransform="translate(15.799636,-19.869239)"
>>>> + x1="251.11844"
>>>> + y1="932.42859"
>>>> + x2="311.44434"
>>>> + y2="853.43036" />
>>>> + <linearGradient
>>>> + id="linearGradient3937-4-8">
>>>> + <stop
>>>> + id="stop3939-8-2"
>>>> + offset="0"
>>>> + style="stop-color:#84006b;stop-opacity:1;" />
>>>> + <stop
>>>> + style="stop-color:#ff0054;stop-opacity:1;"
>>>> + offset="0.4564395"
>>>> + id="stop3941-3-6" />
>>>> + <stop
>>>> + style="stop-color:#ff874e;stop-opacity:1;"
>>>> + offset="0.68263167"
>>>> + id="stop3943-13-0" />
>>>> + <stop
>>>> + id="stop3945-4-5"
>>>> + offset="1"
>>>> + style="stop-color:#ffd600;stop-opacity:1;" />
>>>> + </linearGradient>
>>>> + <inkscape:path-effect
>>>> + effect="skeletal"
>>>> + id="path-effect3613-2-7-2-0-8-2"
>>>> + is_visible="true"
>>>> + pattern="m 230.43803,-130.91244 0,10 10,-5 z"
>>>> + copytype="single_stretched"
>>>> + prop_scale="0.05"
>>>> + scale_y_rel="false"
>>>> + spacing="0"
>>>> + normal_offset="0"
>>>> + tang_offset="0"
>>>> + prop_units="false"
>>>> + vertical_pattern="false"
>>>> + fuse_tolerance="0" />
>>>> + <path
>>>> +
>>>> transform="matrix(-1.6401893,1.4273244,1.4417801,1.6638529,21.095744,-856.12693)"
>>>> + d="m 448.00267,556.62982 a 43.689098,43.689098 0 1 1
>>>> -87.3782,0 43.689098,43.689098 0 1 1 87.3782,0 z"
>>>> + sodipodi:ry="43.689098"
>>>> + sodipodi:rx="43.689098"
>>>> + sodipodi:cy="556.62982"
>>>> + sodipodi:cx="404.31357"
>>>> + id="path3246-9"
>>>> + style="fill:none;stroke:none"
>>>> + sodipodi:type="arc" />
>>>> + <path
>>>> + sodipodi:type="arc"
>>>> + style="opacity:0.52325583;fill:#ff0000;stroke:none"
>>>> + id="path4578-2"
>>>> + sodipodi:cx="148.62184"
>>>> + sodipodi:cy="647.12219"
>>>> + sodipodi:rx="87.683502"
>>>> + sodipodi:ry="87.683502"
>>>> + d="m 236.30534,647.12219 a 87.683502,87.683502 0 1 1
>>>> -175.367001,0 87.683502,87.683502 0 1 1 175.367001,0 z"
>>>> +
>>>> transform="matrix(-0.99647677,0.49346663,0.49346663,0.99647677,-9.4098434,-69.007821)"
>>>> />
>>>> + <linearGradient
>>>> + inkscape:collect="always"
>>>> + xlink:href="#linearGradient3937-7"
>>>> + id="linearGradient4680"
>>>> + gradientUnits="userSpaceOnUse"
>>>> + gradientTransform="translate(15.799636,-19.869239)"
>>>> + x1="251.11844"
>>>> + y1="932.42859"
>>>> + x2="311.44434"
>>>> + y2="853.43036" />
>>>> + <linearGradient
>>>> + inkscape:collect="always"
>>>> + xlink:href="#linearGradient3937-4-8"
>>>> + id="linearGradient4682"
>>>> + gradientUnits="userSpaceOnUse"
>>>> + gradientTransform="translate(15.799636,-19.869239)"
>>>> + x1="251.11844"
>>>> + y1="932.42859"
>>>> + x2="311.44434"
>>>> + y2="853.43036" />
>>>> + <linearGradient
>>>> + inkscape:collect="always"
>>>> + xlink:href="#linearGradient3937-4-8"
>>>> + id="linearGradient3258"
>>>> + gradientUnits="userSpaceOnUse"
>>>> + gradientTransform="translate(15.799636,-19.869239)"
>>>> + x1="251.11844"
>>>> + y1="932.42859"
>>>> + x2="311.44434"
>>>> + y2="853.43036" />
>>>> + </defs>
>>>> + <sodipodi:namedview
>>>> + id="base"
>>>> + pagecolor="#ffffff"
>>>> + bordercolor="#666666"
>>>> + borderopacity="1.0"
>>>> + inkscape:pageopacity="0.0"
>>>> + inkscape:pageshadow="2"
>>>> + inkscape:zoom="2.8284271"
>>>> + inkscape:cx="140.28115"
>>>> + inkscape:cy="51.274541"
>>>> + inkscape:document-units="px"
>>>> + inkscape:current-layer="g3159-19"
>>>> + showgrid="false"
>>>> + inkscape:window-width="1920"
>>>> + inkscape:window-height="1014"
>>>> + inkscape:window-x="0"
>>>> + inkscape:window-y="27"
>>>> + inkscape:window-maximized="1" />
>>>> + <metadata
>>>> + id="metadata3622">
>>>> + <rdf:RDF>
>>>> + <cc:Work
>>>> + rdf:about="">
>>>> + <dc:format>image/svg+xml</dc:format>
>>>> + <dc:type
>>>> + rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
>>>> + <dc:title />
>>>> + </cc:Work>
>>>> + </rdf:RDF>
>>>> + </metadata>
>>>> + <g
>>>> + inkscape:label="Calque 1"
>>>> + inkscape:groupmode="layer"
>>>> + id="layer1"
>>>> + transform="translate(0,-949.36218)">
>>>> + <path
>>>> + sodipodi:type="arc"
>>>> + style="opacity:0.52325583;fill:none;stroke:none"
>>>> + id="path4619"
>>>> + sodipodi:cx="148.62184"
>>>> + sodipodi:cy="647.12219"
>>>> + sodipodi:rx="87.683502"
>>>> + sodipodi:ry="87.683502"
>>>> + d="m 236.30534,647.12219 c 0,48.42626 -39.25724,87.6835
>>>> -87.6835,87.6835 -48.42626,0 -87.683501,-39.25724
>>>> -87.683501,-87.6835 0,-48.42626 39.257241,-87.6835
>>>> 87.683501,-87.6835 48.42626,0 87.6835,39.25724 87.6835,87.6835 z"
>>>> +
>>>> transform="matrix(-1.0183226,0.44664768,0.44664768,1.0183226,-32.11227,-609.65199)"
>>>> />
>>>> + <g
>>>> + id="g3159-19"
>>>> + transform="matrix(1.2352163,0,0,1.2352163,-606.5521,240.78373)">
>>>> + <g
>>>> + id="g3083">
>>>> + <path
>>>> +
>>>> sodipodi:nodetypes="ssscccscccccsscsccsssssscscscccsccssssssccsssssssssccssscccsscccccsccssscscsssscsccscscccscccssssssccccscssscssccccscccscscccsccssccsssccsccc"
>>>> + inkscape:connector-curvature="0"
>>>> + id="path5269-3-3-7-1-7-9-0"
>>>> + d="m 536.69763,655.64671 c -0.47541,-0.0893
>>>> -0.93295,-0.34032 -1.01645,-0.55806 -0.66388,-1.73043
>>>> 0.88083,-8.13365 1.97209,-8.17456 1.9798,-0.0743 6.66894,-0.67975
>>>> 7.58065,-0.97894 1.37989,-0.45292 2.82951,-2.10011 3.34932,-2.58638
>>>> 0.73,-0.8807 2.31717,-4.89066 2.84519,-6.94914 1.26742,-5.06511
>>>> 4.1797,-17.96751 6.38008,-28.26613 3.13357,-14.66661
>>>> 3.80662,-17.10614 5.76495,-20.89934 0.54732,-1.06034 1.5739,-2.5771
>>>> 2.28098,-3.37057 1.40184,-1.68467 1.51285,-1.70825 2.69291,-2.68838
>>>> 0.5828,-0.53494 1.14483,-0.89996 1.84298,-1.29711 2.17962,-1.2387
>>>> 1.77686,-0.90778 2.87801,-1.38454 2.04545,-0.93215 5.14427,-1.78064
>>>> 7.97064,-2.18244 2.50106,-0.35557 9.34544,-0.33399 10.23303,0.0323
>>>> 0.39432,0.16266 0.78019,0.28481 0.85766,0.27142 0.42569,-0.0736
>>>> -0.68946,6.21094 -1.30676,7.36426 -0.31686,0.5924 -1.51985,0.93479
>>>> -3.92704,1.11786 -1.7952,0.22853 -2.73249,0.0625 -4.48884,0.68135
>>>> -0.33519,0.2003 -1.39725,0.57449 -2.62486,1.73561 -1.67454,1.58361
>>>> -2.42239,3.18739 -3.5846,7.!
>>>> 68718 -0.
>>>> 73193,2.83322 -3.68934,15.57009 -3.68934,15.88847 0,0.0548
>>>> 1.52154,0.0997 3.38117,0.0997 4.3409,0 4.51297,0.0963
>>>> 4.51297,2.52758 0,0.95412 -0.18582,2.75245 -0.41194,3.9963
>>>> -0.22684,1.24385 -0.43486,2.4652 -0.46261,2.71413 -0.10136,0.91171
>>>> -1.00921,1.18038 -5.21546,1.54432 -2.26312,0.19571 -4.14664,0.39955
>>>> -4.18598,0.45279 -0.0386,0.0533 -0.73097,3.06738 -1.53722,6.69807
>>>> -1.68105,7.57168 -2.87367,11.89152 -3.9186,14.19627 -0.40204,0.8864
>>>> -0.93198,1.70195 -0.97011,1.84201 -0.44235,0.74009 -0.89289,1.41907
>>>> -1.32003,1.99226 -1.52009,2.04364 -2.8172,3.22697 -4.91453,4.48327
>>>> -4.36697,2.61569 -6.64023,3.3084 -15.3761,4.12364 -2.55053,0.11559
>>>> -3.81096,-0.0326 -5.59216,-0.11318 z m -26.25129,-9.17904 c
>>>> -4.90415,-0.77566 -8.90841,-2.77692 -12.22659,-6.11057
>>>> -1.57439,-1.58184 -3.21611,-3.44816 -3.03318,-3.44816 0.0579,0
>>>> -0.2365,-0.55333 -0.65326,-1.22961 -3.50521,-5.69675
>>>> -4.02092,-16.15759 -1.20758,-24.49004 0.78768,-2.33274
>>>> 3.51631,-7.13798 5.26541,-9.27279 1.86205,-2.27243 4.55158,!
>>>> -4.83303
>>>> 6.57652,-6.2611 1.04806,-0.78063 1.83115,-1.24347
>>>> 2.59928,-1.77836 1.15159,-0.82003 5.74251,-2.94551 8.02711,-3.71636
>>>> 3.47359,-1.17208 7.55242,-1.88861 11.71378,-2.05773
>>>> 6.87648,-0.27948 10.6358,0.58885 14.9463,3.45231 2.98299,1.98157
>>>> 4.79001,4.022 6.22684,7.03102 3.85537,8.07356 2.8838,20.73125
>>>> -2.3261,30.30567 -2.35917,4.33557 -6.17448,8.92132
>>>> -9.34762,11.23548 -6.44765,4.70219 -12.83522,6.74419
>>>> -20.92024,6.68765 -1.98198,-0.0145 -4.52021,-0.17013
>>>> -5.64067,-0.34741 z m 72.57528,-1.58746 c -2.04931,-0.18486
>>>> -3.64662,-0.62298 -4.10055,-1.12447 -0.44572,-0.49242
>>>> -0.44717,-0.61783 -0.0386,-3.01658 0.97808,-5.73189
>>>> 7.11925,-33.74241 9.89277,-45.12283 0.91051,-3.73616
>>>> 1.42598,-5.39016 1.77975,-5.7102 0.81664,-0.7391 3.38576,-1.13054
>>>> 8.51361,-1.2972 4.2299,-0.13756 4.94735,-0.10353 5.66601,0.26808
>>>> 0.47238,0.22994 0.95026,0.64221 1.03021,1.07835 0.0663,0.50763
>>>> 0.0458,0.57315 -0.15204,1.44919 -0.29301,1.29747 -4.39351,16.9667
>>>> -4.77456,18.25683 -0.0989,0.33457 0.76861,0.37116 6.987!
>>>> 97,0.2948
>>>> 6.60234,-0.0811 7.49354,-0.0292 10.20939,0.59399 1.94106,0.54607
>>>> 3.69563,1.41926 4.94129,2.25974 2.93979,1.95942 4.81778,4.55687
>>>> 5.78283,7.31325 0.47709,1.36229 0.57386,2.18474 0.58231,4.94455
>>>> -0.16169,2.99735 -0.27825,3.32654 -0.77609,5.26744 -0.43245,1.07632
>>>> -1.24643,2.63114 -1.80896,3.45514 -1.75296,2.56803 -5.61364,5.83329
>>>> -8.19072,7.05607 -1.48268,0.77344 -2.37944,1.10308 -4.2229,1.76201
>>>> -3.62514,1.29125 -7.03261,1.93061 -11.71402,2.19806 -3.8573,0.22033
>>>> -17.41793,0.27139 -19.60793,0.0738 z m 20.06909,-10.0422 c
>>>> 1.81258,-0.30498 3.76777,-1.32377 4.43068,-1.78313 1.07606,-0.68306
>>>> 2.44629,-1.65139 3.20935,-2.52558 1.10477,-1.29076 1.44479,-2.34138
>>>> 1.44673,-4.47079 0,-1.45553 -0.13997,-1.91796 -0.92306,-2.895
>>>> -0.76234,-0.95136 -1.14532,-1.4439 -2.41419,-1.84771
>>>> -1.49306,-0.47514 -1.76045,-0.57714 -5.6163,-0.57714 -2.19386,0
>>>> -4.07472,0.0854 -4.17898,0.18968 -0.15444,0.1542 -2.20303,9.16482
>>>> -2.5042,11.01491 -0.0458,0.28013 -0.14962,0.68121 -0.23167,0.89128
>>>> -0.082,0.21019 -!
>>>> 0.20029,0
>>>> .74737 -0.26376,1.19399 -0.0869,0.56201 -0.1641,0.71791
>>>> -0.29417,1.10234 0.1641,0.32716 4.80738,0.13321 7.33957,-0.29285 z
>>>> m 44.76964,9.61547 c -0.20195,-0.34127 -0.53984,-0.89215
>>>> -0.53984,-1.28041 0,-0.61928 1.01428,-2.14273 1.97595,-3.41645
>>>> 0.48675,-0.63465 0.58304,-0.7077 0.744,-0.96587 3.18111,-4.33538
>>>> 3.3259,-4.3799 5.95197,-7.85451 0.89386,-0.88655 1.41729,-1.66817
>>>> 2.00611,-2.52732 0.28187,-0.41134 1.02514,-1.59635 2.51869,-3.472
>>>> 2.34348,-3.26401 0.43775,-0.56351 2.17914,-2.98866 l
>>>> 1.93806,-2.61017 -5.17975,0 c -6.38225,0 -6.1624,0.1197
>>>> -5.95776,-3.24248 0.19306,-3.14918 0.6897,-5.52258 1.32582,-6.32042
>>>> 0.40953,-0.51351 0.88831,-0.73736 1.92913,-0.90189 2.26602,-0.35822
>>>> 16.79531,-0.80025 23.1042,-0.70293 5.42131,0.0835 5.9054,0.12863
>>>> 6.42232,0.59629 0.83642,0.757 0.40952,1.94713 -1.182,4.66012
>>>> -0.66702,0.72773 -0.862,1.31755 -1.61541,2.60085 -0.78285,1.04976
>>>> -3.58798,4.98416 -3.87998,5.33393 -0.68222,0.76323 -1.27008,1.76785
>>>> -1.92913,2.65068 -0.35161,0.4792 -1.73415,2!
>>>> .13817 -3
>>>> .72699,4.82621 l -3.62369,4.88735 7.2375,0.12742 c
>>>> 9.10798,0.16024 8.56501,-0.24552 7.16558,5.35405 -0.43679,1.7472
>>>> -0.81808,3.40593 -0.84728,3.68603 -0.029,0.28013 -0.41459,0.75404
>>>> -0.85573,1.05313 -0.75558,0.51197 -1.20975,0.55268 -7.74717,0.69431
>>>> -3.81965,0.0828 -11.42903,0.20368 -16.90946,0.26891 l
>>>> -9.84989,0.11713 c -0.38581,0.0217 -0.48811,-0.2746
>>>> -0.65439,-0.5733 z m -12.89023,0.16578 c -0.28018,-0.0717
>>>> -0.79588,-0.33358 -1.14604,-0.58194 -0.34871,-0.29297
>>>> -0.36874,-0.24963 -0.96336,-0.76297 -0.45899,-0.50448
>>>> -0.38732,-0.41305 -0.62165,-0.76318 -1.18706,-1.77423
>>>> -1.36828,-3.60247 -1.08574,-6.6209 l 0.62986,-4.18934
>>>> 1.35505,-8.41584 c 1.87292,-11.63219 3.0393,-12.65642
>>>> 3.94683,-13.03008 14.10312,-0.58324 0.0684,0.0168 14.11639,-0.6264
>>>> 1.83129,2.9e-4 1.51695,-0.2997 -2.48297,16.07566 -2.78582,11.40408
>>>> -3.7096,15.37571 -4.14664,17.8255 l -0.20512,1.14591
>>>> -4.44854,0.0369 c -2.44676,0.0193 -4.67779,-0.0217 -4.95772,-0.0934
>>>> z m 9.03993,-42.69064 c -2.47017,-0.71943 -4.1582!
>>>> 2,-2.1758
>>>> 8 -4.47435,-3.86022 -0.30986,-1.65197 -0.002,-3.57265
>>>> 0.72686,-4.52754 0.56855,-0.87325 0.83425,-0.95878 1.35816,-1.48348
>>>> 1.64437,-1.36992 5.10349,-2.5134 8.24092,-2.5134 3.12971,0
>>>> 5.91915,1.07664 7.02489,2.7114 0.64868,0.95885 0.58159,4.12316
>>>> 0.0628,5.31006 -0.61876,1.41622 -1.31304,2.05428 -2.42867,2.74673
>>>> -0.88493,0.64274 -1.82054,0.86316 -2.7436,1.20149 -1.89872,0.69962
>>>> -6.03137,0.92043 -7.76696,0.41496 z"
>>>> + style="fill:#ffffff;fill-opacity:1" />
>>>> + <g
>>>> + id="g4106-5"
>>>> + transform="translate(227.38698,-258.89584)">
>>>> + <path
>>>> + style="fill:url(#linearGradient3258);fill-opacity:1;stroke:none"
>>>> + d="m 274.4202,915.83816 c -0.57022,-0.5701
>>>> 0.12725,-5.7981 1.3807,-10.3461 0.31753,-1.1525 1.16983,-3.7056
>>>> 1.89397,-5.6735 1.43464,-3.8983 1.59401,-4.86 0.80655,-4.86
>>>> -1.12196,0 -2.45752,-1.1724 -3.358,-2.9483 -0.84048,-1.6576
>>>> -0.92774,-2.1304 -0.92774,-5.0389 0,-10.2837 6.65933,-24.67072
>>>> 16.05068,-34.67716 4.73112,-5.04105 15.17111,-11.68326
>>>> 23.19872,-14.75984 7.48224,-2.86755 11.08323,-3.96154
>>>> 12.99385,-3.94748 l 1.94911,0.0151 -1.43857,1.17101 c
>>>> -3.79248,3.08658 -8.5533,9.22483 -11.14049,14.36281
>>>> -2.21029,4.38984 -5.05108,12.23644 -7.56162,20.88541
>>>> -2.66658,9.1869 -3.83702,12.4257 -6.14456,17.0055 -3.10984,6.1713
>>>> -5.55039,9.0032 -9.5083,11.0335 -2.17756,1.117 -5.05077,0.9365
>>>> -7.97004,-0.5007 -1.11893,-0.5509 -2.19574,-1.0016 -2.39268,-1.0016
>>>> -0.19694,0 -1.28891,1.8577 -2.42692,4.1283 -1.99001,3.9717
>>>> -3.27982,7.9065 -4.32997,13.2109 -0.3551,1.7935 -0.66415,2.3521
>>>> -1.07469,1.9418 z"
>>>> + id="path5333-2-0-0-8-0-0"
>>>> + inkscape:connector-curvature="0" />
>>>> + <path
>>>> + sodipodi:nodetypes="cc"
>>>> + inkscape:connector-curvature="0"
>>>> + inkscape:original-d="m 293.31501,866.36406 c 0,0
>>>> 6.29839,-23.02314 33.92737,-32.42467"
>>>> + inkscape:path-effect="#path-effect3613-2-7-2-0-8-2"
>>>> + id="path3611-1-3-8-9-9"
>>>> + d="m 293.075,866.29409 0.48004,0.13988 c 0.002,-0.006
>>>> 0.003,-0.0119 0.005,-0.0179 0.005,-0.0167 0.009,-0.0334
>>>> 0.0141,-0.0501 0.0185,-0.0648 0.0378,-0.12966 0.0575,-0.1946
>>>> 0,-1e-5 0,-1e-5 0,-1e-5 0.0756,-0.24869 0.15714,-0.49642
>>>> 0.24215,-0.74378 0.31727,-0.92326 0.68052,-1.83208 1.07312,-2.72925
>>>> 0,0 0,0 0,0 1.37731,-3.14725 3.11649,-6.13655 5.12397,-8.93212 0,0
>>>> 0,0 0,0 6.6322,-9.23764 16.38661,-16.09495 27.17154,-19.82681
>>>> -10.82274,3.62075 -20.67946,10.38748 -27.45648,19.61995 0,0 0,0 0,0
>>>> -2.04968,2.79284 -3.83397,5.78812 -5.25823,8.95292 0,0 0,0 0,0
>>>> -0.40597,0.90207 -0.78333,1.81896 -1.11555,2.75396 0,10e-6 0,10e-6
>>>> 0,10e-6 -0.089,0.25049 -0.17495,0.50294 -0.2554,0.75803 0,0 0,0 0,0
>>>> -0.0208,0.0661 -0.0414,0.13258 -0.0613,0.19948 -0.005,0.0172
>>>> -0.0102,0.0345 -0.0152,0.0518 -0.002,0.006 -0.004,0.0123
>>>> -0.005,0.0185 z"
>>>> +
>>>> style="fill:#000000;fill-opacity:0.53571424;fill-rule:evenodd;stroke:none"
>>>> />
>>>> + </g>
>>>> + </g>
>>>> + </g>
>>>> + <text
>>>> + xml:space="preserve"
>>>> +
>>>> style="font-size:29.00352478px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#034460;fill-opacity:1;stroke:none;font-family:Sans"
>>>> + id="text3248-0-4"
>>>> + sodipodi:linespacing="125%"
>>>> + transform="translate(-430.59109,-502.35325)"><textPath
>>>> + xlink:href="#path4619"
>>>> + id="textPath4636"
>>>> + style="font-size:16px">CommunautÃ©
>>>> francophone</textPath></text>
>>>> + </g>
>>>> +</svg>
>>>>
>>>>
>>>>
>>>
>>
>>

Pierre Smits

Re: svn commit: r1683430 - in /ofbiz/branches/boostrap_theme/themes/bootstrap: data/BootstrapThemeData.xml includes/appbar.ftl includes/header.ftl webapp/bootstrap/css/skins/tomahawk.css webapp/bootstrap/images/Logo-OFBiz.svg

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 <[hidden email]>
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, [hidden email] 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>
>>>>> - 
>>>>> - <#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>
>>>>> - 
>>>>> - <#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>
>>>>> + 
>>>>> + <#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>
>>>>> + 
>>>>> + <#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> 
>>>>> </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"?>
>>>>> +
>>>>> +
>>>>> +<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
>>>>
>>>>

Jacques Le Roux

Re: svn commit: r1683430 - in /ofbiz/branches/boostrap_theme/themes/bootstrap: data/BootstrapThemeData.xml includes/appbar.ftl includes/header.ftl webapp/bootstrap/css/skins/tomahawk.css webapp/bootstrap/images/Logo-OFBiz.svg

Administrator

In reply to this post by JulienNicolas

Le 04/06/2015 10:59, Julien NICOLAS a écrit :
>>> 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 ?

Mmm, OK I'm a bit (just a little bit) daltonian, but really I see yellow normally and on my machine I can't see any yellow anywhere
Ho wait, Pierre just told me on Skype there are 2 themes. I was looking at the basic one :D

For the colors, I like the original Tomahawk because the greys are cool to my eyes. I do it less now with new screens but with CRT I created my own
Windows theme to have greys background.
Sincerely I don't like as much the Boostrap Tomahawk Theme, but that's taste and diversity is good :) (though it's hard to read yellow on white... see
the button to get back from theme choice for instance

I also now understand and agree with Guillaume about the size of the font. I guess he speaks about the 2nd level and not the 3rd (I called it 2nd last
time) which is actually the sub-menus options of Catalog/Shipping in my mind (I hope we agree :D)

Thanks for the effort!

Jacques