svn commit: r1819806 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ themes/rainbowstone/config/ themes/rainbowstone/ofbiz-component.xml themes/rainbowstone/template/includes/TopAppBar.ftl

Author: jleroux
Date: Tue Jan  2 12:09:49 2018
New Revision: 1819806

URL: http://svn.apache.org/viewvc?rev=1819806&view=rev
Log:
"Applied fix from trunk for revision: 1819805"
------------------------------------------------------------------------
r1819805 | jleroux | 2018-01-02 13:07:51 +0100 (mar., 02 janv. 2018) | 7 lines

Improved: Make the number of initially visible applications in main menu a
(OFBIZ-10132)

Currently the number of initially visible applications is hardcoded to 8 in
TopAppBar.ftl

Completes r1819800 thankd to Deepak on dev ML
------------------------------------------------------------------------


Added:
    ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/config/
      - copied from r1819800, ofbiz/ofbiz-framework/trunk/themes/rainbowstone/config/
Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/ofbiz-component.xml
    ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/TopAppBar.ftl

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan  2 12:09:49 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805

Modified: ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/ofbiz-component.xml?rev=1819806&r1=1819805&r2=1819806&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/ofbiz-component.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/ofbiz-component.xml Tue Jan  2 12:09:49 2018
@@ -23,6 +23,7 @@ under the License.
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <!-- define resource loaders; most common is to use the component resource loader -->
     <resource-loader name="main" type="component"/>
+    <classpath type="dir" location="config"/>
 
     <!-- entity resources: model(s), eca(s), group, and data definitions -->
     <entity-resource type="data" reader-name="seed" loader="main" location="data/RainbowStoneThemeData.xml"/>

Modified: ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/TopAppBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/TopAppBar.ftl?rev=1819806&r1=1819805&r2=1819806&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/TopAppBar.ftl (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/TopAppBar.ftl Tue Jan  2 12:09:49 2018
@@ -40,7 +40,7 @@ under the License.
         </a>
     </div>
 <#if userLogin?has_content>
-    <#assign appMax = 8>
+    <#assign appMax = Static["org.apache.ofbiz.base.util.UtilProperties"].getPropertyAsInteger("rainbowstone", "appMax", 8)/>
     <#assign alreadySelected = false>
 <div id="main-navigation-bar">
     <div id="main-nav-bar-left">
@@ -129,9 +129,9 @@ under the License.
                 </#if>
             </#list>
         </ul>
-        <!-- Si le nombre d'application est supérieur au nombre d'application max affichable, je met le restant
-        dans un menu déroulant. J'ai volontairement doublé le code car sinon, la lecture du code lors d'une maintenance
-        risquait d'être compliquée. A corriger si jamais les performances s'en font ressentir -->
+        <!-- If the number of applications is greater than the maximum number of applications that can be displayed, the rest is put
+        in a drop-down menu. The code is deliberately doubled because otherwise, reading the code during maintenance
+        could be complicated. Correct if ever the performance is affected -->
         <#assign appCount = 0>
         <#assign moreApp = false>
         <#list displayApps as display>