ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject incubator-ignite git commit: IGNITE-843 Convert html to jade.
Date Thu, 09 Jul 2015 06:32:15 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-843 e92d9cc56 -> 28fcb5d00


IGNITE-843 Convert html to jade.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/28fcb5d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/28fcb5d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/28fcb5d0

Branch: refs/heads/ignite-843
Commit: 28fcb5d00f291b94db0cfc28b89800af6f73f1b3
Parents: e92d9cc
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Thu Jul 9 13:32:10 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Thu Jul 9 13:32:10 2015 +0700

----------------------------------------------------------------------
 .../nodejs/views/admin/index.jade               |  2 +-
 .../nodejs/views/admin/userList_content.html    | 55 --------------------
 .../nodejs/views/admin/users.jade               | 35 +++++++++++++
 3 files changed, 36 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28fcb5d0/modules/web-control-center/nodejs/views/admin/index.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/admin/index.jade b/modules/web-control-center/nodejs/views/admin/index.jade
index f667976..099d2b7 100644
--- a/modules/web-control-center/nodejs/views/admin/index.jade
+++ b/modules/web-control-center/nodejs/views/admin/index.jade
@@ -18,4 +18,4 @@ append scripts
     script(src='//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2/js/bootstrap.min.js')
 
 block container
-    include userList_content.html
+    include users

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28fcb5d0/modules/web-control-center/nodejs/views/admin/userList_content.html
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/admin/userList_content.html b/modules/web-control-center/nodejs/views/admin/userList_content.html
deleted file mode 100644
index 680b72c..0000000
--- a/modules/web-control-center/nodejs/views/admin/userList_content.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<div class="row" ng-controller="adminController">
-    <div class="docs-content">
-        <div class="docs-header">
-            <h1>Users</h1>
-            <p>List of registered users</p>
-            <hr>
-        </div>
-        <div class="docs-body">
-            <div ng-class="{alert: true, 'alert-danger': alertType == danger, 'alert-success':
alertType == 'success'}"
-                 ng-show="alertStr">
-                {{alertStr}}
-            </div>
-            
-            <table class="table table-striped" st-table="userListDisplay" st-safe-src="userList">
-                <thead>
-                <tr>
-                    <th colspan="5"><input st-search="" class="form-control" placeholder="Search
..." type="text"/></th>
-                </tr>
-                <tr>
-                    <th st-sort="username">User name</th>
-                    <th st-sort="email">Email</th>
-                    <th st-sort="lastLogin">Last login</th>
-                    <th st-sort="lastLogin">Admin</th>
-                    <th colspan="2">Actions</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr ng-repeat="user in userListDisplay">
-                    <td>{{user.username}}</td>
-                    <td><a ng-href="mailto:{{user.email}}">{{user.email}}</a></td>
-                    <td>
-                        <span class="small">{{user.lastLogin | date:'medium'}}</span>
-                    </td>
-                    <td>
-                        <input type="checkbox" ng-disabled="user.adminChanging" ng-model="user.admin"

-                               ng-change="toggleAdmin(user)">
-                    </td>
-                    <td width="1%">
-                        <a href ng-click="removeUser(user)" ng-show="user._id != loggedInUser._id"
title="Remove user">
-                            <span class="glyphicon glyphicon-remove" style="color: red"></span>
-                        </a>
-                    </td>
-                    <td width="1%">
-                        <a ng-href="become?viewedUserId={{user._id}}" ng-show="user._id
!= loggedInUser._id"
-                           title="View user's configurations">
-                            <span class="glyphicon glyphicon-eye-open"></span>
-                        </a>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-</div>
-

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28fcb5d0/modules/web-control-center/nodejs/views/admin/users.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/admin/users.jade b/modules/web-control-center/nodejs/views/admin/users.jade
new file mode 100644
index 0000000..58c46c1
--- /dev/null
+++ b/modules/web-control-center/nodejs/views/admin/users.jade
@@ -0,0 +1,35 @@
+.row(ng-controller='adminController')
+    .docs-content
+        .docs-header
+            h1 Users
+            p List of registered users
+            hr
+        .docs-body
+            div(ng-class='{alert: true, "alert-danger": alertType == danger, "alert-success":
alertType == "success"}' ng-show='alertStr') {{alertStr}}
+            table.table.table-striped(st-table='userListDisplay' st-safe-src='userList')
+                thead
+                    tr
+                        th(colspan='5')
+                            input.form-control(type='text' st-search='' class='' placeholder='Search
...')
+                    tr
+                        th(st-sort='username') User name
+                        th(st-sort='email') Email
+                        th(st-sort='lastLogin') Last login
+                        th(st-sort='lastLogin') Admin
+                        th(colspan='2') Actions
+                tbody
+                    tr(ng-repeat='user in userListDisplay')
+                        td {{user.username}}
+                        td
+                            a(ng-href='mailto:{{user.email}}') {{user.email}}
+                        td
+                            span.small {{user.lastLogin | date:'medium'}}
+                        td
+                            input(type='checkbox' ng-disabled='user.adminChanging' ng-model='user.admin'
+                               ng-change='toggleAdmin(user)')
+                        td(width='1%')
+                            a(ng-click='removeUser(user)' ng-show='user._id != loggedInUser._id'
title='Remove user')
+                                span.glyphicon.glyphicon-remove(style='color: red')
+                        td(width='1%')
+                            a(ng-href='become?viewedUserId={{user._id}}' ng-show='user._id
!= loggedInUser._id' title='View user\'s configurations')
+                                span.glyphicon.glyphicon-eye-open


Mime
View raw message