svn commit: r1838073 - in /ofbiz/ofbiz-framework/trunk/themes/rainbowstone: template/includes/TopAppBar.ftl webapp/rainbowstone/rainbowstone-main-theme.less

[jnicolas]

Author: jnicolas
Date: Wed Aug 15 08:50:28 2018
New Revision: 1838073

URL: http://svn.apache.org/viewvc?rev=1838073&view=rev
Log:
Improve: Main menu enhancement
(OFBIZ-10521)

The main menu in rainbowstone theme don't display more than 9 items, pending items are included in the + menu.
The problem is that it's not really clear to know where you are or to simply click again on the webapp link to be redirected to the main target.

Modified:
    ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl
    ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less

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=1838073&r1=1838072&r2=1838073&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl Wed Aug 15 08:50:28 2018
@@ -166,6 +166,9 @@ under the License.
                         </#if>
                         <li class="app-btn-sup<#if selected> selected</#if>">
                             <a class="more-app-a" href="${thisURL}${StringUtil.wrapString(externalKeyParam)}"<#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a>
+                            <#if selected>
+                                <#assign currentMoreApp = display>
+                            </#if>
                         </li>
                     </#if>
                     <#assign appCount = appCount + 1>
@@ -201,6 +204,9 @@ under the License.
                     </#if>
                     <li class="app-btn-sup<#if selected> selected</#if>">
                         <a class="more-app-a" href="${thisURL}${StringUtil.wrapString(externalKeyParam)}"<#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a>
+                        <#if selected>
+                            <#assign currentMoreApp = display>
+                        </#if>
                     </li>
                 </#if>
                 <#assign appCount = appCount + 1>
@@ -210,6 +216,23 @@ under the License.
         </ul> <!-- more-app-list -->
         </div> <!-- more-app -->
         </#if>
+
+        <#if currentMoreApp?exists>
+        <ul class="app-bar-list more-current-app">
+            <#assign thisApp = currentMoreApp.getContextRoot()>
+            <#assign thisApp = StringUtil.wrapString(thisApp)>
+            <#assign thisURL = thisApp>
+            <#if thisApp != "/">
+                <#assign thisURL = thisURL + "/control/main">
+            </#if>
+            <li class="app-btn selected">
+                <div id="app-selected">
+                    <a class="more-app-a" href="${thisURL}${StringUtil.wrapString(externalKeyParam)}"<#if uiLabelMap??> title="${uiLabelMap[currentMoreApp.description]}">${uiLabelMap[currentMoreApp.title]}<#else> title="${currentMoreApp.description}">${currentMoreApp.title}</#if></a>
+                    <div id="color-add"></div>
+                </div>
+            </li>
+        </ul>
+        </#if>
     </div>
         <div id="main-nav-bar-right">
             <div id="company-logo"></div>

Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less?rev=1838073&r1=1838072&r2=1838073&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less Wed Aug 15 08:50:28 2018
@@ -577,6 +577,10 @@ li.line-odd {
   text-decoration: none;
 }
 
+.more-current-app {
+  margin-left: 10px;
+}
+
 #app-bar-line {
   position: relative;
   width: 100%;
@@ -630,6 +634,7 @@ li.line-odd {
   li {
     padding-left : 4px;
     padding-right: 4px;
+    padding-top: 2px;
   }
 
   a {
@@ -647,6 +652,7 @@ li.line-odd {
       box-shadow: none;
       text-decoration: none;
       border-radius: 0;
+      padding-top:4px;
     }
   }
 
@@ -662,28 +668,6 @@ li.line-odd {
   }
 }
 
-#homeButton {
-  display: flex;
-  //visibility: hidden;
-  align-items: center;
-  justify-content: center;
-  background-color:@grey;
-  border: none;
-  border-radius : 0;
-
-  height: @app-bar-height;
-  width : @home-btn-width;
-  text-decoration: none;
-  img {
-    height: 25px;
-    transition: all .2s ease-in-out;
-  }
-}
-
-#homeButton:hover img {
-  transform: scale(1.1);
-}
-
 #app-bar-list {
   display: flex;
 }
@@ -872,7 +856,7 @@ a.user-pref-btn {
     content: '';
     position: absolute;
     top: -2px;
-    left: 5px;
+    left: calc(50% - 10px);
     width: 0;
     height: 0;
     border-right: 10px solid transparent;
@@ -1002,23 +986,6 @@ a.user-pref-btn {
   height: @app-bar-height ;
 }
 
-#homeGlyph {
-  margin-left: 20px;
-  height: 20px;
-}
-
-#homePageTitle {
-  color: @white;
-  font-size: 20px;
-  font-weight: bold;
-  margin-right: 20px;
-  margin-left: 20px;
-}
-.home-menu-list {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
 .hp-applist {
   display: flex;
   flex-direction: row;