diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d597ceb..b9e8e8c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -46,7 +46,6 @@ $(document).ready(function() { $('#help_three').hide('slow'); }; }); - // Jump to tab if link like rs7412080#plos is opened $(function(){ var hash = window.location.hash; @@ -54,6 +53,6 @@ $(document).ready(function() { if (anchor.length > 0){ anchor.click(); } - }); +}); }); diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb index 283833e..458a7b4 100644 --- a/app/views/layouts/_navbar.html.erb +++ b/app/views/layouts/_navbar.html.erb @@ -43,7 +43,7 @@
  • <%= link_to("Settings", "/users/"+current_user.id.to_s+"/edit", class: "navbar-menu__options", :id => current_user) %>
  • <%= link_to("Edit Your Phenotypes", "/users/"+current_user.id.to_s+"/edit#phenotypes", class: "navbar-menu__options")%>
  • -
  • <%= link_to("Messages ("+current_user.messages.where(:user_has_seen => false).length.to_s+")","/users/" + current_user.id.to_s + "#messages", :method => "get", class: "navbar-menu__options")%>
  • +
  • <%= link_to "Messages (#{current_user.messages.where(:user_has_seen => false).length})", user_path(current_user, anchor: 'messages'), class: 'navbar-menu__options' %>
  • <%= link_to("Sign out", '/signout', class: "navbar-menu__options") %>