]> source.dussan.org Git - redmine.git/commitdiff
projects / redmine.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 776d5ce)
calendar javascripts and stylesheets removed from base layout. they're now only added...
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Sat, 6 Jan 2007 09:08:17 +0000 (09:08 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Sat, 6 Jan 2007 09:08:17 +0000 (09:08 +0000)
git-svn-id: http://redmine.rubyforge.org/svn/trunk@151 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/account/register.rhtml patch | blob | history
app/views/issues/edit.rhtml patch | blob | history
app/views/layouts/base.rhtml patch | blob | history
app/views/projects/_form.rhtml patch | blob | history
app/views/projects/add_issue.rhtml patch | blob | history
app/views/users/_form.rhtml patch | blob | history
app/views/versions/_form.rhtml patch | blob | history
public/stylesheets/calendar.css patch | blob | history

diff --git a/app/views/account/register.rhtml b/app/views/account/register.rhtml
index b34aff79c1228d752ab156fa0bb07bcadfef141e..3101bd5df0284c8232ee8911d016e7266b5f9714 100644 (file)
--- a/app/views/account/register.rhtml
+++ b/app/views/account/register.rhtml
@@ -37,3 +37,10 @@
 
 <%= submit_tag l(:button_submit) %>
 <%= end_form_tag %>
+
+<% 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/edit.rhtml b/app/views/issues/edit.rhtml
index 1666d0fdb73c2f06ef9153a2e1a1d3422501165f..da3805c29fc9c5d22ba5bf620c58f10286691716 100644 (file)
--- a/app/views/issues/edit.rhtml
+++ b/app/views/issues/edit.rhtml
@@ -46,4 +46,11 @@ if (document.getElementById) {
 }
 //]]>
 </script>
+<% 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 %>
\ No newline at end of file
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 56ffbcf8053d20907828af66326254e9ca78988c..cb81f55dbaba496e9338d9ed5ef00ee43c4e41a6 100644 (file)
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -9,13 +9,8 @@
 <%= stylesheet_link_tag "print", :media => "print" %>\r
 <%= javascript_include_tag :defaults %>\r
 <%= javascript_include_tag 'menu' %>\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
 <%= stylesheet_link_tag 'jstoolbar' %>\r
-<!-- page specific tags -->\r
-<%= yield :header_tags %>\r
+<!-- page specific tags --><%= yield :header_tags %>\r
 </head>\r
 \r
 <body>\r
diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml
index 8c5b9f108d7939b5c12d481a874a37256c4844f9..14c7a26eef6572800bb67ebb811add4eec4708ee 100644 (file)
--- a/app/views/projects/_form.rhtml
+++ b/app/views/projects/_form.rhtml
@@ -35,3 +35,10 @@
 </div>
 <%= javascript_tag "Element.hide('repository');" if @project.repository.nil? %>
 </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 %>
\ No newline at end of file
diff --git a/app/views/projects/add_issue.rhtml b/app/views/projects/add_issue.rhtml
index dfd1b314e8fb5acc01824ca829da480c17d3c762..88be854c2ebd9e226c02dc14e5b65324899d26a2 100644 (file)
--- a/app/views/projects/add_issue.rhtml
+++ b/app/views/projects/add_issue.rhtml
@@ -47,4 +47,11 @@ if (document.getElementById) {
 }
 //]]>
 </script>
+<% 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 %>
\ No newline at end of file
diff --git a/app/views/users/_form.rhtml b/app/views/users/_form.rhtml
index 989cb75596bfe9e479f2326ed52fa9e5ea66cbc3..e486c10428e77534fca5f5a985453fc8503d592e 100644 (file)
--- a/app/views/users/_form.rhtml
+++ b/app/views/users/_form.rhtml
@@ -28,3 +28,10 @@
 <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
 </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 3d0eb0a2dffb23c37d94d4f674348b423a7c4b3c..3d6c9c208d296d58079cc1e1407dad8575caa5ec 100644 (file)
--- a/app/views/versions/_form.rhtml
+++ b/app/views/versions/_form.rhtml
@@ -6,4 +6,11 @@
 <p><%= f.text_field :description, :size => 60 %></p>
 <p><%= f.text_field :effective_date, :size => 10, :required => true %><%= calendar_for('version_effective_date') %></p>
 <!--[eoform:version]-->
-</div>
\ No newline at end of file
+</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 %>
\ No newline at end of file
diff --git a/public/stylesheets/calendar.css b/public/stylesheets/calendar.css
index f460d5cb07bbc16cfa8db561d2bb121fe106435f..7f0b908e5e966abf3269bf9c02c467a610ed91fe 100644 (file)
--- a/public/stylesheets/calendar.css
+++ b/public/stylesheets/calendar.css
@@ -19,7 +19,7 @@ div.calendar { position: relative; }
 }
 
 .calendar .nav {
-  background: #467aa7 url(menuarrow.gif) no-repeat 100% 100%;
+  background: #467aa7;
 }
 
 .calendar thead .title { /* This holds the current "month, year" */
Mirror of redmine code source: https://github.com/redmine/redmine