From ae74daef2d1c8816f9788b789109a8ec90586ad2 Mon Sep 17 00:00:00 2001 From: Philipp Bayer Date: Mon, 8 Oct 2018 13:57:01 +0800 Subject: [PATCH 1/3] Get rid of unused bootstrap that just triggers an error --- app/assets/javascripts/application.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d597ceb..ab2b1e2 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -9,7 +9,6 @@ //= require ./jqplot.highlighter.min.js //= require ./jqplot.pieRenderer.min.js //= require jquery_nested_form -//= require bootstrap.min //= require_self // = require_tree . From d78c4b8ce19b1861df2366576e5923b3496df30f Mon Sep 17 00:00:00 2001 From: Philipp Bayer Date: Mon, 8 Oct 2018 14:44:27 +0800 Subject: [PATCH 2/3] Fixes endlessly refreshing issue on my localhost? --- app/views/layouts/_navbar.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb index 283833e..bcfcc95 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})","/users/#{current_user.id}#messages", class: 'navbar-menu__options', :data => { :reload => true }%>
  • <%= link_to("Sign out", '/signout', class: "navbar-menu__options") %>
  • From 57ce6e4f28f4f4175a864d7230f23d00a8720802 Mon Sep 17 00:00:00 2001 From: Philipp Bayer Date: Mon, 15 Oct 2018 22:41:41 +0800 Subject: [PATCH 3/3] Now it works - was the method: get the problem? --- app/assets/javascripts/application.js | 4 ++-- app/views/layouts/_navbar.html.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index ab2b1e2..b9e8e8c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -9,6 +9,7 @@ //= require ./jqplot.highlighter.min.js //= require ./jqplot.pieRenderer.min.js //= require jquery_nested_form +//= require bootstrap.min //= require_self // = require_tree . @@ -45,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; @@ -53,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 bcfcc95..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})","/users/#{current_user.id}#messages", class: 'navbar-menu__options', :data => { :reload => true }%>
  • +
  • <%= 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") %>