# HG changeset patch
# User Chris Cannam
# Date 1331042855 0
# Node ID 04114f36670db5855d649602703f121522871177
# Parent 66ac47c3719b12a2d3e8eeb26beed0fe87d22eeb
Rename .erb to .html.erb in line with the convention
diff -r 66ac47c3719b -r 04114f36670d app/views/activities/_recent.erb
--- a/app/views/activities/_recent.erb Tue Mar 06 14:05:16 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-<% events = @events_by_day %>
-<% max = 5 %>
-<% if (events.nil?)
- activity = Redmine::Activity::Fetcher.new(User.current, :project => @project)
-
- if @project
- # Don't show news (duplicated with News box) or wiki edits (too
- # tedious) in project front page
- activity.scope = [ "changesets", "files", "issues", "documents" ]
- end
-
- events = activity.events(Date.today - 28, Date.today + 1)
-
- if defined? user
- events = events.select { |e| user.member_of? e.project }
- end
-
- events = events.first(max)
-
- end
-%>
-
-
-
-<% if @project.nil? %>
- <%= content_tag('h3', l(:label_activity_my_recent)) %>
-
-<% end %>
-
-<% if events.empty? %>
-
- <% if @project.nil? %>
-
<%= l(:label_activity_my_recent_none) %>
- <% end %>
-
-<% else %>
-
- <% if !@project.nil? %>
-
- <%= content_tag('h3', l(:label_activity_recent)) %>
- <% end %>
-
-
- <% events.sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
-
- <%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
- <%= format_time(e.event_datetime) %>
- <%= content_tag('span', link_to_project(e.project), :class => 'project') if @project.nil? || @project != e.project %>
- <% if e.respond_to?(:event_author) %>
- <%= e.event_author %>
- <% end %>
-
- <%= link_to format_activity_title(e.event_title), e.event_url %>
- <%= format_activity_description(e.event_description) %>
-
- <% end -%>
-
-
-
-
-<% end %>
-
-<% if events.empty? and @project.nil? %>
<% end %>
-
-
+
+<% if @project.nil? %>
+ <%= content_tag('h3', l(:label_activity_my_recent)) %>
+
+<% end %>
+
+<% if events.empty? %>
+
+ <% if @project.nil? %>
+
<%= l(:label_activity_my_recent_none) %>
+ <% end %>
+
+<% else %>
+
+ <% if !@project.nil? %>
+
+ <%= content_tag('h3', l(:label_activity_recent)) %>
+ <% end %>
+
+
+ <% events.sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
+
+ <%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
+ <%= format_time(e.event_datetime) %>
+ <%= content_tag('span', link_to_project(e.project), :class => 'project') if @project.nil? || @project != e.project %>
+ <% if e.respond_to?(:event_author) %>
+ <%= e.event_author %>
+ <% end %>
+
+ <%= link_to format_activity_title(e.event_title), e.event_url %>
+ <%= format_activity_description(e.event_description) %>
+
+ <% end -%>
+
+
+
+
+<% end %>
+
+<% if events.empty? and @project.nil? %>
<% end %>
+
+
-
- <%= l(:label_user) %>
- <%= l(:label_role_plural) %>
-
- <% members.each do |member| %>
- <% next if member.new_record? %>
-
- <%= link_to_user member.principal %>
-
- <%=h member.roles.sort.collect(&:to_s).join(', ') %>
- <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member},
- :method => :post, :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }) do |f| %>
- <% roles.each do |role| %>
- <%= check_box_tag 'member[role_ids][]', role.id, member.roles.include?(role), :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %>
- <%= hidden_field_tag 'member[role_ids][]', '' %>
- <%= submit_tag l(:button_change), :class => "small" %>
- <%= link_to_function l(:button_cancel), "$('member-#{member.id}-roles').show(); $('member-#{member.id}-roles-form').hide(); return false;" %>
- <% end %>
-
-
- <%= link_to_function l(:button_edit), "$('member-#{member.id}-roles').hide(); $('member-#{member.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
- <%= link_to_remote(l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},
- :method => :post,
- :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil)
- }, :title => l(:button_delete),
- :class => 'icon icon-del') if member.deletable? %>
-
-
-<% end; reset_cycle %>
-
-
-<% else %>
-<%= l(:label_no_data) %>
-<% end %>
-
-<% content_for :sidebar do %>
-<% principals = Principal.active.find(:all, :limit => 100, :order => 'type, login, lastname ASC') - @project.principals %>
-
-<% if roles.any? && principals.any? %>
- <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post,
- :loading => '$(\'member-add-submit\').disable();',
- :complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();') do |f| %>
- <%=l(:label_member_new)%>
-
- <%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %>
- <%= observe_field(:principal_search,
- :frequency => 0.5,
- :update => :principals,
- :url => { :controller => 'members', :action => 'autocomplete_for_member', :id => @project },
- :with => 'q')
- %>
-
-
- <% if params[:q] && params[:q].length > 1 %>
- <%= principals_check_box_tags 'member[user_ids][]', @principals %>
- <% end %>
-
-
- <%= l(:label_set_role_plural) %>:
- <% roles.each do |role| %>
- <%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %> <%=l( 'label_' + role.name.downcase + "_description").to_sym %>
- <% end %>
-
- <%= submit_tag l(:button_add), :id => 'member-add-submit' %>
- <% end %>
-<% end %>
-<% end %>
diff -r 66ac47c3719b -r 04114f36670d app/views/members/_editlist.html.erb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/members/_editlist.html.erb Tue Mar 06 14:07:35 2012 +0000
@@ -0,0 +1,77 @@
+<%= error_messages_for 'member' %>
+
+<% roles = Role.find_all_givable
+ members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
+
+<% if members.any? %>
+
+
+ <%= l(:label_user) %>
+ <%= l(:label_role_plural) %>
+
+ <% members.each do |member| %>
+ <% next if member.new_record? %>
+
+ <%= link_to_user member.principal %>
+
+ <%=h member.roles.sort.collect(&:to_s).join(', ') %>
+ <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member},
+ :method => :post, :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }) do |f| %>
+ <% roles.each do |role| %>
+ <%= check_box_tag 'member[role_ids][]', role.id, member.roles.include?(role), :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %>
+ <%= hidden_field_tag 'member[role_ids][]', '' %>
+ <%= submit_tag l(:button_change), :class => "small" %>
+ <%= link_to_function l(:button_cancel), "$('member-#{member.id}-roles').show(); $('member-#{member.id}-roles-form').hide(); return false;" %>
+ <% end %>
+
+
+ <%= link_to_function l(:button_edit), "$('member-#{member.id}-roles').hide(); $('member-#{member.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
+ <%= link_to_remote(l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},
+ :method => :post,
+ :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil)
+ }, :title => l(:button_delete),
+ :class => 'icon icon-del') if member.deletable? %>
+
+
+<% end; reset_cycle %>
+
+
+<% else %>
+<%= l(:label_no_data) %>
+<% end %>
+
+<% content_for :sidebar do %>
+<% principals = Principal.active.find(:all, :limit => 100, :order => 'type, login, lastname ASC') - @project.principals %>
+
+<% if roles.any? && principals.any? %>
+ <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post,
+ :loading => '$(\'member-add-submit\').disable();',
+ :complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();') do |f| %>
+ <%=l(:label_member_new)%>
+
+ <%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %>
+ <%= observe_field(:principal_search,
+ :frequency => 0.5,
+ :update => :principals,
+ :url => { :controller => 'members', :action => 'autocomplete_for_member', :id => @project },
+ :with => 'q')
+ %>
+
+
+ <% if params[:q] && params[:q].length > 1 %>
+ <%= principals_check_box_tags 'member[user_ids][]', @principals %>
+ <% end %>
+
+
+ <%= l(:label_set_role_plural) %>:
+ <% roles.each do |role| %>
+ <%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %> <%=l( 'label_' + role.name.downcase + "_description").to_sym %>
+ <% end %>
+
+ <%= submit_tag l(:button_add), :id => 'member-add-submit' %>
+ <% end %>
+<% end %>
+<% end %>
diff -r 66ac47c3719b -r 04114f36670d app/views/members/_list.erb
--- a/app/views/members/_list.erb Tue Mar 06 14:05:16 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-
-<% roles = Role.find_all_givable
- members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
-
-<% if members.any? %>
-
-
-
-<% members.each do |member| %>
-
-<%= avatar(member.user, :size => "24") %>
-<%= link_to_user member.principal %>
-<%= member.user.mail if !member.user.pref.hide_mail %>
-
-<%=h member.roles.sort.collect(&:to_s).join(', ') %>
-
-<% end %>
-
-<% else %>
-
<%= l(:label_no_data) %>
-<% end %>
-
+
+<% members.each do |member| %>
+
+<%= avatar(member.user, :size => "24") %>
+<%= link_to_user member.principal %>
+<%= member.user.mail if !member.user.pref.hide_mail %>
+
+<%=h member.roles.sort.collect(&:to_s).join(', ') %>
+
+<% end %>
+
+<% else %>
+
<%= l(:label_no_data) %>
+<% end %>
+
<%=l(:label_member_plural)%>
-
-<% editable = authorize_for('members', 'edit') %>
-
-
-<% if editable %>
-<%= render :partial => 'editlist' %>
-<% else %>
-<%= render :partial => 'list' %>
-<% end %>
-
-
diff -r 66ac47c3719b -r 04114f36670d app/views/members/index.html.erb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/members/index.html.erb Tue Mar 06 14:07:35 2012 +0000
@@ -0,0 +1,13 @@
+
+<%=l(:label_member_plural)%>
+
+<% editable = authorize_for('members', 'edit') %>
+
+
+<% if editable %>
+<%= render :partial => 'editlist' %>
+<% else %>
+<%= render :partial => 'list' %>
+<% end %>
+
+
diff -r 66ac47c3719b -r 04114f36670d app/views/my/blocks/_activitymyprojects.erb
--- a/app/views/my/blocks/_activitymyprojects.erb Tue Mar 06 14:05:16 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-
-<%= render :partial => 'activities/recent', :locals => { :user => User.current } %>
-
-
diff -r 66ac47c3719b -r 04114f36670d app/views/my/blocks/_activitymyprojects.html.erb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/my/blocks/_activitymyprojects.html.erb Tue Mar 06 14:07:35 2012 +0000
@@ -0,0 +1,4 @@
+
+<%= render :partial => 'activities/recent', :locals => { :user => User.current } %>
+
+
diff -r 66ac47c3719b -r 04114f36670d app/views/my/blocks/_tipoftheday.erb
--- a/app/views/my/blocks/_tipoftheday.erb Tue Mar 06 14:05:16 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
- <%=l(:label_tipoftheday)%>
-
-
<%= textilizable Setting.tipoftheday_text %>
-
<%=l(:label_tipoftheday)%>
+
+
<%= textilizable Setting.tipoftheday_text %>
+
-
-
<%= l(:text_has_welcome_page_info, { :overview_link => link_to(l(:label_overview), { :controller => 'projects', :action => 'show' } ) } ) %>
-
-<% if @project.module_enabled? :wiki %>
-
-
<%= link_to(l(:button_welcome_page_edit), {:controller => 'wiki', :action => 'edit', :project_id => @project, :id => Wiki.titleize("Overview")}, :class => 'icon icon-edit') %>
-
-<% else %>
-
-
<%= l(:text_has_welcome_page_wiki_disabled, { :modules_link => link_to(l(:label_module_plural), { :controller => 'projects', :action => 'settings', :tab => 'modules' } ) } ) %>
-
-<% end %>
-
-
<%= l(:label_has_welcome_page) %>
-<%= check_box_tag 'has_welcome_page', 1, @project.has_welcome_page? -%>
-<%= l(:setting_has_welcome_page) %>
-
-
-
-
+
+
<%= l(:text_has_welcome_page_info, { :overview_link => link_to(l(:label_overview), { :controller => 'projects', :action => 'show' } ) } ) %>
+
+<% if @project.module_enabled? :wiki %>
+
+
<%= link_to(l(:button_welcome_page_edit), {:controller => 'wiki', :action => 'edit', :project_id => @project, :id => Wiki.titleize("Overview")}, :class => 'icon icon-edit') %>
+
+<% else %>
+
+
<%= l(:text_has_welcome_page_wiki_disabled, { :modules_link => link_to(l(:label_module_plural), { :controller => 'projects', :action => 'settings', :tab => 'modules' } ) } ) %>
+
+<% end %>
+
+
<%= l(:label_has_welcome_page) %>
+<%= check_box_tag 'has_welcome_page', 1, @project.has_welcome_page? -%>
+<%= l(:setting_has_welcome_page) %>
+
+
+
+
-<%= @content %>
-
-
-
-<% html_title(@title) if @title %>
-
-<% asset_include_tags(@doc_template) %>
diff -r 66ac47c3719b -r 04114f36670d vendor/plugins/embedded/app/views/embedded/index.html.erb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vendor/plugins/embedded/app/views/embedded/index.html.erb Tue Mar 06 14:07:35 2012 +0000
@@ -0,0 +1,9 @@
+
+
+<%= @content %>
+
+
+
+<% html_title(@title) if @title %>
+
+<% asset_include_tags(@doc_template) %>
diff -r 66ac47c3719b -r 04114f36670d vendor/plugins/embedded/app/views/settings/_embedded.erb
--- a/vendor/plugins/embedded/app/views/settings/_embedded.erb Tue Mar 06 14:05:16 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-HTML directory
-<%= text_field_tag 'settings[path]', @settings['path'], :size => 80 %>
-Use {PROJECT} to include the project identifier in the path
-
-Index files
-<%= text_area_tag 'settings[index]', @settings['index'], :cols => 60, :rows => 3 %>
-Space separated list of index files by priority
-
-Valid extensions
-<%= text_area_tag 'settings[extensions]', @settings['extensions'], :cols => 60, :rows => 3 %>
-Space separated list of file extensions that can be viewed (case insensitive)
-
-Default template
-<%= select_tag 'settings[template]', options_for_select([''] + Redmine::Plugins::Embedded.available_templates, @settings['template']) %>
-
-Files encoding
-<%= text_field_tag 'settings[encoding]', @settings['encoding'] %>
-Eg. ISO-8859-1
-
-Menu caption
-<%= text_field_tag 'settings[menu]', @settings['menu'], :size => 30 %>
-Clear this field if you don't want to add a tab to the project menu
diff -r 66ac47c3719b -r 04114f36670d vendor/plugins/embedded/app/views/settings/_embedded.html.erb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vendor/plugins/embedded/app/views/settings/_embedded.html.erb Tue Mar 06 14:07:35 2012 +0000
@@ -0,0 +1,22 @@
+HTML directory
+<%= text_field_tag 'settings[path]', @settings['path'], :size => 80 %>
+Use {PROJECT} to include the project identifier in the path
+
+Index files
+<%= text_area_tag 'settings[index]', @settings['index'], :cols => 60, :rows => 3 %>
+Space separated list of index files by priority
+
+Valid extensions
+<%= text_area_tag 'settings[extensions]', @settings['extensions'], :cols => 60, :rows => 3 %>
+Space separated list of file extensions that can be viewed (case insensitive)
+
+Default template
+<%= select_tag 'settings[template]', options_for_select([''] + Redmine::Plugins::Embedded.available_templates, @settings['template']) %>
+
+Files encoding
+<%= text_field_tag 'settings[encoding]', @settings['encoding'] %>
+Eg. ISO-8859-1
+
+Menu caption
+<%= text_field_tag 'settings[menu]', @settings['menu'], :size => 30 %>
+Clear this field if you don't want to add a tab to the project menu
diff -r 66ac47c3719b -r 04114f36670d vendor/plugins/engines/generators/plugin_migration/templates/plugin_migration.erb
--- a/vendor/plugins/engines/generators/plugin_migration/templates/plugin_migration.erb Tue Mar 06 14:05:16 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-class <%= class_name %> < ActiveRecord::Migration
- def self.up
- <%- plugins.each do |plugin| -%>
- Engines.plugins["<%= plugin.name %>"].migrate(<%= new_versions[plugin.name] %>)
- <%- end -%>
- end
-
- def self.down
- <%- plugins.each do |plugin| -%>
- Engines.plugins["<%= plugin.name %>"].migrate(<%= current_versions[plugin.name] %>)
- <%- end -%>
- end
-end
diff -r 66ac47c3719b -r 04114f36670d vendor/plugins/engines/generators/plugin_migration/templates/plugin_migration.html.erb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vendor/plugins/engines/generators/plugin_migration/templates/plugin_migration.html.erb Tue Mar 06 14:07:35 2012 +0000
@@ -0,0 +1,13 @@
+class <%= class_name %> < ActiveRecord::Migration
+ def self.up
+ <%- plugins.each do |plugin| -%>
+ Engines.plugins["<%= plugin.name %>"].migrate(<%= new_versions[plugin.name] %>)
+ <%- end -%>
+ end
+
+ def self.down
+ <%- plugins.each do |plugin| -%>
+ Engines.plugins["<%= plugin.name %>"].migrate(<%= current_versions[plugin.name] %>)
+ <%- end -%>
+ end
+end
diff -r 66ac47c3719b -r 04114f36670d vendor/plugins/redmine_bibliography/app/views/projects/show.erb
--- a/vendor/plugins/redmine_bibliography/app/views/projects/show.erb Tue Mar 06 14:05:16 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-
- <% if User.current.allowed_to?(:add_subprojects, @project) %>
- <%= link_to l(:label_subproject_new), {:controller => 'projects', :action => 'new', :parent_id => @project}, :class => 'icon icon-add' %>
- <% end %>
-
- <% if @project.module_enabled? :redmine_bibliography %>
- <% if User.current.allowed_to?(:add_publication, @project) %>
- <%= link_to l(:label_add_publication_to_project), {:controller => 'publications', :action => 'new', :project_id => @project}, :class => 'icon icon-add' %>
- <% end %>
- <% end %>
-
-
-<% if @project.has_welcome_page %>
-<% page = @project.wiki.find_page("Overview") %>
-<% end %>
-
-<% if page %>
-
-<% if @project.module_enabled? :wiki %>
-<% if User.current.allowed_to?(:edit_wiki_pages, @project) %>
-
-<%= link_to(l(:button_welcome_page_edit_this), {:controller => 'wiki', :action => 'edit', :project_id => @project, :id => Wiki.titleize("Overview")}, :class => 'icon icon-edit') %>
-
-<% end %>
-<% end %>
-
-
-
-<% unless @project.homepage.blank? %><%=l(:field_homepage)%>: <%= auto_link(h(@project.homepage)) %> <% end %>
-<% if @subprojects.any? %>
- <%=l(:label_subproject_plural)%>:
- <%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join(", ") %>
-<% end %>
-
-
<%=l(:label_overview)%>
-
-
-
- <%= textilizable @project.description %>
-
-
- <% unless @project.homepage.blank? %><%=l(:field_homepage)%>: <%= auto_link(h(@project.homepage)) %> <% end %>
- <% if @subprojects.any? %>
- <%=l(:label_subproject_plural)%>:
- <%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join(", ") %>
- <% end %>
- <% @project.visible_custom_field_values.each do |custom_value| %>
- <% if !custom_value.value.blank? %>
- <%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %>
- <% end %>
- <% end %>
-
-
- <% if User.current.allowed_to?(:view_issues, @project) %>
-
-
<%=l(:label_issue_tracking)%>
-
- <% for tracker in @trackers %>
- <%= link_to tracker.name, :controller => 'issues', :action => 'index', :project_id => @project,
- :set_filter => 1,
- "tracker_id" => tracker.id %>:
- <%= l(:label_x_open_issues_abbr_on_total, :count => @open_issues_by_tracker[tracker].to_i,
- :total => @total_issues_by_tracker[tracker].to_i) %>
-
- <% end %>
-
-
- <%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %>
- <% if User.current.allowed_to?(:view_calendar, @project, :global => true) %>
- | <%= link_to(l(:label_calendar), :controller => 'calendars', :action => 'show', :project_id => @project) %>
- <% end %>
- <% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
- | <%= link_to(l(:label_gantt), :controller => 'gantts', :action => 'show', :project_id => @project) %>
- <% end %>
-
-
- <% end %>
- <%= call_hook(:view_projects_show_left, :project => @project) %>
-
-
- <%= render :partial => 'bibliography_box' %>
-
- <%= render :partial => 'members_box' %>
-
- <% if @news.any? && authorize_for('news', 'index') %>
-
-
<%=l(:label_news_latest)%>
- <%= render :partial => 'news/news', :collection => @news %>
-
<%= link_to l(:label_news_view_all), :controller => 'news', :action => 'index', :project_id => @project %>
-
- <% end %>
- <%= call_hook(:view_projects_show_right, :project => @project) %>
-
<%= l(:label_spent_time) %>
- <%= l_hours(@total_hours) %>
- <%= link_to(l(:label_details), {:controller => 'timelog', :action => 'index', :project_id => @project}) %> |
- <%= link_to(l(:label_report), {:controller => 'time_entry_reports', :action => 'report', :project_id => @project}) %>
- <% end %>
- <%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %>
-<% end %>
-
-<% end %>
-
-<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
-<% end %>
-
-<% html_title(l(:label_overview)) -%>
diff -r 66ac47c3719b -r 04114f36670d vendor/plugins/redmine_bibliography/app/views/projects/show.html.erb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vendor/plugins/redmine_bibliography/app/views/projects/show.html.erb Tue Mar 06 14:07:35 2012 +0000
@@ -0,0 +1,120 @@
+
+ <% if User.current.allowed_to?(:add_subprojects, @project) %>
+ <%= link_to l(:label_subproject_new), {:controller => 'projects', :action => 'new', :parent_id => @project}, :class => 'icon icon-add' %>
+ <% end %>
+
+ <% if @project.module_enabled? :redmine_bibliography %>
+ <% if User.current.allowed_to?(:add_publication, @project) %>
+ <%= link_to l(:label_add_publication_to_project), {:controller => 'publications', :action => 'new', :project_id => @project}, :class => 'icon icon-add' %>
+ <% end %>
+ <% end %>
+
+
+<% if @project.has_welcome_page %>
+<% page = @project.wiki.find_page("Overview") %>
+<% end %>
+
+<% if page %>
+
+<% if @project.module_enabled? :wiki %>
+<% if User.current.allowed_to?(:edit_wiki_pages, @project) %>
+
+<%= link_to(l(:button_welcome_page_edit_this), {:controller => 'wiki', :action => 'edit', :project_id => @project, :id => Wiki.titleize("Overview")}, :class => 'icon icon-edit') %>
+
+<% end %>
+<% end %>
+
+
+
+<% unless @project.homepage.blank? %><%=l(:field_homepage)%>: <%= auto_link(h(@project.homepage)) %> <% end %>
+<% if @subprojects.any? %>
+ <%=l(:label_subproject_plural)%>:
+ <%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join(", ") %>
+<% end %>
+
+
<%=l(:label_overview)%>
+
+
+
+ <%= textilizable @project.description %>
+
+
+ <% unless @project.homepage.blank? %><%=l(:field_homepage)%>: <%= auto_link(h(@project.homepage)) %> <% end %>
+ <% if @subprojects.any? %>
+ <%=l(:label_subproject_plural)%>:
+ <%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join(", ") %>
+ <% end %>
+ <% @project.visible_custom_field_values.each do |custom_value| %>
+ <% if !custom_value.value.blank? %>
+ <%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %>
+ <% end %>
+ <% end %>
+
+
+ <% if User.current.allowed_to?(:view_issues, @project) %>
+
+
<%=l(:label_issue_tracking)%>
+
+ <% for tracker in @trackers %>
+ <%= link_to tracker.name, :controller => 'issues', :action => 'index', :project_id => @project,
+ :set_filter => 1,
+ "tracker_id" => tracker.id %>:
+ <%= l(:label_x_open_issues_abbr_on_total, :count => @open_issues_by_tracker[tracker].to_i,
+ :total => @total_issues_by_tracker[tracker].to_i) %>
+
+ <% end %>
+
+
+ <%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %>
+ <% if User.current.allowed_to?(:view_calendar, @project, :global => true) %>
+ | <%= link_to(l(:label_calendar), :controller => 'calendars', :action => 'show', :project_id => @project) %>
+ <% end %>
+ <% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
+ | <%= link_to(l(:label_gantt), :controller => 'gantts', :action => 'show', :project_id => @project) %>
+ <% end %>
+
+
+ <% end %>
+ <%= call_hook(:view_projects_show_left, :project => @project) %>
+
+
+ <%= render :partial => 'bibliography_box' %>
+
+ <%= render :partial => 'members_box' %>
+
+ <% if @news.any? && authorize_for('news', 'index') %>
+
+
<%=l(:label_news_latest)%>
+ <%= render :partial => 'news/news', :collection => @news %>
+
<%= link_to l(:label_news_view_all), :controller => 'news', :action => 'index', :project_id => @project %>
+
+ <% end %>
+ <%= call_hook(:view_projects_show_right, :project => @project) %>
+
<%= l(:label_spent_time) %>
+ <%= l_hours(@total_hours) %>
+ <%= link_to(l(:label_details), {:controller => 'timelog', :action => 'index', :project_id => @project}) %> |
+ <%= link_to(l(:label_report), {:controller => 'time_entry_reports', :action => 'report', :project_id => @project}) %>
+ <% end %>
+ <%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %>
+<% end %>
+
+<% end %>
+
+<% content_for :header_tags do %>
+<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
+<% end %>
+
+<% html_title(l(:label_overview)) -%>
diff -r 66ac47c3719b -r 04114f36670d vendor/plugins/redmine_bibliography/app/views/publications/_authorship_fields.erb
--- a/vendor/plugins/redmine_bibliography/app/views/publications/_authorship_fields.erb Tue Mar 06 14:05:16 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-<%= stylesheet_link_tag 'bibliography', :plugin => 'redmine_bibliography' %>
-
-
-
-
-
-
>
-
- <%= f.text_field :search_name, :size => 25 %>
- <%= observe_field( form_tag_id(f.object_name, :search_name), :frequency => 0.5, :update => form_tag_id( f.object_name, :search_results), :url => { :controller => 'publications', :action => 'autocomplete_for_author', :object_name => form_object_id(f.object_name) }, :with => 'q' ) %>
-
- <%# link_to_function l(:label_author_is_me), "update_author_info(this," + User.current.get_author_info.to_json + ")", :id => "add_me_as_author" %>
-
-
- <%= f.select :search_results, options_for_select(@author_options), {}, {:size => 5,
- :onChange => remote_function( :url => { :controller => :publications, :action => :get_user_info, :object_id => form_object_id(f.object_name) }, :with => "'value=' +
- value" )} %>
-
-
-
<%= l(:identify_author_question) %>
-
- <%= radio_button_tag(:identify_author, "yes", false, :name => form_tag_name(f.object_name,:identify_author ), :id => form_tag_id( f.object_name, :identify_author_yes ), :onchange => "identify_author_status($(this).value, #{form_object_id(f.object_name) });") %> <%= l(:identify_author_yes) %> <%= radio_button_tag(:identify_author, "correct", false, :name => form_tag_name(f.object_name,:identify_author ), :id => form_tag_id( f.object_name, :identify_author_corrections ), :onchange => "identify_author_status($(this).value, #{form_object_id(f.object_name) });") %> <%= l(:identify_author_correct) %> <%= radio_button_tag(:identify_author, "no", true, :name => form_tag_name(f.object_name,:identify_author ), :id => form_tag_id( f.object_name, :identify_author_no ), :onchange => "identify_author_status($(this).value, #{form_object_id(f.object_name) });") %> <%= l(:identify_author_no) %>
-
-
-
-
-
-
-
-
-
-
-
- <%- if params[:action] == 'new' -%>
- <%= button_to_function l(:label_save_author), {}, { :onclick => "toggle_save_author(#{form_object_id(f.object_name)}); return false;", :id => form_tag_id( f.object_name, :edit_save_button )} %>
- <%- else -%>
- <%= button_to_function l(:label_edit_author), {}, { :onclick => "toggle_save_author(#{form_object_id(f.object_name)}); return false;", :id => form_tag_id( f.object_name, :edit_save_button )} %>
- <%- end -%>
-
-
- <%= link_to_remove_fields l("remove_author"), f %>
-
-
+
+
+
>
+
+ <%= f.text_field :search_name, :size => 25 %>
+ <%= observe_field( form_tag_id(f.object_name, :search_name), :frequency => 0.5, :update => form_tag_id( f.object_name, :search_results), :url => { :controller => 'publications', :action => 'autocomplete_for_author', :object_name => form_object_id(f.object_name) }, :with => 'q' ) %>
+
+ <%# link_to_function l(:label_author_is_me), "update_author_info(this," + User.current.get_author_info.to_json + ")", :id => "add_me_as_author" %>
+
+
+ <%= f.select :search_results, options_for_select(@author_options), {}, {:size => 5,
+ :onChange => remote_function( :url => { :controller => :publications, :action => :get_user_info, :object_id => form_object_id(f.object_name) }, :with => "'value=' +
+ value" )} %>
+
+
+
<%= l(:identify_author_question) %>
+
+ <%= radio_button_tag(:identify_author, "yes", false, :name => form_tag_name(f.object_name,:identify_author ), :id => form_tag_id( f.object_name, :identify_author_yes ), :onchange => "identify_author_status($(this).value, #{form_object_id(f.object_name) });") %> <%= l(:identify_author_yes) %> <%= radio_button_tag(:identify_author, "correct", false, :name => form_tag_name(f.object_name,:identify_author ), :id => form_tag_id( f.object_name, :identify_author_corrections ), :onchange => "identify_author_status($(this).value, #{form_object_id(f.object_name) });") %> <%= l(:identify_author_correct) %> <%= radio_button_tag(:identify_author, "no", true, :name => form_tag_name(f.object_name,:identify_author ), :id => form_tag_id( f.object_name, :identify_author_no ), :onchange => "identify_author_status($(this).value, #{form_object_id(f.object_name) });") %> <%= l(:identify_author_no) %>
+
+
+
+
+
+
+
+
+
+
+
+ <%- if params[:action] == 'new' -%>
+ <%= button_to_function l(:label_save_author), {}, { :onclick => "toggle_save_author(#{form_object_id(f.object_name)}); return false;", :id => form_tag_id( f.object_name, :edit_save_button )} %>
+ <%- else -%>
+ <%= button_to_function l(:label_edit_author), {}, { :onclick => "toggle_save_author(#{form_object_id(f.object_name)}); return false;", :id => form_tag_id( f.object_name, :edit_save_button )} %>
+ <%- end -%>
+
+
+ <%= link_to_remove_fields l("remove_author"), f %>
+
+
Menu caption
-<%= text_field_tag 'settings[menu]', @settings['menu'], :size => 30 %>
-Clear this field if you don't want to add a tab to the project menu
diff -r 66ac47c3719b -r 04114f36670d vendor/plugins/redmine_bibliography/app/views/settings/_bibliography.html.erb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vendor/plugins/redmine_bibliography/app/views/settings/_bibliography.html.erb Tue Mar 06 14:07:35 2012 +0000
@@ -0,0 +1,3 @@
+Menu caption
+<%= text_field_tag 'settings[menu]', @settings['menu'], :size => 30 %>
+Clear this field if you don't want to add a tab to the project menu
diff -r 66ac47c3719b -r 04114f36670d vendor/plugins/redmine_bibliography/app/views/users/show.erb
--- a/vendor/plugins/redmine_bibliography/app/views/users/show.erb Tue Mar 06 14:05:16 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-<%= stylesheet_link_tag 'bibliography', :plugin => 'redmine_bibliography' %>
-
-
-<%= link_to(l(:button_edit), edit_user_path(@user), :class => 'icon icon-edit') if User.current.admin? %>
-
-
-<%= avatar @user, :size => "50" %> <%=h @user.name %>
-
-
-
- <% unless @user.pref.hide_mail %>
- <%=l(:field_mail)%>: <%= mail_to(h(@user.mail), nil, :encode => 'javascript') %>
- <% end %>
- <% @user.visible_custom_field_values.each do |custom_value| %>
- <% if !custom_value.value.blank? %>
- <%=h custom_value.custom_field.name%>: <%=h show_value(custom_value) %>
- <% end %>
- <% end %>
- <%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %>
- <% unless @user.last_login_on.nil? %>
- <%=l(:field_last_login_on)%>: <%= format_date(@user.last_login_on) %>
- <% end %>
-
-
-
<%=l(:label_ssamr_description)%>
-<%= textilizable @description %>
-
-
<%=l(:label_ssamr_institution)%>
-
<%= h @institution_name %>
-
-
-<% unless @memberships.empty? %>
-
<%=l(:label_project_plural)%>
-
-<% for membership in @memberships %>
- <%= link_to_project(membership.project) %>
- (<%=h membership.roles.sort.collect(&:to_s).join(', ') %>, <%= format_date(membership.created_on) %>)
-<% end %>
-
-<% end %>
-<%= call_hook :view_account_left_bottom, :user => @user %>
-
-
- <% if @user.author %>
-
- <% @publications = Publication.all(:include => :authors, :conditions => "authors.id = #{@user.author.id}") %>
-
-
<%=l(:publications) %> <%= "(" + @publications.count.to_s + ")" %>
-
- <% @publications.each do |publication|%>
-
-
- <%= publication.authorships.map { |a| h a.name_on_paper }.join(', ') %><% if !publication.authorships.empty? %>.<% end %>
-
- <%= link_to publication.title, :controller => 'publications', :action => 'show', :id => publication %>
- <% if publication.bibtex_entry.year.to_s != "" %>
-
- (<%= publication.bibtex_entry.year %>)
-
- <% end %>
-
-
-
- <% end %>
-
- <% end %>
-
-
-<% unless @events_by_day.empty? %>
-
<%= link_to l(:label_activity), :controller => 'activities', :action => 'index', :id => nil, :user_id => @user, :from => @events_by_day.keys.first %>
-
-
-<%=l(:label_reported_issues)%>: <%= Issue.count(:conditions => ["author_id=?", @user.id]) %>
-
-
-
-<% @events_by_day.keys.sort.reverse.each do |day| %>
-
<%= format_activity_day(day) %>
-
-<% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
-
- <%= format_time(e.event_datetime, false) %>
- <%= content_tag('span', h(e.project), :class => 'project') %>
- <%= link_to format_activity_title(e.event_title), e.event_url %>
- <%= format_activity_description(e.event_description) %>
-<% end -%>
-
-
-<% other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => nil, :user_id => @user, :key => User.current.rss_key} %>
-<% end %>
-
-<% content_for :header_tags do %>
- <%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
-<% end %>
-<% end %>
-<%= call_hook :view_account_right_bottom, :user => @user %>
-
+<%= link_to(l(:button_edit), edit_user_path(@user), :class => 'icon icon-edit') if User.current.admin? %>
+
+
+<%= avatar @user, :size => "50" %> <%=h @user.name %>
+
+
+
+ <% unless @user.pref.hide_mail %>
+ <%=l(:field_mail)%>: <%= mail_to(h(@user.mail), nil, :encode => 'javascript') %>
+ <% end %>
+ <% @user.visible_custom_field_values.each do |custom_value| %>
+ <% if !custom_value.value.blank? %>
+ <%=h custom_value.custom_field.name%>: <%=h show_value(custom_value) %>
+ <% end %>
+ <% end %>
+ <%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %>
+ <% unless @user.last_login_on.nil? %>
+ <%=l(:field_last_login_on)%>: <%= format_date(@user.last_login_on) %>
+ <% end %>
+
+
+
<%=l(:label_ssamr_description)%>
+<%= textilizable @description %>
+
+
<%=l(:label_ssamr_institution)%>
+
<%= h @institution_name %>
+
+
+<% unless @memberships.empty? %>
+
<%=l(:label_project_plural)%>
+
+<% for membership in @memberships %>
+ <%= link_to_project(membership.project) %>
+ (<%=h membership.roles.sort.collect(&:to_s).join(', ') %>, <%= format_date(membership.created_on) %>)
+<% end %>
+
+<% end %>
+<%= call_hook :view_account_left_bottom, :user => @user %>
+
+
+ <% if @user.author %>
+
+ <% @publications = Publication.all(:include => :authors, :conditions => "authors.id = #{@user.author.id}") %>
+
+
<%=l(:publications) %> <%= "(" + @publications.count.to_s + ")" %>
+
+ <% @publications.each do |publication|%>
+
+
+ <%= publication.authorships.map { |a| h a.name_on_paper }.join(', ') %><% if !publication.authorships.empty? %>.<% end %>
+
+ <%= link_to publication.title, :controller => 'publications', :action => 'show', :id => publication %>
+ <% if publication.bibtex_entry.year.to_s != "" %>
+
+ (<%= publication.bibtex_entry.year %>)
+
+ <% end %>
+
+
+
+ <% end %>
+
+ <% end %>
+
+
+<% unless @events_by_day.empty? %>
+
<%= link_to l(:label_activity), :controller => 'activities', :action => 'index', :id => nil, :user_id => @user, :from => @events_by_day.keys.first %>
+
+
+<%=l(:label_reported_issues)%>: <%= Issue.count(:conditions => ["author_id=?", @user.id]) %>
+
+
+
+<% @events_by_day.keys.sort.reverse.each do |day| %>
+
<%= format_activity_day(day) %>
+
+<% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
+
+ <%= format_time(e.event_datetime, false) %>
+ <%= content_tag('span', h(e.project), :class => 'project') %>
+ <%= link_to format_activity_title(e.event_title), e.event_url %>
+ <%= format_activity_description(e.event_description) %>
+<% end -%>
+
+
+<% other_formats_links do |f| %>
+ <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => nil, :user_id => @user, :key => User.current.rss_key} %>
+<% end %>
+
+<% content_for :header_tags do %>
+ <%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
+<% end %>
+<% end %>
+<%= call_hook :view_account_right_bottom, :user => @user %>
+
<%= form.select(:checkout_overwrite, [
- [l(:general_text_Yes), "1"],
- [l(:general_text_No), "0"]
- ],
- {},
- :onchange => <<-EOF
- Effect.toggle($('checkout_settings'), 'slide', {duration:0.2});
- EOF
- )%>
-
->
- <%=l :label_checkout %>
-
- <%= form.text_area :checkout_description, :cols => 60, :rows => 5, :class => 'wiki-edit', :label => :field_description %>
- <%= wikitoolbar_for 'repository_checkout_description' %>
-
- <% if form.object.scm_name == 'Subversion' %>
- <%= form.select :checkout_display_login,[
- [l(:label_display_login_none), ''],
- [l(:label_display_login_username), 'username'],
- [l(:label_display_login_password), 'password']
- ],
- :label => :setting_checkout_display_login %>
- <% end %>
-
- <%= form.check_box :checkout_display_command %>
-
- <% javascript_tag do %>
- protocolForm = new Subform(
- '<%= escape_javascript(render(:partial => "projects/settings/repository_checkout_protocol", :locals => {:protocol => Checkout::Protocol.new({:protocol => form.object.scm_name, :append_path => form.object.allow_subtree_checkout? ? 1: 0, :repository => form.object})})) %>',
- <%= form.object.checkout_protocols.length %>,
- 'checkout_protocol_table'
- );
- <% end %>
- <%=l :label_protocol_plural %> <%=l :help_repository_checkout_protocols %>
- <%= hidden_field_tag 'repository[checkout_protocols][-1][protocol]', 'empty' %>
-
-
- <%= l(:setting_protocol)%>
- <%= l(:setting_checkout_command)%>
- <%= l(:setting_checkout_fixed_url) %>
- <%= l(:label_permissions) %>
- <%= l(:label_append_path) %>
- <%= l(:label_default) %>
-
- <% form.object.checkout_protocols.each_with_index do |protocol, index| %>
- <%= render :partial => 'projects/settings/repository_checkout_protocol', :locals => {:protocol => protocol, :index => index, :classes => cycle('odd', 'even')} %>
- <% end %>
-
-
- <%= link_to_function l(:button_add_protocol), "protocolForm.add()", {:class => "icon icon-add"} %>
- <%= form.select(:checkout_overwrite, [
+ [l(:general_text_Yes), "1"],
+ [l(:general_text_No), "0"]
+ ],
+ {},
+ :onchange => <<-EOF
+ Effect.toggle($('checkout_settings'), 'slide', {duration:0.2});
+ EOF
+ )%>
+
+>
+ <%=l :label_checkout %>
+
+ <%= form.text_area :checkout_description, :cols => 60, :rows => 5, :class => 'wiki-edit', :label => :field_description %>
+ <%= wikitoolbar_for 'repository_checkout_description' %>
+
+ <% if form.object.scm_name == 'Subversion' %>
+ <%= form.select :checkout_display_login,[
+ [l(:label_display_login_none), ''],
+ [l(:label_display_login_username), 'username'],
+ [l(:label_display_login_password), 'password']
+ ],
+ :label => :setting_checkout_display_login %>
+ <% end %>
+
+ <%= form.check_box :checkout_display_command %>
+
+ <% javascript_tag do %>
+ protocolForm = new Subform(
+ '<%= escape_javascript(render(:partial => "projects/settings/repository_checkout_protocol", :locals => {:protocol => Checkout::Protocol.new({:protocol => form.object.scm_name, :append_path => form.object.allow_subtree_checkout? ? 1: 0, :repository => form.object})})) %>',
+ <%= form.object.checkout_protocols.length %>,
+ 'checkout_protocol_table'
+ );
+ <% end %>
+ <%=l :label_protocol_plural %> <%=l :help_repository_checkout_protocols %>
+ <%= hidden_field_tag 'repository[checkout_protocols][-1][protocol]', 'empty' %>
+
+
+ <%= l(:setting_protocol)%>
+ <%= l(:setting_checkout_command)%>
+ <%= l(:setting_checkout_fixed_url) %>
+ <%= l(:label_permissions) %>
+ <%= l(:label_append_path) %>
+ <%= l(:label_default) %>
+
+ <% form.object.checkout_protocols.each_with_index do |protocol, index| %>
+ <%= render :partial => 'projects/settings/repository_checkout_protocol', :locals => {:protocol => protocol, :index => index, :classes => cycle('odd', 'even')} %>
+ <% end %>
+
+
+ <%= link_to_function l(:button_add_protocol), "protocolForm.add()", {:class => "icon icon-add"} %>
+ " class="<%= classes %>" <%= 'style="display:none"' if index == '--INDEX--' %>>
- <%= text_field_tag "repository[checkout_protocols][#{index}][protocol]", protocol.protocol, :size => 10 %>
- <%= text_field_tag "repository[checkout_protocols][#{index}][command]", protocol.command, :size => 15 %>
- <%= text_field_tag "repository[checkout_protocols][#{index}][fixed_url]", protocol.fixed_url, :size => 60 %>
- <%= select_tag "repository[checkout_protocols][#{index}][access]", options_for_select([
- [l(:label_access_read_write), 'read+write'],
- [l(:label_access_read_only), 'read-only'],
- [l(:label_access_permission), 'permission']], protocol.access) %>
- <%= check_box_tag "repository[checkout_protocols][#{index}][append_path]", 1, protocol.append_path? %>
- <%= check_box_tag "repository[checkout_protocols][#{index}][is_default]", 1, protocol.default? %>
- <%= image_to_function 'delete.png', "var e=$('checkout_protocols_#{index}');var parent=e.up(\"tbody\");e.remove();recalculate_even_odd(parent);return false" %>
-
diff -r 66ac47c3719b -r 04114f36670d vendor/plugins/redmine_checkout/app/views/projects/settings/_repository_checkout_protocol.html.erb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vendor/plugins/redmine_checkout/app/views/projects/settings/_repository_checkout_protocol.html.erb Tue Mar 06 14:07:35 2012 +0000
@@ -0,0 +1,18 @@
+<%
+ index ||= "--INDEX--"
+ classes ||= ""
+
+ protocol = Checkout::Protocol.new(protocol) unless protocol.is_a? Checkout::Protocol
+%>
+" class="<%= classes %>" <%= 'style="display:none"' if index == '--INDEX--' %>>
+ <%= text_field_tag "repository[checkout_protocols][#{index}][protocol]", protocol.protocol, :size => 10 %>
+ <%= text_field_tag "repository[checkout_protocols][#{index}][command]", protocol.command, :size => 15 %>
+ <%= text_field_tag "repository[checkout_protocols][#{index}][fixed_url]", protocol.fixed_url, :size => 60 %>
+ <%= select_tag "repository[checkout_protocols][#{index}][access]", options_for_select([
+ [l(:label_access_read_write), 'read+write'],
+ [l(:label_access_read_only), 'read-only'],
+ [l(:label_access_permission), 'permission']], protocol.access) %>
+ <%= check_box_tag "repository[checkout_protocols][#{index}][append_path]", 1, protocol.append_path? %>
+ <%= check_box_tag "repository[checkout_protocols][#{index}][is_default]", 1, protocol.default? %>
+ <%= image_to_function 'delete.png', "var e=$('checkout_protocols_#{index}');var parent=e.up(\"tbody\");e.remove();recalculate_even_odd(parent);return false" %>
+
diff -r 66ac47c3719b -r 04114f36670d vendor/plugins/redmine_checkout/app/views/redmine_checkout_hooks/_view_repositories_show_contextual.erb
--- a/vendor/plugins/redmine_checkout/app/views/redmine_checkout_hooks/_view_repositories_show_contextual.erb Tue Mar 06 14:05:16 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-
- <% if repository.checkout_description.present? %>
-
<%= textilizable repository.checkout_description %>
- <% end %>
- <% if protocols.present? %>
-
-
- <%= text_field_tag :checkout_url, h(default_protocol.full_command(checkout_path)), :readonly => true %>
- <%- if Setting.checkout_use_zero_clipboard? %>
-
-
<%= image_tag 'paste.png', :plugin => 'redmine_checkout' %>
-
- <% end -%>
-
-
- <% if User.current.logged? %>
- <% if repository.is_external? %>
- <%=l :label_access_type_all, :type => l(:label_access_read_only) %>
- <% else %>
- <% if default_protocol %><%=l :label_access_type, :type => l(default_protocol.access_label(User.current)) %><% end %>
- <% end %>
- <% else %>
-
- <% end %>
-
-
- <% javascript_tag do %>
- var checkout_access = $H({<%= protocols.inject([]){|r,p| r << "'checkout_protocol_#{p.protocol.to_s.underscore}': '#{l(p.access_label(User.current))}'"}.join(', ') %>});
- var checkout_commands = $H({<%= protocols.inject([]){|r,p| r << "'checkout_protocol_#{p.protocol.to_s.underscore}': '#{escape_javascript(p.full_command(checkout_path))}'"}.join(', ') %>});
- <%- if Setting.checkout_use_zero_clipboard? %>ZeroClipboard.setMoviePath( '<%= image_path('ZeroClipboard.swf', :plugin => 'redmine_checkout') %>' );<% end %>
- <% end %>
-
- <% end%>
- <% if repository.is_external? %>
-
-
-
<%= l(:text_repository_external, :location => repository.external_url) %>
- <% end %>
-
-
-<% content_for :header_tags do %>
- <%= stylesheet_link_tag 'checkout', :plugin => 'redmine_checkout' %>
- <%= javascript_include_tag 'checkout', :plugin => 'redmine_checkout' %>
- <%= (javascript_include_tag 'ZeroClipboard', :plugin => 'redmine_checkout') if Setting.checkout_use_zero_clipboard? %>
-<% end %>
diff -r 66ac47c3719b -r 04114f36670d vendor/plugins/redmine_checkout/app/views/redmine_checkout_hooks/_view_repositories_show_contextual.html.erb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vendor/plugins/redmine_checkout/app/views/redmine_checkout_hooks/_view_repositories_show_contextual.html.erb Tue Mar 06 14:07:35 2012 +0000
@@ -0,0 +1,52 @@
+
+ <% if repository.checkout_description.present? %>
+
<%= textilizable repository.checkout_description %>
+ <% end %>
+ <% if protocols.present? %>
+
+
+ <%= text_field_tag :checkout_url, h(default_protocol.full_command(checkout_path)), :readonly => true %>
+ <%- if Setting.checkout_use_zero_clipboard? %>
+
+
<%= image_tag 'paste.png', :plugin => 'redmine_checkout' %>
+
+ <% end -%>
+
+
+ <% if User.current.logged? %>
+ <% if repository.is_external? %>
+ <%=l :label_access_type_all, :type => l(:label_access_read_only) %>
+ <% else %>
+ <% if default_protocol %><%=l :label_access_type, :type => l(default_protocol.access_label(User.current)) %><% end %>
+ <% end %>
+ <% else %>
+
+ <% end %>
+
+
+ <% javascript_tag do %>
+ var checkout_access = $H({<%= protocols.inject([]){|r,p| r << "'checkout_protocol_#{p.protocol.to_s.underscore}': '#{l(p.access_label(User.current))}'"}.join(', ') %>});
+ var checkout_commands = $H({<%= protocols.inject([]){|r,p| r << "'checkout_protocol_#{p.protocol.to_s.underscore}': '#{escape_javascript(p.full_command(checkout_path))}'"}.join(', ') %>});
+ <%- if Setting.checkout_use_zero_clipboard? %>ZeroClipboard.setMoviePath( '<%= image_path('ZeroClipboard.swf', :plugin => 'redmine_checkout') %>' );<% end %>
+ <% end %>
+
+ <% end%>
+ <% if repository.is_external? %>
+
+
+
<%= l(:text_repository_external, :location => repository.external_url) %>
+ <% end %>
+
+
+<% content_for :header_tags do %>
+ <%= stylesheet_link_tag 'checkout', :plugin => 'redmine_checkout' %>
+ <%= javascript_include_tag 'checkout', :plugin => 'redmine_checkout' %>
+ <%= (javascript_include_tag 'ZeroClipboard', :plugin => 'redmine_checkout') if Setting.checkout_use_zero_clipboard? %>
+<% end %>
diff -r 66ac47c3719b -r 04114f36670d vendor/plugins/redmine_checkout/app/views/settings/_checkout.erb
--- a/vendor/plugins/redmine_checkout/app/views/settings/_checkout.erb Tue Mar 06 14:05:16 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-<% form_tag({:action => 'edit', :tab => 'checkout'}) do %>
-
-<% javascript_tag do %>
-protocolForms = $H();
-
-document.observe("dom:loaded", function() {
- $('tab-content-checkout').select('fieldset.collapsed').each(function(e){
- e.down('div').hide();
- });
- <%
- CheckoutHelper.supported_scm.select{|scm| Setting.enabled_scm.include?(scm)}.each do |scm|
- next if Setting.send("checkout_overwrite_description_#{scm}?")
- -%>
- $('settings_checkout_description_<%= scm %>').up('div').up('div').hide();
- <%- end %>
-});
-<% end %>
-
-
-
-
<%= setting_check_box :checkout_display_checkout_info %>
-
-
<%= setting_text_area :checkout_description_Abstract, :cols => 60, :rows => 5, :class => 'wiki-edit', :label => :field_description %>
-<%= wikitoolbar_for 'settings_checkout_description_Abstract' %>
-
-
<%= setting_check_box :checkout_use_zero_clipboard %>
-
-<% CheckoutHelper.supported_scm.select{|scm| Setting.enabled_scm.include?(scm)}.each do |scm| -%>
-
- <%= "Repository::#{scm}".constantize.scm_name %>
- <%= render :partial => 'checkout_scm', :locals => {:scm => scm} %>
-
-<%- end %>
-
-
+
<%= setting_check_box :checkout_display_checkout_info %>
+
+
<%= setting_text_area :checkout_description_Abstract, :cols => 60, :rows => 5, :class => 'wiki-edit', :label => :field_description %>
+<%= wikitoolbar_for 'settings_checkout_description_Abstract' %>
+
+
<%= setting_check_box :checkout_use_zero_clipboard %>
+
+<% CheckoutHelper.supported_scm.select{|scm| Setting.enabled_scm.include?(scm)}.each do |scm| -%>
+
+ <%= "Repository::#{scm}".constantize.scm_name %>
+ <%= render :partial => 'checkout_scm', :locals => {:scm => scm} %>
+
+<%- end %>
+
+
" class="<%= classes %>" <%= 'style="display:none"' if index == '--INDEX--' %>>
- <%= text_field_tag "settings[checkout_protocols_#{scm}][#{index}][protocol]", protocol.protocol, :size => 10 %>
- <%= text_field_tag "settings[checkout_protocols_#{scm}][#{index}][command]", protocol.command, :size => 15 %>
- <%= text_field_tag "settings[checkout_protocols_#{scm}][#{index}][regex]", protocol.regex, :size => 30 %>
- <%= text_field_tag "settings[checkout_protocols_#{scm}][#{index}][regex_replacement]", protocol.regex_replacement, :size => 30 %>
- <%= select_tag "settings[checkout_protocols_#{scm}][#{index}][access]", options_for_select([
- [l(:label_access_read_write), 'read+write'],
- [l(:label_access_read_only), 'read-only'],
- [l(:label_access_permission), 'permission']], protocol.access) %>
- <%= check_box_tag "settings[checkout_protocols_#{scm}][#{index}][append_path]", 1, protocol.append_path? %>
- <%= check_box_tag "settings[checkout_protocols_#{scm}][#{index}][is_default]", 1, protocol.default? %>
- <%= image_to_function 'delete.png', "var e=$('checkout_protocols_#{scm}_#{index}');var parent=e.up(\"tbody\");e.remove();recalculate_even_odd(parent);return false" %>
-
diff -r 66ac47c3719b -r 04114f36670d vendor/plugins/redmine_checkout/app/views/settings/_checkout_protocol.html.erb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vendor/plugins/redmine_checkout/app/views/settings/_checkout_protocol.html.erb Tue Mar 06 14:07:35 2012 +0000
@@ -0,0 +1,19 @@
+<%
+ index ||= "--INDEX--"
+ classes ||= ""
+
+ protocol = Checkout::Protocol.new(protocol) unless protocol.is_a? Checkout::Protocol
+%>
+" class="<%= classes %>" <%= 'style="display:none"' if index == '--INDEX--' %>>
+ <%= text_field_tag "settings[checkout_protocols_#{scm}][#{index}][protocol]", protocol.protocol, :size => 10 %>
+ <%= text_field_tag "settings[checkout_protocols_#{scm}][#{index}][command]", protocol.command, :size => 15 %>
+ <%= text_field_tag "settings[checkout_protocols_#{scm}][#{index}][regex]", protocol.regex, :size => 30 %>
+ <%= text_field_tag "settings[checkout_protocols_#{scm}][#{index}][regex_replacement]", protocol.regex_replacement, :size => 30 %>
+ <%= select_tag "settings[checkout_protocols_#{scm}][#{index}][access]", options_for_select([
+ [l(:label_access_read_write), 'read+write'],
+ [l(:label_access_read_only), 'read-only'],
+ [l(:label_access_permission), 'permission']], protocol.access) %>
+ <%= check_box_tag "settings[checkout_protocols_#{scm}][#{index}][append_path]", 1, protocol.append_path? %>
+ <%= check_box_tag "settings[checkout_protocols_#{scm}][#{index}][is_default]", 1, protocol.default? %>
+ <%= image_to_function 'delete.png', "var e=$('checkout_protocols_#{scm}_#{index}');var parent=e.up(\"tbody\");e.remove();recalculate_even_odd(parent);return false" %>
+
diff -r 66ac47c3719b -r 04114f36670d vendor/plugins/redmine_checkout/app/views/settings/_checkout_scm.erb
--- a/vendor/plugins/redmine_checkout/app/views/settings/_checkout_scm.erb Tue Mar 06 14:05:16 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-
-
<%= setting_check_box "checkout_overwrite_description_#{scm}", :label => :setting_checkout_overwrite_description, :onclick => <<-EOF
- Effect.toggle($('settings_checkout_description_#{scm}').up("div").up("div"), 'slide', {duration:0.2});
- EOF
- %>
-
-
-
<%= setting_text_area "checkout_description_#{scm}", :cols => 60, :rows => 5, :class => 'wiki-edit', :label => :field_description %>
- <%= wikitoolbar_for "settings_checkout_description_#{scm}" %>
-
-
- <% if scm == 'Subversion' %>
-
<%= setting_select "checkout_display_login",[
- [l(:label_display_login_username), 'username'],
- [l(:label_display_login_password), 'password']
- ],
- :blank => :label_display_login_none %>
- <% end %>
-
-
<%= setting_check_box "checkout_display_command_#{scm}", :label => :field_checkout_display_command %>
-
- <% javascript_tag do %>
- <% repo = "Repository::#{scm}".constantize %>
- var subform = new Subform('<%= escape_javascript(render(:partial => "checkout_protocol", :locals => {:protocol => Checkout::Protocol.new({:protocol => repo.scm_name, :append_path => (repo.allow_subtree_checkout? ? '1' : '0'), :command => repo.checkout_default_command}), :scm => scm})) %>',<%= Setting.send("checkout_protocols_#{scm}").length %>,'settings_checkout_protocols_<%= scm %>');
- protocolForms.set('<%= scm %>', subform);
- <% end %>
-
<%=l :label_protocol_plural %> <%=l :help_checkout_protocols %>
-
-
- <%= l(:setting_protocol)%>
- <%= l(:setting_checkout_command)%>
- <%= l(:setting_checkout_url_regex) %>
- <%= l(:setting_checkout_url_regex_replacement) %>
- <%= l(:label_permissions) %>
- <%= l(:label_append_path) %>
- <%= l(:label_default) %>
-
- <% Setting.send("checkout_protocols_#{scm}").each_with_index do |protocol, index| %>
- <%= render :partial => 'checkout_protocol', :locals => {:protocol => Checkout::Protocol.new(protocol), :scm => scm, :index => index, :classes => cycle('odd', 'even')} %>
- <% end %>
-
-
-
<%= link_to_function l(:button_add_protocol), "protocolForms.get('#{scm}').add()", {:class => "icon icon-add"} %>
-
+
<%= setting_check_box "checkout_overwrite_description_#{scm}", :label => :setting_checkout_overwrite_description, :onclick => <<-EOF
+ Effect.toggle($('settings_checkout_description_#{scm}').up("div").up("div"), 'slide', {duration:0.2});
+ EOF
+ %>
+
+
+
<%= setting_text_area "checkout_description_#{scm}", :cols => 60, :rows => 5, :class => 'wiki-edit', :label => :field_description %>
+ <%= wikitoolbar_for "settings_checkout_description_#{scm}" %>
+
+
+ <% if scm == 'Subversion' %>
+
<%= setting_select "checkout_display_login",[
+ [l(:label_display_login_username), 'username'],
+ [l(:label_display_login_password), 'password']
+ ],
+ :blank => :label_display_login_none %>
+ <% end %>
+
+
<%= setting_check_box "checkout_display_command_#{scm}", :label => :field_checkout_display_command %>
+
+ <% javascript_tag do %>
+ <% repo = "Repository::#{scm}".constantize %>
+ var subform = new Subform('<%= escape_javascript(render(:partial => "checkout_protocol", :locals => {:protocol => Checkout::Protocol.new({:protocol => repo.scm_name, :append_path => (repo.allow_subtree_checkout? ? '1' : '0'), :command => repo.checkout_default_command}), :scm => scm})) %>',<%= Setting.send("checkout_protocols_#{scm}").length %>,'settings_checkout_protocols_<%= scm %>');
+ protocolForms.set('<%= scm %>', subform);
+ <% end %>
+
<%=l :label_protocol_plural %> <%=l :help_checkout_protocols %>
+
+
+ <%= l(:setting_protocol)%>
+ <%= l(:setting_checkout_command)%>
+ <%= l(:setting_checkout_url_regex) %>
+ <%= l(:setting_checkout_url_regex_replacement) %>
+ <%= l(:label_permissions) %>
+ <%= l(:label_append_path) %>
+ <%= l(:label_default) %>
+
+ <% Setting.send("checkout_protocols_#{scm}").each_with_index do |protocol, index| %>
+ <%= render :partial => 'checkout_protocol', :locals => {:protocol => Checkout::Protocol.new(protocol), :scm => scm, :index => index, :classes => cycle('odd', 'even')} %>
+ <% end %>
+
+
+
<%= link_to_function l(:button_add_protocol), "protocolForms.get('#{scm}').add()", {:class => "icon icon-add"} %>
+
- <% fields_for @project, :builder => TabularFormBuilder do |f| -%>
-
-
- <%= f.text_field :tag_list, :label => :tags, :size => 60, :class => 'hol' %>
-
-
- <%= javascript_include_tag 'tags_input', :plugin => 'redmine_tags' %>
-
- <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_tags', :project_id => Project.first.id)}')" %>
-
+ <% fields_for @project, :builder => TabularFormBuilder do |f| -%>
+
+
+ <%= f.text_field :tag_list, :label => :tags, :size => 60, :class => 'hol' %>
+
+
+ <%= javascript_include_tag 'tags_input', :plugin => 'redmine_tags' %>
+
+ <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_tags', :project_id => Project.first.id)}')" %>
+
- <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }%>
- <%= '| ' + link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
-
-
-
-
-
-<% if User.current.logged? %>
- <%= render :partial => 'my_projects' %>
-<% end %>
-
-
-
- <%= l("label_project_all") %>
-
-
-
- <%- form_remote_tag(:controller => :projects, :action => :index, :method => :get, :html => {:id => :project_filtering_form}) do -%>
-
- <% if @filter_status=="true" %>
-
- <%= l(:label_filter_plural) %>
- <%- else -%>
-
- <%= l(:label_filter_plural) %>
-
- <%- end -%>
-
-
-
- <%= render :partial => 'filter_search_tags' -%>
-
-
-
- <%= label_tag 'q', l('project_filtering_q_label') %>
- <%= text_field_tag 'q', @question, :size => 30, :id => 'search-input' %>
-
-
-
<%= submit_tag( l('button_filter'), :id => 'submitButton') -%>
- <%= link_to l(:button_apply), {}, :onclick => "$('submitButton').click(); return false;", :class => 'icon icon-checked' -%>
- <%= link_to l(:button_clear), {}, :class => 'icon icon-reload' %>
-
-
- <% unless @filter_status=="true" %>
-
-
-
- <%= render :partial => 'filtered_projects' %>
-
-
-
-
-
-<% other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
-<% end %>
-
-<% html_title(l(:label_project_plural)) -%>
diff -r 66ac47c3719b -r 04114f36670d vendor/plugins/redmine_tags/app/views/projects/index.html.erb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/index.html.erb Tue Mar 06 14:07:35 2012 +0000
@@ -0,0 +1,71 @@
+<% content_for :header_tags do %>
+ <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
+ <%= stylesheet_link_tag 'redmine_tags', :plugin => 'redmine_tags' %>
+<% end %>
+<%= javascript_include_tag 'projects_index', :plugin => 'redmine_tags' %>
+
+
+
+ <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }%>
+ <%= '| ' + link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
+
+
+
+
+
+<% if User.current.logged? %>
+ <%= render :partial => 'my_projects' %>
+<% end %>
+
+
+
+ <%= l("label_project_all") %>
+
+
+
+ <%- form_remote_tag(:controller => :projects, :action => :index, :method => :get, :html => {:id => :project_filtering_form}) do -%>
+
+ <% if @filter_status=="true" %>
+
+ <%= l(:label_filter_plural) %>
+ <%- else -%>
+
+ <%= l(:label_filter_plural) %>
+
+ <%- end -%>
+
+
+
+ <%= render :partial => 'filter_search_tags' -%>
+
+
+
+ <%= label_tag 'q', l('project_filtering_q_label') %>
+ <%= text_field_tag 'q', @question, :size => 30, :id => 'search-input' %>
+
+
+
<%= submit_tag( l('button_filter'), :id => 'submitButton') -%>
+ <%= link_to l(:button_apply), {}, :onclick => "$('submitButton').click(); return false;", :class => 'icon icon-checked' -%>
+ <%= link_to l(:button_clear), {}, :class => 'icon icon-reload' %>
+
+
+ <% unless @filter_status=="true" %>
+
+
+
+ <%= render :partial => 'filtered_projects' %>
+
+
+
+
+
+<% other_formats_links do |f| %>
+ <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+<% end %>
+
+<% html_title(l(:label_project_plural)) -%>