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 2015/07/21 12:31:22 UTC
incubator-ignite git commit: # ignite-843 Fixed admin page
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 56db3f32d -> 6ed40f83d
# ignite-843 Fixed admin page
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6ed40f83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6ed40f83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6ed40f83
Branch: refs/heads/ignite-843
Commit: 6ed40f83d42ccc80105f2884f8b7faf512bdbc8d
Parents: 56db3f3
Author: Andrey <an...@gridgain.com>
Authored: Tue Jul 21 17:32:20 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Jul 21 17:32:20 2015 +0700
----------------------------------------------------------------------
.../nodejs/public/stylesheets/style.less | 16 +++++++++++++++-
.../nodejs/views/settings/admin.jade | 9 +++++++--
2 files changed, 22 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6ed40f83/modules/web-control-center/nodejs/public/stylesheets/style.less
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/public/stylesheets/style.less b/modules/web-control-center/nodejs/public/stylesheets/style.less
index 495567c..f2cb9bc 100644
--- a/modules/web-control-center/nodejs/public/stylesheets/style.less
+++ b/modules/web-control-center/nodejs/public/stylesheets/style.less
@@ -243,7 +243,6 @@
li a:hover {
color: @ignite-red;
- //background-color: transparent;
}
.active {
@@ -793,6 +792,21 @@ button .caret, .btn .caret {
padding: 0;
}
}
+
+ tfoot > tr > td {
+ padding: 0;
+
+ .pagination {
+ margin: 0.65em 0;
+
+ > .active > a {
+ color: @ignite-red;
+ font-weight: bold;
+ border-color: #ddd;
+ background-color: #eee;
+ }
+ }
+ }
}
.panel-title a {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6ed40f83/modules/web-control-center/nodejs/views/settings/admin.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/settings/admin.jade b/modules/web-control-center/nodejs/views/settings/admin.jade
index f8ced1c..fb0c0d1 100644
--- a/modules/web-control-center/nodejs/views/settings/admin.jade
+++ b/modules/web-control-center/nodejs/views/settings/admin.jade
@@ -47,7 +47,12 @@ block container
input(type='checkbox' ng-disabled='row.adminChanging || row._id == user._id'
ng-model='row.admin' ng-change='toggleAdmin(row)')
td(style='text-align: center;')
- a(ng-click='removeUser(row)' ng-show='row._id != user._id' title='Remove user')
+ a(ng-click='removeUser(row)' ng-show='row._id != user._id' bs-tooltip data-title='Remove user')
i.fa.fa-remove
- a(style='margin-left: 5px' ng-href='admin/become?viewedUserId={{row._id}}' ng-show='row._id != user._id' title='Become this user')
+ a(style='margin-left: 5px' ng-href='admin/become?viewedUserId={{row._id}}' ng-show='row._id != user._id' bs-tooltip data-title='Become this user')
i.fa.fa-eye
+ tfoot
+ tr
+ td(colspan='5' class="text-right")
+ div(st-pagination st-items-by-page='15' st-displayed-pages='5')
+