Merge remote-tracking branch 'refs/remotes/origin/master' into activatePrecommitHooks

Author: jjeffryes

js/templates/itemShort.html

@@ -18,7 +18,7 @@
         style="background-image: <% if(ob.avatar_hash && ob.avatarURL) { %> url(<%= ob.avatarURL %>), <% } %>url(imgs/defaultUser.png);"></div>
       <% } %>
       <div class="js-item pad8Left <% if(ob.title.length >= 30) { %>tooltip<% } %>"
-      <% if(ob.title.length >= 30) { %>data-tooltip="<%= ob.title.substring(0, 40) %>"<% } %> data-id="<%= ob.contract_hash %>">
+      <% if(ob.title.length >= 30) { %>data-tooltip="<%= ob.title %>"<% } %> data-id="<%= ob.contract_hash %>">
         <div class="textSize14px noOverflow textOpacity1 js-searchTitle">
           <%= ob.title %>
         </div>

js/templates/pageNav.html

@@ -153,7 +153,7 @@ <h3 class="margin0 marginTop25"><%= polyglot.t('Discover') %></h3>
     <a class="btn btn-togRight btn-fwd ion-chevron-right js-navFwd custCol-primary custCol-text fontSize13 tooltip" data-tooltip="<%= polyglot.t('nav.Forward') %>"></a>
   </div>
   <div class="ctrlGroup">
-    <a class="btn btn-home ion-refresh custCol-primary custCol-text js-navRefresh tooltip" data-tooltip="<%= polyglot.t('Reload') %> <%= config.keyShortcutPrefix + config.keyShortcuts.refresh.toUpperCase() %>"> </a>
+    <a class="btn btn-home ion-refresh custCol-primary custCol-text js-navRefresh tooltip" data-tooltip="<%= polyglot.t('Reload') %> (<%= config.keyShortcutPrefix + config.keyShortcuts.refresh.toUpperCase() %>)"> </a>
   </div>
   <div class="ctrlGroup flexExpand">
     <div class="txtFieldWrapper searchWrapper mainSearchWrapper js-mainSearchWrapper">