scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-03 19:24:48 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #716 from mlorb/ml-sci-1420

Browse source 
Add tooltips to navigation bar [SCI-1420]
This commit is contained in:
mlorb 2017-06-27 14:52:07 +02:00 committed by GitHub
commit 025050a7cd
5 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/projects/index.html.erb
View file

@ -59,7 +59,7 @@
<div class="form-group">
<!-- project archive button -->
<a class="btn btn-default pull-right" href="<%= url_for projects_archive_path %>" id="project-archive-btn" title="">
<a class="btn btn-default pull-right" href="<%= url_for projects_archive_path %>" id="project-archive-btn" title="<%= t'projects.index.archive' %>">
<span class="glyphicon glyphicon-briefcase" aria-hidden="true"></span>
</a>

2
app/views/protocols/index.html.erb
View file

@ -12,7 +12,7 @@
</li>
<li role="presentation" class="<%= "active" if @type == :archive %>">
<%= link_to protocols_path(team: @current_team, type: :archive) do %>
<span class="glyphicon glyphicon-briefcase"></span>
<span class="glyphicon glyphicon-briefcase" title="<%= t'protocols.index.navigation.archive' %>"></span>
<% end %>
</li>
</ul>

22
app/views/shared/_navigation.html.erb
View file

@ -9,7 +9,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<%= link_to(root_path, class: 'navbar-brand') do %>
<%= link_to(root_path, class: 'navbar-brand', title: t('nav.label.scinote')) do %>
<%
show_version = !Rails.env.production?
if ENV['NAVBAR_SHOW_VERSION'].present?
@ -32,33 +32,33 @@
<!-- links -->
<ul class="nav navbar-nav">
<li>
<a href="<%= projects_path %>">
<a title="<%= t('nav.label.projects') %>" href="<%= projects_path %>">
<span class="glyphicon glyphicon-home"></span>
<span class="visible-xs-inline visible-sm-inline"><%= t('nav.label.projects') %></span>
</a>
</li>
<% if current_team %>
<li>
<a id="protocol-link" href="<%= protocols_path %>">
<a id="protocol-link" title="<%= t('nav.label.protocols') %>" href="<%= protocols_path %>">
<span class="glyphicon glyphicon-list-alt"></span>
<span class="visible-xs-inline visible-sm-inline"><%= t('nav.label.protocols') %></span>
</a>
</li>
<li>
<a id="repositories-link" href="<%= team_repositories_path(current_team) %>">
<a id="repositories-link" title="<%= t('nav.label.repositories') %>" href="<%= team_repositories_path(current_team) %>">
<i class="fa fa-cubes" aria-hidden="true"></i>
<span class="visible-xs-inline visible-sm-inline"><%= t('nav.label.repositories') %></span>
</a>
</li>
<% else %>
<li class="disabled">
<a id="protocol-link" href="#">
<a id="protocol-link" title="<%= t('nav.label.protocols') %>" href="#">
<span class="glyphicon glyphicon-list-alt"></span>
<span class="visible-xs-inline visible-sm-inline"><%= t('nav.label.protocols') %></span>
</a>
</li>
<li class="disabled">
<a id="repositories-link" href="#">
<a id="repositories-link" title="<%= t('nav.label.repositories') %>" href="#">
<span class="fa fa-cubes"></span>
<span class="visible-xs-inline visible-sm-inline"><%= t('nav.label.repositories') %></span>
</a>
@ -73,7 +73,7 @@
</li>
<% end %>
<li>
<a class="btn-activity" href="<%= activities_path(format: :json) %>" role="button" data-remote="true">
<a class="btn-activity" title="<%= t('nav.label.activities') %>" href="<%= activities_path(format: :json) %>" role="button" data-remote="true">
<span class="glyphicon glyphicon-equalizer"></span>
<span class="visible-xs-inline visible-sm-inline"><%= t('nav.label.activities') %></span>
</a>
@ -88,6 +88,7 @@
<li class="dropdown" id="team-switch">
<a href="#"
class="dropdown-toggle"
title="<%= t('nav.label.teams') %>"
data-toggle="dropdown"
role="button"
aria-haspopup="true"
@ -135,11 +136,13 @@
id="search-ico">
<a href="#"
class="dropdown-toggle"
title="<%= t('nav.label.search') %>"
data-toggle="dropdown"
role="button"
aria-haspopup="true"
aria-expanded="false">
<span class="glyphicon glyphicon-search"></span>
<span class="visible-xs-inline visible-sm-inline"><%= t('nav.label.search') %></span>
</a>
<ul class="dropdown-menu search-dropdown">
<li>
@ -174,12 +177,14 @@
<a href="#"
id="notifications-dropdown"
class="dropdown-toggle"
title="<%= t('nav.label.notifications') %>"
data-toggle="dropdown"
role="button"
aria-haspopup="true"
aria-expanded="false"
data-href="<%= recent_notifications_url(current_user) %>">
<%= fa_icon 'bell'%>
<span class="visible-xs-inline visible-sm-inline"><%= t('nav.label.notifications') %></span>
<span id="count-notifications"
data-href="<%= unseen_notification_url(current_user) %>">
</span>
@ -205,11 +210,13 @@
<a href="#"
id="help-link"
class="dropdown-toggle"
title="<%= t('nav.label.info') %>"
data-toggle="dropdown"
role="button"
aria-haspopup="true"
aria-expanded="false">
<span class="glyphicon glyphicon-info-sign"></span>
<span class="visible-xs-inline visible-sm-inline"><%= t('nav.label.info') %></span>
</a>
<ul class="dropdown-menu" data-hook="navigation-help-menu">
<li><%= link_to t('nav.help.support'),
@ -234,6 +241,7 @@
<li class="dropdown">
<a href="#"
class="dropdown-toggle"
title="<%= t('nav.label.account') %>"
data-toggle="dropdown"
role="button"
aria-haspopup="true"

8
app/views/shared/_secondary_navigation.html.erb
View file

@ -101,7 +101,9 @@
<% end %>
<% if can_view_project_archive(@project) then %>
<li id="project-archive-nav-tab" class="<%= "active" if is_project_archive? %>">
<a href="<%= experiment_archive_project_url(@project) %>"><span class="glyphicon glyphicon-briefcase"></span></a>
<a href="<%= experiment_archive_project_url(@project) %>" title="<%=t "nav2.projects.archive" %>">
<span class="glyphicon glyphicon-briefcase"></span>
</a>
</li>
<% end %>
@ -136,7 +138,9 @@
<% end %>
<% if can_view_experiment_archive(@experiment) then %>
<li id="project-archive-nav-tab" class="<%= "active" if is_experiment_archive? %>">
<a href="<%= module_archive_experiment_url(@experiment) %>"><span class="glyphicon glyphicon-briefcase"></span></a>
<a href="<%= module_archive_experiment_url(@experiment) %>" title="<%=t "nav2.projects.archive" %>">
<span class="glyphicon glyphicon-briefcase"></span>
</a>
</li>
<% end %>

11
config/locales/en.yml
View file

@ -75,11 +75,17 @@ en:
activities:
none: "No activities!"
label:
projects: "Projects"
scinote: "sciNote"
projects: "Home"
protocols: "Protocols"
calendar: "Calendar"
activities: "Activities"
repositories: "Repositories"
teams: "Teams"
search: "Search"
notifications: "Notifications"
info: "Info"
account: "Account"
sidebar:
title: "Navigation"
@ -91,6 +97,7 @@ en:
samples: "Samples"
activities: "Activity"
reports: "Reports"
archive: "Archive"
experiments:
canvas: "Overview"
modules:
@ -165,6 +172,7 @@ en:
projects:
index:
head_title: "Home"
archive: "Archive"
new: "New project"
visibility_private: "Project is private. Only invited users can see it."
visibility_public: "Project is public. Everybody from the team can see it."
@ -1420,6 +1428,7 @@ en:
navigation:
public: "Public protocols"
private: "Private protocols"
archive: "Archive"
public_description: "Public protocols are visible and can be used by everyone from the team."
private_description: "Private protocols are only visible to you."
create_new: "Create new"