From 6bfb5e125c0919d2cecdb22e1e8007fdc98e9589 Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mlorber@biosistemika.com>
Date: Tue, 27 Jun 2017 13:46:49 +0200
Subject: [PATCH 1/3] add tooltips to navigation bar

---
 app/views/shared/_navigation.html.erb | 22 +++++++++++++++-------
 config/locales/en.yml                 |  8 +++++++-
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/views/shared/_navigation.html.erb b/app/views/shared/_navigation.html.erb
index b39e084bc..52a780799 100644
--- a/app/views/shared/_navigation.html.erb
+++ b/app/views/shared/_navigation.html.erb
@@ -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?
@@ -33,33 +33,33 @@
       <ul class="nav navbar-nav">
         <li>
           <a href="<%= projects_path %>">
-            <span class="glyphicon glyphicon-home"></span>
+            <span class="glyphicon glyphicon-home" title="<%= t('nav.label.projects') %>"></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 %>">
-            <span class="glyphicon glyphicon-list-alt"></span>
+            <span class="glyphicon glyphicon-list-alt" title="<%= t('nav.label.protocols') %>"></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) %>">
-            <i class="fa fa-cubes" aria-hidden="true"></i>
+            <i class="fa fa-cubes" aria-hidden="true" title="<%= t('nav.label.repositories') %>"></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="#">
-            <span class="glyphicon glyphicon-list-alt"></span>
+            <span class="glyphicon glyphicon-list-alt" title="<%= t('nav.label.protocols') %>"></span>
             <span class="visible-xs-inline visible-sm-inline"><%= t('nav.label.protocols') %></span>
           </a>
         </li>
         <li class="disabled">
           <a id="repositories-link" href="#">
-            <span class="fa fa-cubes"></span>
+            <span class="fa fa-cubes" title="<%= t('nav.label.repositories') %>"></span>
             <span class="visible-xs-inline visible-sm-inline"><%= t('nav.label.repositories') %></span>
           </a>
         </li>
@@ -74,7 +74,7 @@
 <% end %>
         <li>
           <a class="btn-activity" href="<%= activities_path(format: :json) %>" role="button" data-remote="true">
-            <span class="glyphicon glyphicon-equalizer"></span>
+            <span class="glyphicon glyphicon-equalizer" title="<%= t('nav.label.activities') %>"></span>
             <span class="visible-xs-inline visible-sm-inline"><%= t('nav.label.activities') %></span>
           </a>
         </li>
@@ -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"
@@ -132,6 +133,7 @@
 
         <!-- search -->
         <li class="dropdown"
+            title="<%= t('nav.label.search') %>"
             id="search-ico">
           <a href="#"
              class="dropdown-toggle"
@@ -140,6 +142,7 @@
              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"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index dd4626945..7c4205d84 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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"

From 0160956377565daf304cad669d4bb808deb0b966 Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mlorber@biosistemika.com>
Date: Tue, 27 Jun 2017 14:21:06 +0200
Subject: [PATCH 2/3] put all titles on links

---
 app/views/shared/_navigation.html.erb | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/views/shared/_navigation.html.erb b/app/views/shared/_navigation.html.erb
index 52a780799..ff7598c0f 100644
--- a/app/views/shared/_navigation.html.erb
+++ b/app/views/shared/_navigation.html.erb
@@ -32,34 +32,34 @@
       <!-- links -->
       <ul class="nav navbar-nav">
         <li>
-          <a href="<%= projects_path %>">
-            <span class="glyphicon glyphicon-home" title="<%= t('nav.label.projects') %>"></span>
+          <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 %>">
-            <span class="glyphicon glyphicon-list-alt" title="<%= t('nav.label.protocols') %>"></span>
+          <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) %>">
-            <i class="fa fa-cubes" aria-hidden="true" title="<%= t('nav.label.repositories') %>"></i>
+          <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="#">
-            <span class="glyphicon glyphicon-list-alt" title="<%= t('nav.label.protocols') %>"></span>
+          <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="#">
-            <span class="fa fa-cubes" title="<%= t('nav.label.repositories') %>"></span>
+          <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>
         </li>
@@ -73,8 +73,8 @@
         </li>
 <% end %>
         <li>
-          <a class="btn-activity" href="<%= activities_path(format: :json) %>" role="button" data-remote="true">
-            <span class="glyphicon glyphicon-equalizer" title="<%= t('nav.label.activities') %>"></span>
+          <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>
         </li>
@@ -133,10 +133,10 @@
 
         <!-- search -->
         <li class="dropdown"
-            title="<%= t('nav.label.search') %>"
             id="search-ico">
           <a href="#"
              class="dropdown-toggle"
+             title="<%= t('nav.label.search') %>"
              data-toggle="dropdown"
              role="button"
              aria-haspopup="true"

From d03be76f35da7856e2ad476610a3f77d63bbbe32 Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mlorber@biosistemika.com>
Date: Tue, 27 Jun 2017 14:48:45 +0200
Subject: [PATCH 3/3] add tooltips to archive buttons

---
 app/views/projects/index.html.erb               | 2 +-
 app/views/protocols/index.html.erb              | 2 +-
 app/views/shared/_secondary_navigation.html.erb | 8 ++++++--
 config/locales/en.yml                           | 3 +++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index 58e47d5fa..ac16d84d1 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -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>
 
diff --git a/app/views/protocols/index.html.erb b/app/views/protocols/index.html.erb
index 3b07639e4..d9a48073d 100644
--- a/app/views/protocols/index.html.erb
+++ b/app/views/protocols/index.html.erb
@@ -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>
diff --git a/app/views/shared/_secondary_navigation.html.erb b/app/views/shared/_secondary_navigation.html.erb
index 36b2006cc..ddea1c2ff 100644
--- a/app/views/shared/_secondary_navigation.html.erb
+++ b/app/views/shared/_secondary_navigation.html.erb
@@ -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 %>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7c4205d84..8140dde09 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -97,6 +97,7 @@ en:
       samples: "Samples"
       activities: "Activity"
       reports: "Reports"
+      archive: "Archive"
     experiments:
       canvas: "Overview"
     modules:
@@ -165,6 +166,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."
@@ -1418,6 +1420,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"