From 1029365c7a16a3bae8dd716fabf46e3a4323f402 Mon Sep 17 00:00:00 2001 From: Marius BALTEANU Date: Sat, 10 Nov 2018 07:39:56 +0000 Subject: [PATCH] Replace cancel button with cancel link in modals --- app/views/groups/_new_users_modal.html.erb | 2 +- app/views/issue_categories/_new_modal.html.erb | 2 +- app/views/issues/index.html.erb | 2 +- app/views/members/_new_modal.html.erb | 2 +- app/views/principal_memberships/_new_modal.html.erb | 2 +- app/views/sudo_mode/_new_modal.html.erb | 2 +- app/views/timelog/index.html.erb | 2 +- app/views/versions/_new_modal.html.erb | 2 +- app/views/watchers/_new.html.erb | 2 +- app/views/wiki/_new_modal.html.erb | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/views/groups/_new_users_modal.html.erb b/app/views/groups/_new_users_modal.html.erb index eb2e985..c68d3f0 100644 --- a/app/views/groups/_new_users_modal.html.erb +++ b/app/views/groups/_new_users_modal.html.erb @@ -4,6 +4,6 @@ <%= render :partial => 'new_users_form' %>

<%= submit_tag l(:button_add) %> - <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %> + <%= link_to_function l(:button_cancel), "hideModal(this);" %>

<% end %> diff --git a/app/views/issue_categories/_new_modal.html.erb b/app/views/issue_categories/_new_modal.html.erb index 07cc289..9ab1595 100644 --- a/app/views/issue_categories/_new_modal.html.erb +++ b/app/views/issue_categories/_new_modal.html.erb @@ -4,6 +4,6 @@ <%= render :partial => 'issue_categories/form', :locals => { :f => f } %>

<%= submit_tag l(:button_create), :name => nil %> - <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %> + <%= link_to_function l(:button_cancel), "hideModal(this);" %>

<% end %> diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index c02c183..d5a77ca 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -46,7 +46,7 @@ <% end %>

<%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);", :data => { :disable_with => false } %> - <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button', :data => { :disable_with => false } %> + <%= link_to_function l(:button_cancel), "hideModal(this);" %>

<% end %> diff --git a/app/views/members/_new_modal.html.erb b/app/views/members/_new_modal.html.erb index 0338a95..3cb3360 100644 --- a/app/views/members/_new_modal.html.erb +++ b/app/views/members/_new_modal.html.erb @@ -4,6 +4,6 @@ <%= render :partial => 'new_form' %>

<%= submit_tag l(:button_add), :id => 'member-add-submit' %> - <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %> + <%= link_to_function l(:button_cancel), "hideModal(this);" %>

<% end %> diff --git a/app/views/principal_memberships/_new_modal.html.erb b/app/views/principal_memberships/_new_modal.html.erb index 175e093..945eff7 100644 --- a/app/views/principal_memberships/_new_modal.html.erb +++ b/app/views/principal_memberships/_new_modal.html.erb @@ -4,6 +4,6 @@ <%= render :partial => 'new_form' %>

<%= submit_tag l(:button_add), :name => nil %> - <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %> + <%= link_to_function l(:button_cancel), "hideModal(this);" %>

<% end %> diff --git a/app/views/sudo_mode/_new_modal.html.erb b/app/views/sudo_mode/_new_modal.html.erb index adc4851..bc780be 100644 --- a/app/views/sudo_mode/_new_modal.html.erb +++ b/app/views/sudo_mode/_new_modal.html.erb @@ -13,6 +13,6 @@

<%= submit_tag l(:button_submit), onclick: "hideModal(this);" %> - <%= submit_tag l(:button_cancel), name: nil, onclick: "hideModal(this);", type: 'button' %> + <%= link_to_function l(:button_cancel), "hideModal(this);" %>

<% end %> diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb index 9f320d6..35e833e 100644 --- a/app/views/timelog/index.html.erb +++ b/app/views/timelog/index.html.erb @@ -34,7 +34,7 @@ <%= export_csv_encoding_select_tag %>

<%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);", :data => { :disable_with => false } %> - <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button', :data => { :disable_with => false } %> + <%= link_to_function l(:button_cancel), "hideModal(this);" %>

<% end %> diff --git a/app/views/versions/_new_modal.html.erb b/app/views/versions/_new_modal.html.erb index 99fef84..052a739 100644 --- a/app/views/versions/_new_modal.html.erb +++ b/app/views/versions/_new_modal.html.erb @@ -4,6 +4,6 @@ <%= render :partial => 'versions/form', :locals => { :f => f } %>

<%= submit_tag l(:button_create), :name => nil %> - <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %> + <%= link_to_function l(:button_cancel), "hideModal(this);" %>

<% end %> diff --git a/app/views/watchers/_new.html.erb b/app/views/watchers/_new.html.erb index 3640c69..3bd7953 100644 --- a/app/views/watchers/_new.html.erb +++ b/app/views/watchers/_new.html.erb @@ -26,6 +26,6 @@

<%= submit_tag l(:button_add), :name => nil, :onclick => "hideModal(this);" %> - <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %> + <%= link_to_function l(:button_cancel), "hideModal(this);" %>

<% end %> diff --git a/app/views/wiki/_new_modal.html.erb b/app/views/wiki/_new_modal.html.erb index 2f9dcdb..108c6ad 100644 --- a/app/views/wiki/_new_modal.html.erb +++ b/app/views/wiki/_new_modal.html.erb @@ -24,6 +24,6 @@

<%= submit_tag l(:label_next), :name => nil %> - <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %> + <%= link_to_function l(:button_cancel), "hideModal(this);" %>

<% end %> -- 2.1.4