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: Rename sidebar template.
Date Fri, 10 Jul 2015 18:53:10 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-843 a74f5e31f -> faec0e476


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/faec0e47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/faec0e47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/faec0e47

Branch: refs/heads/ignite-843
Commit: faec0e4765e72894b7cb27110641fd7b69439db3
Parents: a74f5e3
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Sat Jul 11 01:53:10 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Sat Jul 11 01:53:10 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/sidebar.jade     | 47 ++++++++++++++++++++
 .../nodejs/views/configuration/summary.jade     |  2 +-
 .../views/templates/configuration-sidebar.jade  | 47 --------------------
 7 files changed, 52 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faec0e47/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 bccd184..42d12e4 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/configuration-sidebar
+extends sidebar
 
 append scripts
     script(src='/caches-controller.js')

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faec0e47/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 962490d..0fcdb29 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/configuration-sidebar
+extends sidebar
 
 append scripts
     script(src='/clusters-controller.js')

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faec0e47/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 b20bc91..5c21c2b 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/configuration-sidebar
+extends sidebar
 
 append scripts
     script(src='/metadata-controller.js')

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faec0e47/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 60f9431..3a276f8 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/configuration-sidebar
+extends sidebar
 
 append scripts
     script(src='/persistence-controller.js')

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faec0e47/modules/web-control-center/nodejs/views/configuration/sidebar.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/configuration/sidebar.jade b/modules/web-control-center/nodejs/views/configuration/sidebar.jade
new file mode 100644
index 0000000..a1aa1e0
--- /dev/null
+++ b/modules/web-control-center/nodejs/views/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 ../templates/layout
+
+mixin sidebar-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 sidebar-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')
+                    +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
+                block content
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faec0e47/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 29a9a92..bbb1331 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/configuration-sidebar
+extends sidebar
 
 append scripts
     script(src='/summary-controller.js')

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faec0e47/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
deleted file mode 100644
index 45293a6..0000000
--- a/modules/web-control-center/nodejs/views/templates/configuration-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 sidebar-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 sidebar-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')
-                    +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
-                block content
\ No newline at end of file


Mime
View raw message