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

Commit

Permalink
HAWKULAR-67 Updating styles for organization screen / people screen
Browse files Browse the repository at this point in the history 
The screen was not working properly:
https://dl.dropboxusercontent.com/u/2730435/organizations.png

However, I updated the styles to match our implementation (like in the
organizations screen). To-dos for you:
- Fix the link All Organizations
- Add a link to <a href="#">organizations list</a>
  • Loading branch information
@cardosogabriel
cardosogabriel committed Oct 5, 2015
1 parent 726201e commit 10b3acc
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 41 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

0 comments on commit 10b3acc

Please sign in to comment.