From 13fb447ad64da9d2d00d0e233201a5b972110a87 Mon Sep 17 00:00:00 2001 From: Danil Tashkinov Date: Thu, 28 Apr 2016 12:19:05 +0300 Subject: [PATCH 1/5] Note in Readme about supported redmine versions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ebfed01..742d92b 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,6 @@ Enable plugin at project level. Now you will see "Custom report" tab at the proj ## Compatibility -This version supports only redmine 2.x. +This version supports redmine 2.x and 3.x For all tested versions see the "tests matrix":https://travis-ci.org/nodecarter/redmine_custom_reports From 7a3c82f36c60da304bb18750345e3df76f1bf1a4 Mon Sep 17 00:00:00 2001 From: Danil Tashkinov Date: Mon, 2 May 2016 00:51:49 +0300 Subject: [PATCH 2/5] Require to fill series name; fixes #23 --- app/models/custom_report_series.rb | 2 ++ app/views/custom_reports/_form.html.erb | 5 ++--- app/views/custom_reports/_series.html.erb | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/custom_report_series.rb b/app/models/custom_report_series.rb index 4225528..2bc098e 100644 --- a/app/models/custom_report_series.rb +++ b/app/models/custom_report_series.rb @@ -5,6 +5,8 @@ class CustomReportSeries < ActiveRecord::Base belongs_to :custom_report, :inverse_of => :series + validates :name, presence: true + def query @query ||= build_query end diff --git a/app/views/custom_reports/_form.html.erb b/app/views/custom_reports/_form.html.erb index 78ba299..2072d4c 100644 --- a/app/views/custom_reports/_form.html.erb +++ b/app/views/custom_reports/_form.html.erb @@ -18,8 +18,7 @@

- - <%= text_field 'custom_report', 'name', :size => 80 %> + <%= f.text_field :name, size: 80, required: true %>

@@ -46,7 +45,7 @@ <%= select 'custom_report', 'group_by', @custom_report.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, - :include_blank => true %> + include_blank: false %>

diff --git a/app/views/custom_reports/_series.html.erb b/app/views/custom_reports/_series.html.erb index 242d8dc..da8872a 100644 --- a/app/views/custom_reports/_series.html.erb +++ b/app/views/custom_reports/_series.html.erb @@ -3,7 +3,7 @@

<%= l(:label_series_filters) %>

- <%= f.text_field :name, :size => 80 %> + <%= f.text_field :name, size: 80, required: true %>

<%= render :partial => 'series_filters', :locals => { :f => f, :query => f.object.query, :series_id => series_id } %> From 9375df36e24a28e7cc9ab0f6ef57ab83593ef2f8 Mon Sep 17 00:00:00 2001 From: Danil Tashkinov Date: Tue, 9 Aug 2016 11:14:46 +0300 Subject: [PATCH 3/5] Some refactoring and moving to Restream --- .travis.yml | 37 +---- app/controllers/custom_reports_controller.rb | 22 +-- app/helpers/custom_reports_helper.rb | 19 +-- app/models/custom_report.rb | 30 ++-- app/models/custom_report_series.rb | 21 +-- app/views/custom_reports/_form.html.erb | 36 ++--- app/views/custom_reports/_links.html.erb | 10 +- app/views/custom_reports/_series.html.erb | 10 +- .../custom_reports/_series_filters.html.erb | 94 ++++++------- app/views/custom_reports/_sidebar.html.erb | 16 +-- app/views/custom_reports/edit.html.erb | 13 +- app/views/custom_reports/index.html.erb | 78 +++++----- app/views/custom_reports/new.html.erb | 12 +- app/views/custom_reports/show.html.erb | 51 ++++--- assets/javascripts/jquery-1.8.2.min.js | 2 - assets/javascripts/jquery-noconflict.js | 1 - assets/javascripts/jquery.masonry.min.js | 10 -- .../20121212125001_create_custom_reports.rb | 10 +- init.rb | 32 ++--- lib/redmine_custom_reports.rb | 14 ++ lib/redmine_custom_reports/project_patch.rb | 9 +- lib/redmine_custom_reports/user_patch.rb | 9 +- .../custom_reports_controller_test.rb | 133 +++++++++--------- 23 files changed, 320 insertions(+), 349 deletions(-) delete mode 100644 assets/javascripts/jquery-1.8.2.min.js delete mode 100644 assets/javascripts/jquery-noconflict.js delete mode 100644 assets/javascripts/jquery.masonry.min.js create mode 100644 lib/redmine_custom_reports.rb diff --git a/.travis.yml b/.travis.yml index 5badc30..2ace80f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,42 +5,19 @@ services: - postgresql rvm: - - 1.9.3 - 2.2.0 gemfile: - $REDMINE_PATH/Gemfile env: - - REDMINE_VER=2.3.3 DB=mysql - - REDMINE_VER=2.6.9 DB=mysql - - REDMINE_VER=3.2.1 DB=mysql - - - REDMINE_VER=2.3.3 DB=postgresql - - REDMINE_VER=2.6.9 DB=postgresql - - REDMINE_VER=3.2.1 DB=postgresql - -matrix: - exclude: - - rvm: 2.2.0 - env: REDMINE_VER=2.3.3 DB=mysql - gemfile: $REDMINE_PATH/Gemfile - - rvm: 2.2.0 - env: REDMINE_VER=2.6.9 DB=mysql - gemfile: $REDMINE_PATH/Gemfile - - rvm: 1.9.3 - env: REDMINE_VER=3.2.1 DB=mysql - gemfile: $REDMINE_PATH/Gemfile - - - rvm: 2.2.0 - env: REDMINE_VER=2.3.3 DB=postgresql - gemfile: $REDMINE_PATH/Gemfile - - rvm: 2.2.0 - env: REDMINE_VER=2.6.9 DB=postgresql - gemfile: $REDMINE_PATH/Gemfile - - rvm: 1.9.3 - env: REDMINE_VER=3.2.1 DB=postgresql - gemfile: $REDMINE_PATH/Gemfile + - REDMINE_VER=3.1.6 DB=mysql + - REDMINE_VER=3.2.3 DB=mysql + - REDMINE_VER=3.3.0 DB=mysql + + - REDMINE_VER=3.1.6 DB=postgresql + - REDMINE_VER=3.2.3 DB=postgresql + - REDMINE_VER=3.3.0 DB=postgresql before_install: - export PLUGIN_NAME=redmine_custom_reports diff --git a/app/controllers/custom_reports_controller.rb b/app/controllers/custom_reports_controller.rb index 18ce72f..7b53775 100644 --- a/app/controllers/custom_reports_controller.rb +++ b/app/controllers/custom_reports_controller.rb @@ -3,9 +3,9 @@ class CustomReportsController < ApplicationController before_filter :find_project_by_project_id before_filter :authorize - before_filter :find_custom_reports, :only => [:index, :show, :new, :edit] - before_filter :find_custom_report, :only => [:show, :edit, :update, :destroy] - before_filter :authorize_to_manage, :only => [:edit, :update, :destroy] + before_filter :find_custom_reports, only: [:index, :show, :new, :edit] + before_filter :find_custom_report, only: [:show, :edit, :update, :destroy] + before_filter :authorize_to_manage, only: [:edit, :update, :destroy] helper :queries include QueriesHelper @@ -32,11 +32,11 @@ def create if @custom_report.save redirect_to url_for( - :controller => "custom_reports", - :action => "show", :project_id => @project, :id => @custom_report.id), - :notice => l(:message_custom_reports_created) + controller: 'custom_reports', + action: 'show', project_id: @project, id: @custom_report.id), + notice: l(:message_custom_reports_created) else - render :action => "new" + render action: 'new' end end @@ -53,11 +53,11 @@ def update params.required(:custom_report).permit! if params.class.method_defined? :required if @custom_report.update_attributes(params[:custom_report]) redirect_to url_for( - :controller => "custom_reports", - :action => "show", :project_id => @project, :id => @custom_report.id), - :notice => l(:message_custom_reports_updated) + controller: 'custom_reports', + action: 'show', project_id: @project, id: @custom_report.id), + notice: l(:message_custom_reports_updated) else - render :action => "edit" + render action: 'edit' end end diff --git a/app/helpers/custom_reports_helper.rb b/app/helpers/custom_reports_helper.rb index 55a08f2..295307f 100644 --- a/app/helpers/custom_reports_helper.rb +++ b/app/helpers/custom_reports_helper.rb @@ -1,10 +1,10 @@ module CustomReportsHelper def sanitized_object_name(object_name) - object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "") + object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, '_').sub(/_$/, '') end def operators_for_select(filter_type) - Query.operators_by_filter_type[filter_type].collect {|o| [l(Query.operators[o]), o]} + Query.operators_by_filter_type[filter_type].collect { |o| [l(Query.operators[o]), o] } end def query_options_for_select(query) @@ -19,15 +19,18 @@ def query_options_for_select(query) def link_to_add_custom_report_series(name, f) new_object = f.object.series.build - id = new_object.object_id - fields = f.fields_for(:series, new_object, :child_index => id) do |builder| - render("series", :f => builder) + id = new_object.object_id + fields = f.fields_for(:series, new_object, child_index: id) do |builder| + render('series', f: builder) end - link_to(name, '#', :class => "add-custom-report-series", - "data-id" => id, "data-fields" => fields.gsub("\n", "")) + link_to(name, '#', + class: 'add-custom-report-series', + 'data-id' => id, + 'data-fields' => fields.gsub("\n", '') + ) end def width_style_for_series(custom_report) - "width:100%;" + 'width:100%;' end end diff --git a/app/models/custom_report.rb b/app/models/custom_report.rb index e21484a..0785d38 100644 --- a/app/models/custom_report.rb +++ b/app/models/custom_report.rb @@ -1,35 +1,35 @@ class CustomReport < ActiveRecord::Base unloadable - CHART_TYPES = %w(undev_pie pie donut bar horizontal_bar stacked_bar) + CHART_TYPES = %w(undev_pie pie donut bar horizontal_bar stacked_bar) MULTI_SERIES = %w(horizontal_bar stacked_bar) belongs_to :project belongs_to :user - has_many :series, :class_name => "CustomReportSeries" + has_many :series, class_name: 'CustomReportSeries' validates_presence_of :project validates_presence_of :user validates_presence_of :name validates_presence_of :group_by validates_presence_of :null_text - validates_inclusion_of :chart_type, :in => CHART_TYPES + validates_inclusion_of :chart_type, in: CHART_TYPES - accepts_nested_attributes_for :series, :allow_destroy => true + accepts_nested_attributes_for :series, allow_destroy: true scope :visible, lambda { |*args| - user = args.shift || User.current - user_id = user.logged? ? user.id : 0 - where "(#{table_name}.is_public = ? OR #{table_name}.user_id = ?)", true, user_id + user = args.shift || User.current + user_id = user.logged? ? user.id : 0 + where "(#{table_name}.is_public = ? OR #{table_name}.user_id = ?)", true, user_id } - scope :by_name, -> { order("name") } + scope :by_name, -> { order('name') } def groupable_columns QueryExt.new().groupable_columns.select do |col| if col.respond_to? :custom_field col.custom_field.is_for_all || - project.all_issue_custom_fields.include?(col.custom_field) + project.all_issue_custom_fields.include?(col.custom_field) else true end @@ -38,10 +38,10 @@ def groupable_columns def info { - :chart_type => chart_type, - :group_by_caption => group_by_column.try(:caption), - :series_count => series.count, - :multi_series => multi_series? + chart_type: chart_type, + group_by_caption: group_by_column.try(:caption), + series_count: series.count, + multi_series: multi_series? } end @@ -61,8 +61,8 @@ def data def allowed_to_manage?(user = User.current) user.allowed_to?( - is_public? ? :manage_public_custom_reports : :manage_custom_reports, - project + is_public? ? :manage_public_custom_reports : :manage_custom_reports, + project ) end diff --git a/app/models/custom_report_series.rb b/app/models/custom_report_series.rb index 2bc098e..e8d3c24 100644 --- a/app/models/custom_report_series.rb +++ b/app/models/custom_report_series.rb @@ -3,7 +3,7 @@ class CustomReportSeries < ActiveRecord::Base serialize :filters - belongs_to :custom_report, :inverse_of => :series + belongs_to :custom_report, inverse_of: :series validates :name, presence: true @@ -14,24 +14,25 @@ def query def data(data_keys = []) _keys = data_keys.dup _data = { - :key => name, - :values => data_hash.map do |k, v| + key: name, + values: data_hash.map do |k, v| _keys.delete(k) - { :label => data_label_text(k), :value => v } + { label: data_label_text(k), value: v } end } _keys.each do |key| - _data[:values] << { :label => data_label_text(key), :value => 0 } + _data[:values] << { label: data_label_text(key), value: 0 } end _data end def data_hash + true @data_hash ||= (query.issue_count_by_group || {}) end def flt=(*args) - filters_hash = args.extract_options! + filters_hash = args.extract_options! query.filters = {} query.add_filters(filters_hash[:f], filters_hash[:op], filters_hash[:v]) self.filters = query.filters @@ -41,10 +42,10 @@ def flt=(*args) def build_query QueryExt.new( - :name => name, - :filters => filters, - :group_by => custom_report.try(:group_by), - :project => custom_report.try(:project)) + name: name, + filters: filters, + group_by: custom_report.try(:group_by), + project: custom_report.try(:project)) end def data_label_text(label) diff --git a/app/views/custom_reports/_form.html.erb b/app/views/custom_reports/_form.html.erb index 2072d4c..873f2ed 100644 --- a/app/views/custom_reports/_form.html.erb +++ b/app/views/custom_reports/_form.html.erb @@ -1,16 +1,10 @@ <% content_for :header_tags do %> - - <%= javascript_include_tag 'custom_report_edit.js', :plugin => 'redmine_custom_reports' %> + <%= javascript_include_tag 'custom_report_edit.js', plugin: 'redmine_custom_reports' %> <% end %> <%= labelled_form_for custom_report, - :url => url, - :html => { :id => 'custom-report-form' } do |f| %> + url: url, + html: { id: 'custom-report-form' } do |f| %> <%= error_messages_for custom_report %> @@ -23,41 +17,41 @@

- <%= text_field 'custom_report', 'description', :size => 80 %> + <%= text_field 'custom_report', 'description', size: 80 %>

<%= select 'custom_report', 'chart_type', - CustomReport::CHART_TYPES.collect { |ct| [l("label_chart_type_#{ct}"), ct] }, - :include_blank => false %> + CustomReport::CHART_TYPES.collect { |ct| [l("label_chart_type_#{ct}"), ct] }, + include_blank: false %>

<% if User.current.admin? || User.current.allowed_to?(:manage_public_custom_reports, @project) %>

- + <%= check_box 'custom_report', 'is_public', - :onchange => (User.current.admin? ? nil : 'if (this.checked) {$("custom_report_is_for_all").checked = false; $("custom_report_is_for_all").disabled = true;} else {$("custom_report_is_for_all").disabled = false;}') %> + onchange: (User.current.admin? ? nil : 'if (this.checked) {$("custom_report_is_for_all").checked = false; $("custom_report_is_for_all").disabled = true;} else {$("custom_report_is_for_all").disabled = false;}') %>

<% end %>

<%= select 'custom_report', 'group_by', - @custom_report.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, - include_blank: false %> + @custom_report.groupable_columns.collect { |c| [c.caption, c.name.to_s] }, + include_blank: false %>

- <%= text_field 'custom_report', 'null_text', :size => 80 %> + <%= text_field 'custom_report', 'null_text', size: 80 %>

- <%= f.fields_for :series do |series_fields| %> - <%= render :partial => 'series', :locals => { :f => series_fields } %> - <% end %> - <%= link_to_add_custom_report_series l(:message_add_custom_report_series), f %> + <%= f.fields_for :series do |series_fields| %> + <%= render partial: 'series', locals: { f: series_fields } %> + <% end %> + <%= link_to_add_custom_report_series l(:message_add_custom_report_series), f %> diff --git a/app/views/custom_reports/_links.html.erb b/app/views/custom_reports/_links.html.erb index ee40aa9..ea4c6dc 100644 --- a/app/views/custom_reports/_links.html.erb +++ b/app/views/custom_reports/_links.html.erb @@ -1,10 +1,10 @@ <% if custom_reports && custom_reports.any? %> <% custom_reports.each do |custom_report| %> - <%= link_to custom_report.name, - { :controller => 'custom_reports', - :action => 'show', - :project_id => @project, - :id => custom_report.id } %>
+ <%= link_to custom_report.name, + { controller: 'custom_reports', + action: 'show', + project_id: @project, + id: custom_report.id } %>
<% end %> <% else %> <%= l(:label_no_data) %> diff --git a/app/views/custom_reports/_series.html.erb b/app/views/custom_reports/_series.html.erb index da8872a..41516ec 100644 --- a/app/views/custom_reports/_series.html.erb +++ b/app/views/custom_reports/_series.html.erb @@ -5,11 +5,11 @@

<%= f.text_field :name, size: 80, required: true %>

- <%= render :partial => 'series_filters', :locals => { - :f => f, :query => f.object.query, :series_id => series_id } %> + <%= render partial: 'series_filters', locals: { + f: f, query: f.object.query, series_id: series_id } %> <%= link_to l(:message_remove_custom_report_series), '#', - :class => 'remove-custom-report-series', - "data-cant_delete_message" => l(:message_cant_delete_last_series) %> - <%= f.hidden_field :_destroy, :value => :false %> + class: 'remove-custom-report-series', + 'data-cant_delete_message' => l(:message_cant_delete_last_series) %> + <%= f.hidden_field :_destroy, value: :false %> diff --git a/app/views/custom_reports/_series_filters.html.erb b/app/views/custom_reports/_series_filters.html.erb index 9520305..8c0d98a 100644 --- a/app/views/custom_reports/_series_filters.html.erb +++ b/app/views/custom_reports/_series_filters.html.erb @@ -6,7 +6,7 @@ <% query.available_filters.each do |field, options| %> <% - field_id = "#{series_id}_#{field}" + field_id = "#{series_id}_#{field}" %> id="tr_<%= field_id %>" class="filter" @@ -14,25 +14,25 @@
<%= check_box_tag "#{filter_attr}f[]", - field, - query.has_filter?(field), - :id => "cb_#{field_id}", - :class => "toggle_series_filter" %> + field, + query.has_filter?(field), + id: "cb_#{field_id}", + class: 'toggle_series_filter' %> <%= label_tag "operators_#{field_id}", - l(:description_filter), - :class => "hidden-for-sighted" %> + l(:description_filter), + class: 'hidden-for-sighted' %> <%= select_tag "#{filter_attr}op[#{field}]", - options_for_select( - operators_for_select(options[:type]), - query.operator_for(field)), - :id => "operators_#{field_id}", - :class => "toggle_series_filter_operator" %> + options_for_select( + operators_for_select(options[:type]), + query.operator_for(field)), + id: "operators_#{field_id}", + class: 'toggle_series_filter_operator' %> @@ -41,61 +41,61 @@ when :list, :list_optional, :list_status, :list_subprojects %> <%= select_tag "#{filter_attr}v[#{field}][]", - options_for_select( - options[:values], - query.values_for(field)), - :class => "values_#{field_id}", - :id => "values_#{field_id}_1", - :multiple => (query.values_for(field) && query.values_for(field).length > 1) %> + options_for_select( + options[:values], + query.values_for(field)), + class: "values_#{field_id}", + id: "values_#{field_id}_1", + multiple: (query.values_for(field) && query.values_for(field).length > 1) %> <%= link_to_function image_tag('bullet_toggle_plus.png'), - "toggle_multi_select('values_#{field_id}_1');" %> + "toggle_multi_select('values_#{field_id}_1');" %> <% when :date, :date_past %> <%= text_field_tag "#{filter_attr}v[#{field}][]", - query.value_for(field), - :size => 10, - :class => "values_#{field_id}", - :id => "values_#{field_id}_1" %> + query.value_for(field), + size: 10, + class: "values_#{field_id}", + id: "values_#{field_id}_1" %> <%= calendar_for "values_#{field_id}_1" %> <%= text_field_tag "#{filter_attr}v[#{field}][]", - query.value_for(field, 1), - :size => 10, - :class => "values_#{field_id}", - :id => "values_#{field_id}_2" %> + query.value_for(field, 1), + size: 10, + class: "values_#{field_id}", + id: "values_#{field_id}_2" %> <%= calendar_for "values_#{field_id}_2" %> <%= text_field_tag "#{filter_attr}v[#{field}][]", - query.value_for(field), - :size => 3, - :class => "values_#{field_id}" %> + query.value_for(field), + size: 3, + class: "values_#{field_id}" %> <%= l(:label_day_plural) %> <% when :string, :text %> <%= text_field_tag "#{filter_attr}v[#{field}][]", - query.value_for(field), - :class => "values_#{field_id}", - :id => "values_#{field_id}", - :size => 30 %> + query.value_for(field), + class: "values_#{field_id}", + id: "values_#{field_id}", + size: 30 %> <% when :integer, :float %> <%= text_field_tag "#{filter_attr}v[#{field}][]", - query.value_for(field), - :class => "values_#{field_id}", - :id => "values_#{field_id}_1", - :size => 6 %> + query.value_for(field), + class: "values_#{field_id}", + id: "values_#{field_id}_1", + size: 6 %> <%= text_field_tag "#{filter_attr}v[#{field}][]", - query.value_for(field, 1), - :class => "values_#{field_id}", - :id => "values_#{field_id}_2", - :size => 6 %> + query.value_for(field, 1), + class: "values_#{field_id}", + id: "values_#{field_id}_2", + size: 6 %> <% end %> @@ -107,10 +107,10 @@ <%= label_tag("#{series_id}_add_filter_select", l(:label_filter_add)) %> <%= select_tag "#{series_id}_add_filter_select", - query_options_for_select(query), - :class => "add_series_filter", - :name => nil %> + query_options_for_select(query), + class: 'add_series_filter', + name: nil %>
-<%= hidden_field_tag "#{filter_attr}f[]", "" %> +<%= hidden_field_tag "#{filter_attr}f[]", '' %> diff --git a/app/views/custom_reports/_sidebar.html.erb b/app/views/custom_reports/_sidebar.html.erb index 54ba91c..2ffbc81 100644 --- a/app/views/custom_reports/_sidebar.html.erb +++ b/app/views/custom_reports/_sidebar.html.erb @@ -1,21 +1,21 @@

<%= l(:label_custom_report_plural) %>

<%= link_to l(:label_custom_report_view_all), - { :controller => 'custom_reports', - :action => 'index', - :project_id => @project } %>
+ { controller: 'custom_reports', + action: 'index', + project_id: @project } %>
<% if User.current.allowed_to?(:manage_custom_reports, @project) %> <%= link_to l(:label_custom_report_new), - { :controller => 'custom_reports', - :action => 'new', - :project_id => @project } %>
+ { controller: 'custom_reports', + action: 'new', + project_id: @project } %>
<% end %>

<%= l(:label_custom_report_public_list) %>

-<%= render :partial => 'links', :locals => { :custom_reports => @public_custom_reports } %> +<%= render partial: 'links', locals: { custom_reports: @public_custom_reports } %> <% if User.current.allowed_to?(:manage_custom_reports, @project) %>

<%= l(:label_custom_report_own_list) %>

- <%= render :partial => 'links', :locals => { :custom_reports => @own_custom_reports } %> + <%= render partial: 'links', locals: { custom_reports: @own_custom_reports } %> <% end %> diff --git a/app/views/custom_reports/edit.html.erb b/app/views/custom_reports/edit.html.erb index ea9ab69..afa86e7 100644 --- a/app/views/custom_reports/edit.html.erb +++ b/app/views/custom_reports/edit.html.erb @@ -1,14 +1,13 @@

<%= l(:label_custom_report_edit) %>

-<%= render :partial => 'form', - :locals => { - :custom_report => @custom_report, - :message => l(:button_update), - :url => url_for(:controller => "custom_reports", - :action => "update", :id => @custom_report.id) } %> +<%= render partial: 'form', + locals: { + custom_report: @custom_report, + message: l(:button_update), + url: url_for(controller: 'custom_reports', action: 'update', id: @custom_report.id) } %> <% html_title(l(:label_custom_report_edit)) -%> <% content_for :sidebar do %> - <%= render :partial => 'sidebar' %> + <%= render partial: 'sidebar' %> <% end %> diff --git a/app/views/custom_reports/index.html.erb b/app/views/custom_reports/index.html.erb index c59aeb3..370482c 100644 --- a/app/views/custom_reports/index.html.erb +++ b/app/views/custom_reports/index.html.erb @@ -1,8 +1,8 @@ <% if User.current.allowed_to?(:manage_custom_reports, @project) %>
<%= link_to(l(:button_create), - new_project_custom_report_path(@project), - :class => 'icon icon-add') %> + new_project_custom_report_path(@project), + class: 'icon icon-add') %>
<% end %> @@ -12,52 +12,52 @@
- - - - <% if User.current.allowed_to?(:manage_custom_reports, @project) %> - - <% end %> - + + + + <% if User.current.allowed_to?(:manage_custom_reports, @project) %> + + <% end %> + - <% @custom_reports.each do |custom_report| %> - - - - - <% if User.current.allowed_to?(:manage_custom_reports, @project) %> - - <% end %> - + + + + <% if User.current.allowed_to?(:manage_custom_reports, @project) %> + + <% end %> + - - <% end %> + <%= link_to(l(:button_delete), + project_custom_report_path(@project, custom_report), + confirm: l(:text_are_you_sure), + method: :delete, + class: 'icon icon-del') %> + <% end %> + + + <% end %>
<%= l(:field_name) %><%= l(:field_description) %><%= l(:field_chart_type) %><%= l(:field_is_public) %><%= l(:field_name) %><%= l(:field_description) %><%= l(:field_chart_type) %><%= l(:field_is_public) %>
- <%= link_to custom_report.name, - { :controller => 'custom_reports', - :action => 'show', - :project_id => @project, - :id => custom_report.id } %>
- 		<%= custom_report.description %><%= custom_report.chart_type %><%= custom_report.is_public %> - <% if custom_report.allowed_to_manage? %> - <%= link_to(l(:button_edit), - edit_project_custom_report_path(@project, custom_report), - :class => 'icon icon-edit') %> + <% @custom_reports.each do |custom_report| %> +
+ <%= link_to custom_report.name, + { controller: 'custom_reports', + action: 'show', + project_id: @project, + id: custom_report.id } %>
+ 		<%= custom_report.description %><%= custom_report.chart_type %><%= custom_report.is_public %> + <% if custom_report.allowed_to_manage? %> + <%= link_to(l(:button_edit), + edit_project_custom_report_path(@project, custom_report), + class: 'icon icon-edit') %> - <%= link_to(l(:button_delete), - project_custom_report_path(@project, custom_report), - :confirm => l(:text_are_you_sure), - :method => :delete, - :class => 'icon icon-del') %> - <% end %> -
- +
<% else %> <%= l(:label_no_data) %> <% end %> <% content_for :sidebar do %> - <%= render :partial => 'sidebar' %> + <%= render partial: 'sidebar' %> <% end %> diff --git a/app/views/custom_reports/new.html.erb b/app/views/custom_reports/new.html.erb index 693c8f5..b81d998 100644 --- a/app/views/custom_reports/new.html.erb +++ b/app/views/custom_reports/new.html.erb @@ -1,13 +1,13 @@

<%= l(:label_custom_report_new) %>

-<%= render :partial => 'form', - :locals => { - :custom_report => @custom_report, - :message => l(:button_create), - :url => url_for(:controller => "custom_reports", :action => "create") } %> +<%= render partial: 'form', + locals: { + custom_report: @custom_report, + message: l(:button_create), + url: url_for(controller: 'custom_reports', action: 'create') } %> <% html_title(l(:label_custom_report_new)) -%> <% content_for :sidebar do %> - <%= render :partial => 'sidebar' %> + <%= render partial: 'sidebar' %> <% end %> diff --git a/app/views/custom_reports/show.html.erb b/app/views/custom_reports/show.html.erb index 4d8174b..0b14bb1 100644 --- a/app/views/custom_reports/show.html.erb +++ b/app/views/custom_reports/show.html.erb @@ -1,49 +1,46 @@ <% content_for :header_tags do %> - <%= stylesheet_link_tag 'custom_report', :plugin => 'redmine_custom_reports' %> - <%= stylesheet_link_tag 'nv.d3.css', :plugin => 'redmine_custom_reports' %> - <%= javascript_include_tag 'd3.v2.min.js', :plugin => 'redmine_custom_reports' %> - <%= javascript_include_tag 'nv.d3.min.js', :plugin => 'redmine_custom_reports' %> - - <%= javascript_include_tag 'custom_report_charts', :plugin => 'redmine_custom_reports' %> + <%= stylesheet_link_tag 'custom_report', plugin: 'redmine_custom_reports' %> + <%= stylesheet_link_tag 'nv.d3.css', plugin: 'redmine_custom_reports' %> + <%= javascript_include_tag 'd3.v2.min.js', plugin: 'redmine_custom_reports' %> + <%= javascript_include_tag 'nv.d3.min.js', plugin: 'redmine_custom_reports' %> + <%= javascript_include_tag 'custom_report_charts', plugin: 'redmine_custom_reports' %> <% end %> <% if @custom_report.allowed_to_manage? %>
<%= link_to(l(:button_edit), - edit_project_custom_report_path(@project, @custom_report), - :class => 'icon icon-edit') %> + edit_project_custom_report_path(@project, @custom_report), + class: 'icon icon-edit') %> <%= link_to(l(:button_delete), - project_custom_report_path(@project, @custom_report), - :confirm => l(:text_are_you_sure), - :method => :delete, - :class => 'icon icon-del') %> + project_custom_report_path(@project, @custom_report), + confirm: l(:text_are_you_sure), + method: :delete, + class: 'icon icon-del') %>
<% end %> -

<%=h @custom_report.name %>

+

<%= h @custom_report.name %>

<%= @custom_report.description %>

-<%= content_tag :div, :class => "custom-report", - "data-custom_report_info" => @custom_report.info.to_json do %> +<%= content_tag :div, + class: 'custom-report', + 'data-custom_report_info' => @custom_report.info.to_json do %> <% if @custom_report.multi_series? %> - <% content_tag :div, :class => "custom-report-chart", - :style => width_style_for_series(@custom_report), - "data-chart_data" => @custom_report.data.to_json do %> + <% content_tag :div, + class: 'custom-report-chart', + style: width_style_for_series(@custom_report), + 'data-chart_data' => @custom_report.data.to_json do %> <% end %> <% else %> <% @custom_report.series.each do |series| %> - <%= content_tag :div, :class => "custom-report-chart", - :style => width_style_for_series(@custom_report), - "data-chart_data" => [series.data].to_json do %> + <%= content_tag :div, + class: 'custom-report-chart', + style: width_style_for_series(@custom_report), + 'data-chart_data' => [series.data].to_json do %>

<%= series.name %>

<% end %> @@ -52,5 +49,5 @@ <% end %> <% content_for :sidebar do %> - <%= render :partial => 'sidebar' %> + <%= render partial: 'sidebar' %> <% end %> diff --git a/assets/javascripts/jquery-1.8.2.min.js b/assets/javascripts/jquery-1.8.2.min.js deleted file mode 100644 index f65cf1d..0000000 --- a/assets/javascripts/jquery-1.8.2.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v1.8.2 jquery.com | jquery.org/license */ -(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write(""),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bS[a]=c,c}function ci(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||ce.test(a)?d(a,e):ci(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ci(a+"["+e+"]",b[e],c,d);else d(a,b)}function cz(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.2",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return a!=null?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b
a",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="
t
",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="
",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||p.guid++:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.length,e=c.shift(),f=p._queueHooks(a,b),g=function(){p.dequeue(a,b)};e==="inprogress"&&(e=c.shift(),d--),e&&(b==="fx"&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c=0)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c=0)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,d+""),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j=0:p.find(m,this,null,[f]).length),h[m]&&j.push(l);j.length&&u.push({elem:f,matches:j})}o.length>q&&u.push({elem:this,matches:o.slice(q)});for(d=0;d0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function bc(a,b,c,d){c=c||[],b=b||r;var e,f,i,j,k=b.nodeType;if(!a||typeof a!="string")return c;if(k!==1&&k!==9)return[];i=g(b);if(!i&&!d)if(e=P.exec(a))if(j=e[1]){if(k===9){f=b.getElementById(j);if(!f||!f.parentNode)return c;if(f.id===j)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(j))&&h(b,f)&&f.id===j)return c.push(f),c}else{if(e[2])return w.apply(c,x.call(b.getElementsByTagName(a),0)),c;if((j=e[3])&&_&&b.getElementsByClassName)return w.apply(c,x.call(b.getElementsByClassName(j),0)),c}return bp(a.replace(L,"$1"),b,c,d,i)}function bd(a){return function(b){var c=b.nodeName.toLowerCase();return c==="input"&&b.type===a}}function be(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}}function bf(a){return z(function(b){return b=+b,z(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function bg(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}function bh(a,b){var c,d,f,g,h,i,j,k=C[o][a];if(k)return b?0:k.slice(0);h=a,i=[],j=e.preFilter;while(h){if(!c||(d=M.exec(h)))d&&(h=h.slice(d[0].length)),i.push(f=[]);c=!1;if(d=N.exec(h))f.push(c=new q(d.shift())),h=h.slice(c.length),c.type=d[0].replace(L," ");for(g in e.filter)(d=W[g].exec(h))&&(!j[g]||(d=j[g](d,r,!0)))&&(f.push(c=new q(d.shift())),h=h.slice(c.length),c.type=g,c.matches=d);if(!c)break}return b?h.length:h?bc.error(a):C(a,i).slice(0)}function bi(a,b,d){var e=b.dir,f=d&&b.dir==="parentNode",g=u++;return b.first?function(b,c,d){while(b=b[e])if(f||b.nodeType===1)return a(b,c,d)}:function(b,d,h){if(!h){var i,j=t+" "+g+" ",k=j+c;while(b=b[e])if(f||b.nodeType===1){if((i=b[o])===k)return b.sizset;if(typeof i=="string"&&i.indexOf(j)===0){if(b.sizset)return b}else{b[o]=k;if(a(b,d,h))return b.sizset=!0,b;b.sizset=!1}}}else while(b=b[e])if(f||b.nodeType===1)if(a(b,d,h))return b}}function bj(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function bk(a,b,c,d,e){var f,g=[],h=0,i=a.length,j=b!=null;for(;h-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==l)||((b=c).nodeType?j(a,c,d):k(a,c,d))}];for(;i1&&bj(m),i>1&&a.slice(0,i-1).join("").replace(L,"$1"),c,i0,f=a.length>0,g=function(h,i,j,k,m){var n,o,p,q=[],s=0,u="0",x=h&&[],y=m!=null,z=l,A=h||f&&e.find.TAG("*",m&&i.parentNode||i),B=t+=z==null?1:Math.E;y&&(l=i!==r&&i,c=g.el);for(;(n=A[u])!=null;u++){if(f&&n){for(o=0;p=a[o];o++)if(p(n,i,j)){k.push(n);break}y&&(t=B,c=++g.el)}d&&((n=!p&&n)&&s--,h&&x.push(n))}s+=u;if(d&&u!==s){for(o=0;p=b[o];o++)p(x,q,i,j);if(h){if(s>0)while(u--)!x[u]&&!q[u]&&(q[u]=v.call(k));q=bk(q)}w.apply(k,q),y&&!h&&q.length>0&&s+b.length>1&&bc.uniqueSort(k)}return y&&(t=B,l=z),x};return g.el=0,d?z(g):g}function bo(a,b,c,d){var e=0,f=b.length;for(;e2&&(j=h[0]).type==="ID"&&b.nodeType===9&&!f&&e.relative[h[1].type]){b=e.find.ID(j.matches[0].replace(V,""),b,f)[0];if(!b)return c;a=a.slice(h.shift().length)}for(g=W.POS.test(a)?-1:h.length-1;g>=0;g--){j=h[g];if(e.relative[k=j.type])break;if(l=e.find[k])if(d=l(j.matches[0].replace(V,""),R.test(h[0].type)&&b.parentNode||b,f)){h.splice(g,1),a=d.length&&h.join("");if(!a)return w.apply(c,x.call(d,0)),c;break}}}return i(a,m)(d,b,f,c,R.test(a)),c}function bq(){}var c,d,e,f,g,h,i,j,k,l,m=!0,n="undefined",o=("sizcache"+Math.random()).replace(".",""),q=String,r=a.document,s=r.documentElement,t=0,u=0,v=[].pop,w=[].push,x=[].slice,y=[].indexOf||function(a){var b=0,c=this.length;for(;be.cacheLength&&delete a[b.shift()],a[c]=d},a)},B=A(),C=A(),D=A(),E="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",G=F.replace("w","w#"),H="([*^$|!~]?=)",I="\\["+E+"*("+F+")"+E+"*(?:"+H+E+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+G+")|)|)"+E+"*\\]",J=":("+F+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+I+")|[^:]|\\\\.)*|.*))\\)|)",K=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+E+"*((?:-\\d)?\\d*)"+E+"*\\)|)(?=[^-]|$)",L=new RegExp("^"+E+"+|((?:^|[^\\\\])(?:\\\\.)*)"+E+"+$","g"),M=new RegExp("^"+E+"*,"+E+"*"),N=new RegExp("^"+E+"*([\\x20\\t\\r\\n\\f>+~])"+E+"*"),O=new RegExp(J),P=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,Q=/^:not/,R=/[\x20\t\r\n\f]*[+~]/,S=/:not\($/,T=/h\d/i,U=/input|select|textarea|button/i,V=/\\(?!\\)/g,W={ID:new RegExp("^#("+F+")"),CLASS:new RegExp("^\\.("+F+")"),NAME:new RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:new RegExp("^("+F.replace("w","w*")+")"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+J),POS:new RegExp(K,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+E+"*(even|odd|(([+-]|)(\\d*)n|)"+E+"*(?:([+-]|)"+E+"*(\\d+)|))"+E+"*\\)|)","i"),needsContext:new RegExp("^"+E+"*[>+~]|"+K,"i")},X=function(a){var b=r.createElement("div");try{return a(b)}catch(c){return!1}finally{b=null}},Y=X(function(a){return a.appendChild(r.createComment("")),!a.getElementsByTagName("*").length}),Z=X(function(a){return a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!==n&&a.firstChild.getAttribute("href")==="#"}),$=X(function(a){a.innerHTML="";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),_=X(function(a){return a.innerHTML="",!a.getElementsByClassName||!a.getElementsByClassName("e").length?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length===2)}),ba=X(function(a){a.id=o+0,a.innerHTML="
",s.insertBefore(a,s.firstChild);var b=r.getElementsByName&&r.getElementsByName(o).length===2+r.getElementsByName(o+0).length;return d=!r.getElementById(o),s.removeChild(a),b});try{x.call(s.childNodes,0)[0].nodeType}catch(bb){x=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}bc.matches=function(a,b){return bc(a,null,null,b)},bc.matchesSelector=function(a,b){return bc(b,null,null,[a]).length>0},f=bc.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=f(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=f(b);return c},g=bc.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},h=bc.contains=s.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b&&b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:s.compareDocumentPosition?function(a,b){return b&&!!(a.compareDocumentPosition(b)&16)}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},bc.attr=function(a,b){var c,d=g(a);return d||(b=b.toLowerCase()),(c=e.attrHandle[b])?c(a):d||$?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},e=bc.selectors={cacheLength:50,createPseudo:z,match:W,attrHandle:Z?{}:{href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}},find:{ID:d?function(a,b,c){if(typeof b.getElementById!==n&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==n&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==n&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:Y?function(a,b){if(typeof b.getElementsByTagName!==n)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c},NAME:ba&&function(a,b){if(typeof b.getElementsByName!==n)return b.getElementsByName(name)},CLASS:_&&function(a,b,c){if(typeof b.getElementsByClassName!==n&&!c)return b.getElementsByClassName(a)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(V,""),a[3]=(a[4]||a[5]||"").replace(V,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||bc.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&bc.error(a[0]),a},PSEUDO:function(a){var b,c;if(W.CHILD.test(a[0]))return null;if(a[3])a[2]=a[3];else if(b=a[4])O.test(b)&&(c=bh(b,!0))&&(c=b.indexOf(")",b.length-c)-b.length)&&(b=b.slice(0,c),a[0]=a[0].slice(0,c)),a[2]=b;return a.slice(0,3)}},filter:{ID:d?function(a){return a=a.replace(V,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(V,""),function(b){var c=typeof b.getAttributeNode!==n&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(V,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=B[o][a];return b||(b=B(a,new RegExp("(^|"+E+")"+a+"("+E+"|$)"))),function(a){return b.test(a.className||typeof a.getAttribute!==n&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return function(d,e){var f=bc.attr(d,a);return f==null?b==="!=":b?(f+="",b==="="?f===c:b==="!="?f!==c:b==="^="?c&&f.indexOf(c)===0:b==="*="?c&&f.indexOf(c)>-1:b==="$="?c&&f.substr(f.length-c.length)===c:b==="~="?(" "+f+" ").indexOf(c)>-1:b==="|="?f===c||f.substr(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d){return a==="nth"?function(a){var b,e,f=a.parentNode;if(c===1&&d===0)return!0;if(f){e=0;for(b=f.firstChild;b;b=b.nextSibling)if(b.nodeType===1){e++;if(a===b)break}}return e-=d,e===c||e%c===0&&e/c>=0}:function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b){var c,d=e.pseudos[a]||e.setFilters[a.toLowerCase()]||bc.error("unsupported pseudo: "+a);return d[o]?d(b):d.length>1?(c=[a,a,"",b],e.setFilters.hasOwnProperty(a.toLowerCase())?z(function(a,c){var e,f=d(a,b),g=f.length;while(g--)e=y.call(a,f[g]),a[e]=!(c[e]=f[g])}):function(a){return d(a,0,c)}):d}},pseudos:{not:z(function(a){var b=[],c=[],d=i(a.replace(L,"$1"));return d[o]?z(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)if(f=g[h])a[h]=!(b[h]=f)}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:z(function(a){return function(b){return bc(a,b).length>0}}),contains:z(function(a){return function(b){return(b.textContent||b.innerText||f(b)).indexOf(a)>-1}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!e.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},header:function(a){return T.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:bd("radio"),checkbox:bd("checkbox"),file:bd("file"),password:bd("password"),image:bd("image"),submit:be("submit"),reset:be("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return U.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement},first:bf(function(a,b,c){return[0]}),last:bf(function(a,b,c){return[b-1]}),eq:bf(function(a,b,c){return[c<0?c+b:c]}),even:bf(function(a,b,c){for(var d=0;d=0;)a.push(d);return a}),gt:bf(function(a,b,c){for(var d=c<0?c+b:c;++d",a.querySelectorAll("[selected]").length||e.push("\\["+E+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),X(function(a){a.innerHTML="

",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+E+"*(?:\"\"|'')"),a.innerHTML="",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=new RegExp(e.join("|")),bp=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a))){var i,j,k=!0,l=o,m=d,n=d.nodeType===9&&a;if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){i=bh(a),(k=d.getAttribute("id"))?l=k.replace(c,"\\$&"):d.setAttribute("id",l),l="[id='"+l+"'] ",j=i.length;while(j--)i[j]=l+i[j].join("");m=R.test(a)&&d.parentNode||d,n=i.join(",")}if(n)try{return w.apply(f,x.call(m.querySelectorAll(n),0)),f}catch(p){}finally{k||d.removeAttribute("id")}}return b(a,d,f,g,h)},h&&(X(function(b){a=h.call(b,"div");try{h.call(b,"[test!='']:sizzle"),f.push("!=",J)}catch(c){}}),f=new RegExp(f.join("|")),bc.matchesSelector=function(b,c){c=c.replace(d,"='$1']");if(!g(b)&&!f.test(c)&&(!e||!e.test(c)))try{var i=h.call(b,c);if(i||a||b.document&&b.document.nodeType!==11)return i}catch(j){}return bc(c,null,null,[b]).length>0})}(),e.pseudos.nth=e.pseudos.eq,e.filters=bq.prototype=e.pseudos,e.setFilters=new bq,bc.attr=p.attr,p.find=bc,p.expr=bc.selectors,p.expr[":"]=p.expr.pseudos,p.unique=bc.uniqueSort,p.text=bc.getText,p.isXMLDoc=bc.isXML,p.contains=bc.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b0)for(e=d;e=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*\s*$/g,bz={option:[1,""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X
","
"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1>");try{for(;d1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=b===e&&bA,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(f=0;(h=a[f])!=null;f++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{s=s||bk(b),l=b.createElement("div"),s.appendChild(l),h=h.replace(bo,"<$1>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]===""&&!m?l.childNodes:[];for(g=n.length-1;g>=0;--g)p.nodeName(n[g],"tbody")&&!n[g].childNodes.length&&n[g].parentNode.removeChild(n[g])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l.parentNode.removeChild(l)}h.nodeType?t.push(h):p.merge(t,h)}l&&(h=l=s=null);if(!p.support.appendChecked)for(f=0;(h=t[f])!=null;f++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(f=0;(h=t[f])!=null;f++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[f+1,0].concat(r)),f+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.chrome?b.webkit=!0:b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^(none|table(?!-c[ea]).+)/,bO=/^margin/,bP=new RegExp("^("+q+")(.*)$","i"),bQ=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bR=new RegExp("^([-+])=("+q+")","i"),bS={},bT={position:"absolute",visibility:"hidden",display:"block"},bU={letterSpacing:0,fontWeight:400},bV=["Top","Right","Bottom","Left"],bW=["Webkit","O","Moz","ms"],bX=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return b$(this,!0)},hide:function(){return b$(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bX.apply(this,arguments):this.each(function(){(c?a:bZ(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bY(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bR.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bY(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bU&&(f=bU[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(b,c){var d,e,f,g,h=a.getComputedStyle(b,null),i=b.style;return h&&(d=h[c],d===""&&!p.contains(b.ownerDocument,b)&&(d=p.style(b,c)),bQ.test(d)&&bO.test(c)&&(e=i.width,f=i.minWidth,g=i.maxWidth,i.minWidth=i.maxWidth=i.width=d,d=h.width,i.width=e,i.minWidth=f,i.maxWidth=g)),d}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bQ.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth===0&&bN.test(bH(a,"display"))?p.swap(a,bT,function(){return cb(a,b,d)}):cb(a,b,d)},set:function(a,c,d){return b_(a,c,d?ca(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bQ.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bV[d]+b]=e[d]||e[d-2]||e[0];return f}},bO.test(a)||(p.cssHooks[a+b].set=b_)});var cd=/%20/g,ce=/\[\]$/,cf=/\r?\n/g,cg=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,ch=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ch.test(this.nodeName)||cg.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(cf,"\r\n")}}):{name:b.name,value:c.replace(cf,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ci(d,a[d],c,f);return e.join("&").replace(cd,"+")};var cj,ck,cl=/#.*$/,cm=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,co=/^(?:GET|HEAD)$/,cp=/^\/\//,cq=/\?/,cr=/)<[^<]*)*<\/script>/gi,cs=/([?&])_=[^&]*/,ct=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,cu=p.fn.load,cv={},cw={},cx=["*/"]+["*"];try{ck=f.href}catch(cy){ck=e.createElement("a"),ck.href="",ck=ck.href}cj=ct.exec(ck.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&cu)return cu.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):c&&typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("
").append(a.replace(cr,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cB(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cB(a,b),a},ajaxSettings:{url:ck,isLocal:cn.test(cj[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cx},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cz(cv),ajaxTransport:cz(cw),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cC(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cD(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=(c||y)+"",k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cm.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(cl,"").replace(cp,cj[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=ct.exec(l.url.toLowerCase())||!1,l.crossDomain=i&&i.join(":")+(i[3]?"":i[1]==="http:"?80:443)!==cj.join(":")+(cj[3]?"":cj[1]==="http:"?80:443)),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cA(cv,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!co.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cq.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cs,"$1_="+z);l.url=A+(A===l.url?(cq.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cx+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cA(cw,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cE=[],cF=/\?/,cG=/(=)\?(?=&|$)|\?\?/,cH=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cE.pop()||p.expando+"_"+cH++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cG.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cG.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cG,"$1"+f):m?c.data=i.replace(cG,"$1"+f):k&&(c.url+=(cF.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cE.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cI,cJ=a.ActiveXObject?function(){for(var a in cI)cI[a](0,1)}:!1,cK=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cL()||cM()}:cL,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cJ&&delete cI[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cK,cJ&&(cI||(cI={},p(a).unload(cJ)),cI[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cN,cO,cP=/^(?:toggle|show|hide)$/,cQ=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cR=/queueHooks$/,cS=[cY],cT={"*":[function(a,b){var c,d,e=this.createTween(a,b),f=cQ.exec(b),g=e.cur(),h=+g||0,i=1,j=20;if(f){c=+f[2],d=f[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&h){h=p.css(e.elem,a,!0)||c||1;do i=i||".5",h=h/i,p.style(e.elem,a,h+d);while(i!==(i=e.cur()/g)&&i!==1&&--j)}e.unit=d,e.start=h,e.end=f[1]?h+(f[1]+1)*c:c}return e}]};p.Animation=p.extend(cW,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c_.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c_.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=da(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g,null)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window); \ No newline at end of file diff --git a/assets/javascripts/jquery-noconflict.js b/assets/javascripts/jquery-noconflict.js deleted file mode 100644 index dbd782e..0000000 --- a/assets/javascripts/jquery-noconflict.js +++ /dev/null @@ -1 +0,0 @@ -$.noConflict(); diff --git a/assets/javascripts/jquery.masonry.min.js b/assets/javascripts/jquery.masonry.min.js deleted file mode 100644 index 67be988..0000000 --- a/assets/javascripts/jquery.masonry.min.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * jQuery Masonry v2.1.05 - * A dynamic layout plugin for jQuery - * The flip-side of CSS Floats - * http://masonry.desandro.com - * - * Licensed under the MIT license. - * Copyright 2012 David DeSandro - */ -(function(a,b,c){"use strict";var d=b.event,e;d.special.smartresize={setup:function(){b(this).bind("resize",d.special.smartresize.handler)},teardown:function(){b(this).unbind("resize",d.special.smartresize.handler)},handler:function(a,c){var d=this,f=arguments;a.type="smartresize",e&&clearTimeout(e),e=setTimeout(function(){b.event.handle.apply(d,f)},c==="execAsap"?0:100)}},b.fn.smartresize=function(a){return a?this.bind("smartresize",a):this.trigger("smartresize",["execAsap"])},b.Mason=function(a,c){this.element=b(c),this._create(a),this._init()},b.Mason.settings={isResizable:!0,isAnimated:!1,animationOptions:{queue:!1,duration:500},gutterWidth:0,isRTL:!1,isFitWidth:!1,containerStyle:{position:"relative"}},b.Mason.prototype={_filterFindBricks:function(a){var b=this.options.itemSelector;return b?a.filter(b).add(a.find(b)):a},_getBricks:function(a){var b=this._filterFindBricks(a).css({position:"absolute"}).addClass("masonry-brick");return b},_create:function(c){this.options=b.extend(!0,{},b.Mason.settings,c),this.styleQueue=[];var d=this.element[0].style;this.originalStyle={height:d.height||""};var e=this.options.containerStyle;for(var f in e)this.originalStyle[f]=d[f]||"";this.element.css(e),this.horizontalDirection=this.options.isRTL?"right":"left",this.offset={x:parseInt(this.element.css("padding-"+this.horizontalDirection),10),y:parseInt(this.element.css("padding-top"),10)},this.isFluid=this.options.columnWidth&&typeof this.options.columnWidth=="function";var g=this;setTimeout(function(){g.element.addClass("masonry")},0),this.options.isResizable&&b(a).bind("smartresize.masonry",function(){g.resize()}),this.reloadItems()},_init:function(a){this._getColumns(),this._reLayout(a)},option:function(a,c){b.isPlainObject(a)&&(this.options=b.extend(!0,this.options,a))},layout:function(a,b){for(var c=0,d=a.length;c 0, :null => false - t.column :is_public, :boolean, :default => false, :null => false - t.column :name, :string, :default => "", :null => false + t.column :user_id, :integer, default: 0, null: false + t.column :is_public, :boolean, default: false, null: false + t.column :name, :string, default: '', null: false t.column :description, :text t.column :filters, :text - t.column :group_by, :string, :default => "", :null => false + t.column :group_by, :string, default: '', null: false t.column :chart_type, :string - t.column :null_text, :string, :default => "Null", :null => false + t.column :null_text, :string, default: 'Null', null: false t.timestamps end diff --git a/init.rb b/init.rb index 5e3db6e..c06a5b6 100644 --- a/init.rb +++ b/init.rb @@ -1,34 +1,24 @@ -require 'redmine' - -Rails.configuration.to_prepare do - require_dependency 'project' - unless Project.included_modules.include? RedmineCustomReports::ProjectPatch - Project.send :include, RedmineCustomReports::ProjectPatch - end - require_dependency 'user' - unless User.included_modules.include? RedmineCustomReports::UserPatch - User.send :include, RedmineCustomReports::UserPatch - end -end - Redmine::Plugin.register :redmine_custom_reports do name 'Redmine Custom Reports (with charts) plugin' - author 'Danil Tashkinov' + author 'Restream' description 'Redmine plugin for custom reports with charts' version '0.1.5' - url 'https://github.com/nodecarter/redmine_custom_reports' - author_url 'https://github.com/Undev' + url 'https://github.com/Restream/redmine_custom_reports' + author_url 'https://github.com/Restream' project_module :custom_reports do permission :manage_custom_reports, - { :custom_reports => [:new, :create, :edit, :update, :destroy] } - permission :view_custom_reports, { :custom_reports => [:index, :show] } + { custom_reports: [:new, :create, :edit, :update, :destroy] } + permission :view_custom_reports, { custom_reports: [:index, :show] } permission :manage_public_custom_reports, {} end menu :project_menu, :custom_reports, - { :controller => 'custom_reports', :action => 'index' }, - :param => :project_id, - :before => :settings + { controller: 'custom_reports', action: 'index' }, + param: :project_id, + before: :settings end + +# Require plugin after register +require 'redmine_custom_reports' diff --git a/lib/redmine_custom_reports.rb b/lib/redmine_custom_reports.rb new file mode 100644 index 0000000..1a15c5f --- /dev/null +++ b/lib/redmine_custom_reports.rb @@ -0,0 +1,14 @@ +ActionDispatch::Callbacks.to_prepare do + + # Requiring plugin's controller and model + require_dependency 'custom_report' + require_dependency 'custom_report_series' + require_dependency 'query_ext' + require_dependency 'custom_reports_helper' + require_dependency 'custom_reports_controller' + + # Check that patches applied on every request + load 'redmine_custom_reports/project_patch.rb' + load 'redmine_custom_reports/user_patch.rb' + +end \ No newline at end of file diff --git a/lib/redmine_custom_reports/project_patch.rb b/lib/redmine_custom_reports/project_patch.rb index ba3941a..09cda4e 100644 --- a/lib/redmine_custom_reports/project_patch.rb +++ b/lib/redmine_custom_reports/project_patch.rb @@ -1,8 +1,13 @@ +require_dependency 'project' + module RedmineCustomReports module ProjectPatch def self.included(base) - base.send :has_many, :custom_reports, :dependent => :destroy - base.send :unloadable + base.send :has_many, :custom_reports, dependent: :destroy end end end + +unless Project.included_modules.include? RedmineCustomReports::ProjectPatch + Project.send :include, RedmineCustomReports::ProjectPatch +end \ No newline at end of file diff --git a/lib/redmine_custom_reports/user_patch.rb b/lib/redmine_custom_reports/user_patch.rb index 7bc5ffa..bd0dc06 100644 --- a/lib/redmine_custom_reports/user_patch.rb +++ b/lib/redmine_custom_reports/user_patch.rb @@ -1,8 +1,13 @@ +require_dependency 'user' + module RedmineCustomReports module UserPatch def self.included(base) - base.send :has_many, :custom_reports, :dependent => :destroy - base.send :unloadable + base.send :has_many, :custom_reports, dependent: :destroy end end end + +unless User.included_modules.include? RedmineCustomReports::UserPatch + User.send :include, RedmineCustomReports::UserPatch +end \ No newline at end of file diff --git a/test/functional/custom_reports_controller_test.rb b/test/functional/custom_reports_controller_test.rb index 66f7334..4f3ffe9 100644 --- a/test/functional/custom_reports_controller_test.rb +++ b/test/functional/custom_reports_controller_test.rb @@ -2,76 +2,76 @@ class CustomReportsControllerTest < ActionController::TestCase fixtures :projects, :trackers, :issue_statuses, :issues, - :enumerations, :users, :issue_categories, - :projects_trackers, - :roles, - :member_roles, - :members + :enumerations, :users, :issue_categories, + :projects_trackers, + :roles, + :member_roles, + :members def setup @project = Project.find(1) @project.enable_module! :custom_reports # admin - @user = User.find(1) + @user = User.find(1) User.current = @user - @request = ActionController::TestRequest.new + @request = ActionController::TestRequest.new @request.session[:user_id] = @user.id @custom_report = @project.custom_reports.create!( - :name => 'name', - :description => 'description', - :group_by => 'status', - :user_id => @user.id, - :is_public => true, - :chart_type => 'pie', - :series_attributes => [{ - :name => 'series1', - :filters => {} - }] + name: 'name', + description: 'description', + group_by: 'status', + user_id: @user.id, + is_public: true, + chart_type: 'pie', + series_attributes: [{ + name: 'series1', + filters: {} + }] ) end def test_show_all_custom_reports - get :index, :project_id => @project.identifier + get :index, project_id: @project.identifier assert_response :success end def test_show_custom_report - get :new, :project_id => @project.identifier, :id => @custom_report.id + get :new, project_id: @project.identifier, id: @custom_report.id assert_response :success end def test_show_new_custom_report - get :new, :project_id => @project.identifier + get :new, project_id: @project.identifier assert_response :success end def test_create_custom_report - series_name = 'series2-1' - series_filters = { "status_id" => { :operator => "=", :values => ["1"] } } - attrs = { - :name => 'name2', - :description => 'description2', - :group_by => 'status', - :user_id => @user.id, - :is_public => true, - :chart_type => 'donut', - :series_attributes => { - 0 => { - :name => series_name, - :flt => { - :f => ['status_id'], - :op => { :status_id => '=' }, - :v => { :status_id => ["1"] } - } - } + series_name = 'series2-1' + series_filters = { 'status_id' => { operator: '=', values: ['1'] } } + attrs = { + name: 'name2', + description: 'description2', + group_by: 'status', + user_id: @user.id, + is_public: true, + chart_type: 'donut', + series_attributes: { + 0 => { + name: series_name, + flt: { + f: ['status_id'], + op: { status_id: '=' }, + v: { status_id: ['1'] } + } } + } } - post :create, :project_id => @project.identifier, :custom_report => attrs + post :create, project_id: @project.identifier, custom_report: attrs assert_response :redirect - custom_report = @project.custom_reports.find_by_name( attrs[:name] ) + custom_report = @project.custom_reports.find_by_name(attrs[:name]) assert custom_report assert_equal attrs[:description], custom_report.description assert_equal attrs[:group_by], custom_report.group_by @@ -86,38 +86,37 @@ def test_create_custom_report end def test_show_edit_custom_report - get :edit, :project_id => @project.identifier, :id => @custom_report.id + get :edit, project_id: @project.identifier, id: @custom_report.id assert_response :success end def test_update_custom_report - old_series = @custom_report.series.first - series_name = 'series2-1' - series_filters = { "status_id" => { :operator => "=", :values => ["1"] } } - attrs = { - :name => 'name2', - :description => 'description2', - :group_by => 'status', - :user_id => @user.id, - :is_public => true, - :chart_type => 'donut', - :series_attributes => { - 0 => { - :id => old_series.id, - :_destroy => true - }, - 1 => { - :name => series_name, - :flt => { - :f => ['status_id'], - :op => { :status_id => '=' }, - :v => { :status_id => ["1"] } - } - } + old_series = @custom_report.series.first + series_name = 'series2-1' + series_filters = { 'status_id' => { operator: '=', values: ['1'] } } + attrs = { + name: 'name2', + description: 'description2', + group_by: 'status', + user_id: @user.id, + is_public: true, + chart_type: 'donut', + series_attributes: { + 0 => { + id: old_series.id, + _destroy: true + }, + 1 => { + name: series_name, + flt: { + f: ['status_id'], + op: { status_id: '=' }, + v: { status_id: ['1'] } + } } + } } - put :update, :project_id => @project.identifier, :id => @custom_report.id, - :custom_report => attrs + put :update, project_id: @project.identifier, id: @custom_report.id, custom_report: attrs assert_response :redirect @custom_report.reload assert_equal attrs[:description], @custom_report.description @@ -133,7 +132,7 @@ def test_update_custom_report end def test_destroy_custom_report - delete :destroy, :project_id => @project.identifier, :id => @custom_report.id + delete :destroy, project_id: @project.identifier, id: @custom_report.id assert_response :redirect custom_report = CustomReport.find_by_id @custom_report.id assert_nil custom_report From 46d5b2b6315ae9646bb45c6cce83ad928a679345 Mon Sep 17 00:00:00 2001 From: Danil Tashkinov Date: Tue, 9 Aug 2016 11:36:33 +0300 Subject: [PATCH 4/5] Update README --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 742d92b..de4e920 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Redmine Custom Reports Plugin (with charts) -[![Build Status](https://travis-ci.org/nodecarter/redmine_custom_reports.png?branch=master)](https://travis-ci.org/nodecarter/redmine_custom_reports) -[![Code Climate](https://codeclimate.com/github/nodecarter/redmine_custom_reports.png)](https://codeclimate.com/github/nodecarter/redmine_custom_reports) +[![Build Status](https://travis-ci.org/Restream/redmine_custom_reports.svg?branch=master)](https://travis-ci.org/Restream/redmine_custom_reports) +[![Code Climate](https://codeclimate.com/github/Restream/redmine_custom_reports/badges/gpa.svg)](https://codeclimate.com/github/Restream/redmine_custom_reports) Redmine plugin to create project reports using [d3.js](http://d3js.org/) charts (with using [NVD3](http://nvd3.org/)). The data for the report - the number of filtered issues grouped by a column. @@ -19,7 +19,7 @@ There are public and private custom reports. Permission "View custom reports" al If you are downloading the plugin directly from GitHub, you can do so by changing into your plugin directory and issuing a command like - git clone git://github.com/nodecarter/redmine_custom_reports.git + git clone git://github.com/Restream/redmine_custom_reports.git 2. Run the following command to upgrade your database (make a db backup before). @@ -33,10 +33,10 @@ Enable plugin at project level. Now you will see "Custom report" tab at the proj ## Screenshot -![Sample](https://github.com/nodecarter/redmine_custom_reports/raw/master/screenshot.png) +![Sample](screenshot.png) ## Compatibility This version supports redmine 2.x and 3.x -For all tested versions see the "tests matrix":https://travis-ci.org/nodecarter/redmine_custom_reports +For all tested versions see the "tests matrix":https://travis-ci.org/Restream/redmine_custom_reports From 1e49dee7f4bc3bf0415067689c0c0970f044b1c2 Mon Sep 17 00:00:00 2001 From: Redneck Bubba Date: Sun, 21 Jan 2018 14:37:51 -0600 Subject: [PATCH 5/5] Renamed issue_count_by_group to result_count_by_group for Redmine 3.4 compatibility. --- app/models/custom_report_series.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/custom_report_series.rb b/app/models/custom_report_series.rb index e8d3c24..01f550e 100644 --- a/app/models/custom_report_series.rb +++ b/app/models/custom_report_series.rb @@ -28,7 +28,7 @@ def data(data_keys = []) def data_hash true - @data_hash ||= (query.issue_count_by_group || {}) + @data_hash ||= (query.result_count_by_group || {}) end def flt=(*args)