#786: Quartz plugin. Work in progress.

hawtio · Dec 30, 2013 · 6a656b4 · 6a656b4
1 parent e8b1f21
commit 6a656b4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 44 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,15 @@
 
   <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>
+    <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 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,12 +1,18 @@
 <ul class="nav nav-tabs" ng-controller="Quartz.QuartzController">
   <li ng-class='active'>
-    <a ng-href="#/quartz/schedulers{{hash}}">Schedulers</a>
+    <a ng-href="#/quartz/schedulers{{hash}}" title="Schedulers"
+       data-placement="bottom">Schedulers
+    </a>
   </li>
   <li ng-class='active'>
-    <a ng-href="#/quartz/triggers{{hash}}">Triggers</a>
+    <a ng-href="#/quartz/triggers{{hash}}" title="Triggers"
+       data-placement="bottom">Triggers
+    </a>
   </li>
   <li ng-class='active'>
-    <a ng-href="#/quartz/jobs{{hash}}">Jobs</a>
+    <a ng-href="#/quartz/jobs{{hash}}" title="Jobs"
+       data-placement="bottom">Jobs
+    </a>
   </li>
 
   <li class="pull-right">

diff --git a/hawtio-web/src/main/webapp/app/quartz/html/schedulers.html b/hawtio-web/src/main/webapp/app/quartz/html/schedulers.html
@@ -11,7 +11,6 @@
 
   <div ng-show="selectedSchedulerMBean" class="row-fluid">
     <div class="alert alert-info">
-      <button class="close" data-dismiss="alert">×</button>
 
       <strong>Scheduler Details:</strong>
 
@@ -32,36 +31,6 @@
       </div>
     </div>
 
-    <div class="row-fluid">
-      <div class="pull-left">
-        <form class="form-inline no-bottom-margin">
-          <fieldset>
-            <div class="controls control-group inline-block controls-row">
-              <div class="btn-group">
-                <button
-                    ng-disabled="gridOptions.selectedItems.length == 0 || gridOptions.selectedItems[0].state != 'PAUSED'"
-                    class="btn" ng-click="resume()" title="Resume">
-                  <i class="icon-play-circle"></i></button>
-                <button
-                    ng-disabled="gridOptions.selectedItems.length == 0 || gridOptions.selectedItems[0].state == 'PAUSED'"
-                    class="btn" ng-click="pause()" title="Pause">
-                  <i class="icon-off"></i></button>
-              </div>
-            </div>
-          </fieldset>
-        </form>
-      </div>
-    </div>
-
-    <div class="row-fluid">
-      <div class="row-fluid">
-        <strong>Scheduler Triggers:</strong>
-      </div>
-      <div class="row-fluid">
-        <div class="gridStyle" ng-grid="gridOptions"></div>
-      </div>
-    </div>
-
   </div>
 
 </div>

diff --git a/hawtio-web/src/main/webapp/app/quartz/js/quartzPlugin.ts b/hawtio-web/src/main/webapp/app/quartz/js/quartzPlugin.ts
@@ -27,7 +27,8 @@ module Quartz {
               content: "Quartz",
               title: "Quartz Scheduler",
               isValid: (workspace: Workspace) => workspace.treeContainsDomainAndProperties(jmxDomain),
-              href: () => "#/quartz/schedulers"
+              href: () => "#/quartz/schedulers",
+              isActive: (workspace:Workspace) => workspace.isTopTabActive("quartz")
             });
 
     });