Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
On Add-url section of the screen Capitalize the users Name.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mtho11
mtho11 committed May 27, 2015
1 parent 76e9924 commit 642d164
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 71 deletions.
2 changes: 1 addition & 1 deletion ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/add-url.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div ng-controller="HawkularMetrics.AddUrlController as vm">
<div class="hk-fade-in" ng-class="{'hk-urls-list text-center': vm.resourceList.length === 0}">
<h1 class="text-center">Hello {{userDetails.firstName}}!</h1>
<h1 class="text-center">Hello {{userDetails.firstName | capitalize}}!</h1>
<i class="fa fa-line-chart" ng-show="vm.resourceList.length === 0"></i>
<h2 ng-show="vm.resourceList.length === 0">Collect metrics from a website that you want to monitor.</h2>
<form class="form-horizontal hk-add-url" name="addUrlForm" role="form" novalidate ng-submit="vm.addUrl(vm.resourceUrl)">
Expand Down
159 changes: 89 additions & 70 deletions ui/console/src/main/scripts/plugins/metrics/plugins/metrics/ts/metricsPlugin.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,76 +20,95 @@

module HawkularMetrics {

export var _module = angular.module(HawkularMetrics.pluginName, ['ngResource', 'ui.select', 'hawkularCharts',
'hawkular.services', 'ui.bootstrap', 'topbar', 'patternfly.select', 'angular-momentjs', 'angular-md5']);

var metricsTab:any;

_module.config(['$httpProvider', '$locationProvider', '$routeProvider', 'HawtioNavBuilderProvider', ($httpProvider, $locationProvider, $routeProvider:ng.route.IRouteProvider, navBuilder:HawtioMainNav.BuilderFactory) => {

metricsTab = navBuilder.create()
.id(HawkularMetrics.pluginName)
.title(() => 'Metrics')
.href(() => '/metrics')
.subPath('Add Url', 'add-url', navBuilder.join(HawkularMetrics.templatePath, 'add-url.html'))
.subPath('Response Time', 'response-time', navBuilder.join(HawkularMetrics.templatePath, 'response-time.html'))
.subPath('Availability', 'availability', navBuilder.join(HawkularMetrics.templatePath, 'availability.html'))
.subPath('Alerts', 'alerts', navBuilder.join(HawkularMetrics.templatePath, 'alerts.html'))
.build();

navBuilder.configureRouting($routeProvider, metricsTab);

$locationProvider.html5Mode(true);
}]);

_module.run(['HawtioNav', (HawtioNav:HawtioMainNav.Registry) => {
HawtioNav.add(metricsTab);
log.debug('loaded Metrics Plugin');
}]);

///@todo: move this someplace common
_module.directive('hkEnter', () => {
return function (scope, element, attrs) {
element.bind('keydown keypress', (event) => {
if (event.which === 13) {
scope.$apply(() => {
scope.$eval(attrs.hkEnter);
});

event.preventDefault();
}
});
};
});

_module.config(["$routeProvider", ($routeProvider) => {
$routeProvider.
// 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',
resolve: {
hkResourceList : function($filter, $location, $rootScope, $q, HawkularInventory) {
var resPromise = HawkularInventory.Resource.query({tenantId: $rootScope.currentPersona.id, environmentId: globalEnvironmentId}).$promise;
resPromise.then(function(hkResourceList){
$location.path('/metrics/response-time/' + hkResourceList[0].id);
}, function(){
$location.url('/error');
export var _module = angular.module(HawkularMetrics.pluginName, ['ngResource', 'ui.select', 'hawkularCharts',
'hawkular.services', 'ui.bootstrap', 'topbar', 'patternfly.select', 'angular-momentjs', 'angular-md5']);

var metricsTab:any;

_module.config(['$httpProvider', '$locationProvider', '$routeProvider', 'HawtioNavBuilderProvider', ($httpProvider, $locationProvider, $routeProvider:ng.route.IRouteProvider, navBuilder:HawtioMainNav.BuilderFactory) => {

metricsTab = navBuilder.create()
.id(HawkularMetrics.pluginName)
.title(() => 'Metrics')
.href(() => '/metrics')
.subPath('Add Url', 'add-url', navBuilder.join(HawkularMetrics.templatePath, 'add-url.html'))
.subPath('Response Time', 'response-time', navBuilder.join(HawkularMetrics.templatePath, 'response-time.html'))
.subPath('Availability', 'availability', navBuilder.join(HawkularMetrics.templatePath, 'availability.html'))
.subPath('Alerts', 'alerts', navBuilder.join(HawkularMetrics.templatePath, 'alerts.html'))
.build();

navBuilder.configureRouting($routeProvider, metricsTab);

$locationProvider.html5Mode(true);
}]);

_module.run(['HawtioNav', (HawtioNav:HawtioMainNav.Registry) => {
HawtioNav.add(metricsTab);
log.debug('loaded Metrics Plugin');
}]);

_module.directive('hkEnter', () => {
return function (scope, element, attrs) {
element.bind('keydown keypress', (event) => {
if (event.which === 13) {
scope.$apply(() => {
scope.$eval(attrs.hkEnter);
});

event.preventDefault();
}
});
};
});

_module.filter('capitalize', function () {
return function (input, all) {
return (!!input) ? input.replace(/([^\W_]+[^\s-]*) */g, function (txt) {
return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
}) : '';
};
});

_module.config(["$routeProvider", ($routeProvider) => {
$routeProvider.
// 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',
resolve: {
hkResourceList: function ($filter, $location, $rootScope, $q, HawkularInventory) {
var resPromise = HawkularInventory.Resource.query({
tenantId: $rootScope.currentPersona.id,
environmentId: globalEnvironmentId
}).$promise;
resPromise.then(function (hkResourceList) {
$location.path('/metrics/response-time/' + hkResourceList[0].id);
}, function () {
$location.url('/error');
});

// Returning a promise which would never be resolved, so that the page would not render.
// The page will be redirected before rendering based on the resource list loaded above.
return $q.defer().promise;
}
}
}).
when('/hawkular-ui/url/url-list', {templateUrl: 'plugins/metrics/html/add-url.html'}).
when('/hawkular-ui/url/response-time/:resourceId/:timeOffset?/:endTime?', {templateUrl: 'plugins/metrics/html/response-time.html'}).
when('/hawkular-ui/url/availability/:resourceId/:timeOffset?/:endTime?', {templateUrl: 'plugins/metrics/html/availability.html'}).
when('/hawkular-ui/url/alerts/:resourceId/:timeOffset?/:endTime?', {templateUrl: 'plugins/metrics/html/alerts.html'}).

when('/hawkular-ui/app/app-list', {templateUrl: 'plugins/metrics/html/app-server-list.html'}).
when('/hawkular-ui/app/app-details/:resourceId/:timeOffset?/:endTime?', {
templateUrl: 'plugins/metrics/html/app-server-details.html',
resolve: {
hideSubNav: function () {
return true;
}
}
}).
otherwise({redirectTo: '/hawkular-ui/url/url-list'});
}]);

// Returning a promise which would never be resolved, so that the page would not render.
// The page will be redirected before rendering based on the resource list loaded above.
return $q.defer().promise;
}
}}).
when('/hawkular-ui/url/url-list', { templateUrl: 'plugins/metrics/html/add-url.html'}).
when('/hawkular-ui/url/response-time/:resourceId/:timeOffset?/:endTime?', {templateUrl: 'plugins/metrics/html/response-time.html'}).
when('/hawkular-ui/url/availability/:resourceId/:timeOffset?/:endTime?', {templateUrl: 'plugins/metrics/html/availability.html'}).
when('/hawkular-ui/url/alerts/:resourceId/:timeOffset?/:endTime?', {templateUrl: 'plugins/metrics/html/alerts.html'}).

when('/hawkular-ui/app/app-list', { templateUrl: 'plugins/metrics/html/app-server-list.html' }).
when('/hawkular-ui/app/app-details/:resourceId/:timeOffset?/:endTime?', { templateUrl: 'plugins/metrics/html/app-server-details.html', resolve: { hideSubNav: function() { return true; } } }).
otherwise({redirectTo: '/hawkular-ui/url/url-list'});
}]);

hawtioPluginLoader.addModule(HawkularMetrics.pluginName);
hawtioPluginLoader.addModule(HawkularMetrics.pluginName);
}

0 comments on commit 642d164

Please sign in to comment.