Merge branch 'master' into stable

Gemfile

@@ -24,7 +24,7 @@ group :test do
 end
 
 group :ldap do
-  gem "net-ldap", '~> 0.2.2'
+  gem "net-ldap", '~> 0.3.1'
 end
 
 group :openid do

Rakefile

@@ -8,3 +8,5 @@ require 'rake/testtask'
 require 'rdoc/task'
 
 require 'tasks/rails'
+# Load rake tasks from plugins in chiliproject_plugins
+Dir["#{RAILS_ROOT}/vendor/chiliproject_plugins/*/lib/tasks/**/*.rake"].sort.each { |ext| load ext }

app/helpers/application_helper.rb

@@ -436,6 +436,7 @@ module ApplicationHelper
       css << 'theme-' + theme.name
     end
 
+    css << 'project-' + @project.id.to_s if @project.present?
     css << 'controller-' + params[:controller] if params[:controller]
     css << 'action-' + params[:action] if params[:action]
     css.join(' ')
@@ -867,12 +868,10 @@ module ApplicationHelper
     pcts << (100 - pcts[1] - pcts[0])
     width = options[:width] || '100px;'
     legend = options[:legend] || ''
-    content_tag('table',
+    content_tag('div',
-      content_tag('tr',
+      content_tag('div', '', :style => "width: #{pcts[0]}%;", :class => 'closed ui-progressbar-value ui-widget-header ui-corner-left') +
-        (pcts[0] > 0 ? content_tag('td', '', :style => "width: #{pcts[0]}%;", :class => 'closed') : '') +
+      content_tag('div', '', :style => "width: #{pcts[1]}%;", :class => 'done ui-progressbar-value ui-widget-header'),
-        (pcts[1] > 0 ? content_tag('td', '', :style => "width: #{pcts[1]}%;", :class => 'done') : '') +
+      :class => 'progress ui-progressbar ui-widget ui-widget-content ui-corner-all', :style => "width: #{width};") +
-        (pcts[2] > 0 ? content_tag('td', '', :style => "width: #{pcts[2]}%;", :class => 'todo') : '')
-      ), :class => 'progress', :style => "width: #{width};") +
       content_tag('p', legend, :class => 'pourcent')
   end
 
@@ -915,33 +914,25 @@ module ApplicationHelper
   end
 
   def calendar_for(field_id)
-    include_calendar_headers_tags
+    javascript_tag("jQuery('##{field_id}').datepicker(datepickerSettings)")
-    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
+  def jquery_datepicker_settings
-    unless @calendar_headers_tags_included
+    start_of_week = Setting.start_of_week.to_s
-      @calendar_headers_tags_included = true
+    start_of_week_string = start_of_week.present? ? "firstDay: '#{start_of_week}', " : ''
-      content_for :header_tags do
+    script = javascript_tag("var datepickerSettings = {" +
-        start_of_week = case Setting.start_of_week.to_i
+                   start_of_week_string +
-        when 1
+                   "showOn: 'both', " +
-          'Calendar._FD = 1;' # Monday
+                   "buttonImage: '" + path_to_image('/images/calendar.png') + "', " +
-        when 7
+                   "buttonImageOnly: true, " +
-          'Calendar._FD = 0;' # Sunday
+                   "showButtonPanel: true, " +
-        when 6
+                   "dateFormat: 'yy-mm-dd' " +
-          'Calendar._FD = 6;' # Saturday
+                   "}")
-        else
+    unless current_language == :en
-          '' # use language
+      jquery_locale = l("jquery.ui", :default => current_language.to_s)
-        end
+      script << javascript_include_tag("libs/ui/i18n/jquery.ui.datepicker-#{jquery_locale}.js")
-
-        javascript_include_tag('calendar/calendar') +
-        javascript_include_tag("calendar/lang/calendar-#{current_language.to_s.downcase}.js") +
-        javascript_tag(start_of_week) +
-        javascript_include_tag('calendar/calendar-setup') +
-        stylesheet_link_tag('calendar')
-      end
     end
+    script
   end
 
   def content_for(name, content = nil, &block)
@@ -996,6 +987,7 @@ module ApplicationHelper
     unless User.current.pref.warn_on_leaving_unsaved == '0'
       tags << "\n" + javascript_tag("Event.observe(window, 'load', function(){ new WarnLeavingUnsaved('#{escape_javascript( l(:text_warn_on_leaving_unsaved) )}'); });")
     end
+    tags << jquery_datepicker_settings
     tags
   end
 

app/helpers/custom_fields_helper.rb

@@ -36,8 +36,7 @@ module CustomFieldsHelper
     field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
     case field_format.try(:edit_as)
     when "date"
-      text_field_tag(field_name, custom_value.value, :id => field_id, :size => 10) +
+      date_field_tag(field_name, custom_value.value, :id => field_id, :size => 10)
-      calendar_for(field_id)
     when "text"
       text_area_tag(field_name, custom_value.value, :id => field_id, :rows => 3, :style => 'width:90%')
     when "bool"
@@ -71,8 +70,7 @@ module CustomFieldsHelper
     field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
     case field_format.try(:edit_as)
       when "date"
-        text_field_tag(field_name, '', :id => field_id, :size => 10) +
+        date_field_tag(field_name, '', :id => field_id, :size => 10)
-        calendar_for(field_id)
       when "text"
         text_area_tag(field_name, '', :id => field_id, :rows => 3, :style => 'width:90%')
       when "bool"

app/models/changeset.rb

@@ -89,12 +89,12 @@ class Changeset < ActiveRecord::Base
   # Attribute reader for committer that encodes the committer string to
   # the repository log encoding (e.g. UTF-8)
   def committer
-    self.class.to_utf8(read_attribute(:committer), repository.repo_log_encoding)
+    self.class.to_utf8(read_attribute(:committer), repository_encoding)
   end
 
   def before_create
-    self.committer = self.class.to_utf8(self.committer, repository.repo_log_encoding)
+    self.committer = self.class.to_utf8(self.committer, repository_encoding)
-    self.comments  = self.class.normalize_comments(self.comments, repository.repo_log_encoding)
+    self.comments  = self.class.normalize_comments(self.comments, repository_encoding)
     self.user = repository.find_committer_user(self.committer)
   end
 

app/models/query.rb

@@ -383,8 +383,10 @@ class Query < ActiveRecord::Base
       next unless v and !v.empty?
       operator = operator_for(field)
 
-      # "me" value subsitution
+      # "me" value substitution
-      if %w(assigned_to_id author_id watcher_id).include?(field)
+      if %w(assigned_to_id author_id watcher_id).include?(field) ||
+        # user custom fields
+        available_filters.has_key?(field) && available_filters[field][:format] == 'user'
         v.push(User.current.logged? ? User.current.id.to_s : "0") if v.delete("me")
       end
 
@@ -640,11 +642,15 @@ class Query < ActiveRecord::Base
         options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
       when "user", "version"
         next unless project
-        options = { :type => :list_optional, :values => field.possible_values_options(project), :order => 20}
+        values = field.possible_values_options(project)
+        if User.current.logged? && field.field_format == 'user'
+          values.unshift ["<< #{l(:label_me)} >>", "me"]
+        end
+        options = { :type => :list_optional, :values => values, :order => 20}
       else
         options = { :type => :string, :order => 20 }
       end
-      @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
+      @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name, :format => field.field_format })
     end
   end
 

app/models/setting.rb

@@ -185,8 +185,10 @@ private
   def self.find_or_default(name)
     name = name.to_s
     raise "There's no setting named #{name}" unless @@available_settings.has_key?(name)
-    setting = find_by_name(name)
+    find_by_name(name) or new do |s|
-    setting ||= new(:name => name, :value => @@available_settings[name]['default']) if @@available_settings.has_key? name
+      s.name  = name
+      s.value = @@available_settings[name]['default']
+    end
   end
 
   def self.cache_key(name)

app/views/issue_moves/new.rhtml

@@ -46,12 +46,12 @@
 <div class="splitcontentright">
 <p>
   <label for='start_date'><%= l(:field_start_date) %></label>
-  <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %>
+  <%= date_field_tag 'start_date', '', :size => 10 %>
 </p>
 
 <p>
   <label for='due_date'><%= l(:field_due_date) %></label>
-  <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %>
+  <%= date_field_tag 'due_date', '', :size => 10 %>
 </p>
 </div>
 

app/views/issues/_attributes.rhtml

@@ -31,8 +31,8 @@
 </div>
 
 <div class="splitcontentright">
-<p><%= f.text_field :start_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_start_date') if @issue.leaf? %></p>
+<p><%= f.date_field :start_date, :size => 10, :disabled => !@issue.leaf? %></p>
-<p><%= f.text_field :due_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_due_date') if @issue.leaf? %></p>
+<p><%= f.date_field :due_date, :size => 10, :disabled => !@issue.leaf? %></p>
 <p><%= f.text_field :estimated_hours, :size => 3, :disabled => !@issue.leaf? %> <%= l(:field_hours) %></p>
 <% if @issue.leaf? && Issue.use_field_for_done_ratio? %>
 <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>

app/views/issues/bulk_edit.rhtml

@@ -65,11 +65,11 @@
 <% end %>
 <p>
 	<label for='issue_start_date'><%= l(:field_start_date) %></label>
-	<%= text_field_tag 'issue[start_date]', '', :size => 10 %><%= calendar_for('issue_start_date') %>
+	<%= date_field_tag 'issue[start_date]', '', :size => 10 %>
 </p>
 <p>
 	<label for='issue_due_date'><%= l(:field_due_date) %></label>
-	<%= text_field_tag 'issue[due_date]', '', :size => 10 %><%= calendar_for('issue_due_date') %>
+	<%= date_field_tag 'issue[due_date]', '', :size => 10 %>
 </p>
 <% if Issue.use_field_for_done_ratio? %>
 <p>

app/views/layouts/base.rhtml

@@ -1,7 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<html lang="<%= current_language %>">
 <head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta charset="utf-8" />
 <title><%= html_title %></title>
 <meta name="description" content="<%= Redmine::Info.app_name %>" />
 <meta name="keywords" content="issue,bug,tracker" />
@@ -20,6 +20,7 @@
 <%= javascript_include_tag 'jquery-ui.min.js' %>
 <%= javascript_include_tag 'jquery.menu_expand.js' %>
 <%= javascript_tag('jQuery.noConflict();') %>
+<%= javascript_include_tag 'modernizr.min.js' %>
 <%= javascript_heads %>
 <%= stylesheet_link_tag 'jstoolbar' %>
 <%= heads_for_theme %>
@@ -34,12 +35,14 @@
     <div id="header">
       <div id="logo"><%= link_to(h(Setting.app_title), home_path) %></div>
       <div id="top-menu-items">
+      <% if User.current.logged? || !Setting.login_required? %>
       <div id="search">
         <%= render :partial => 'search/quick_search', :locals => {:search_term => @question} %>
       </div>
+      <% end %>
 
-      <% if User.current.logged? || !Setting.login_required? %>
       <ul id="account-nav">
+        <% if User.current.logged? || !Setting.login_required? %>
         <% main_top_menu_items.each do |item| %>
             <%= render_menu_node(item) %>
         <% end %>
@@ -74,7 +77,8 @@
           </ul>
         </li>
         <% end %>
-          <%= render_menu_node(help_menu_item) %>
+        <%= render_menu_node(help_menu_item) %>
+        <% end %>
           <% unless User.current.logged? %>
             <% if Setting.self_registration? %>
             <li>
@@ -98,7 +102,6 @@
             </li>
           <% end %>
       </ul>
-      <% end %>
     </div>
     </div>
     <div id="breadcrumb">

app/views/queries/_filters.rhtml

@@ -42,10 +42,17 @@ function enableValues(field, indexes) {
       f[i].up('span').hide();
 		}
 	}
+  var hasDateFields = ((jQuery("#div_values_" + field).find('input[type="date"]').size() > 0) && (Modernizr.inputtypes.date === false));
 	if (indexes.length > 0) {
 		Element.show("div_values_" + field);
+    if(hasDateFields) {
+      jQuery("#div_values_" + field).find('input[type="date"]').datepicker('enable');
+    }
 	} else {
 		Element.hide("div_values_" + field);
+    if(hasDateFields) {
+      jQuery("#div_values_" + field).find('input[type="date"]').datepicker('disable');
+    }
 	}
 }
 
@@ -95,6 +102,9 @@ function apply_filters_observer() {
                           :complete => "e.stop(); apply_filters_observer()") %>
     }
   });
+  if(Modernizr.inputtypes.date === false) {
+    jQuery('#query_form input[type="date"]').datepicker(datepickerSettings);
+  }
 }
 Event.observe(document,"dom:loaded", apply_filters_observer);
 //]]>
@@ -125,8 +135,8 @@ Event.observe(document,"dom:loaded", apply_filters_observer);
           <%= link_to_function image_tag('bullet_toggle_plus.png'), "toggle_multi_select('values_#{field}_1');", :style => "vertical-align: bottom;" %>
         </span>
     <% when :date, :date_past %>
-        <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field), :size => 10, :class => "values_#{field}", :id => "values_#{field}_1" %> <%= calendar_for "values_#{field}_1" %></span>
+        <span class="span_values_<%= field %>"><%= date_field_tag "v[#{field}][]", query.value_for(field), :size => 10, :class => "values_#{field}", :id => "values_#{field}_1" %></span>
-        <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field, 1), :size => 10, :class => "values_#{field}", :id => "values_#{field}_2" %> <%= calendar_for "values_#{field}_2" %></span>
+        <span class="span_values_<%= field %>"><%= date_field_tag "v[#{field}][]", query.value_for(field, 1), :size => 10, :class => "values_#{field}", :id => "values_#{field}_2" %></span>
         <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field), :size => 3, :class => "values_#{field}" %> <%= l(:label_day_plural) %></span>
     <% when :string, :text %>
         <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field), :class => "values_#{field}", :id => "values_#{field}", :size => 30 %></span>

app/views/timelog/_date_range.rhtml

@@ -18,13 +18,11 @@
 l(:label_date_from_to,
   :start => (
     label_tag("from", l(:description_date_from), :class => "hidden-for-sighted") +
-    text_field_tag('from', @from, :size => 10, :disabled => !@free_period) +
+    date_field_tag('from', @from, :size => 10, :disabled => !@free_period)
-    calendar_for('from')
   ),
   :end => (
     label_tag("to", l(:description_date_to), :class => "hidden-for-sighted") +
-    text_field_tag('to', @to, :size => 10, :disabled => !@free_period) +
+    date_field_tag('to', @to, :size => 10, :disabled => !@free_period)
-    calendar_for('to')
   )
 )
 %>

app/views/timelog/edit.rhtml

@@ -11,7 +11,7 @@
 
 <div class="box">
 <p><%= f.text_field :issue_id, :size => 6 %> <em><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></em></p>
-<p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
+<p><%= f.date_field :spent_on, :size => 10, :required => true %></p>
 <p><%= f.text_field :hours, :size => 6, :required => true %></p>
 <p><%= f.text_field :comments, :size => 100 %></p>
 <p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>

app/views/versions/_form.rhtml

@@ -5,8 +5,8 @@
 <p><%= f.text_field :description, :size => 60 %></p>
 <p><%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %></p>
 <p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p>
-<p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('version_start_date') %></p>
+<p><%= f.date_field :start_date, :size => 10 %></p>
-<p><%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
+<p><%= f.date_field :effective_date, :size => 10 %></p>
 <p><%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %></p>
 
 <% @version.custom_field_values.each do |value| %>

config/environment.rb

@@ -24,9 +24,12 @@ ENV['RAILS_ENV'] ||= ENV['RACK_ENV'] if ENV['RACK_ENV']
 # Specifies gem version of Rails to use when vendor/rails is not present
 RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
 
+# this is replaced by config.encoding = "utf-8" in rails3
 if RUBY_VERSION >= '1.9'
   Encoding.default_external = 'UTF-8'
   Encoding.default_internal = 'UTF-8'
+else
+  $KCODE='UTF-8'
 end
 
 # Bootstrap the Rails environment, frameworks, and default configuration

config/initializers/10-patches.rb

@@ -78,6 +78,53 @@ module ActionView
         end
       end
     end
+
+    module FormHelper
+      # Returns an input tag of the "date" type tailored for accessing a specified attribute (identified by +method+) on an object
+      # assigned to the template (identified by +object+). Additional options on the input tag can be passed as a
+      # hash with +options+. These options will be tagged onto the HTML as an HTML element attribute as in the example
+      # shown.
+      #
+      # ==== Examples
+      #   date_field(:user, :birthday, :size => 20)
+      #   # => <input type="date" id="user_birthday" name="user[birthday]" size="20" value="#{@user.birthday}" />
+      #
+      #   date_field(:user, :birthday, :class => "create_input")
+      #   # => <input type="date" id="user_birthday" name="user[birthday]" value="#{@user.birthday}" class="create_input" />
+      #
+      # NOTE: This will be part of rails 4.0, the monkey patch can be removed by then.
+      def date_field(object_name, method, options = {})
+        InstanceTag.new(object_name, method, self, options.delete(:object)).to_input_field_tag("date", options)
+      end
+    end
+
+    # As ActionPacks metaprogramming will already have happened when we're here,
+    # we have to tell the FormBuilder about the above date_field ourselvse
+    #
+    # NOTE: This can be remove when the above ActionView::Helpers::FormHelper#date_field is removed
+    class FormBuilder
+      self.field_helpers << "date_field"
+
+      def date_field(method, options = {})
+        @template.date_field(@object_name, method, objectify_options(options))
+      end
+    end
+
+    module FormTagHelper
+      # Creates a date form input field.
+      #
+      # ==== Options
+      # * Creates standard HTML attributes for the tag.
+      #
+      # ==== Examples
+      #   date_field_tag 'meeting_date'
+      #   # => <input id="meeting_date" name="meeting_date" type="date" />
+      #
+      # NOTE: This will be part of rails 4.0, the monkey patch can be removed by then.
+      def date_field_tag(name, value = nil, options = {})
+        text_field_tag(name, value, options.stringify_keys.update("type" => "date"))
+      end
+    end
   end
 end
 

config/locales/sr-YU.yml

@@ -2,6 +2,8 @@
 # by Vladimir Medarović (vlada@medarovic.com)
 sr-YU:
   direction: ltr
+  jquery:
+    ui: "sr-SR"
   date:
     formats:
       # Use the strftime parameters for formats.

config/locales/zh-TW.yml

@@ -4,6 +4,9 @@
 
 "zh-TW":
   direction: ltr
+  jquery:
+    # Falls back to the value in zh.yml if not set
+    ui: "zh-TW"
   date:
     formats:
       # Use the strftime parameters for formats.

config/locales/zh.yml

@@ -3,6 +3,8 @@
 
 zh:
   direction: ltr
+  jquery:
+    ui: "zh-CN"
   date:
     formats:
       default: "%Y-%m-%d"

config/preinitializer.rb

@@ -19,9 +19,9 @@ rescue LoadError
   raise "Could not load the bundler gem. Install it with `gem install bundler`."
 end
 
-if Gem::Version.new(Bundler::VERSION) < Gem::Version.new("1.0.6")
+if Gem::Version.new(Bundler::VERSION) < Gem::Version.new("1.0.14")
   raise RuntimeError, "Your bundler version is too old. We require " +
-   "at least version 1.0.6. Run `gem install bundler` to upgrade."
+   "at least version 1.0.14. Run `gem install bundler` to upgrade."
 end
 
 begin

lib/chili_project/liquid/filters.rb

@@ -64,6 +64,21 @@ module ChiliProject
           count.to_i > 0 ? array[(count.to_i * -1)..-1] : []
         end
       end
+
+      def date(input, format=nil)
+        if format.nil?
+          return "" unless input
+          if Setting.date_format.blank?
+            input = super(input, '%Y-%m-%d')
+            return ::I18n.l(input.to_date) if input.respond_to?(:to_date)
+            input # default return value
+          else
+            super(input, Setting.date_format)
+          end
+        else
+          super
+        end
+      end
     end
 
     module Filters

lib/chili_project/liquid/liquid_ext/strainer.rb

@@ -21,18 +21,23 @@ module ChiliProject
           base.extend(ClassMethods)
 
           base.class_attribute :filters, :instance_reader => false, :instance_writer => false
-          base.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          base.class_eval do
-            self.filters = @@filters.values
+            self.filters = base.send(:class_variable_get, '@@filters').values
-          RUBY
+
+            class << self
+              alias_method_chain :global_filter, :filter_array
+              alias_method_chain :create, :filter_array
+            end
+          end
         end
 
         module ClassMethods
-          def global_filter(filter)
+          def global_filter_with_filter_array(filter)
             raise ArgumentError, "Passed filter is not a module" unless filter.is_a?(Module)
-            filters += [filter]
+            self.filters += [filter]
           end
 
-          def create(context)
+          def create_with_filter_array(context)
             strainer = self.new(context)
             filters.each { |filter| strainer.extend(filter) }
             strainer

lib/chili_project/liquid/variables.rb

@@ -53,6 +53,10 @@ module ChiliProject
         vars.uniq.sort
       end
 
+      register "today" do
+        Date.today.to_s
+      end
+
       # DEPRACATED: This is just a hint on how to use Liquid introspection
       register "macro_list",
         "Use '{{ variables | to_list: \"Variables:\" }}' to see all Liquid variables and '{{ tags | to_list: \"Tags:\" }}' to see all of the Liquid tags."

lib/gravatar.rb

@@ -0,0 +1,2 @@
+ActiveSupport::Deprecation.warn("\"require gravatar\" is not needed anymore. Please remove this statement from your code.")
+require "gravatarify"