projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
closes #3296
[arvados.git]
/
apps
/
workbench
/
app
/
views
/
layouts
/
body.html.erb
diff --git
a/apps/workbench/app/views/layouts/body.html.erb
b/apps/workbench/app/views/layouts/body.html.erb
index ef96f08e4bcd7479fcab7cc4a437060f09dacfe6..4c58daba70e85efeddb34704e89fe6badde9cdab 100644
(file)
--- a/
apps/workbench/app/views/layouts/body.html.erb
+++ b/
apps/workbench/app/views/layouts/body.html.erb
@@
-49,7
+49,7
@@
<% if current_user.is_active %>
<li role="presentation"><a href="/manage_account" role="menuitem"><i class="fa fa-key fa-fw"></i> Manage account</a></li>
<% if Rails.configuration.user_profile_form_fields %>
<% if current_user.is_active %>
<li role="presentation"><a href="/manage_account" role="menuitem"><i class="fa fa-key fa-fw"></i> Manage account</a></li>
<% if Rails.configuration.user_profile_form_fields %>
- <li role="presentation"><a href="/users/<%=current_user.uuid%>/profile" role="menuitem"><i class="fa fa-key fa-fw"></i> Manage
my
profile</a></li>
+ <li role="presentation"><a href="/users/<%=current_user.uuid%>/profile" role="menuitem"><i class="fa fa-key fa-fw"></i> Manage profile</a></li>
<% end %>
<li role="presentation" class="divider"></li>
<% end %>
<% end %>
<li role="presentation" class="divider"></li>
<% end %>
@@
-147,13
+147,10
@@
<ul class="nav navbar-nav navbar-left">
<li>
<a href="/">
<ul class="nav navbar-nav navbar-left">
<li>
<a href="/">
- <i class="fa fa-lg fa-fw fa-
home
"></i>
- Home
+ <i class="fa fa-lg fa-fw fa-
dashboard
"></i>
+ Dashboard
</a>
</li>
</a>
</li>
- <li class="nav-separator">
- <i class="fa fa-lg fa-angle-double-right"></i>
- </li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" id="projects-menu">
Projects
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" id="projects-menu">
Projects
@@
-175,13
+172,23
@@
<% } %>
</ul>
</li>
<% } %>
</ul>
</li>
- <%
project_breadcrumbs.each do |p|
%>
+ <%
if @name_link or @object
%>
<li class="nav-separator">
<i class="fa fa-lg fa-angle-double-right"></i>
</li>
<li>
<li class="nav-separator">
<i class="fa fa-lg fa-angle-double-right"></i>
</li>
<li>
- <%= link_to(p.name, project_path(p.uuid), data: {object_uuid: p.uuid, name: 'name'}) %>
+ <%= link_to project_path(current_user.uuid) do %>
+ Home
+ <% end %>
</li>
</li>
+ <% project_breadcrumbs.each do |p| %>
+ <li class="nav-separator">
+ <i class="fa fa-lg fa-angle-double-right"></i>
+ </li>
+ <li>
+ <%= link_to(p.name, project_path(p.uuid), data: {object_uuid: p.uuid, name: 'name'}) %>
+ </li>
+ <% end %>
<% end %>
</ul>
</nav>
<% end %>
</ul>
</nav>