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:54:52 UTC
incubator-ignite git commit: IGNITE-843: Rename mixin to not override
by name.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 faec0e476 -> dd79dd36e
IGNITE-843: Rename mixin to not override by name.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dd79dd36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dd79dd36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dd79dd36
Branch: refs/heads/ignite-843
Commit: dd79dd36e79dc8e60954a4d7d67a98ebe8b575ed
Parents: faec0e4
Author: AKuznetsov <ak...@gridgain.com>
Authored: Sat Jul 11 01:54:52 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Sat Jul 11 01:54:52 2015 +0700
----------------------------------------------------------------------
.../web-control-center/nodejs/views/includes/header.jade | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd79dd36/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 c85f477..1a6c1ad 100644
--- a/modules/web-control-center/nodejs/views/includes/header.jade
+++ b/modules/web-control-center/nodejs/views/includes/header.jade
@@ -13,7 +13,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.
-mixin item(active, ref, txt)
+mixin header-item(active, ref, txt)
li
a(ng-class='{active: isActive("#{active}")}' href='#{ref}') #{txt}
@@ -23,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')
- +item('/configuration', '/configuration/clusters', 'Configuration')
- //+item('/monitoring', '/monitoring', 'Monitoring')
- //+item('/sql', '/sql', 'SQL')
- //+item('/deploy', '/deploy', 'Deploy')
+ +header-item('/configuration', '/configuration/clusters', 'Configuration')
+ //+header-item('/monitoring', '/monitoring', 'Monitoring')
+ //+header-item('/sql', '/sql', 'SQL')
+ //+header-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}}