Merge pull request #480 from hawkular/url-refactoring

UI Url list refactoring
hawkular · Sep 21, 2015 · 1e977e0 · 1e977e0
2 parents bab7eab + e8326c4
commit 1e977e0
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 23 deletions.
diff --git a/...pts/plugins/metrics/html/alerts-view.html → ...etrics/html/partials/url-alerts-view.html b/...pts/plugins/metrics/html/alerts-view.html → ...etrics/html/partials/url-alerts-view.html
diff --git a/.../scripts/plugins/metrics/html/alerts.html → ...ipts/plugins/metrics/html/url-alerts.html b/.../scripts/plugins/metrics/html/alerts.html → ...ipts/plugins/metrics/html/url-alerts.html
@@ -18,6 +18,6 @@ <h3 class="pull-left">Alerts <span>({{(mac.alertList).length}})</span></h3>
           <i class="fa fa-cog"></i>Availability Alert Settings</a>
       </span>
     </div>
-    <div ng-include="'plugins/metrics/html/alerts-view.html'"></div>
+    <div ng-include="'plugins/metrics/html/partials/url-alerts-view.html'"></div>
   </section>
 </div>
diff --git a/...ts/plugins/metrics/html/availability.html → ...lugins/metrics/html/url-availability.html b/...ts/plugins/metrics/html/availability.html → ...lugins/metrics/html/url-availability.html
diff --git a/console/src/main/scripts/plugins/metrics/html/url-pagination.html b/console/src/main/scripts/plugins/metrics/html/url-pagination.html
diff --git a/...s/plugins/metrics/html/response-time.html → ...ugins/metrics/html/url-response-time.html b/...s/plugins/metrics/html/response-time.html → ...ugins/metrics/html/url-response-time.html
diff --git a/console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts b/console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts
@@ -34,7 +34,7 @@ module HawkularMetrics {
       // this was for single page.. remove ?
       when('/hawkular/:resourceId/:timeOffset?/:endTime?', {templateUrl: 'plugins/metrics/html/single-page.html'}).
       when('/metrics/response-time', {
-        templateUrl: 'plugins/metrics/html/response-time.html',
+        templateUrl: 'plugins/metrics/html/url-response-time.html',
         resolve: {
           hkResourceList: function ($route, $filter, $location, $rootScope, $q, HawkularInventory) {
             var idParts = $route.current.params.resourceId.split('~');
@@ -56,7 +56,7 @@ module HawkularMetrics {
         }
       }).when('/hawkular-ui/url/url-list', {templateUrl: 'plugins/metrics/html/url-list.html'}).
       when('/hawkular-ui/url/response-time/:resourceId/:timeOffset?/:endTime?', {
-        templateUrl: 'plugins/metrics/html/response-time.html',
+        templateUrl: 'plugins/metrics/html/url-response-time.html',
         reloadOnSearch: false,
         resolve: {
           resource: function ($route, $location, HawkularInventory, NotificationsService:INotificationsService) {
@@ -75,7 +75,7 @@ module HawkularMetrics {
         }
       }).
       when('/hawkular-ui/url/availability/:resourceId/:timeOffset?/:endTime?', {
-        templateUrl: 'plugins/metrics/html/availability.html',
+        templateUrl: 'plugins/metrics/html/url-availability.html',
         reloadOnSearch: false,
         resolve: {
           resource: function ($route, $location, HawkularInventory, NotificationsService:INotificationsService) {
@@ -94,7 +94,7 @@ module HawkularMetrics {
         }
       }).
       when('/hawkular-ui/url/alerts/:resourceId/:timeOffset?/:endTime?', {
-        templateUrl: 'plugins/metrics/html/alerts.html',
+        templateUrl: 'plugins/metrics/html/url-alerts.html',
         reloadOnSearch: false,
         resolve: {
           resource: function ($route, $location, HawkularInventory, NotificationsService:INotificationsService) {