Merged r10368 to r10373 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10374 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/application_helper.rb

@@ -1095,8 +1095,14 @@ module ApplicationHelper
     unless @calendar_headers_tags_included
       @calendar_headers_tags_included = true
       content_for :header_tags do
+        start_of_week = Setting.start_of_week
+        start_of_week = l(:general_first_day_of_week, :default => '1') if start_of_week.blank?
+        # Redmine uses 1..7 (monday..sunday) in settings and locales
+        # JQuery uses 0..6 (sunday..saturday), 7 needs to be changed to 0
+        start_of_week = start_of_week.to_i % 7
+
         tags = javascript_tag(
-                   "var datepickerOptions={dateFormat: 'yy-mm-dd', " +
+                   "var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: #{start_of_week}, " +
                      "showOn: 'button', buttonImageOnly: true, buttonImage: '" + 
                      path_to_image('/images/calendar.png') +
                      "', showButtonPanel: true};")

app/views/repositories/_revision_graph.html.erb

@@ -1,6 +1,4 @@
-<%= javascript_include_tag 'raphael.js' %>
-<%= javascript_include_tag 'revision_graph.js' %>
-<script type="text/javascript" charset="utf-8">
+<%= javascript_tag do %>
 function revisionGraphHandler(){
   drawRevisionGraph(
     document.getElementById('holder'),
@@ -10,5 +8,11 @@ function revisionGraphHandler(){
 }
 $(document).ready(revisionGraphHandler);
 $(window).resize(revisionGraphHandler);
-</script>
+<% end %>
+
 <div id="holder" class="revision-graph"></div>
+
+<% content_for :header_tags do %>
+  <%= javascript_include_tag 'raphael' %>
+  <%= javascript_include_tag 'revision_graph' %>
+<% end %>