diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js index 45e9f4e..0b7606e 100644 --- a/app/assets/javascripts/admin.js +++ b/app/assets/javascripts/admin.js @@ -200,7 +200,7 @@ //action to hide the alert to edit a version $("#edit-version-confirmed").click(function (e){ e.preventDefault(); - $("#version_edit_alert").modal("hide"); + $("#version_edit_alert").modal("hide"); }); //action to clone/add a version diff --git a/app/assets/stylesheets/admin.css.less b/app/assets/stylesheets/admin.css.less index 3a52df1..132e00e 100644 --- a/app/assets/stylesheets/admin.css.less +++ b/app/assets/stylesheets/admin.css.less @@ -15,6 +15,7 @@ // Font Awesome @import "fontawesome/font-awesome"; + // Glyphicons //@import "twitter/bootstrap/sprites.less"; @@ -113,7 +114,7 @@ margin-top: 70px; font-size: @font_size; } - + /*********************************************/ /**** header ****/ /*********************************************/ @@ -475,7 +476,6 @@ margin-left:0px; } - /**********************/ /* Organisation admin */ /**********************/ diff --git a/app/controllers/dmptemplates_controller.rb b/app/controllers/dmptemplates_controller.rb index 90c20db..9c7f757 100644 --- a/app/controllers/dmptemplates_controller.rb +++ b/app/controllers/dmptemplates_controller.rb @@ -255,7 +255,6 @@ # SECTIONS - #create a section def admin_createsection @section = Section.new(params[:section]) diff --git a/app/views/dmptemplates/_versions_table.html.erb b/app/views/dmptemplates/_versions_table.html.erb index 259fb5f..e51dbfe 100644 --- a/app/views/dmptemplates/_versions_table.html.erb +++ b/app/views/dmptemplates/_versions_table.html.erb @@ -4,6 +4,7 @@

<%= t('org_admin.versions.versions_text_html')%>

+ diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7015dcd..3426b8c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -20,7 +20,8 @@ } - + + <%= stylesheet_link_tag "spinner" %> <%= stylesheet_link_tag "application" %> <%= javascript_include_tag "application"%> diff --git a/config/application.rb b/config/application.rb index 14189c6..1c27efc 100644 --- a/config/application.rb +++ b/config/application.rb @@ -67,6 +67,7 @@ config.assets.precompile += %w(toolbar.js) config.assets.precompile += %w(admin.js) config.assets.precompile += %w(admin.css) + config.assets.precompile += %w(spinner.css) config.autoload_paths += %W(#{config.root}/lib) config.action_controller.include_all_helpers = true