Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/addmembers/add.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h2>Import Users</h2>
<div class="wrapper wrapper-content animated fadeInRight">
<div class="row" ng-controller="addmembers.AddMemberController">
<div class="col-lg-12">
<div class="ibox float-e-margins">
<div class="ibox float-e-margins import-form">
<div class="ibox-title">
<div class="row">
<form role="form">
Expand Down
5 changes: 3 additions & 2 deletions src/app/admintool/admintool.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ <h2>Admins / Copilots / Reviewers</h2>
<div class="text-center" ng-show="formSearch.isLoading">
<img src="assets/images/loading.gif"/>
</div>
<div ng-show="!formSearch.isLoading && formSearch.role && formSearch.usersFound && !users.length">
<div ng-show="!formSearch.isLoading && formSearch.role && formSearch.usersFound && !users.length" class="table-responsive">
<p> No users found. </p>
</div>
<div ng-show="!formSearch.isLoading && formSearch.role && formSearch.usersFound && users.length">
<div ng-show="!formSearch.isLoading && formSearch.role && formSearch.usersFound && users.length" class="table-responsive">
<table class="footable table table-stripped toggle-arrow-tiny"
data-sort="true"
data-page-size="50">
Expand Down Expand Up @@ -135,6 +135,7 @@ <h2>Admins / Copilots / Reviewers</h2>
</tfoot>
</table>
</div>
<!-- table-responsive -->
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="text-center" ng-show="formSearch.isLoading">
<img src="assets/images/loading.gif" />
</div>
<div ng-show="!formSearch.isLoading">
<div ng-show="!formSearch.isLoading" class="table-responsive">
<table class="footable table table-stripped toggle-arrow-tiny" data-page-size="50">
<thead>
<tr>
Expand Down Expand Up @@ -46,6 +46,7 @@
</tfoot>
</table>
</div>
<!-- table-responsive -->
</div>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion src/app/billing_accounts/billingaccounts.list.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<div class="text-center" ng-show="formSearch.isLoading">
<img src="assets/images/loading.gif" />
</div>
<div ng-show="!formSearch.isLoading">
<div ng-show="!formSearch.isLoading" class="table-responsive">
<table class="footable table table-stripped toggle-arrow-tiny">
<thead>
<tr>
Expand Down Expand Up @@ -131,6 +131,7 @@
</tfoot>
</table>
</div>
<!-- table-responsive -->
</div>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion src/app/clients/clients.list.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<div class="text-center" ng-show="formSearch.isLoading">
<img src="assets/images/loading.gif" />
</div>
<div ng-show="!formSearch.isLoading">
<div ng-show="!formSearch.isLoading" class="table-responsive">
<table class="footable table table-stripped toggle-arrow-tiny">
<thead>
<tr>
Expand Down Expand Up @@ -116,6 +116,7 @@
</tfoot>
</table>
</div>
<!-- table-responsive -->
</div>
</div>
</div>
Expand Down
93 changes: 48 additions & 45 deletions src/app/groupmembers/groupmembers.list.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,52 +102,55 @@ <h2>{{memberType === 'user' ? 'Users' : 'Groups'}}</h2>
<div class="text-center" ng-show="isLoading[memberType]">
<img src="assets/images/loading.gif" />
</div>
<table class="footable table table-stripped toggle-arrow-tiny table-type-{{memberType}}" ng-show="memberships[memberType].length && !isLoading[memberType]">
<thead>
<tr>
<th data-sort-ignore="true"><input type="checkbox" ng-model="isAllSelected[memberType]" ng-change="toggleAll(memberType); checkSelected();" /></th>
<th data-type="numeric">{{memberType === 'user' ? 'User Id' : 'Group Id'}}</th>
<th>{{memberType === 'user' ? 'Handle' : 'Name'}}</th>
<th>Created by</th>
<th>Created at</th>
<th>Modified by</th>
<th>Modified at</th>
<th data-sort-ignore="true">&nbsp;</th>
</tr>
</thead>
<div class="table-responsive">
<table class="footable table table-stripped toggle-arrow-tiny table-type-{{memberType}}" ng-show="memberships[memberType].length && !isLoading[memberType]">
<thead>
<tr>
<th data-sort-ignore="true"><input type="checkbox" ng-model="isAllSelected[memberType]" ng-change="toggleAll(memberType); checkSelected();" /></th>
<th data-type="numeric">{{memberType === 'user' ? 'User Id' : 'Group Id'}}</th>
<th>{{memberType === 'user' ? 'Handle' : 'Name'}}</th>
<th>Created by</th>
<th>Created at</th>
<th>Modified by</th>
<th>Modified at</th>
<th data-sort-ignore="true">&nbsp;</th>
</tr>
</thead>

<tbody>
<tr class="animate-repeat" ng-repeat="membership in memberships[memberType]">
<td><input type="checkbox" ng-model="membership.isSelected" ng-change="checkSelected();" /></td>
<td>{{membership.memberId}}</td>
<td>
<span ng-show="memberType === 'user'">
<span ng-if="users[membership.memberId]">{{users[membership.memberId]}}</span>
<span class="text-info" ng-if="membership.memberId && !users[membership.memberId]">loading...</span>
</span>
<span ng-show="memberType === 'group'">
<span ng-if="groups[membership.memberId]">{{groups[membership.memberId]}}</span>
<span class="text-info" ng-if="membership.memberId && !groups[membership.memberId]">loading...</span>
</span>
</td>
<td>
<span ng-if="users[membership.createdBy]">{{users[membership.createdBy]}}</span>
<span class="text-info" ng-if="membership.createdBy && !users[membership.createdBy]">loading...</span>
</td>
<td>{{membership.createdAt | date : 'yyyy-MM-dd HH:mm' : 'EDT'}} {{membership.createdAt ? 'EDT' : ''}}</td>
<td>
<span ng-if="users[membership.modifiedBy]">{{users[membership.modifiedBy]}}</span>
<span class="text-info" ng-if="membership.modifiedBy && !users[membership.modifiedBy]">loading...</span>
</td>
<td>{{membership.modifiedAt | date : 'yyyy-MM-dd HH:mm' : 'EDT'}} {{membership.modifiedAt ? 'EDT' : ''}}</td>
<td>
<button data-ng-click='removeMember(membership)' class="btn btn-sm btn-danger" ng-disabled="membership.isRemoving">
<strong>Remove</strong>
</button>
</td>
</tr>
</tbody>
</table>
<tbody>
<tr class="animate-repeat" ng-repeat="membership in memberships[memberType]">
<td><input type="checkbox" ng-model="membership.isSelected" ng-change="checkSelected();" /></td>
<td>{{membership.memberId}}</td>
<td>
<span ng-show="memberType === 'user'">
<span ng-if="users[membership.memberId]">{{users[membership.memberId]}}</span>
<span class="text-info" ng-if="membership.memberId && !users[membership.memberId]">loading...</span>
</span>
<span ng-show="memberType === 'group'">
<span ng-if="groups[membership.memberId]">{{groups[membership.memberId]}}</span>
<span class="text-info" ng-if="membership.memberId && !groups[membership.memberId]">loading...</span>
</span>
</td>
<td>
<span ng-if="users[membership.createdBy]">{{users[membership.createdBy]}}</span>
<span class="text-info" ng-if="membership.createdBy && !users[membership.createdBy]">loading...</span>
</td>
<td>{{membership.createdAt | date : 'yyyy-MM-dd HH:mm' : 'EDT'}} {{membership.createdAt ? 'EDT' : ''}}</td>
<td>
<span ng-if="users[membership.modifiedBy]">{{users[membership.modifiedBy]}}</span>
<span class="text-info" ng-if="membership.modifiedBy && !users[membership.modifiedBy]">loading...</span>
</td>
<td>{{membership.modifiedAt | date : 'yyyy-MM-dd HH:mm' : 'EDT'}} {{membership.modifiedAt ? 'EDT' : ''}}</td>
<td>
<button data-ng-click='removeMember(membership)' class="btn btn-sm btn-danger" ng-disabled="membership.isRemoving">
<strong>Remove</strong>
</button>
</td>
</tr>
</tbody>
</table>
</div>
<!-- table-responsive -->
<div ng-show="!memberships[memberType].length" style="margin-bottom: 20px;">No members</div><br/>
</div>

Expand Down
3 changes: 2 additions & 1 deletion src/app/groups/groups.list.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="text-center" ng-show="isLoading">
<img src="assets/images/loading.gif" />
</div>
<div ng-show="!isLoading">
<div ng-show="!isLoading" class="table-responsive">
<table class="footable table table-stripped toggle-arrow-tiny" ng-show="groups.length" data-page-size="50">
<thead>
<tr>
Expand Down Expand Up @@ -53,6 +53,7 @@
</table>
<div ng-show="!groups.length">No records found</div>
</div>
<!-- table-responsive -->
</div>
</div>
</div>
Expand Down
13 changes: 9 additions & 4 deletions src/app/less/base.less
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ body {
}

html,body {
height: 100%;
min-height: 100%;
}

.app-wrapper {
height: inherit;
}

body.full-height-layout #wrapper,
Expand All @@ -18,7 +21,7 @@ body.full-height-layout #page-wrapper {
}

#page-wrapper {
min-height: auto;
height: 100%;
}

body.boxed-layout {
Expand Down Expand Up @@ -171,6 +174,7 @@ video {
#wrapper {
width: 100%;
overflow-x: hidden;
height: inherit;
}

.wrapper {
Expand All @@ -183,16 +187,17 @@ video {

#page-wrapper {
padding: 0 15px;
min-height: 568px;
min-height: 667px;
position: relative !important;
}

@media (min-width: 768px) {
#page-wrapper {
position: inherit;
min-height: 959px;
margin: 0 0 0 240px;
min-height: 1000px;
}

}

.title-action {
Expand Down
23 changes: 23 additions & 0 deletions src/app/less/buttons.less
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,29 @@
margin-bottom: 5px;
}

@media (max-width: 768px) {

.float-e-margins .btn {
margin: 15px 0 0 14px;
}

.float-e-margins .col-md-2 .btn,
.float-e-margins .col-sm-3 .btn {
margin-left: 0;
}

.float-e-margins table .btn {
margin: 0;
width: 100%;
display: block;

&:first-child {
margin-bottom: 15px;
}
}
}


.btn-w-m {
min-width: 120px;
}
Expand Down
55 changes: 51 additions & 4 deletions src/app/less/media.less
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
#page-wrapper {
position: inherit;
margin: 0 0 0 @sidebar-width;
min-height: 1200px;
height: 100%;
}

.m-menu {
display: none;
}

.navbar-static-side {
Expand All @@ -23,14 +27,57 @@
#page-wrapper {
position: inherit;
margin: 0 0 0 0px;
min-height: 1000px;
}

.m-menu {
display: block;
position: absolute;
top: 5px;
right: 10px;
z-index: 2;
&.menu-open {
color: #fff;
}
}

.table-responsive {
overflow-y: auto;
border: none;
padding-bottom: 49px;
margin: 0;
}

// Now at mobile, paignation will be position absolute and display 0 left
.table-responsive .pagination {
position: absolute;
left: 34px;
bottom: 42px;
}

.roles-table .pagination {
bottom: 22px;
}

.dropdown-menu {
right: 0;
left: auto;
top: 30px;
}

.body-small .navbar-static-side {
display: none;
z-index: 2001;
position: absolute;
width: 70px;
width: 100%;
top: 0;
}

.metismenu {
display: none;
}

.metismenu.menu-open {
background: rgb(47, 64, 80);
display: block;
}

.body-small.mini-navbar .navbar-static-side {
Expand Down
25 changes: 25 additions & 0 deletions src/app/less/pages.less
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,10 @@ a.compose-mail {
margin-bottom: 20px;
}

.word-wrap {
word-break: break-all;
}

.mail-box-header {
background-color: #ffffff;
border: 1px solid @border-color;
Expand Down Expand Up @@ -1319,3 +1323,24 @@ body.body-small .vote-icon {
display: none;
}

// Mobile new style
@media (max-width: 768px) {

.float-e-margins {
&.import-form {
.row {
margin-left: 0;
margin-right: 0;
}

.block {
word-break: break-all;
}
}
}

.float-e-margins table .btn-group {
width: 100%;
}

}
3 changes: 1 addition & 2 deletions src/app/less/rtl.less
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,7 @@ body.rtls .top-navigation .footer.fixed, body.rtls.top-navigation .footer.fixed

.body-small.rtls #page-wrapper {
position: inherit;
margin: 0 0 0 0px;
min-height: 1000px;
margin: 0;
}

.body-small.rtls .navbar-static-side {
Expand Down
Loading