You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/06/18 07:13:15 UTC
incubator-ignite git commit: # IGNITE-843 Added sub for summary page
+ minor cleanup.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 2d7e971ab -> 2d7a38289
# IGNITE-843 Added sub for summary page + minor cleanup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2d7a3828
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2d7a3828
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2d7a3828
Branch: refs/heads/ignite-843
Commit: 2d7a3828970b3296527758fb05a6b464d885d70b
Parents: 2d7e971
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Jun 18 12:13:09 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Jun 18 12:13:09 2015 +0700
----------------------------------------------------------------------
modules/webconfig/nodejs/routes/pages.js | 30 ++++----------------
.../webconfig/nodejs/views/layout-sidebar.jade | 2 +-
modules/webconfig/nodejs/views/summary.jade | 26 +++++++++++++++++
3 files changed, 32 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d7a3828/modules/webconfig/nodejs/routes/pages.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/routes/pages.js b/modules/webconfig/nodejs/routes/pages.js
index d795d56..7b6c24e 100644
--- a/modules/webconfig/nodejs/routes/pages.js
+++ b/modules/webconfig/nodejs/routes/pages.js
@@ -27,21 +27,6 @@ router.get('/login', function(req, res) {
res.render('login');
});
-/* GET page for discovery advanced settings. */
-router.get('/simplePopup', function(req, res) {
- res.render('simplePopup');
-});
-
-/* GET page for indexedTypes popup. */
-router.get('/indexedTypes', function(req, res) {
- res.render('indexedTypes');
-});
-
-/* GET register page. */
-router.get('/register', function(req, res) {
- res.render('register');
-});
-
/* GET home page. */
router.get('/', function(req, res) {
if (req.isAuthenticated())
@@ -55,16 +40,6 @@ router.get('/clusters', function(req, res) {
res.render('clusters', { user: req.user });
});
-/* GET advanced options for TcpDiscoveryVmIpFinder page. */
-router.get('/tcpDiscoveryVmIpFinder', function(req, res) {
- res.render('tcpDiscoveryVmIpFinder');
-});
-
-/* GET advanced options for TcpDiscoveryMulticastIpFinder page. */
-router.get('/tcpDiscoveryMulticastIpFinder', function(req, res) {
- res.render('tcpDiscoveryMulticastIpFinder');
-});
-
/* GET caches page. */
router.get('/caches', function(req, res) {
res.render('caches', { user: req.user });
@@ -85,4 +60,9 @@ router.get('/clients', function(req, res) {
res.render('clients', { user: req.user });
});
+/* GET summary page. */
+router.get('/summary', function(req, res) {
+ res.render('summary', { user: req.user });
+});
+
module.exports = router;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d7a3828/modules/webconfig/nodejs/views/layout-sidebar.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/layout-sidebar.jade b/modules/webconfig/nodejs/views/layout-sidebar.jade
index 4c36105..a16811b 100644
--- a/modules/webconfig/nodejs/views/layout-sidebar.jade
+++ b/modules/webconfig/nodejs/views/layout-sidebar.jade
@@ -35,7 +35,7 @@ block container
a(ng-class="{active: isActive('/clients')}" href='/clients') Clients
li
p
- a(ng-class="{active: isActive('/overview')}" href='/overview') Summary
+ a(ng-class="{active: isActive('/summary')}" href='/summary') Summary
.col-sm-10.border-left.section-right
.docs-content
block content
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d7a3828/modules/webconfig/nodejs/views/summary.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/summary.jade b/modules/webconfig/nodejs/views/summary.jade
new file mode 100644
index 0000000..07e70cd
--- /dev/null
+++ b/modules/webconfig/nodejs/views/summary.jade
@@ -0,0 +1,26 @@
+//-
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+extends layout-sidebar
+block head
+block content
+ .docs-header
+ h1 Summary
+ p Configurations summary.
+ hr
+ .docs-body(ng-controller='summaryRouter')
+block body
+ script(src='/javascripts/controllers/summary.js')
\ No newline at end of file