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 #522 from cardosogabriel/HAWKULAR-439
Browse files Browse the repository at this point in the history 
HAWKULAR-439 / UI updates / HAWKULAR-67
  • Loading branch information
@mtho11
mtho11 committed Oct 5, 2015
2 parents d9daabe + 10b3acc commit 652575a
Show file tree
Hide file tree
Showing 12 changed files with 106 additions and 84 deletions.
76 changes: 38 additions & 38 deletions console/src/main/scripts/plugins/accounts/html/organization-memberships.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<li><a data-ng-href="/hawkular-ui/organizations">&laquo; All organizations</a></li>
</ol>

<h1 class="text-center">Organization {{controller.organization.name}}</h1>
<h1 class="text-center">{{controller.organization.name}} Members</h1>

<div class="pull-right" ng-show="controller.memberships.length && !controller.loading && controller.foundOrganization">
<div class="text-right" ng-show="controller.memberships.length && !controller.loading && controller.foundOrganization">
<button
class="btn btn-primary"
type="button"
Expand All @@ -16,21 +16,19 @@ <h1 class="text-center">Organization {{controller.organization.name}}</h1>
Invite People
</button>
</div>
<h2>Members</h2>

<div class="progress-description" ng-show="controller.loading">
<div class="spinner spinner-xs spinner-inline"></div>
<strong>Loading:</strong> Organization members
<div class="text-center hk-spinner-container-alone" ng-show="controller.loading">
<div class="spinner spinner-lg"></div>
<p class="hk-spinner-legend-below">Loading...</p>
</div>

<div ng-show="!controller.loading && controller.foundOrganization">
<div class="row text-center" ng-show="!controller.memberships.length">
<i class="fa fa-users" id="empty-organizations-icon"></i>
<h2>No members for this organization (not even you?). Found organization: {{controller.foundOrganization}}</h2>
<p>
With organizations, multiple users can have access<br/>
to the same resources, with multiple roles.
</p>
<div class="blank-slate-pf" ng-show="!controller.loading && controller.foundOrganization">
<div ng-show="!controller.memberships.length">
<div class="blank-slate-pf-icon">
<i class="fa fa-users" id="empty-organizations-icon"></i>
</div>
<!-- <h2>No members for this organization (not even you?). Found organization: {{controller.foundOrganization}}</h2> -->
<h1>No members.</h1>
<button
class="btn btn-primary"
type="button"
Expand All @@ -40,34 +38,36 @@ <h2>No members for this organization (not even you?). Found organization: {{cont
Invite People
</button>
</div>
</div>

<div ng-show="controller.memberships.length">
<table class="table table-striped table-bordered">
<thead>
<tr>
<th>Name</th>
<th>Role</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="membership in controller.memberships">
<td>{{membership.member.name}}</td>
<td>{{membership.role.name}}</td>
</tr>
<tr ng-repeat="invitation in controller.pending" ng-show="controller.isAllowedToListPending">
<td>{{invitation.email}} <span class="label label-default">INVITED</span></td>
<td>{{invitation.role.name}}</td>
</tr>
</tbody>
</table>
</div>
<div class="hk-table-container" ng-show="controller.memberships.length">
<table class="table table-bordered hk-table-clean">
<thead>
<tr>
<th>Name</th>
<th>Role</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="membership in controller.memberships">
<td>{{membership.member.name}}</td>
<td>{{membership.role.name}}</td>
</tr>
<tr ng-repeat="invitation in controller.pending" ng-show="controller.isAllowedToListPending">
<td>{{invitation.email}} <span class="label label-default">INVITED</span></td>
<td>{{invitation.role.name}}</td>
</tr>
</tbody>
</table>
</div>

<div class="row text-center" ng-show="!controller.loading && !controller.foundOrganization">
<i class="fa fa-users" id="organization-not-found-icon"></i>
<h2>Organization not found.</h2>
<div class="blank-slate-pf" ng-show="!controller.loading && !controller.foundOrganization">
<div class="blank-slate-pf-icon">
<i class="fa fa-building-o" id="empty-organizations-icon"></i>
</div>
<h1>Organization not found.</h1>
<p>
The requested organization could not be found.
The requested organization could not be found. You can try to find it in the <a href="#">organizations list</a>.
</p>
</div>

Expand Down
6 changes: 3 additions & 3 deletions console/src/main/scripts/plugins/accounts/html/organizations.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h1 class="text-center">Organizations</h1>

<div class="blank-slate-pf" ng-show="!organizations.length && !loading && !isOrganization">
<div class="blank-slate-pf-icon">
<i class="fa fa-users" id="empty-organizations-icon"></i>
<i class="fa fa-building-o" id="empty-organizations-icon"></i>
</div>
<h1>No organizations created.</h1>
<p>
Expand All @@ -26,9 +26,9 @@ <h1>No organizations created.</h1>
<div class="blank-slate-pf-icon">
<i class="fa fa-users" id="empty-organizations-icon-for-organizations"></i>
</div>
<h2>You cannot create an organization.</h2>
<h1>No organizations inside organization.</h1>
<p>
You are currently logged in as an organization. At this moment, sub-organizations are not supported. To create an organization, switch to your user account.
It is not possible to have organizations managed by an organization. <br/> To create an organization, switch to your user profile.
</p>
</div>

Expand Down
2 changes: 1 addition & 1 deletion console/src/main/scripts/plugins/metrics/html/app-details/app-server-details.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<ng-include ng-repeat="tab in tabs.availableTabs" src="tab.src" ng-if="tabs.activeTab === tab.id" ng-controller="tab.controller"></ng-include>

<div class="hk-nav-tabs-container pull-right">
<button type="button" class="btn btn-primary" data-ng-click="tabs.requestExportJDR()" data-ng-disabled="tabs.jdrGenerating">
<button type="button" class="btn btn-default" data-ng-click="tabs.requestExportJDR()" data-ng-disabled="tabs.jdrGenerating">
Export JDR
</button>
</div>
Expand Down
12 changes: 6 additions & 6 deletions console/src/main/scripts/plugins/metrics/html/app-details/detail-datasources.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<div class="hk-container-separator">
<div class="btn-group" dropdown auto-close="always">
<button id="simple-btn-keyboard-nav" type="button" class="btn btn-primary" dropdown-toggle>
<button id="simple-btn-keyboard-nav" type="button" class="btn btn-default" dropdown-toggle>
Sort {{vm.sortInv ? 'Z - A' : 'A - Z'}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu" aria-labelledby="simple-btn-keyboard-nav">
Expand Down Expand Up @@ -51,7 +51,7 @@
</div>
</div>
<div class="hk-panel-collapse-area" ng-class="{'hk-collapsed' : !vm.expandedList[ds.id]}">
<a href="#" ng-click="vm.expandedList[ds.id] = !vm.expandedList[ds.id]"><span ng-hide="vm.expandedList[ds.id]">View Metrics</span><span ng-show="vm.expandedList[ds.id]">Hide Metrics</span><i class="fa" ng-class="vm.expandedList[ds.id] ? 'fa-angle-up' : 'fa-angle-down'"></i></a>
<a href="#" ng-click="vm.expandedList[ds.id] = !vm.expandedList[ds.id]"><span ng-hide="vm.expandedList[ds.id]">View Metrics</span><span ng-show="vm.expandedList[ds.id]">Hide Metrics</span><i class="fa" ng-class="vm.expandedList[ds.id] ? 'fa-chevron-circle-up' : 'fa-chevron-circle-down'"></i></a>
</div>

<div class="hk-collapsible-area" ng-class="{ 'hide': !vm.expandedList[ds.id]}" ng-if="vm.expandedList[ds.id]">
Expand All @@ -62,23 +62,23 @@ <h3 class="pull-left">
<button class="btn btn-link hk-trigger" ng-click="vm.showAllAlerts = !vm.showAllAlerts" tooltip-trigger
tooltip-placement="top" tooltip="Expand/collapse">
<i class="fa" ng-show="ds.alertList.length > 0"
ng-class="vm.showAllAlerts ? 'fa-minus-square-o' : 'fa-plus-square-o'"></i> JVM Alerts
ng-class="vm.showAllAlerts ? 'fa-minus-square-o' : 'fa-plus-square-o'"></i> Datasource Alerts
<span ng-show="ds.alertList.length > 0">
({{vm.showAllAlerts ? ds.alertList.length : vm.math.min(ds.alertList.length, 3)}} of {{ds.alertList.length}})
</span>
</button>
</h3>
<span class="hk-settings pull-right">
<span class="hk-settings pull-left">
<a href="#" ng-click="vm.openSetup(ds.id)">
<i class="fa fa-cog"></i>Datasource Alert Settings
<i class="fa fa-cog"></i>Alert Settings
</a>
</span>
</div>
<div class="clearfix">
<!-- No Alerts -->
<div class="panel panel-default alert alert-info" ng-show="ds.alertList.length === 0">
<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 class="hk-event">No Alerts.</div>
</div>
<!-- Alerts exist -->
<hk-alert-panel-list class="clearfix" hk-alert-list="ds.alertList"
Expand Down
2 changes: 1 addition & 1 deletion console/src/main/scripts/plugins/metrics/html/app-details/detail-deployments.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ <h3 class="pull-left">
<!-- 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 gray"></i></div>
<div>No alerts have been fired in this category and time range.</div>
<div>No alerts.</div>
</div>
<!-- Alerts exist -->
<div class="panel panel-default alert alert-danger" ng-repeat="alert in vm.alertList | limitTo: (showAllAlerts ? 100000 : 3) track by $index">
Expand Down
6 changes: 3 additions & 3 deletions console/src/main/scripts/plugins/metrics/html/app-details/detail-jvm.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ <h3 class="pull-left">
</span>
</button>
</h3>
<span class="hk-settings pull-right">
<span class="hk-settings pull-left">
<a href="#" ng-controller="JvmAlertController as jac" ng-click="jac.openSetup()">
<i class="fa fa-cog"></i>JVM Alert Settings
<i class="fa fa-cog"></i>Alert Settings
</a>
</span>
</div>
<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 gray"></i></div>
<div class="hk-event">No Alerts have been fired in this category and time range.</div>
<div class="hk-event">No Alerts.</div>
</div>
<!-- Alerts exist -->
<hk-alert-panel-list class="clearfix" hk-alert-list="vm.alertList"
Expand Down
6 changes: 3 additions & 3 deletions console/src/main/scripts/plugins/metrics/html/app-details/detail-web.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ <h3 class="pull-left">Web Status</h3>
<h3 class="pull-left">
<button class="btn btn-link hk-trigger" ng-click="showAllAlerts = !showAllAlerts" tooltip-trigger tooltip-placement="top" tooltip="Expand/collapse"><i class="fa" ng-show="vm.alertList.length > 0" ng-class="showAllAlerts ? 'fa-minus-square-o' : 'fa-plus-square-o'"></i> Web Alerts <span ng-show="vm.alertList.length > 0">({{showAllAlerts ? vm.alertList.length : vm.math.min(vm.alertList.length, 3)}} of {{vm.alertList.length}})</span></button>
</h3>
<span class="hk-settings pull-right">
<span class="hk-settings pull-left">
<a href="#" ng-controller="WebAlertController as wac" ng-click="wac.openSetup()">
<i class="fa fa-cog"></i>Web Alert Settings
<i class="fa fa-cog"></i>Alert Settings
</a>
</span>
</div>
<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 gray"></i></div>
<div>No alerts have been fired in this category and time range.</div>
<div>No alerts.</div>
</div>
<!-- Alerts exist -->
<!-- Alerts exist -->
Expand Down
2 changes: 1 addition & 1 deletion console/src/main/scripts/plugins/metrics/html/partials/url-alerts-view.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="blank-slate-pf-icon">
<i class="fa fa-flag"></i>
</div>
<h1>No alerts have been fired.</h1>
<h1>No alerts.</h1>
</div>

<hk-alert-panel-list class="clearfix" hk-alert-list="mac.alertList"></hk-alert-panel-list>
Expand Down
2 changes: 1 addition & 1 deletion console/src/main/scripts/plugins/metrics/html/url-alerts.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<section id="hk-alerts" class="hk-tab-content">
<div class="hk-info-top clearfix">
<h3 class="pull-left">Alerts <span>({{(mac.alertList).length}})</span></h3>
<span class="hk-settings pull-right">
<span class="hk-settings pull-left">
<a href="#" ng-click="mac.openResponseSetup()"><i class="fa fa-cog"></i>Response Time Alert Settings</a>
<a href="#" ng-controller="MetricsAvailabilityController as vm" ng-click="vm.openAvailabilitySetup()">
<i class="fa fa-cog"></i>Availability Alert Settings</a>
Expand Down
6 changes: 3 additions & 3 deletions console/src/main/scripts/plugins/metrics/html/url-availability.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,16 @@ <h3 class="pull-left" data-toggle="tooltip" data-placement="top" title="" data-o
Availability Alerts <span ng-show="vm.alertList.length > 0">({{showAllAlerts ? vm.alertList.length : MetricsAvailabilityController.min(vm.alertList.length, 3)}} of {{vm.alertList.length}})</span>
</button>
</h3>
<span class="hk-settings pull-right">
<a href="#" ng-click="vm.openAvailabilitySetup()"><i class="fa fa-cog"></i>Availability Alert Settings</a>
<span class="hk-settings pull-left">
<a href="#" ng-click="vm.openAvailabilitySetup()"><i class="fa fa-cog"></i>Alert Settings</a>
</span>
</div>

<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 gray"></i></div>
<div class="hk-event">No Alerts have been fired in this category and time range.</div>
<div class="hk-event">No Alerts.</div>
</div>
<!-- Alerts exist -->
<hk-alert-panel-list class="clearfix" hk-alert-list="vm.alertList"
Expand Down
4 changes: 2 additions & 2 deletions console/src/main/scripts/plugins/metrics/html/url-response-time.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ <h3 class="pull-left" data-toggle="tooltip" data-placement="top" title="" data-o
<i class="fa" ng-show="vm.alertList.length > 0" ng-class="showAllAlerts ? 'fa-minus-square-o' : 'fa-plus-square-o'"></i>
Response Time Alerts <span ng-show="vm.alertList.length > 0">({{showAllAlerts ? vm.alertList.length : MetricsViewController.min(vm.alertList.length, 3)}} of {{vm.alertList.length}})</span></button>
</h3>
<span class="hk-settings pull-right"><a href="#" ng-controller="MetricsAlertController as mac" ng-click="mac.openResponseSetup()"><i class="fa fa-cog"></i>Response Time Alert Settings</a></span>
<span class="hk-settings pull-left"><a href="#" ng-controller="MetricsAlertController as mac" ng-click="mac.openResponseSetup()"><i class="fa fa-cog"></i>Alert Settings</a></span>
</div>
<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 gray"></i></div>
<div>No alerts have been fired in this category and time range.</div>
<div>No alerts.</div>
</div>
<!-- Alerts exist -->
<hk-alert-panel-list class="clearfix" hk-alert-list="vm.alertList" hk-limit="(showAllAlerts ? 100000 : 3)"></hk-alert-panel-list>
Expand Down

0 comments on commit 652575a

Please sign in to comment.