Merge "Removed translation if cluster name starts from '.'"

This commit is contained in:
Jenkins 2014-01-17 13:18:58 +00:00 committed by Gerrit Code Review
commit 8e50e545b2
2 changed files with 8 additions and 4 deletions

View File

@ -37,7 +37,7 @@ function(utils, models, commonViews, dialogViews, NodesTab, NetworkTab, Settings
ClusterPage = commonViews.Page.extend({
navbarActiveElement: 'clusters',
breadcrumbsPath: function() {
return [['home', '#'], ['environments', '#clusters'], this.model.get('name')];
return [['home', '#'], ['environments', '#clusters'], [this.model.get('name'), null, true]];
},
title: function() {
return this.model.get('name');

View File

@ -1,9 +1,13 @@
<ul class="breadcrumb">
<% _.each(path, function(part) { %>
<% if (_.isArray(part)) { %>
<li>
<a href="<%- part[1] %>"><%- $.t('breadcrumbs.' + part[0], {defaultValue: part[0]}) %></a> <span class="divider">/</span>
</li>
<% if (part[2]) { %>
<li class="active"><%- part[0] %></li>
<% } else { %>
<li>
<a href="<%- part[1] %>"><%- $.t('breadcrumbs.' + part[0], {defaultValue: part[0]}) %></a><span class="divider">/</span>
</li>
<% } %>
<% } else { %>
<li class="active"><%- $.t('breadcrumbs.' + part, {defaultValue: part}) %></li>
<% } %>