Merge pull request #166 from ezsystems/ezp-23986_navigationhub

EZP-23986: As an editor, I want to have a navigation hub to navigate through the PlatformUI
ezsystems · Feb 16, 2015 · 7d7f15a · 7d7f15a
2 parents ace1370 + f87ebcc
commit 7d7f15a
Show file tree

Hide file tree

Showing 21 changed files with 981 additions and 625 deletions.
diff --git a/Resources/config/yui.yml b/Resources/config/yui.yml
@@ -20,6 +20,8 @@ system:
                         - 'ez-contenteditview'
                         - 'ez-locationviewview'
                         - 'ez-locationviewviewservice'
+                        - 'ez-serversideview'
+                        - 'ez-serversideviewservice'
                         - 'ez-navigationhubviewservice'
                         - 'ez-navigationhubview'
                         - 'ez-discoverybarviewservice'
@@ -67,7 +69,7 @@ system:
                         - 'ez-contentcreateplugin'
                     path: %ez_platformui.public_dir%/js/views/services/ez-locationviewviewservice.js
                 ez-navigationhubviewservice:
-                    requires: ['ez-viewservice', 'ez-navigationitemsubtreeview', 'array-extras']
+                    requires: ['ez-viewservice', 'ez-navigationitemsubtreeview', 'ez-navigationitemparameterview', 'array-extras']
                     path: %ez_platformui.public_dir%/js/views/services/ez-navigationhubviewservice.js
                 ez-discoverybarviewservice:
                     requires: ['ez-viewservice', 'ez-contenttreeplugin']
@@ -117,6 +119,9 @@ system:
                 ez-navigationitemsubtreeview:
                     requires: ['ez-navigationitemview']
                     path: %ez_platformui.public_dir%/js/views/navigation/ez-navigationitemsubtreeview.js
+                ez-navigationitemparameterview:
+                    requires: ['ez-navigationitemview']
+                    path: %ez_platformui.public_dir%/js/views/navigation/ez-navigationitemparameterview.js
                 ez-navigationitemview:
                     requires: ['ez-templatebasedview', 'navigationitemview-ez-template']
                     path: %ez_platformui.public_dir%/js/views/navigation/ez-navigationitemview.js

diff --git a/Resources/public/css/theme/views/navigationhub.css b/Resources/public/css/theme/views/navigationhub.css
@@ -24,6 +24,10 @@
     border-right: 1px solid #ddd;
 }
 
+.ez-view-navigationhubview .ez-zone-no-navigation.is-zone-active {
+    border-bottom: 3px solid #528036;
+}
+
 .ez-view-navigationhubview .ez-navigation {
     border-top: 1px solid #ccc;
     border-bottom: 1px solid #bbb;
@@ -44,9 +48,9 @@
 }
 
 .ez-view-navigationhubview .ez-zone:before {
-    width: 1.5em;
-    height: 1.5em;
-    line-height: 1.5em;
+    width: 2rem;
+    height: 2rem;
+    line-height: 2rem;
     margin: 0;
     background: #528036;
     color: #fff;
@@ -55,11 +59,17 @@
     float: left;
     text-align: center;
     font-family: 'ez-platformui-icomoon';
-    font-size: 150%;
+    font-size: 135%;
     -webkit-font-smoothing: antialiased;
 }
 
-@media (max-width: 62em) {
+.ez-view-navigationhubview .ez-admin-zone:before {
+    background: transparent;
+    color: #444;
+    font-size: 100%;
+}
+
+@media (max-width: 58em) {
     .ez-view-navigationhubview .ez-zone:before {
         font-size: 120%;
         width: 1.4em;
@@ -68,29 +78,42 @@
     }
 }
 
-.ez-view-navigationhubview .ez-create-zone:before {
+.ez-view-navigationhubview .ez-platform-zone:before {
     content: "\E611";
 }
 
-.ez-view-navigationhubview .ez-optimize-zone:before {
+.ez-view-navigationhubview .ez-studioplus-zone:before {
     content: "\E612";
 }
 
-.ez-view-navigationhubview .ez-deliver-zone:before {
+.ez-view-navigationhubview .ez-studio-zone:before {
     content: "\E60D";
 }
 
-.ez-view-navigationhubview .ez-link a:after {
-    padding-left: 0.5em;
-    vertical-align: middle;
+.ez-view-navigationhubview .ez-admin-zone:before {
+    content: "\E613";
 }
 
-.ez-view-navigationhubview .ez-navigation .ez-navigation-item,
-.ez-view-navigationhubview .ez-zone-name {
+.ez-view-navigationhubview .ez-navigation .ez-navigation-item {
     font-weight: bold;
     color: #333;
 }
 
+.ez-view-navigationhubview .ez-zone-name {
+    color: #333;
+    font-size: 110%;
+}
+
+.ez-view-navigationhubview .ez-admin-zone .ez-zone-name {
+    font-size: 80%;
+}
+
+@media (max-width:58em) {
+    .ez-view-navigationhubview .ez-zone-name {
+        font-size: 100%;
+    }
+}
+
 .ez-view-navigationhubview .ez-navigation .ez-logo {
     opacity: 0;
     visibility: visible;
@@ -150,26 +173,12 @@
     border-bottom: 3px solid #528036;
 }
 
-.ez-view-navigationhubview .ez-zone-hint {
-    color: #777;
-    font-size: 80%;
-}
-
-.ez-view-navigationhubview .ez-link a {
-    color: #333;
-    font-size: 85%;
-    font-weight: bold;
-    margin-bottom: 1em;
-    display: inline-block;
-}
-
-.ez-view-navigationhubview .ez-navigation .ez-navigation-item:hover,
-.ez-view-navigationhubview .ez-link a:hover {
+.ez-view-navigationhubview .ez-navigation .ez-navigation-item:hover {
     color: #528036;
 }
 
 .ez-view-navigationhubview .ez-user-info {
-    font-size: 85%;
+    font-size: 0.85rem;
 }
 
 .ez-view-navigationhubview .ez-user-info-name {

diff --git a/Resources/public/css/views/navigationhub.css b/Resources/public/css/views/navigationhub.css
@@ -4,20 +4,18 @@
  */
 
 .ez-view-navigationhubview .ez-zones-navigation,
-.ez-view-navigationhubview .ez-navigation-create,
-.ez-view-navigationhubview .ez-navigation-deliver,
-.ez-view-navigationhubview .ez-navigation-optimize {
+.ez-view-navigationhubview .ez-navigation-platform,
+.ez-view-navigationhubview .ez-navigation-admin,
+.ez-view-navigationhubview .ez-navigation-studio,
+.ez-view-navigationhubview .ez-navigation-studioplus {
     list-style-type: none;
     margin: 0;
     padding: 0;
 }
 
 .ez-view-navigationhubview .ez-zones-navigation li {
     display: inline-block;
-}
-
-.ez-view-navigationhubview .ez-zones-navigation .ez-link {
-    vertical-align: bottom;
+    overflow: hidden;
 }
 
 .ez-view-navigationhubview .ez-navigation > ul,
@@ -26,24 +24,43 @@
     white-space: nowrap;
 }
 
+.ez-view-navigationhubview .ez-zones-navigation {
+    font-size: 0;
+}
+
 .ez-view-navigationhubview .ez-navigation li {
     display: inline-block;
 }
 
-.ez-view-navigationhubview .ez-zone-name,
-.ez-view-navigationhubview .ez-zone-hint {
+.ez-view-navigationhubview .ez-zone-name {
+    height: 2rem;
+    line-height: 2rem;
     margin: 0 0 0 2.6rem;
 }
 
+.ez-view-navigationhubview .ez-admin-zone .ez-zone-name {
+    margin: 0 0 0 2rem;
+}
+
 .ez-view-navigationhubview .ez-logo {
     text-align: center;
-    width: 9em;
 }
 
 .ez-view-navigationhubview .ez-zone,
-.ez-view-navigationhubview .ez-link,
+.ez-view-navigationhubview .ez-zones-navigation .ez-logo,
 .ez-view-navigationhubview .ez-user-info {
-    padding: 1em;
+    font-size: 1rem;
+    padding: 0.8rem 1rem;
+}
+
+.ez-view-navigationhubview .ez-zones-navigation .ez-logo,
+.ez-view-navigationhubview .ez-zone {
+    height: 2rem;
+}
+
+.ez-view-navigationhubview .ez-admin-zone {
+    padding-right: 1.3rem;
+    margin-left: 3em;
 }
 
 .ez-view-navigationhubview .ez-user-info {
@@ -145,28 +162,19 @@
     display: block;
 }
 
-@media (max-width:70em) {
-    .ez-view-navigationhubview .ez-zones-navigation .ez-exchange {
-        display: none;
-    }
-}
-
-@media (max-width:62em) {
-    .ez-view-navigationhubview .ez-logo {
-        width: 6em;
-        vertical-align: middle;
-    }
-
-    .ez-view-navigationhubview .ez-zone-hint {
-        display: none;
+@media (max-width:58em) {
+    .ez-view-navigationhubview .ez-zone,
+    .ez-view-navigationhubview .ez-zones-navigation .ez-logo,
+    .ez-view-navigationhubview .ez-user-info {
+        padding: 0.6rem 0.4rem;
     }
 
     .ez-view-navigationhubview .ez-zone-name {
-        margin: 0.2em 0 0 1.9rem;
-        font-size: 90%;
+        margin: 0 0 0 1.9rem;
     }
 
-    .ez-view-navigationhubview .ez-zones-navigation .ez-settings a {
-        margin-bottom: 0.4em;
+    .ez-view-navigationhubview .ez-admin-zone {
+        padding-right: 1.3rem;
+        margin-left: 1em;
     }
 }
diff --git a/Resources/public/js/apps/extensions/ez-app-extension-admin.js b/Resources/public/js/apps/extensions/ez-app-extension-admin.js