Move repetitive calendar include code from views into helper (patch #966 by Peter...

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 77019eba324bcd1f770446f6c36cb4100dab8f73..e30343ff54b5da5b30deb3fe845b304d8ed9b273 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -463,9 +463,22 @@ module ApplicationHelper
   end
   
   def calendar_for(field_id)
+    include_calendar_headers_tags
     image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
     javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
   end
+
+  def include_calendar_headers_tags
+    unless @calendar_headers_tags_included
+      @calendar_headers_tags_included = true
+      content_for :header_tags do
+        javascript_include_tag('calendar/calendar') +
+        javascript_include_tag("calendar/lang/calendar-#{current_language}.js") +
+        javascript_include_tag('calendar/calendar-setup') +
+        stylesheet_link_tag('calendar')
+      end
+    end
+  end
   
   def wikitoolbar_for(field_id)
     return '' unless Setting.text_formatting == 'textile'

diff --git a/app/views/account/register.rhtml b/app/views/account/register.rhtml
index c1425a38013dea88c82a600275aef0530b4334a8..7cf4b6da3c19462ada17a4af91afc8dba5bff50a 100644 (file)
--- a/app/views/account/register.rhtml
+++ b/app/views/account/register.rhtml
@@ -35,10 +35,3 @@
 
 <%= submit_tag l(:button_submit) %>
 <% end %>
-
-<% content_for :header_tags do %>
-<%= javascript_include_tag 'calendar/calendar' %>
-<%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
-<%= javascript_include_tag 'calendar/calendar-setup' %>
-<%= stylesheet_link_tag 'calendar' %>
-<% end %>

diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
index 5034e0a29401da2bf0cb22c34b74ea2b65bd6138..9bb74fd34748b8dab51c4b5d2e929e319de450d6 100644 (file)
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -49,10 +49,3 @@
 <% end %>
 
 <%= wikitoolbar_for 'issue_description' %>
-
-<% content_for :header_tags do %>
-    <%= javascript_include_tag 'calendar/calendar' %>
-    <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
-    <%= javascript_include_tag 'calendar/calendar-setup' %>
-    <%= stylesheet_link_tag 'calendar' %>
-<% end %>

diff --git a/app/views/issues/bulk_edit.rhtml b/app/views/issues/bulk_edit.rhtml
index 31ed7ee56015a11a7221bcba1aaaa8a933b26308..86bc76765b22124c039fa58404183d2285b15ed5 100644 (file)
--- a/app/views/issues/bulk_edit.rhtml
+++ b/app/views/issues/bulk_edit.rhtml
@@ -47,10 +47,3 @@
 
 <p><%= submit_tag l(:button_submit) %>
 <% end %>
-
-<% content_for :header_tags do %>
-    <%= javascript_include_tag 'calendar/calendar' %>
-    <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
-    <%= javascript_include_tag 'calendar/calendar-setup' %>
-    <%= stylesheet_link_tag 'calendar' %>
-<% end %>

diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml
index a810369d42e8efd14d8fc7ce0d12fb75b50234d5..32e4dcd442ba1ee6562b99be2480fee178cfe3fc 100644 (file)
--- a/app/views/projects/_form.rhtml
+++ b/app/views/projects/_form.rhtml
@@ -46,11 +46,3 @@
 </fieldset>
 <% end %>
 <!--[eoform:project]-->
-
-
-<% content_for :header_tags do %>
-<%= javascript_include_tag 'calendar/calendar' %>
-<%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
-<%= javascript_include_tag 'calendar/calendar-setup' %>
-<%= stylesheet_link_tag 'calendar' %>
-<% end %>

diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml
index cba1597d1b13907f1491a56a6a866d5b9c9afa34..89793745e72f8d2ae658f7e128cf2f20775ae6a9 100644 (file)
--- a/app/views/timelog/details.rhtml
+++ b/app/views/timelog/details.rhtml
@@ -44,10 +44,3 @@
 <span><%= link_to 'CSV', params.merge(:format => 'csv'), :class => 'csv' %></span>\r
 </p>\r
 <% end %>\r
-\r
-<% content_for :header_tags do %>\r
-    <%= javascript_include_tag 'calendar/calendar' %>\r
-    <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>\r
-    <%= javascript_include_tag 'calendar/calendar-setup' %>\r
-    <%= stylesheet_link_tag 'calendar' %>\r
-<% end %>\r

diff --git a/app/views/timelog/edit.rhtml b/app/views/timelog/edit.rhtml
index 13d76f1ef4f7c2ae8fce59b48289ebaa6befac6e..e221038a0e82a6bc4a5969206ad02214b16e93c4 100644 (file)
--- a/app/views/timelog/edit.rhtml
+++ b/app/views/timelog/edit.rhtml
@@ -14,10 +14,3 @@
 <%= submit_tag l(:button_save) %>\r
 \r
 <% end %>\r
-\r
-<% content_for :header_tags do %>\r
-<%= javascript_include_tag 'calendar/calendar' %>\r
-<%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>\r
-<%= javascript_include_tag 'calendar/calendar-setup' %>\r
-<%= stylesheet_link_tag 'calendar' %>\r
-<% end %>
\ No newline at end of file

diff --git a/app/views/timelog/report.rhtml b/app/views/timelog/report.rhtml
index 8fc15a3b43c97e720b67fcc2682d5a8b0f3ddb65..2682a5cb0e7d2c5b50968b9eb9bd82b3797e1b9b 100644 (file)
--- a/app/views/timelog/report.rhtml
+++ b/app/views/timelog/report.rhtml
@@ -63,10 +63,3 @@
 <% end %>
 <% end %>
 <% end %>
-
-<% content_for :header_tags do %>
-<%= javascript_include_tag 'calendar/calendar' %>
-<%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
-<%= javascript_include_tag 'calendar/calendar-setup' %>
-<%= stylesheet_link_tag 'calendar' %>
-<% end %>

diff --git a/app/views/users/_form.rhtml b/app/views/users/_form.rhtml
index d32399c60d78f2069da384a52597ffbc9d5ebdcb..ff4278c1fbefc5cf45528a5fadb061280f47da9d 100644 (file)
--- a/app/views/users/_form.rhtml
+++ b/app/views/users/_form.rhtml
@@ -30,10 +30,3 @@
 </div>
 </div>
 <!--[eoform:user]-->
-
-<% content_for :header_tags do %>
-<%= javascript_include_tag 'calendar/calendar' %>
-<%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
-<%= javascript_include_tag 'calendar/calendar-setup' %>
-<%= stylesheet_link_tag 'calendar' %>
-<% end %>
\ No newline at end of file

diff --git a/app/views/versions/_form.rhtml b/app/views/versions/_form.rhtml
index e18f912bfcca9ff07136dbe5b1d316341f302aff..adc83b5730032fc7873c45bf2bfc7b8b7a68d60f 100644 (file)
--- a/app/views/versions/_form.rhtml
+++ b/app/views/versions/_form.rhtml
@@ -6,10 +6,3 @@
 <p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p>
 <p><%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
 </div>
-
-<% content_for :header_tags do %>
-<%= javascript_include_tag 'calendar/calendar' %>
-<%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
-<%= javascript_include_tag 'calendar/calendar-setup' %>
-<%= stylesheet_link_tag 'calendar' %>
-<% end %>