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

Commit

Permalink
Merge pull request #256 from cardosogabriel/master
Browse files Browse the repository at this point in the history
Fixing labels / style
  • Loading branch information
mtho11 committed Jun 25, 2015
2 parents 629201a + 159056f commit fa7e547
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ <h3 class="pull-left" data-toggle="tooltip" data-placement="top" title="" data-o
<div class="clearfix">
<!-- No Alerts -->
<div class="panel panel-default alert alert-info" ng-show="vm.alertList.length === 0">
<div class="hk-alert-icon"><i class="fa fa-flag-o"></i></div>
<div class="hk-alert-icon"><i class="fa fa-flag gray"></i></div>
<div class="hk-event">No Alerts have been fired in this category and time range.</div>
</div>
<!-- Alerts exist -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<button type="button" class="close" ng-click="vm.cancel()">
<span class="pficon pficon-close"></span>
</button>
<h4 class="modal-title">Delete Resource</h4>
<h4 class="modal-title">Delete URL</h4>
</div>
<div class="modal-body">
<div class="form-group">
<p class="primary-message">Are you sure you want to stop monitoring and delete the data for the site <strong>{{ vm.resource.properties.url }}</strong> (Resource ID: {{ vm.resource.id }}) ?</p>
<p class="primary-message">Are you sure you want to stop monitoring and delete the data for the website <strong>{{ vm.resource.properties.url }}</strong> (Resource ID: {{ vm.resource.id }}) ?</p>
<p>This action can't be undone.</p>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ module HawkularMetrics {
this.HawkularAlertsManager.deleteTrigger(triggerIds[1])])
.then(removeResource)
.then((res) => {
toastr.success('The site ' + this.resource.properties.url + ' is no longer being monitored.');
toastr.success('The website ' + this.resource.properties.url + ' is no longer being monitored.');
this.$modalInstance.close(res);
});
}
Expand Down
2 changes: 1 addition & 1 deletion ui/console/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>

<head>
<title>HAWKULAR</title>
<title>Hawkular - The OpenSource monitoring platform</title>
<base href='${hawkular.console.index.html.base.href}'>
<meta charset="UTF8">

Expand Down

0 comments on commit fa7e547

Please sign in to comment.