svn commit: r1819800 - in /ofbiz/ofbiz-framework/trunk/themes: common/config/rainbowstone.properties rainbowstone/config/ rainbowstone/config/rainbowstone.properties rainbowstone/template/includes/TopAppBar.ftl

Author: jleroux
Date: Tue Jan  2 10:36:49 2018
New Revision: 1819800

URL: http://svn.apache.org/viewvc?rev=1819800&view=rev
Log:
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

This temporarily do it by putting an appMax properties in a
common/config/rainbowstone.properties file.
Putting it in themes/common/config/rainbowstone.properties does not work yet.
I have to find why, WIP in relation with OFBIZ-7073

Added:
    ofbiz/ofbiz-framework/trunk/themes/common/config/rainbowstone.properties   (with props)
    ofbiz/ofbiz-framework/trunk/themes/rainbowstone/config/
    ofbiz/ofbiz-framework/trunk/themes/rainbowstone/config/rainbowstone.properties   (with props)
Modified:
    ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl

Added: ofbiz/ofbiz-framework/trunk/themes/common/config/rainbowstone.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/config/rainbowstone.properties?rev=1819800&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/config/rainbowstone.properties (added)
+++ ofbiz/ofbiz-framework/trunk/themes/common/config/rainbowstone.properties Tue Jan  2 10:36:49 2018
@@ -0,0 +1 @@
+appMax=12
\ No newline at end of file

Propchange: ofbiz/ofbiz-framework/trunk/themes/common/config/rainbowstone.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/themes/common/config/rainbowstone.properties
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/themes/common/config/rainbowstone.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/config/rainbowstone.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/config/rainbowstone.properties?rev=1819800&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/config/rainbowstone.properties (added)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/config/rainbowstone.properties Tue Jan  2 10:36:49 2018
@@ -0,0 +1 @@
+appMax=8
\ No newline at end of file

Propchange: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/config/rainbowstone.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/config/rainbowstone.properties
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/config/rainbowstone.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl?rev=1819800&r1=1819799&r2=1819800&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl Tue Jan  2 10:36: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>