You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/07/09 19:45:14 UTC
[1/2] incubator-ignite git commit: # IGNITE-843 Add .greedy
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 43e51ed70 -> 566325de7
# IGNITE-843 Add .greedy
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8dd61f64
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8dd61f64
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8dd61f64
Branch: refs/heads/ignite-843
Commit: 8dd61f64649b816b55259d227262c1eb48c4129e
Parents: 43e51ed
Author: sevdokimov <se...@jetbrains.com>
Authored: Thu Jul 9 20:05:04 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Thu Jul 9 20:05:04 2015 +0300
----------------------------------------------------------------------
modules/web-control-center/nodejs/views/admin/userList.jade | 4 ++--
modules/web-control-center/nodejs/views/sql/sql.jade | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8dd61f64/modules/web-control-center/nodejs/views/admin/userList.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/admin/userList.jade b/modules/web-control-center/nodejs/views/admin/userList.jade
index 6a9f9b3..a592c2a 100644
--- a/modules/web-control-center/nodejs/views/admin/userList.jade
+++ b/modules/web-control-center/nodejs/views/admin/userList.jade
@@ -17,7 +17,7 @@ append scripts
script(src='/admin-controller.js')
block container
- .row(ng-controller='adminController')
+ .greedy.row(ng-controller='adminController')
.docs-content
.docs-header
h1 Users
@@ -43,7 +43,7 @@ block container
td
span.small {{user.lastLogin | date:'medium'}}
td
- input(type='checkbox' ng-disabled='user.adminChanging || user._id == loggedInUser._id'
+ input(type='checkbox' ng-disabled='user.adminChanging || user._id == loggedInUser._id'
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')
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8dd61f64/modules/web-control-center/nodejs/views/sql/sql.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/sql/sql.jade b/modules/web-control-center/nodejs/views/sql/sql.jade
index 134eb10..e3b9361 100644
--- a/modules/web-control-center/nodejs/views/sql/sql.jade
+++ b/modules/web-control-center/nodejs/views/sql/sql.jade
@@ -22,7 +22,7 @@ append css
link(rel='stylesheet', href='/stylesheets/sql-console.css')
block container
- div(ng-controller='cacheViewerController')
+ div.greedy(ng-controller='cacheViewerController')
h3 Sql console
table#queryTable(cellpadding=0, cellspacing=0, ng-init='queryType = "sql"')
[2/2] incubator-ignite git commit: # IGNITE-843 Sql: add some results
Posted by se...@apache.org.
# IGNITE-843 Sql: add some results
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/566325de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/566325de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/566325de
Branch: refs/heads/ignite-843
Commit: 566325de72b26069a40583d6df939527bf0146bb
Parents: 8dd61f6
Author: sevdokimov <se...@jetbrains.com>
Authored: Thu Jul 9 20:45:04 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Thu Jul 9 20:45:04 2015 +0300
----------------------------------------------------------------------
.../controllers/cache-viewer-controller.js | 34 ++++++++++++++++++++
.../nodejs/public/stylesheets/sql-console.css | 18 ++++++++---
.../nodejs/views/sql/sql.jade | 27 ++++++++++------
3 files changed, 66 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/566325de/modules/web-control-center/nodejs/controllers/cache-viewer-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/cache-viewer-controller.js b/modules/web-control-center/nodejs/controllers/cache-viewer-controller.js
index 4bac759..2327b0f 100644
--- a/modules/web-control-center/nodejs/controllers/cache-viewer-controller.js
+++ b/modules/web-control-center/nodejs/controllers/cache-viewer-controller.js
@@ -17,6 +17,40 @@
controlCenterModule.controller('cacheViewerController', ['$scope', '$alert', '$http', 'commonFunctions', function ($scope, $alert, $http, commonFunctions) {
+ $scope.results = [
+ {
+ id: 256,
+ s: 'com.foo.User@3213',
+ fields: {
+ id: 256,
+ firstName: 'Ivan',
+ lastName: 'Ivanov',
+ old: 23
+ }
+ },
+
+ {
+ id: 384,
+ s: 'com.foo.User@23214',
+ fields: {
+ id: 384,
+ firstName: 'Sergey',
+ lastName: 'Petrov',
+ old: 28
+ }
+ },
+
+ {
+ id: 923,
+ s: 'com.foo.User@93494',
+ fields: {
+ id: 923,
+ firstName: 'Andrey',
+ lastName: 'Sidorov',
+ old: 28
+ }
+ }
+ ];
var sqlEditor = ace.edit('querySql');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/566325de/modules/web-control-center/nodejs/public/stylesheets/sql-console.css
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/public/stylesheets/sql-console.css b/modules/web-control-center/nodejs/public/stylesheets/sql-console.css
index a81c31f..98c1026 100644
--- a/modules/web-control-center/nodejs/public/stylesheets/sql-console.css
+++ b/modules/web-control-center/nodejs/public/stylesheets/sql-console.css
@@ -16,16 +16,26 @@
border: 1px solid #aaa;
}
-#querySqlContainer {
- margin: 0 10px;
+.queryTd {
+ width: 99%;
+ padding: 0 10px;
+}
+
+#resultPanel {
+ margin-top: 20px;
}
#queryResult {
width: 100%;
- margin-top: 10px;
-
padding: 5px;
+}
+#queryResult .props {
+ color: #666;
+ font-size: smaller;
+}
+.resultRow {
+ padding: 2px;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/566325de/modules/web-control-center/nodejs/views/sql/sql.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/sql/sql.jade b/modules/web-control-center/nodejs/views/sql/sql.jade
index e3b9361..ff39a08 100644
--- a/modules/web-control-center/nodejs/views/sql/sql.jade
+++ b/modules/web-control-center/nodejs/views/sql/sql.jade
@@ -23,21 +23,30 @@ append css
block container
div.greedy(ng-controller='cacheViewerController')
- h3 Sql console
+ h4 Sql console
table#queryTable(cellpadding=0, cellspacing=0, ng-init='queryType = "sql"')
tr
td
- | Query type:
-
-
- td(width='99%')
- #querySqlContainer
+ label(for='queryTypeSelect') Query type:
+ select#queryTypeSelect(ng-model='queryType')
+ option(value='sql') Sql query
+ option(value='id') Get by ID
+ option(value='scane') Scan cache
+
+ td.queryTd
+ div(ng-show='queryType == "sql"')
#querySql
-
td
| Default cache
- #queryResult
- | Some result
+ #resultPanel
+ strong Results
+
+ #queryResult
+ div(ng-repeat='r in results')
+ .resultRow
+ | {{r.id}} -> {{r.s}}
+ span.props {{r.fields}}
+