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 #563 from jpkrohling/HAWKULAR-240-RefactorOldAccou…
Browse files Browse the repository at this point in the history 
…ntsUIControllers

HAWKULAR-240 - Refactor older Accounts UI controllers
  • Loading branch information
@mtho11
mtho11 committed Oct 15, 2015
2 parents 03536f2 + b387e7a commit 0da7b78
Show file tree
Hide file tree
Showing 12 changed files with 330 additions and 311 deletions.
6 changes: 0 additions & 6 deletions console/src/main/scripts/plugins/accounts/html/accounts.html
View file

This file was deleted.

18 changes: 9 additions & 9 deletions console/src/main/scripts/plugins/accounts/html/organization-memberships.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<div class="hk-organization-memberships" ng-controller="HawkularAccounts.OrganizationMembershipController as controller">

<div ng-show="!controller.isOrganization()">
<div ng-show="!controller.isOrganization">
<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 class="hk-screen-top-nav">
<div class="row hk-top-row" >
<div class="col-xs-6" ng-show="!controller.loading">
Expand All @@ -23,15 +28,10 @@ <h1 ng-show="!controller.loading">{{controller.organization.name}} Members</h1>
</button>
</div>

<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="blank-slate-pf" ng-show="!controller.memberships.length">
<div class="blank-slate-pf-icon">
<i class="fa fa-users" id="empty-organizations-icon"></i>
<i class="fa fa-users"></i>
</div>
<!-- <h2>No members for this organization (not even you?). Found organization: {{controller.foundOrganization}}</h2> -->
<h1>No members.</h1>
Expand Down Expand Up @@ -96,7 +96,7 @@ <h1>No members.</h1>

<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>
<i class="fa fa-building-o"></i>
</div>
<h1>Organization not found.</h1>
<p>
Expand All @@ -105,7 +105,7 @@ <h1>Organization not found.</h1>
</div>
</div>

<div class="blank-slate-pf" ng-show="controller.isOrganization() && !controller.loading">
<div class="blank-slate-pf" ng-show="controller.isOrganization">
<div class="blank-slate-pf-icon">
<i class="fa fa-building-o"></i>
</div>
Expand Down
11 changes: 4 additions & 7 deletions console/src/main/scripts/plugins/accounts/html/organization-new.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="modal-header">
<button type="button" class="close" dismiss="modal" aria-label="Close" ng-click="cancel()">
<button type="button" class="close" dismiss="modal" aria-label="Close" ng-click="newModal.cancel()">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title">Create Organization</h4>
Expand All @@ -10,16 +10,13 @@ <h4 class="modal-title">Create Organization</h4>
<div class="form-group">
<label for="name" class="col-md-4 control-label">Organization name</label>
<div class="col-md-6">
<input type="text" class="form-control" id="name" ng-model="organizationNew.name" autofocus>
<input type="text" class="form-control" id="name" ng-model="newModal.organizationNew.name" autofocus>
</div>
</div>
</form>
</div>

<div class="modal-footer">
<button type="button" class="btn btn-default" dismiss="modal" ng-click="cancel()"
id="createOrganizationFormCancelBtn">
Cancel
</button>
<button type="button" class="btn btn-primary" id="createOrganizationFormBtn" ng-click="persist()">Create</button>
<button type="button" class="btn btn-default" dismiss="modal" ng-click="newModal.cancel()">Cancel</button>
<button type="button" class="btn btn-primary" ng-click="newModal.persist()">Create</button>
</div>
8 changes: 4 additions & 4 deletions console/src/main/scripts/plugins/accounts/html/organization-remove-modal.html
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<div class="modal-header">
<button type="button" class="close" ng-click="cancel()">
<button type="button" class="close" ng-click="removeModal.cancel()">
<span class="pficon pficon-close"></span>
</button>
<h4 class="modal-title">Delete Organization</h4>
</div>
<div class="modal-body">
<div class="form-group">
<p class="primary-message">
Are you sure you want to delete the organization <strong>{{organization.name}}</strong>?
Are you sure you want to delete the organization <strong>{{removeModal.organization.name}}</strong>?
</p>
<p>This action can't be undone.</p>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
<button type="button" class="btn btn-danger" ng-click="delete()">Delete</button>
<button type="button" class="btn btn-default" ng-click="removeModal.cancel()">Cancel</button>
<button type="button" class="btn btn-danger" ng-click="removeModal.remove()">Delete</button>
</div>
83 changes: 41 additions & 42 deletions console/src/main/scripts/plugins/accounts/html/organizations.html
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,41 @@
<div class="hk-organizations" ng-controller="HawkularAccounts.OrganizationsController">
<div class="hk-organizations" ng-controller="HawkularAccounts.OrganizationsController as controller">

<h1 class="text-center" ng-show="!loading">Organizations</h1>
<div ng-show="!controller.isOrganization">
<h1 class="text-center" ng-show="!controller.loading">Organizations</h1>

<div class="text-center hk-spinner-container-alone" ng-show="loading">
<div class="spinner spinner-lg"></div>
<p class="hk-spinner-legend-below">Loading...</p>
</div>

<div class="blank-slate-pf" ng-show="!organizations.length && !loading && !isOrganization">
<div class="blank-slate-pf-icon">
<i class="fa fa-building-o" id="empty-organizations-icon"></i>
</div>
<h1>No organizations created.</h1>
<p>
With organizations, multiple users can have access to the same resources, with multiple roles.
</p>
<div class="blank-slate-pf-main-action">
<button class="btn btn-primary btn-lg" type="button" role="button" ng-click="showCreateForm()">
Create Organization
</button>
<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>

<div class="blank-slate-pf" ng-show="isOrganization">
<div class="blank-slate-pf-icon">
<i class="fa fa-users" id="empty-organizations-icon-for-organizations"></i>
<div class="blank-slate-pf" ng-show="!controller.organizations.length && !controller.loading">
<div class="blank-slate-pf-icon">
<i class="fa fa-building-o"></i>
</div>
<h1>No organizations created.</h1>
<p>
With organizations, multiple users can have access to the same resources, with multiple roles.
</p>
<div class="blank-slate-pf-main-action">
<button class="btn btn-primary btn-lg" type="button" role="button" ng-click="controller.showCreateForm()">
Create Organization
</button>
</div>
</div>
<h1>No organizations inside organization.</h1>
<p>
It is not possible to have organizations managed by an organization. <br/> To create an organization, switch to your user profile.
</p>
</div>

<div class="text-right" ng-show="organizations.length && !loading">
<button class="btn btn-primary" type="button" role="button" ng-click="showCreateForm()">Create Organization</button>
</div>
<div class="hk-table-container" ng-show="organizations.length && !loading">
<table class="table table-bordered hk-table-clean">
<thead>
<div class="text-right" ng-show="controller.organizations.length && !controller.loading">
<button class="btn btn-primary" type="button" role="button" ng-click="controller.showCreateForm()">Create Organization</button>
</div>
<div class="hk-table-container" ng-show="controller.organizations.length && !controller.loading">
<table class="table table-bordered hk-table-clean">
<thead>
<tr>
<th>Name</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="organization in organizations">
</thead>
<tbody>
<tr ng-repeat="organization in controller.organizations">
<td>
<a href="/hawkular-ui/organization/{{organization.id}}/memberships">
{{organization.name}}
Expand All @@ -56,15 +47,23 @@ <h1>No organizations inside organization.</h1>
tooltip-trigger
tooltip-placement="top"
tooltip="Delete"
ng-click="remove(organization)">
ng-click="controller.remove(organization)">
<i class="fa fa-trash-o"></i>
</button>
</td>
</tr>
</tbody>
</table>
</tbody>
</table>
</div>
</div>
</div>
<!-- /col -->

<div class="blank-slate-pf" ng-show="controller.isOrganization">
<div class="blank-slate-pf-icon">
<i class="fa fa-users"></i>
</div>
<h1>No organizations inside organization.</h1>
<p>
It is not possible to have organizations managed by an organization. <br/> To create an organization, switch to your user profile.
</p>
</div>
</div>
77 changes: 40 additions & 37 deletions console/src/main/scripts/plugins/accounts/html/user-settings.html
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,56 @@
<div class="hk-user-settings" ng-controller="HawkularAccounts.UserSettingsController as controller">

<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>

<h1 class="text-center" ng-show="!controller.loading && !controller.isOrganization()">User Settings</h1>
<form name="form" class="form-horizontal" ng-show="!controller.loading && !controller.isOrganization()" novalidate>
<fieldset>
<legend>Alert Notifications</legend>
<p>Receive alert notifications on the following email.
<div class="form-group" ng-class="{'has-error': form.email.$error.emails}">
<label class="col-sm-3 control-label" for="email">Email
<a class="hk-btn-icon"
tabindex="0"
role="button"
tooltip-trigger
tooltip-placement="top"
tooltip="For multiple emails, separate by comma.">
<i class="fa fa-info-circle"></i>
</a>
</label>
<div class="col-sm-6">
<input
type="text"
name="email"
id="email"
class="form-control"
hawkular-emails
ng-model="controller.settings['hawkular.settings.emails']">
<div ng-show="!controller.isOrganization">
<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>

<h1 class="text-center" ng-show="!controller.loading">User Settings</h1>
<form name="form" class="form-horizontal" ng-show="!controller.loading" novalidate>
<fieldset>
<legend>Alert Notifications</legend>
<p>Receive alert notifications on the following email.
<div class="form-group" ng-class="{'has-error': form.email.$error.emails}">
<label class="col-sm-3 control-label" for="email">Email
<a class="hk-btn-icon"
tabindex="0"
role="button"
tooltip-trigger
tooltip-placement="top"
tooltip="For multiple emails, separate by comma.">
<i class="fa fa-info-circle"></i>
</a>
</label>
<div class="col-sm-6">
<input
type="text"
name="email"
id="email"
class="form-control"
hawkular-emails
ng-model="controller.settings['hawkular.settings.emails']">
<span class="help-block" ng-show="form.email.$error.emails">
Please enter valid email addresses.
</span>

<span class="help-block" ng-show="!form.email.$error.emails">
Emails are valid.
</span>
</div>
</div>
</fieldset>
<div class="form-actions text-right" ng-show="!controller.loading">
<button type="button" class="btn btn-default">Cancel</button>
<button type="button" class="btn btn-primary" ng-disabled="!form.$valid" ng-click="controller.save()">
Save
</button>
</div>
</fieldset>
<div class="form-actions text-right" ng-show="!controller.loading">
<button type="button" class="btn btn-default">Cancel</button>
<button type="button" class="btn btn-primary" ng-disabled="!form.$valid" ng-click="controller.save()">
Save
</button>
</div>
</form>
</form>
</div>

<div class="blank-slate-pf" ng-show="controller.isOrganization() && !controller.loading">
<div class="blank-slate-pf" ng-show="controller.isOrganization">
<div class="blank-slate-pf-icon">
<i class="fa fa-users"></i>
</div>
Expand Down
6 changes: 6 additions & 0 deletions console/src/main/scripts/plugins/accounts/ts/accountsGlobals.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ module HawkularAccounts {
$update(options:{},
success?:(success:IOrganization) => void,
failure?:(error:IErrorPayload) => void);
$save(options:{},
success?:(success:IOrganization) => void,
failure?:(error:IErrorPayload) => void);
$remove(options:{},
success?:(success:IOrganization) => void,
failure?:(error:IErrorPayload) => void);
}

export interface IInvitation {
Expand Down

0 comments on commit 0da7b78

Please sign in to comment.