HAWKULAR-843 : Fix dropdowns across console

There were changes to angular-ui bootstrap which caused the dropdowns to stop working. The dropdown top-most element requires a "dropdown" directive, as class="dropdown" is not sufficient.
hawkular · Nov 25, 2015 · 7ab23a8 · 7ab23a8
1 parent 59282f7
commit 7ab23a8
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/console/src/main/scripts/plugins/directives/subtab/html/subtab.html b/console/src/main/scripts/plugins/directives/subtab/html/subtab.html
@@ -7,8 +7,8 @@
         <a ng-show="isAlertsCenterDetailPage()" href="/hawkular-ui/alerts-center-detail/{{hkParams.timeOffset}}" class="back">« All Alerts</a>
       </div>
       <div class="col-xs-5">
-        <div class="hk-date-range dropdown" ng-hide="isAlertsCenterTriggersPage()">
-          <div class="input-group" dropdown-toggle data-toggle="dropdown">
+        <div class="hk-date-range dropdown" dropdown ng-hide="isAlertsCenterTriggersPage()">
+          <div class="input-group" dropdown-toggle>
             <div class="hk-input">
               {{offsetName}} <span ng-show="false">{{getFormattedDate()}}</span>
             </div>

diff --git a/console/src/main/scripts/plugins/metrics/html/alerts-center-list.html b/console/src/main/scripts/plugins/metrics/html/alerts-center-list.html
@@ -38,7 +38,7 @@ <h3 class="pull-left">Alerts ({{ac.headerLinks.total}})</h3>
 
       <div class="hk-table-container">
         <div class="hk-actions-table">
-          <div class="dropdown">
+          <div class="dropdown" dropdown>
             <a href="#" class="btn btn-default" dropdown-toggle>
               Change State <b class="caret"></b>
             </a>

diff --git a/console/src/main/scripts/plugins/metrics/html/alerts-center-triggers.html b/console/src/main/scripts/plugins/metrics/html/alerts-center-triggers.html
@@ -33,7 +33,7 @@ <h3 class="pull-left">Triggers ({{act.headerLinks.total}})</h3>
 
       <div class="hk-table-container">
         <div class="hk-actions-table">
-          <div class="dropdown">
+          <div class="dropdown" dropdown>
             <a href="#" class="btn btn-default" dropdown-toggle>
               Change State <b class="caret"></b>
             </a>

diff --git a/console/src/main/scripts/plugins/metrics/html/app-details/detail-datasources.html b/console/src/main/scripts/plugins/metrics/html/app-details/detail-datasources.html
@@ -14,10 +14,10 @@
           </button>
           <ul class="dropdown-menu" role="menu" aria-labelledby="datasource-sort-dropdown">
             <li ng-class="{'active': !vm.sortInv}">
-              <a href="" ng-click="vm.sortInv = false" dropdown-toggle>Sort A - Z</a>
+              <a href="" ng-click="vm.sortInv = false">Sort A - Z</a>
             </li>
             <li ng-class="{'active': vm.sortInv}">
-              <a href="" ng-click="vm.sortInv = true" dropdown-toggle>Sort Z - A</a>
+              <a href="" ng-click="vm.sortInv = true">Sort Z - A</a>
             </li>
           </ul>
         </div>
@@ -30,7 +30,7 @@
           </button>
           <ul class="dropdown-menu" role="menu" aria-labelledby="datasource-jdbc-drivers">
             <li ng-repeat="driver in vm.driversList">
-              <a href="" ng-click="vm.deleteDriver(driver)" dropdown-toggle>{{driver.name}}
+              <a href="" ng-click="vm.deleteDriver(driver)">{{driver.name}}
                 <span class="pull-right"><i class="fa fa-trash-o"></i></span></a>
             </li>
           </ul>

diff --git a/console/src/main/scripts/plugins/metrics/html/app-details/detail-deployments.html b/console/src/main/scripts/plugins/metrics/html/app-details/detail-deployments.html
@@ -49,27 +49,27 @@ <h3>Deployments</h3>
           <div class="actions-table">
             <button class="btn btn-primary add" type="button"
                     ng-click="vm.showDeploymentAddDialog()">Add Deployment</button>
-            <div class="dropdown">
+            <div class="dropdown" dropdown>
               <button class="btn btn-default" type="button" id="add-dep" dropdown-toggle ng-disabled="!vm.selectCount">
                 Actions
                 <span class="caret"></span>
               </button>
               <ul class="dropdown-menu disabled" role="menu" aria-labelledby="add-dep">
                 <li role="presentation">
                   <a role="menuitem" tabindex="-1" href="#"
-                     ng-click="vm.performOperationMulti('Deploy', vm.resourceList)" dropdown-toggle>Enable</a>
+                     ng-click="vm.performOperationMulti('Deploy', vm.resourceList)">Enable</a>
                 </li>
                 <li role="presentation">
                   <a role="menuitem" tabindex="-1" href="#"
-                     ng-click="vm.performOperationMulti('Redeploy', vm.resourceList)" dropdown-toggle>Redeploy</a>
+                     ng-click="vm.performOperationMulti('Redeploy', vm.resourceList)">Redeploy</a>
                 </li>
                 <li role="presentation">
                   <a role="menuitem" tabindex="-1" href="#"
-                     ng-click="vm.performOperationMulti('Undeploy', vm.resourceList)" dropdown-toggle>Disable</a>
+                     ng-click="vm.performOperationMulti('Undeploy', vm.resourceList)">Disable</a>
                 </li>
                 <li role="presentation">
                   <a role="menuitem" tabindex="-1" href="#"
-                     ng-click="vm.performOperationMulti('Remove', vm.resourceList)" dropdown-toggle>Remove</a>
+                     ng-click="vm.performOperationMulti('Remove', vm.resourceList)">Remove</a>
                 </li>
               </ul>
             </div>

diff --git a/console/src/main/scripts/plugins/metrics/html/directives/table-filters.html b/console/src/main/scripts/plugins/metrics/html/directives/table-filters.html
@@ -1,3 +1,3 @@
 <div>
-  <div pf-simple-filter id="exampleSimpleFilter" config="vm.filterConfig" class="ng-isolate-scope"></div>
+  <div pf-simple-filter id="exampleSimpleFilter" config="vm.filterConfig"></div>
 </div>
diff --git a/console/src/main/webapp/index.html b/console/src/main/webapp/index.html
@@ -43,7 +43,7 @@
         </div>
         <div class="collapse navbar-collapse navbar-collapse-1">
           <ul class="nav navbar-nav navbar-utility pull-right">
-            <li class="dropdown">
+            <li class="dropdown" dropdown>
               <a href="#" dropdown-toggle>
                 Red Hat Access <b class="caret"></b>
               </a>
@@ -58,7 +58,7 @@
                 </li>
               </ul>
             </li>
-            <li class="dropdown" ng-controller="HawkularAccounts.PersonaController as personaController">
+            <li class="dropdown" dropdown ng-controller="HawkularAccounts.PersonaController as personaController">
               <a href="#" dropdown-toggle>
                 <span class="pficon pficon-user"></span>
                 {{personaController.currentPersona.name}} <b class="caret"></b>