diff --git a/Gemfile b/Gemfile index 14abcde..2449cba 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ # Use SCSS for stylesheets gem 'less-rails' -gem 'twitter-bootstrap-rails', '2.2.8' +gem 'bootstrap' #'twitter-bootstrap-rails', '2.2.8' gem 'therubyracer', '>=0.11.4', platforms: :ruby #'0.11.4', platforms: :ruby gem 'libv8' diff --git a/app/assets/fonts/fontawesome-webfont.woff b/app/assets/fonts/fontawesome-webfont.woff new file mode 100644 index 0000000..6e7483c --- /dev/null +++ b/app/assets/fonts/fontawesome-webfont.woff Binary files differ diff --git a/app/assets/javascripts/projects.js b/app/assets/javascripts/projects.js index cb9f486..cbd434f 100644 --- a/app/assets/javascripts/projects.js +++ b/app/assets/javascripts/projects.js @@ -131,6 +131,8 @@ function update_guidance_options() { var institution = $("#project_institution_id").select2('val'); var template = $("#project_dmptemplate_id :selected").val(); + var options = null; + $.ajax({ type: 'GET', url: "possible_guidance.json?institution="+institution+"&template="+template, @@ -138,7 +140,6 @@ async: false, //Needs to be synchronous, otherwise end up mixing up answers success: function(data) { options = data; - console.log(data); }, error: function(err){ console.log(err); diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index 0780fac..3177ca7 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -32,7 +32,6 @@

<%= raw t("helpers.project.project_text_when_no_project")%>

- <% end %>