jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Do not make users view 100% site width

Browse Source 
Fixes #242
This commit is contained in:
Johannes Zellner
2015-03-05 14:03:11 +01:00
parent 04633e0dd6
commit cbf6340657
2 changed files with 70 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webadmin/dist/views/users.html
Vendored
+35 -31
View File
@@ -84,7 +84,7 @@
</div>
</div>
<div class="row animateMeOpacity ng-hide" ng-show="ready">
<div class="row animateMeOpacity ng-hide" ng-show="ready" style="max-width: 600px; margin: 0 auto;">
<div class="col-lg-12">
<h1>Users <button class="btn btn-primary btn-outline pull-right" data-toggle="modal" data-target="#userAddModal"><i class="fa fa-user-plus"></i> New User</button></h1>
</div>
@@ -92,35 +92,39 @@
<br/>
<div class="row animateMeOpacity ng-hide" ng-show="ready">
<div class="col-lg-12">
<table class="table table-hover shadow" style="background-color: white;">
<thead>
<tr>
<th style="width: 33%">Username</th>
<th style="width: 33%" class="text-center">Email</th>
<th style="width: 33%" class="text-right">Actions</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="user in users">
<td>
{{ user.username }}
<span ng-show="isMe(user)" class="label label-primary" style="margin-left: 20px;">This is you!</span>
<span ng-show="isAdmin(user)" class="label label-danger" style="margin-left: 20px;">Admin</span>
</td>
<td class="text-center">
{{ user.email }}
</td>
<td class="text-right">
<button ng-show="!isMe(user) && userInfo.admin" ng-click="toggleAdmin(user)" class="btn btn-xs btn-default">
<span ng-show="!user.admin"><i class="fa fa-plus"></i> Add Admin</span>
<span ng-show="user.admin"><i class="fa fa-minus"></i> Remove Admin</span>
</button>
<button ng-show="!isMe(user) && userInfo.admin" class="btn btn-xs btn-danger" ng-click="showUserRemove(user)"><i class="fa fa-trash-o"></i> Delete</button>
</td>
</tr>
</tbody>
</table>
<div class="card">
<div class="grid-item-top">
<div class="row animateMeOpacity ng-hide" ng-show="ready">
<div class="col-lg-12">
<table class="table table-hover">
<thead>
<tr>
<th style="width: 50%">User</th>
<th style="width: 25%" class="text-right">Group</th>
<th style="width: 25%" class="text-right">Actions</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="user in users">
<td class="text-overflow: ellipsis; white-space: nowrap;">
{{ user.username }}
<span class="text-muted">{{ user.email }}</span>
</td>
<td class="text-right" style="vertical-align: bottom">
<span ng-show="isAdmin(user)" class="label label-danger">Admin</span>
</td>
<td class="text-right" style="vertical-align: bottom">
<span ng-show="isMe(user)" class="label label-primary">This is you!</span>
<button ng-show="!isMe(user) && userInfo.admin" ng-click="toggleAdmin(user)" class="btn btn-xs btn-default">
<span ng-show="!user.admin"><i class="fa fa-plus"></i> Add Admin</span>
<span ng-show="user.admin"><i class="fa fa-minus"></i> Remove Admin</span>
</button>
<button ng-show="!isMe(user) && userInfo.admin" class="btn btn-xs btn-danger" ng-click="showUserRemove(user)"><i class="fa fa-trash-o"></i> Delete</button>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
webadmin/src/views/users.html
+35 -31
View File
@@ -84,7 +84,7 @@
</div>
</div>
<div class="row animateMeOpacity ng-hide" ng-show="ready">
<div class="row animateMeOpacity ng-hide" ng-show="ready" style="max-width: 600px; margin: 0 auto;">
<div class="col-lg-12">
<h1>Users <button class="btn btn-primary btn-outline pull-right" data-toggle="modal" data-target="#userAddModal"><i class="fa fa-user-plus"></i> New User</button></h1>
</div>
@@ -92,35 +92,39 @@
<br/>
<div class="row animateMeOpacity ng-hide" ng-show="ready">
<div class="col-lg-12">
<table class="table table-hover shadow" style="background-color: white;">
<thead>
<tr>
<th style="width: 33%">Username</th>
<th style="width: 33%" class="text-center">Email</th>
<th style="width: 33%" class="text-right">Actions</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="user in users">
<td>
{{ user.username }}
<span ng-show="isMe(user)" class="label label-primary" style="margin-left: 20px;">This is you!</span>
<span ng-show="isAdmin(user)" class="label label-danger" style="margin-left: 20px;">Admin</span>
</td>
<td class="text-center">
{{ user.email }}
</td>
<td class="text-right">
<button ng-show="!isMe(user) && userInfo.admin" ng-click="toggleAdmin(user)" class="btn btn-xs btn-default">
<span ng-show="!user.admin"><i class="fa fa-plus"></i> Add Admin</span>
<span ng-show="user.admin"><i class="fa fa-minus"></i> Remove Admin</span>
</button>
<button ng-show="!isMe(user) && userInfo.admin" class="btn btn-xs btn-danger" ng-click="showUserRemove(user)"><i class="fa fa-trash-o"></i> Delete</button>
</td>
</tr>
</tbody>
</table>
<div class="card">
<div class="grid-item-top">
<div class="row animateMeOpacity ng-hide" ng-show="ready">
<div class="col-lg-12">
<table class="table table-hover">
<thead>
<tr>
<th style="width: 50%">User</th>
<th style="width: 25%" class="text-right">Group</th>
<th style="width: 25%" class="text-right">Actions</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="user in users">
<td class="text-overflow: ellipsis; white-space: nowrap;">
{{ user.username }}
<span class="text-muted">{{ user.email }}</span>
</td>
<td class="text-right" style="vertical-align: bottom">
<span ng-show="isAdmin(user)" class="label label-danger">Admin</span>
</td>
<td class="text-right" style="vertical-align: bottom">
<span ng-show="isMe(user)" class="label label-primary">This is you!</span>
<button ng-show="!isMe(user) && userInfo.admin" ng-click="toggleAdmin(user)" class="btn btn-xs btn-default">
<span ng-show="!user.admin"><i class="fa fa-plus"></i> Add Admin</span>
<span ng-show="user.admin"><i class="fa fa-minus"></i> Remove Admin</span>
</button>
<button ng-show="!isMe(user) && userInfo.admin" class="btn btn-xs btn-danger" ng-click="showUserRemove(user)"><i class="fa fa-trash-o"></i> Delete</button>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>