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/07/10 20:51:24 UTC
[1/2] incubator-ignite git commit: IGNITE-843: Rename sidebar
template.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 5e41cfa5e -> a74f5e31f
IGNITE-843: Rename sidebar template.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5c6ecb8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5c6ecb8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5c6ecb8e
Branch: refs/heads/ignite-843
Commit: 5c6ecb8e7b20323a91477c768fa42840c056b111
Parents: 5e41cfa
Author: AKuznetsov <ak...@gridgain.com>
Authored: Sat Jul 11 01:46:14 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Sat Jul 11 01:46:14 2015 +0700
----------------------------------------------------------------------
.../nodejs/views/configuration/caches.jade | 2 +-
.../nodejs/views/configuration/clusters.jade | 2 +-
.../nodejs/views/configuration/metadata.jade | 2 +-
.../nodejs/views/configuration/persistence.jade | 2 +-
.../nodejs/views/configuration/summary.jade | 2 +-
.../nodejs/views/includes/header.jade | 11 +++--
.../nodejs/views/sql/sql.jade | 2 +-
.../views/templates/configuration-sidebar.jade | 47 ++++++++++++++++++++
.../nodejs/views/templates/layout-sidebar.jade | 47 --------------------
9 files changed, 60 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c6ecb8e/modules/web-control-center/nodejs/views/configuration/caches.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/configuration/caches.jade b/modules/web-control-center/nodejs/views/configuration/caches.jade
index c430d26..bccd184 100644
--- a/modules/web-control-center/nodejs/views/configuration/caches.jade
+++ b/modules/web-control-center/nodejs/views/configuration/caches.jade
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-extends ../templates/layout-sidebar
+extends ../templates/configuration-sidebar
append scripts
script(src='/caches-controller.js')
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c6ecb8e/modules/web-control-center/nodejs/views/configuration/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/configuration/clusters.jade b/modules/web-control-center/nodejs/views/configuration/clusters.jade
index 4f2488a..962490d 100644
--- a/modules/web-control-center/nodejs/views/configuration/clusters.jade
+++ b/modules/web-control-center/nodejs/views/configuration/clusters.jade
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-extends ../templates/layout-sidebar
+extends ../templates/configuration-sidebar
append scripts
script(src='/clusters-controller.js')
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c6ecb8e/modules/web-control-center/nodejs/views/configuration/metadata.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/configuration/metadata.jade b/modules/web-control-center/nodejs/views/configuration/metadata.jade
index 81c10dd..b20bc91 100644
--- a/modules/web-control-center/nodejs/views/configuration/metadata.jade
+++ b/modules/web-control-center/nodejs/views/configuration/metadata.jade
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-extends ../templates/layout-sidebar
+extends ../templates/configuration-sidebar
append scripts
script(src='/metadata-controller.js')
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c6ecb8e/modules/web-control-center/nodejs/views/configuration/persistence.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/configuration/persistence.jade b/modules/web-control-center/nodejs/views/configuration/persistence.jade
index 2d23004..60f9431 100644
--- a/modules/web-control-center/nodejs/views/configuration/persistence.jade
+++ b/modules/web-control-center/nodejs/views/configuration/persistence.jade
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-extends ../templates/layout-sidebar
+extends ../templates/configuration-sidebar
append scripts
script(src='/persistence-controller.js')
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c6ecb8e/modules/web-control-center/nodejs/views/configuration/summary.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/configuration/summary.jade b/modules/web-control-center/nodejs/views/configuration/summary.jade
index c516b9e..29a9a92 100644
--- a/modules/web-control-center/nodejs/views/configuration/summary.jade
+++ b/modules/web-control-center/nodejs/views/configuration/summary.jade
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-extends ../templates/layout-sidebar
+extends ../templates/configuration-sidebar
append scripts
script(src='/summary-controller.js')
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c6ecb8e/modules/web-control-center/nodejs/views/includes/header.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/includes/header.jade b/modules/web-control-center/nodejs/views/includes/header.jade
index 681b3a2..c85f477 100644
--- a/modules/web-control-center/nodejs/views/includes/header.jade
+++ b/modules/web-control-center/nodejs/views/includes/header.jade
@@ -13,6 +13,9 @@
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.
+mixin item(active, ref, txt)
+ li
+ a(ng-class='{active: isActive("#{active}")}' href='#{ref}') #{txt}
header.header(id='header')
.container
@@ -20,10 +23,10 @@ header.header(id='header')
a(href='/') Apache Ignite Web Configurator
.navbar-collapse.collapse(ng-controller='auth')
ul.nav.navbar-nav(ng-controller='activeLink' ng-show='loggedInUser')
- li
- a(ng-class="{active: isActive('/configuration')}" href='/configuration/clusters') Configuration
- //li
- // a(ng-class="{active: isActive('/sql')}" href='/sql') SQL
+ +item('/configuration', '/configuration/clusters', 'Configuration')
+ //+item('/monitoring', '/monitoring', 'Monitoring')
+ //+item('/sql', '/sql', 'SQL')
+ //+item('/deploy', '/deploy', 'Deploy')
ul.nav.navbar-nav.pull-right
li(ng-show='loggedInUser')
a.dropdown-toggle(data-toggle='dropdown' aria-expanded='true' bs-dropdown data-template='user-dropdown' data-placement='bottom-right') {{loggedInUser.username}}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c6ecb8e/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 ea989e0..84617b2 100644
--- a/modules/web-control-center/nodejs/views/sql/sql.jade
+++ b/modules/web-control-center/nodejs/views/sql/sql.jade
@@ -12,7 +12,7 @@
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 ../templates/layout-sidebar
+extends ../templates/layout
append scripts
script(src='/cache-viewer-controller.js')
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c6ecb8e/modules/web-control-center/nodejs/views/templates/configuration-sidebar.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/templates/configuration-sidebar.jade b/modules/web-control-center/nodejs/views/templates/configuration-sidebar.jade
new file mode 100644
index 0000000..6e4a008
--- /dev/null
+++ b/modules/web-control-center/nodejs/views/templates/configuration-sidebar.jade
@@ -0,0 +1,47 @@
+//-
+ 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
+
+mixin item(ref, num, txt)
+ li
+ a(ng-class='{active: isActive("#{ref}")}' href='#{ref}')
+ span.fa-stack
+ i.fa.fa-circle-thin.fa-stack-2x
+ i.fa.fa-stack-1x #{num}
+ | #{txt}
+
+mixin subitem(ref, txt)
+ li
+ a(style='font-size: 16px' ng-class='{active: isActive("#{ref}")}' href='#{ref}')
+ span.fa-stack
+ i.fa.fa-stack-2x
+ | #{txt}
+
+block container
+ .row
+ .col-sm-2.border-right.section-left.greedy
+ .sidebar-nav
+ ul.menu(ng-controller='activeLink')
+ +item('/configuration/clusters', 1, 'Clusters')
+ +item('/configuration/caches', 2, 'Caches')
+ //+subitem('/configuration/metadata', 'Metadata')
+ //+subitem('/configuration/persistence', 'Persistence')
+ +item('/configuration/summary', 3, '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/5c6ecb8e/modules/web-control-center/nodejs/views/templates/layout-sidebar.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/templates/layout-sidebar.jade b/modules/web-control-center/nodejs/views/templates/layout-sidebar.jade
deleted file mode 100644
index 6e4a008..0000000
--- a/modules/web-control-center/nodejs/views/templates/layout-sidebar.jade
+++ /dev/null
@@ -1,47 +0,0 @@
-//-
- 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
-
-mixin item(ref, num, txt)
- li
- a(ng-class='{active: isActive("#{ref}")}' href='#{ref}')
- span.fa-stack
- i.fa.fa-circle-thin.fa-stack-2x
- i.fa.fa-stack-1x #{num}
- | #{txt}
-
-mixin subitem(ref, txt)
- li
- a(style='font-size: 16px' ng-class='{active: isActive("#{ref}")}' href='#{ref}')
- span.fa-stack
- i.fa.fa-stack-2x
- | #{txt}
-
-block container
- .row
- .col-sm-2.border-right.section-left.greedy
- .sidebar-nav
- ul.menu(ng-controller='activeLink')
- +item('/configuration/clusters', 1, 'Clusters')
- +item('/configuration/caches', 2, 'Caches')
- //+subitem('/configuration/metadata', 'Metadata')
- //+subitem('/configuration/persistence', 'Persistence')
- +item('/configuration/summary', 3, 'Summary')
-
- .col-sm-10.border-left.section-right
- .docs-content
- block content
\ No newline at end of file
[2/2] incubator-ignite git commit: IGNITE-843: Fixed mixin.
Posted by ak...@apache.org.
IGNITE-843: Fixed mixin.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a74f5e31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a74f5e31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a74f5e31
Branch: refs/heads/ignite-843
Commit: a74f5e31f833f0e4090992acae6bd9edcd02cc5e
Parents: 5c6ecb8
Author: AKuznetsov <ak...@gridgain.com>
Authored: Sat Jul 11 01:51:25 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Sat Jul 11 01:51:25 2015 +0700
----------------------------------------------------------------------
.../nodejs/views/templates/configuration-sidebar.jade | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74f5e31/modules/web-control-center/nodejs/views/templates/configuration-sidebar.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/templates/configuration-sidebar.jade b/modules/web-control-center/nodejs/views/templates/configuration-sidebar.jade
index 6e4a008..45293a6 100644
--- a/modules/web-control-center/nodejs/views/templates/configuration-sidebar.jade
+++ b/modules/web-control-center/nodejs/views/templates/configuration-sidebar.jade
@@ -16,7 +16,7 @@
extends layout
-mixin item(ref, num, txt)
+mixin sidebar-item(ref, num, txt)
li
a(ng-class='{active: isActive("#{ref}")}' href='#{ref}')
span.fa-stack
@@ -24,7 +24,7 @@ mixin item(ref, num, txt)
i.fa.fa-stack-1x #{num}
| #{txt}
-mixin subitem(ref, txt)
+mixin sidebar-subitem(ref, txt)
li
a(style='font-size: 16px' ng-class='{active: isActive("#{ref}")}' href='#{ref}')
span.fa-stack
@@ -36,11 +36,11 @@ block container
.col-sm-2.border-right.section-left.greedy
.sidebar-nav
ul.menu(ng-controller='activeLink')
- +item('/configuration/clusters', 1, 'Clusters')
- +item('/configuration/caches', 2, 'Caches')
- //+subitem('/configuration/metadata', 'Metadata')
- //+subitem('/configuration/persistence', 'Persistence')
- +item('/configuration/summary', 3, 'Summary')
+ +sidebar-item('/configuration/clusters', 1, 'Clusters')
+ +sidebar-item('/configuration/caches', 2, 'Caches')
+ //+sidebar-subitem('/configuration/metadata', 'Metadata')
+ //+sidebar-subitem('/configuration/persistence', 'Persistence')
+ +sidebar-item('/configuration/summary', 3, 'Summary')
.col-sm-10.border-left.section-right
.docs-content