You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/02/10 12:02:56 UTC
ignite git commit: IGNITE-843 Fixed greedy on admin page.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 ee4a8252c -> aca04bc3b
IGNITE-843 Fixed greedy on admin page.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aca04bc3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aca04bc3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aca04bc3
Branch: refs/heads/ignite-843-rc2
Commit: aca04bc3b271b6ec9f850ea1b33f3a9cecf758bc
Parents: ee4a825
Author: Dmitriyff <dm...@gmail.com>
Authored: Wed Feb 10 18:02:58 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Feb 10 18:02:58 2016 +0700
----------------------------------------------------------------------
.../src/main/js/views/settings/admin.jade | 73 ++++++++++----------
1 file changed, 37 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/aca04bc3/modules/control-center-web/src/main/js/views/settings/admin.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/settings/admin.jade b/modules/control-center-web/src/main/js/views/settings/admin.jade
index 0a021d3..9475aae 100644
--- a/modules/control-center-web/src/main/js/views/settings/admin.jade
+++ b/modules/control-center-web/src/main/js/views/settings/admin.jade
@@ -14,43 +14,44 @@
See the License for the specific language governing permissions and
limitations under the License.
-.row.greedy(ng-controller='adminController')
- .docs-content
+.row(ng-controller='adminController')
+ .docs-content.greedy
.docs-header
h1 List of registered users
hr
.docs-body
- table.table.table-striped.admin(st-table='displayedUsers' st-safe-src='users')
- thead
- tr
- th.header(colspan='7')
- .col-sm-2.pull-right
- input.form-control(type='text' st-search='' placeholder='Filter users...')
- tr
- th(st-sort='username') User name
- th(st-sort='email') Email
- th(st-sort='company') Company
- th(st-sort='country') Country
- th.col-sm-2(st-sort='lastLogin') Last login
- th(width='1%' st-sort='admin') Admin
- th(width='1%') Actions
- tbody
- tr(ng-repeat='row in displayedUsers')
- td {{row.username}}
- td
- a(ng-href='mailto:{{row.email}}') {{row.email}}
- td {{row.company}}
- td {{row.country}}
- td
- span {{row.lastLogin | date:'medium'}}
- td(style='text-align: center;')
- input(type='checkbox' ng-disabled='row.adminChanging || row._id == user._id'
- ng-model='row.admin' ng-change='toggleAdmin(row)')
- td(style='text-align: center;')
- div(ng-show='row._id != user._id')
- i.fa.fa-remove(ng-click='removeUser(row)' bs-tooltip='' data-title='Remove user')
- i.fa.fa-eye(ng-click='becomeUser(row)' style='margin-left: 5px' bs-tooltip='' data-title='Become this user')
- tfoot
- tr
- td.text-right(colspan='7')
- div(st-pagination st-items-by-page='15' st-displayed-pages='5')
+ .col-xs-12
+ table.table.table-striped.admin(st-table='displayedUsers' st-safe-src='users')
+ thead
+ tr
+ th.header(colspan='7')
+ .col-xs-2.pull-right
+ input.form-control(type='text' st-search='' placeholder='Filter users...')
+ tr
+ th(st-sort='username') User name
+ th(st-sort='email') Email
+ th(st-sort='company') Company
+ th(st-sort='country') Country
+ th.col-xs-2(st-sort='lastLogin') Last login
+ th(width='1%' st-sort='admin') Admin
+ th(width='1%') Actions
+ tbody
+ tr(ng-repeat='row in displayedUsers')
+ td {{row.username}}
+ td
+ a(ng-href='mailto:{{row.email}}') {{row.email}}
+ td {{row.company}}
+ td {{row.country}}
+ td
+ span {{row.lastLogin | date:'medium'}}
+ td(style='text-align: center;')
+ input(type='checkbox' ng-disabled='row.adminChanging || row._id == user._id'
+ ng-model='row.admin' ng-change='toggleAdmin(row)')
+ td(style='text-align: center;')
+ div(ng-show='row._id != user._id')
+ i.fa.fa-remove(ng-click='removeUser(row)' bs-tooltip='' data-title='Remove user')
+ i.fa.fa-eye(ng-click='becomeUser(row)' style='margin-left: 5px' bs-tooltip='' data-title='Become this user')
+ tfoot
+ tr
+ td.text-right(colspan='7')
+ div(st-pagination st-items-by-page='15' st-displayed-pages='5')