]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard_v2: Reorder menu entries
authorRicardo Marques <rimarques@suse.com>
Wed, 21 Feb 2018 10:14:49 +0000 (10:14 +0000)
committerRicardo Dias <rdias@suse.com>
Mon, 5 Mar 2018 13:07:12 +0000 (13:07 +0000)
Signed-off-by: Ricardo Marques <rimarques@suse.com>
src/pybind/mgr/dashboard_v2/frontend/src/app/core/navigation/navigation/navigation.component.html

index 9df024e0dfa63a8f40b65fb23c2b2d28ca9755dc..ae50c267c87034dfd0c55fa50848ef55e08739b7 100644 (file)
@@ -25,6 +25,8 @@
   <div class="collapse navbar-collapse"
        id="bs-example-navbar-collapse-1">
     <ul class="nav navbar-nav navbar-primary">
+
+      <!-- Dashboard -->
       <li routerLinkActive="active"
           class="tc_menuitem tc_menuitem_dashboard">
         <a i18n
         </a>
       </li>
 
-      <li dropdown
-          routerLinkActive="active"
-          class="dropdown tc_menuitem tc_menuitem_cephs">
-        <a dropdownToggle
-           class="dropdown-toggle"
-           data-toggle="dropdown">
-          <ng-container i18n>Filesystems</ng-container>
-          <span class="caret"></span>
-        </a>
-        <ul *dropdownMenu
-            class="dropdown-menu">
-          <li routerLinkActive="active"
-              class="tc_submenuitem tc_submenuitem_cephfs_fs"
-              *ngFor="let fs of topLevelData?.filesystems">
-            <a i18n
-               class="dropdown-item"
-               routerLink="/cephfs/{{fs.id}}">{{ fs.name }}
-            </a>
-          </li>
-          <li class="tc_submenuitem tc_submenuitem_cephfs_nofs"
-              *ngIf="topLevelData.filesystems.length === 0">
-            <span i18n>There are no filesystems</span>
-          </li>
-        </ul>
-      </li>
-      <!--
-  <li routerLinkActive="active"
-          class="tc_menuitem tc_menuitem_ceph_osds">
-        <a i18n
-           routerLink="/cephOsds">OSDs
-        </a>
-      </li>
-      <li routerLinkActive="active"
-          class="tc_menuitem tc_menuitem_ceph_pools">
-        <a i18n
-           routerLink="/cephPools">Pools
-        </a>
-      </li>
-      -->
+      <!-- Cluster -->
       <li dropdown
           routerLinkActive="active"
           class="dropdown tc_menuitem tc_menuitem_cluster">
           </li>
         </ul>
       </li>
+
       <!-- Block -->
       <li dropdown
           routerLinkActive="active"
           </li>
         </ul>
       </li>
+
+      <!-- Filesystem -->
+      <li dropdown
+          routerLinkActive="active"
+          class="dropdown tc_menuitem tc_menuitem_cephs">
+        <a dropdownToggle
+           class="dropdown-toggle"
+           data-toggle="dropdown">
+          <ng-container i18n>Filesystems</ng-container>
+          <span class="caret"></span>
+        </a>
+        <ul *dropdownMenu
+            class="dropdown-menu">
+          <li routerLinkActive="active"
+              class="tc_submenuitem tc_submenuitem_cephfs_fs"
+              *ngFor="let fs of topLevelData?.filesystems">
+            <a i18n
+               class="dropdown-item"
+               routerLink="/cephfs/{{fs.id}}">{{ fs.name }}
+            </a>
+          </li>
+          <li class="tc_submenuitem tc_submenuitem_cephfs_nofs"
+              *ngIf="topLevelData.filesystems.length === 0">
+            <span i18n>There are no filesystems</span>
+          </li>
+        </ul>
+      </li>
+      <!--
+  <li routerLinkActive="active"
+          class="tc_menuitem tc_menuitem_ceph_osds">
+        <a i18n
+           routerLink="/cephOsds">OSDs
+        </a>
+      </li>
+      <li routerLinkActive="active"
+          class="tc_menuitem tc_menuitem_ceph_pools">
+        <a i18n
+           routerLink="/cephPools">Pools
+        </a>
+      </li>
+      -->
+
+      <!-- Object Gateway -->
       <li routerLinkActive="active"
           class="tc_menuitem tc_menuitem_rgw">
         <a i18n
            routerLink="/rgw">Object Gateway
         </a>
       </li>
+
       <!--<li class="dropdown tc_menuitem tc_menuitem_ceph_rgw">
         <a href=""
            class="dropdown-toggle"