From 7b2f928df0aef978ee519ad6232d42e35ece06e1 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 7 Nov 2017 12:32:50 +0630 Subject: [PATCH] test for jade --- app/assets/javascripts/application.js | 3 --- app/assets/javascripts/login.js | 1 - app/views/origami/surveys/new.html.erb | 5 ++--- app/views/settings/menu_item_instances/index.html.erb | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index f6005ebd..66714f33 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -17,9 +17,6 @@ //= require bootstrap/js/bootstrap-material-design.min //= require jquery_nested_form //= require cable -//= require tether -//= require bootstrap/js/popper.min -//= require bootstrap/js/bootstrap-material-design.min //= require momentjs/moment //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker //= require multi-select/js/jquery.multi-select.js diff --git a/app/assets/javascripts/login.js b/app/assets/javascripts/login.js index 92005cdb..28976f6b 100755 --- a/app/assets/javascripts/login.js +++ b/app/assets/javascripts/login.js @@ -11,7 +11,6 @@ // about supported directives. // //= require jquery -//= require jquery_nested_form //= require tether //= require bootstrap/js/popper.min //= require bootstrap/js/bootstrap-material-design.min diff --git a/app/views/origami/surveys/new.html.erb b/app/views/origami/surveys/new.html.erb index c7185018..05dfdf68 100755 --- a/app/views/origami/surveys/new.html.erb +++ b/app/views/origami/surveys/new.html.erb @@ -1,12 +1,11 @@ - <%= render 'form', settings_account: @settings_account %> \ No newline at end of file + <%= render 'form', survey: @survey %> \ No newline at end of file diff --git a/app/views/settings/menu_item_instances/index.html.erb b/app/views/settings/menu_item_instances/index.html.erb index 05be23d2..5c899c99 100755 --- a/app/views/settings/menu_item_instances/index.html.erb +++ b/app/views/settings/menu_item_instances/index.html.erb @@ -88,7 +88,7 @@ <% else %> <%= link_to t("views.btn.show"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ),,:class=>"btn btn-primary waves-effect btn-sm" %> <%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item),,:class=>"btn btn-info waves-effect btn-sm" %> - <%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },,:class=>"btn btn-danger waves-effect btn-sm" %> + <%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class=>"btn btn-danger waves-effect btn-sm" %> <% end %> <% end %>