Replace cancel button with cancel link in modals (#28662).

Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@17677 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/groups/_new_users_modal.html.erb b/app/views/groups/_new_users_modal.html.erb
index eb2e985bf0ddd2ae33a5ad38589095aa9ab81726..c68d3f0602b7cc788b47143cfd57733b94cf7057 100644 (file)
--- 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' %>
   <p class="buttons">
     <%= 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);" %>
   </p>
 <% end %>

diff --git a/app/views/issue_categories/_new_modal.html.erb b/app/views/issue_categories/_new_modal.html.erb
index 07cc289ff76f979b467e0ad7b23f568d0bb0bdc0..9ab1595b40637d0f1a62bf6a534a76ec246f7674 100644 (file)
--- 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 } %>
   <p class="buttons">
     <%= 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);" %>
   </p>
 <% end %>

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index c02c183683e4d59ceaf05c248acd0c701886b3c9..d5a77ca5107e1aed692bd719cc2d7fa09e1e0263 100644 (file)
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -46,7 +46,7 @@
   <% end %>
   <p class="buttons">
     <%= 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);" %>
   </p>
   <% end %>
 </div>

diff --git a/app/views/members/_new_modal.html.erb b/app/views/members/_new_modal.html.erb
index 0338a953c5a78f0b6ac05e32a2b2987d7887071a..3cb3360f5ee4137c57573c35de790d5e412e7496 100644 (file)
--- a/app/views/members/_new_modal.html.erb
+++ b/app/views/members/_new_modal.html.erb
@@ -4,6 +4,6 @@
   <%= render :partial => 'new_form' %>
   <p class="buttons">
     <%= 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);" %>
   </p>
 <% end %>

diff --git a/app/views/principal_memberships/_new_modal.html.erb b/app/views/principal_memberships/_new_modal.html.erb
index 175e093307e4ff7408655e154dcebb408f6e65e2..945eff73cf9e783a15c9a1a4477395bf0bfc4322 100644 (file)
--- 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' %>
   <p class="buttons">
     <%= 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);" %>
   </p>
 <% end %>

diff --git a/app/views/sudo_mode/_new_modal.html.erb b/app/views/sudo_mode/_new_modal.html.erb
index adc4851cc01f2137beabed547afead6a36022467..bc780be56342a92309f660750cb960cbf18d10fb 100644 (file)
--- a/app/views/sudo_mode/_new_modal.html.erb
+++ b/app/views/sudo_mode/_new_modal.html.erb
@@ -13,6 +13,6 @@
 
   <p class="buttons">
     <%= 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);" %>
   </p>
 <% end %>

diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb
index 9f320d63784772772f0ea798feaed459edca2162..35e833efb8dd7ade643b07ad17475e7f7041783d 100644 (file)
--- a/app/views/timelog/index.html.erb
+++ b/app/views/timelog/index.html.erb
@@ -34,7 +34,7 @@
   <%= export_csv_encoding_select_tag %>
   <p class="buttons">
     <%= 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);" %>
   </p>
   <% end %>
 </div>

diff --git a/app/views/versions/_new_modal.html.erb b/app/views/versions/_new_modal.html.erb
index 99fef84e50867e7be46fed030e6257b06830dfbe..052a7397479cc221d636e58a2da3b1b68d063134 100644 (file)
--- 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 } %>
   <p class="buttons">
     <%= 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);" %>
   </p>
 <% end %>

diff --git a/app/views/watchers/_new.html.erb b/app/views/watchers/_new.html.erb
index 3640c69931fa58070aa105bbe8389239fc58c67a..3bd7953ac179ebbf66111808cb850b4c8bd60e46 100644 (file)
--- a/app/views/watchers/_new.html.erb
+++ b/app/views/watchers/_new.html.erb
@@ -26,6 +26,6 @@
 
   <p class="buttons">
     <%= 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);" %>
   </p>
 <% end %>

diff --git a/app/views/wiki/_new_modal.html.erb b/app/views/wiki/_new_modal.html.erb
index 2f9dcdb7f37d386d8c14d3f51ddb289e101fd741..108c6ad88195ceb4b3bc8ae8497aca1fd4e4e9c7 100644 (file)
--- a/app/views/wiki/_new_modal.html.erb
+++ b/app/views/wiki/_new_modal.html.erb
@@ -24,6 +24,6 @@
 
   <p class="buttons">
     <%= 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);" %>
   </p>
 <% end %>