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

Commit

Permalink
Console: Fix headings, tooltip on alert badges
Browse files Browse the repository at this point in the history
  • Loading branch information
ammendonca committed May 22, 2015
1 parent 3bfaa52 commit 8234a22
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2 ng-show="vm.resourceList.length === 0">Collect metrics from a website that y
</form>
</div>

<h3 ng-show="vm.resourceList.length > 0" class="text-center">Current status of your websites</h3>
<h2 ng-show="vm.resourceList.length > 0" class="text-center">Current status of your websites</h2>

<div class="row hk-urls-list-labels" ng-show="vm.resourceList.length > 0">
<div class="col-sm-6 text-left">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="hk-application-servers" ng-controller="HawkularMetrics.AppServerListController as vm">

<h1 class="text-center">{{userDetails.firstName}}'s application servers</h1>
<h3 class="pull-left">Aggregate Status (Last 24 hrs)</h3>
<span class="hk-update pull-right" tooltip-trigger tooltip-placement="bottom" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'mediumTime'}}</span>
<h3 class="pull-left">Aggregate Status</h3>
<span class="hk-update pull-right" tooltip-trigger tooltip-placement="top" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'mediumTime'}}</span>
<div class="panel panel-default hk-summary">
<div class="row">
<div class="col-sm-3 hk-summary-item">
Expand Down Expand Up @@ -33,7 +33,7 @@ <h3>Application Servers (45)</h3>
<table class="datatable table table-striped table-bordered table-checkbox" ng-show="vm.resourceList.length > 0">
<thead>
<tr>
<th>Application Server Name <span class="label label-default label-alert pull-right">2</span></th>
<th>Application Server Name <span class="label label-default label-alert pull-right" tooltip-trigger tooltip-placement="top" tooltip="Total alerts">2</span></th>
<th>Type</th>
<th>Host</th>
<th>State</th>
Expand All @@ -43,7 +43,7 @@ <h3>Application Servers (45)</h3>
<tbody>
<tr class="odd"><td valign="top" colspan="5" class="dataTables_empty" ng-show="vm.search && (vm.resourceList | filter:vm.search).length === 0"><p>Suggestions</p><ul><li>Check the syntax of the search term.</li><li>Check that the correct menu option is chosen (token ID vs. user ID).</li><li>Use wildcards (* to match zero or more characters or ? to match a single character).</li><li>Clear the search field, then click Search to return to the 20 most recent records.</li></ul></td></tr>
<tr ng-repeat="res in vm.resourceList | filter:vm.search | orderBy:'properties.url':vm.reverse">
<td><a href="/hawkular-ui/app/app-details/{{res.id}}">{{res.properties.name}}</a> <span class="label label-danger label-alert pull-right" ng-show="res.alerts.length > 0">{{res.alerts.length}}</span></td>
<td><a href="/hawkular-ui/app/app-details/{{res.id}}">{{res.properties.name}}</a> <a href="/hawkular-ui/app/app-details/{{res.id}}" class="pull-right"><span class="label label-danger label-alert" tooltip-trigger tooltip-placement="top" tooltip="Server alerts" ng-show="res.alerts.length > 0">{{res.alerts.length}}</span></a></td>
<td>{{res.type.id}}</td>
<td>{{res.properties.url}}</td>
<td class="center">{{res.state}}</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ section > h1 {
}

h2 {
font-size: ceil(@font-size-base * 1.67);
font-size: ceil(@font-size-base * 1.5);
font-weight: 100;
margin-bottom: @grid-gutter-width/2;

Expand Down Expand Up @@ -135,6 +135,10 @@ a:hover .fa-arrow-down {
padding: 2px 4px;
}

a .label-alert {
padding: 0 4px;
}

// tables

.table > thead > tr > th,
Expand Down

0 comments on commit 8234a22

Please sign in to comment.