#786: Quartz plugin. Work in progress.

hawtio · Dec 30, 2013 · b4a7d61 · b4a7d61
1 parent acfd03e
commit b4a7d61
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/hawtio-web/src/main/webapp/app/quartz/html/jobs.html b/hawtio-web/src/main/webapp/app/quartz/html/jobs.html
@@ -11,15 +11,19 @@
 
   <div ng-show="selectedScheduler" class="row-fluid">
 
-    <div class="pull-right">
-      <form class="form-inline no-bottom-margin">
-        <fieldset>
-          <div class="control-group inline-block">
-            <input type="text" class="search-query" placeholder="Filter..."
-                   ng-model="jobsGridOptions.filterOptions.filterText">
-          </div>
-        </fieldset>
-      </form>
+    <div class="row-fluid">
+
+      <div class="pull-right">
+        <form class="form-inline no-bottom-margin">
+          <fieldset>
+            <div class="control-group inline-block">
+              <input type="text" class="search-query" placeholder="Filter..."
+                     ng-model="jobsGridOptions.filterOptions.filterText">
+            </div>
+          </fieldset>
+        </form>
+      </div>
+
     </div>
 
     <div class="row-fluid">

diff --git a/hawtio-web/src/main/webapp/app/quartz/html/quartzTabs.html b/hawtio-web/src/main/webapp/app/quartz/html/quartzTabs.html
@@ -1,18 +1,12 @@
-<ul class="nav nav-tabs" ng-controller="Quartz.QuartzController">
-  <li ng-class='active'>
-    <a ng-href="#/quartz/schedulers{{hash}}" title="Schedulers"
-       data-placement="bottom">Schedulers
-    </a>
+<ul class="nav nav-tabs" ng-controller="Core.NavBarController">
+  <li ng-class='{active : isActive("#/quartz/schedulers")}'>
+    <a ng-href="{{link('#/quartz/schedulers')}}">Schedulers</a>
   </li>
-  <li ng-class='active'>
-    <a ng-href="#/quartz/triggers{{hash}}" title="Triggers"
-       data-placement="bottom">Triggers
-    </a>
+  <li ng-class='{active : isActive("#/quartz/triggers")}'>
+    <a ng-href="{{link('#/quartz/triggers')}}">Triggers</a>
   </li>
-  <li ng-class='active'>
-    <a ng-href="#/quartz/jobs{{hash}}" title="Jobs"
-       data-placement="bottom">Jobs
-    </a>
+  <li ng-class='{active : isActive("#/quartz/jobs")}'>
+    <a ng-href="{{link('#/quartz/jobs')}}">Jobs</a>
   </li>
 
   <li class="pull-right">