diff --git a/app/views/attachments/diff.html.erb b/app/views/attachments/diff.html.erb
index 83ac87bbe9..def3c51f77 100644
--- a/app/views/attachments/diff.html.erb
+++ b/app/views/attachments/diff.html.erb
@@ -26,15 +26,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
diff --git a/app/views/auth_sources/index.html.erb b/app/views/auth_sources/index.html.erb
index 5a981fef85..b393fdac96 100644
--- a/app/views/auth_sources/index.html.erb
+++ b/app/views/auth_sources/index.html.erb
@@ -30,39 +30,36 @@ See doc/COPYRIGHT.rdoc for more details.
<% content_for :action_menu_specific do %>
<%= link_to l(:label_auth_source_new), { :action => 'new' }, :class => 'icon icon-add' %>
<% end %>
-
<% html_title l(:label_administration), l(:label_auth_source_plural) %>
-
-
<%= pagination_links_full @auth_sources %>
diff --git a/app/views/boards/_form.html.erb b/app/views/boards/_form.html.erb
index ed4701ba8f..b37afd5ded 100644
--- a/app/views/boards/_form.html.erb
+++ b/app/views/boards/_form.html.erb
@@ -26,12 +26,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= error_messages_for 'board' %>
-
diff --git a/app/views/boards/index.html.erb b/app/views/boards/index.html.erb
index d81ef408a0..bf21ec5d4f 100644
--- a/app/views/boards/index.html.erb
+++ b/app/views/boards/index.html.erb
@@ -26,38 +26,37 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
-
<%= other_formats_links do |f| %>
<%= f.link_to 'Atom', :url => {:controller => '/activities', :action => 'index', :id => @project, :show_messages => 1, :key => User.current.rss_key} %>
<% end %>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 671bcf1542..088b58b56b 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -34,25 +34,23 @@ See doc/COPYRIGHT.rdoc for more details.
{:controller => '/messages', :action => 'new', :board_id => @board},
:class => 'icon icon-add',
:onclick => 'Element.show("add-message"); Form.Element.focus("message_subject"); return false;' %>
- <%= watcher_link(@board, User.current) %>
+ <%= watcher_link(@board, User.current) %>
<% end %>
-
<%= render :partial => 'layouts/action_menu_specific' %>
@@ -61,13 +59,15 @@ See doc/COPYRIGHT.rdoc for more details.
<% if @topics.any? %>
-
- <%= Message.human_attribute_name(:subject) %>
- <%= Message.human_attribute_name(:author) %>
- <%= Message.human_attribute_name(:created_on) %>
- <%= l(:label_reply_plural) %>
- <%= l(:label_message_last) %>
-
+
+
+ <%= Message.human_attribute_name(:subject) %>
+ <%= Message.human_attribute_name(:author) %>
+ <%= Message.human_attribute_name(:created_on) %>
+ <%= l(:label_reply_plural) %>
+ <%= l(:label_message_last) %>
+
+
@@ -98,9 +98,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= other_formats_links do |f| %>
<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
<% end %>
-
<% html_title h(@board.name) %>
-
<% content_for :header_tags do %>
- <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %>
+ <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %>
<% end %>
diff --git a/app/views/categories/_form.html.erb b/app/views/categories/_form.html.erb
index d686c7ab05..f885ed7c4b 100644
--- a/app/views/categories/_form.html.erb
+++ b/app/views/categories/_form.html.erb
@@ -26,12 +26,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= error_messages_for 'category' %>
-
-
<%= f.text_field :name, :size => 30, :required => true %>
-
- <%= f.select :assigned_to_id, @project.possible_assignees.sort.collect{|u| [u.name, u.id]}, :include_blank => true %>
-
+
<%= f.text_field :name, :size => 30, :required => true %>
+
+ <%= f.select :assigned_to_id, @project.possible_assignees.sort.collect{|u| [u.name, u.id]}, :include_blank => true %>
+
diff --git a/app/views/categories/destroy.html.erb b/app/views/categories/destroy.html.erb
index 806fcb750b..a817bc7ff9 100644
--- a/app/views/categories/destroy.html.erb
+++ b/app/views/categories/destroy.html.erb
@@ -26,21 +26,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= Category.model_name.human %>: <%=h @category.name %>
-
<%= form_tag({}, {:method => :delete}) do %>
-
-
<%= l(:text_work_package_category_destroy_question, @issue_count) %>
-
<%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_work_package_category_destroy_assignments) %>
-<% if @categories.size > 0 %>
-<%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_work_package_category_reassign_to) %>
-<%= label_tag "reassign_to_id", l(:description_work_package_category_reassign), :class => "hidden-for-sighted" %>
-<%= select_tag 'reassign_to_id', options_from_collection_for_select(@categories, 'id', 'name') %>
-<% end %>
-
-
-<%= submit_tag l(:button_apply), class: 'button -highlight' %>
-<%= link_to l(:button_cancel), { :controller => '/projects', :action => 'settings', :id => @project, :tab => 'categories' },
+
+
<%= l(:text_work_package_category_destroy_question, @issue_count) %>
+
<%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_work_package_category_destroy_assignments) %>
+ <% if @categories.size > 0 %>
+ <%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_work_package_category_reassign_to) %>
+ <%= label_tag "reassign_to_id", l(:description_work_package_category_reassign), :class => "hidden-for-sighted" %>
+ <%= select_tag 'reassign_to_id', options_from_collection_for_select(@categories, 'id', 'name') %>
+ <% end %>
+
+ <%= submit_tag l(:button_apply), class: 'button -highlight' %>
+ <%= link_to l(:button_cancel), { :controller => '/projects', :action => 'settings', :id => @project, :tab => 'categories' },
class: 'button' %>
<% end %>
diff --git a/app/views/categories/edit.html.erb b/app/views/categories/edit.html.erb
index 658df1d99a..1b9c207640 100644
--- a/app/views/categories/edit.html.erb
+++ b/app/views/categories/edit.html.erb
@@ -26,10 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= Category.model_name.human %>
-
<%= labelled_tabular_form_for @category, :as => :category do |f| %>
-<%= render :partial => 'categories/form', :locals => { :f => f } %>
-<%= submit_tag l(:button_save), class: 'button -highlight' %>
+ <%= render :partial => 'categories/form', :locals => { :f => f } %>
+ <%= submit_tag l(:button_save), class: 'button -highlight' %>
<% end %>
diff --git a/app/views/categories/new.html.erb b/app/views/categories/new.html.erb
index 5839f4199c..b355fcb3b0 100644
--- a/app/views/categories/new.html.erb
+++ b/app/views/categories/new.html.erb
@@ -26,10 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%=l(:label_work_package_category_new)%>
-
<%= labelled_tabular_form_for [@project, @category], :as => :category do |f| %>
-<%= render :partial => 'categories/form', :locals => { :f => f } %>
-<%= submit_tag l(:button_create), class: 'button -highlight' %>
+ <%= render :partial => 'categories/form', :locals => { :f => f } %>
+ <%= submit_tag l(:button_create), class: 'button -highlight' %>
<% end %>
diff --git a/app/views/common/_calendar.html.erb b/app/views/common/_calendar.html.erb
index c37c1df2f7..a1ceb1492d 100644
--- a/app/views/common/_calendar.html.erb
+++ b/app/views/common/_calendar.html.erb
@@ -26,48 +26,50 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
-
- <% 7.times do |i| %><%= day_name( (calendar.first_wday+i)%7 ) %> <% end %>
-
-
-
-<% day = calendar.startdt
+
+
+
+ <% 7.times do |i| %>
+ <%= day_name( (calendar.first_wday+i)%7 ) %>
+ <% end %>
+
+
+
+ <% day = calendar.startdt
while day <= calendar.enddt %>
-<%= "#{(day+(11-day.cwday)%7).cweek} ".html_safe if day.cwday == calendar.first_wday %>
-
-<%= day.day %>
-<% calendar.events_on(day).each do |i| %>
- <% if i.is_a? WorkPackage %>
-
- <%= h("#{i.project} -") unless @project && @project == i.project %>
- <%# date_img = '' %>
- <% if day == i.start_date and day == i.due_date %>
- <% date_img = image_tag("bullet_diamond.png", :title => l(:text_tip_work_package_begin_end_day), :alt => l(:text_tip_work_package_begin_end_day),
+ <%= "
#{(day+(11-day.cwday)%7).cweek} ".html_safe if day.cwday == calendar.first_wday %>
+
+ <%= day.day %>
+ <% calendar.events_on(day).each do |i| %>
+ <% if i.is_a? WorkPackage %>
+
+ <%= h("#{i.project} -") unless @project && @project == i.project %>
+ <%# date_img = '' %>
+ <% if day == i.start_date and day == i.due_date %>
+ <% date_img = image_tag("bullet_diamond.png", :title => l(:text_tip_work_package_begin_end_day), :alt => l(:text_tip_work_package_begin_end_day),
:class => "imgtag-icon") %>
- <% elsif day == i.start_date %>
- <% date_img = image_tag("bullet_go.png", :title => l(:text_tip_work_package_begin_day), :alt => l(:text_tip_work_package_begin_day),
+ <% elsif day == i.start_date %>
+ <% date_img = image_tag("bullet_go.png", :title => l(:text_tip_work_package_begin_day), :alt => l(:text_tip_work_package_begin_day),
:class => "imgtag-icon") %>
- <% elsif day == i.due_date %>
- <% date_img = image_tag("bullet_end.png", :title => l(:text_tip_work_package_end_day), :alt => l(:text_tip_work_package_end_day),
+ <% elsif day == i.due_date %>
+ <% date_img = image_tag("bullet_end.png", :title => l(:text_tip_work_package_end_day), :alt => l(:text_tip_work_package_end_day),
:class => "imgtag-icon") %>
- <% end %>
-
- <%= link_to_work_package i, :truncate => 30, :before_text => date_img %>
- <%= render_issue_tooltip i %>
-
- <% else %>
-
- <%= h("#{i.project} -") unless @project && @project == i.project %>
- <%= link_to_version i, {}, {:before_text => icon_wrapper('icon-context icon-version', Version.model_name.human) }%>
-
- <% end %>
-<% end %>
-
-<%= '
'.html_safe if day.cwday==calendar.last_wday and day!=calendar.enddt %>
-<% day = day + 1
+ <% end %>
+ <%= link_to_work_package i, :truncate => 30, :before_text => date_img %>
+ <%= render_issue_tooltip i %>
+
+ <% else %>
+
+ <%= h("#{i.project} -") unless @project && @project == i.project %>
+ <%= link_to_version i, {}, {:before_text => icon_wrapper('icon-context icon-version', Version.model_name.human) }%>
+
+ <% end %>
+ <% end %>
+
+ <%= ' '.html_safe if day.cwday==calendar.last_wday and day!=calendar.enddt %>
+ <% day = day + 1
end %>
-
-
-
+
+
+
diff --git a/app/views/common/_diff.html.erb b/app/views/common/_diff.html.erb
index 2bfa93f0fe..a3ec65b4a9 100644
--- a/app/views/common/_diff.html.erb
+++ b/app/views/common/_diff.html.erb
@@ -26,61 +26,66 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% diff = Redmine::UnifiedDiff.new(diff, :type => diff_type, :max_lines => Setting.diff_max_lines_displayed.to_i) -%>
-
<% diff.each do |table_file| -%>
-
-<% end -%>
-
<%= l(:text_diff_truncated) if diff.truncated? %>
diff --git a/app/views/common/_file.html.erb b/app/views/common/_file.html.erb
index fab363637e..9f16dee0a8 100644
--- a/app/views/common/_file.html.erb
+++ b/app/views/common/_file.html.erb
@@ -26,18 +26,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
diff --git a/app/views/common/_tabs.html.erb b/app/views/common/_tabs.html.erb
index 2a62ce93dc..57ae5122a8 100644
--- a/app/views/common/_tabs.html.erb
+++ b/app/views/common/_tabs.html.erb
@@ -26,13 +26,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% selected_tab = params[:tab] ? params[:tab].to_s : tabs.first[:name] %>
-
- <% tabs.each do |tab| %>
- <%=
+ <% tabs.each do |tab| %>
+ <%=
position_span = you_are_here_info(tab[:name] == selected_tab)
caption = case tab[:label]
when Proc
@@ -44,7 +42,7 @@ See doc/COPYRIGHT.rdoc for more details.
id: "tab-#{tab[:name]}",
class: (tab[:name] != selected_tab ? nil : 'selected'),
onclick: "showTab('#{tab[:name]}', this.href); this.blur(); return false;") %>
- <% end %>
+ <% end %>
diff --git a/app/views/custom_fields/_form.html.erb b/app/views/custom_fields/_form.html.erb
index 0a1ca175c6..e9be36dc7f 100644
--- a/app/views/custom_fields/_form.html.erb
+++ b/app/views/custom_fields/_form.html.erb
@@ -26,115 +26,112 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= error_messages_for 'custom_field' %>
-
-
<%= f.text_field :name,
@@ -194,44 +191,39 @@ jQuery(".locale_selector").each(function (index) {
<% end %>
-<%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>
+ <%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>
-
<% case @custom_field.class.name
when "WorkPackageCustomField" %>
-
- <%=l(:label_type_plural)%>
- <% for type in @types %>
- <%= check_box_tag "custom_field[type_ids][]", type.id, (@custom_field.types.include? type), :id => "custom_field_type_ids_#{type.id}" %>
- <%= content_tag :label, (type.is_standard) ? l(:label_custom_field_default_type) : h(type), :class => "no-css", :for => "custom_field_type_ids_#{type.id}" %>
- <% end %>
+
+ <%=l(:label_type_plural)%>
+ <% for type in @types %>
+ <%= check_box_tag "custom_field[type_ids][]", type.id, (@custom_field.types.include? type), :id => "custom_field_type_ids_#{type.id}" %>
+ <%= content_tag :label, (type.is_standard) ? l(:label_custom_field_default_type) : h(type), :class => "no-css", :for => "custom_field_type_ids_#{type.id}" %>
+ <% end %>
<%= hidden_field_tag "custom_field[type_ids][]", '' %>
+
<%= f.check_box :is_required %>
<%= f.check_box :is_for_all %>
<%= f.check_box :is_filter %>
<%= f.check_box :searchable %>
-
- <% when "UserCustomField" %>
- <%= f.check_box :is_required %>
- <%= f.check_box :visible %>
- <%= f.check_box :editable %>
-
- <% when "ProjectCustomField" %>
- <%= f.check_box :is_required %>
- <%= f.check_box :visible %>
- <%= f.check_box :searchable %>
-
- <% when "TimeEntryCustomField" %>
- <%= f.check_box :is_required %>
-
- <% else %>
- <%= f.check_box :is_required %>
-
- <% end %>
-<%= call_hook(:"view_custom_fields_form_#{@custom_field.type.to_s.underscore}", :custom_field => @custom_field, :form => f) %>
-
-<%= javascript_tag "toggle_custom_field_format();" %>
-<%= javascript_tag "initLocaleChangeListener();" %>
+ <% when "UserCustomField" %>
+
<%= f.check_box :is_required %>
+
<%= f.check_box :visible %>
+
<%= f.check_box :editable %>
+ <% when "ProjectCustomField" %>
+
<%= f.check_box :is_required %>
+
<%= f.check_box :visible %>
+
<%= f.check_box :searchable %>
+ <% when "TimeEntryCustomField" %>
+
<%= f.check_box :is_required %>
+ <% else %>
+
<%= f.check_box :is_required %>
+ <% end %>
+ <%= call_hook(:"view_custom_fields_form_#{@custom_field.type.to_s.underscore}", :custom_field => @custom_field, :form => f) %>
+
+ <%= javascript_tag "toggle_custom_field_format();" %>
+ <%= javascript_tag "initLocaleChangeListener();" %>
diff --git a/app/views/custom_fields/_index.html.erb b/app/views/custom_fields/_index.html.erb
index 5352ab8762..01541965bd 100644
--- a/app/views/custom_fields/_index.html.erb
+++ b/app/views/custom_fields/_index.html.erb
@@ -26,36 +26,36 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
-
- <%= CustomField.human_attribute_name(:name) %>
- <%= CustomField.human_attribute_name(:field_format) %>
- <%= CustomField.human_attribute_name(:is_required) %>
- <% if tab[:name] == 'WorkPackageCustomField' %>
- <%= CustomField.human_attribute_name(:is_for_all) %>
- <%=l(:label_used_by)%>
- <% end %>
- <%=l(:button_sort)%>
-
-
-
- <% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
- ">
- <%= link_to h(custom_field.name), edit_custom_field_path(custom_field), lang: custom_field.name_locale %>
- <%= Redmine::CustomFieldFormat.label_for(custom_field.field_format) %>
- <%= checked_image custom_field.is_required? %>
+
+
+ <%= CustomField.human_attribute_name(:name) %>
+ <%= CustomField.human_attribute_name(:field_format) %>
+ <%= CustomField.human_attribute_name(:is_required) %>
<% if tab[:name] == 'WorkPackageCustomField' %>
- <%= checked_image custom_field.is_for_all? %>
- <%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? WorkPackageCustomField and !custom_field.is_for_all? %>
+ <%= CustomField.human_attribute_name(:is_for_all) %>
+ <%=l(:label_used_by)%>
<% end %>
- <%= reorder_links('custom_field', {:action => 'update', :id => custom_field}, method: :put) %>
-
- <%= delete_link custom_field_path(custom_field) %>
-
+ <%=l(:button_sort)%>
+
- <% end; reset_cycle %>
+
+
+ <% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
+ ">
+ <%= link_to h(custom_field.name), edit_custom_field_path(custom_field), lang: custom_field.name_locale %>
+ <%= Redmine::CustomFieldFormat.label_for(custom_field.field_format) %>
+ <%= checked_image custom_field.is_required? %>
+ <% if tab[:name] == 'WorkPackageCustomField' %>
+ <%= checked_image custom_field.is_for_all? %>
+ <%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? WorkPackageCustomField and !custom_field.is_for_all? %>
+ <% end %>
+ <%= reorder_links('custom_field', {:action => 'update', :id => custom_field}, method: :put) %>
+
+ <%= delete_link custom_field_path(custom_field) %>
+
+
+ <% end; reset_cycle %>
-
<%= link_to l(:label_custom_field_new), new_custom_field_path(:type => tab[:name]), :class => 'icon icon-add' %>
diff --git a/app/views/custom_fields/edit.html.erb b/app/views/custom_fields/edit.html.erb
index b3322a98fc..59ed11bf73 100644
--- a/app/views/custom_fields/edit.html.erb
+++ b/app/views/custom_fields/edit.html.erb
@@ -36,6 +36,6 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for @custom_field, :as => :custom_field,
:url => custom_field_path(@custom_field),
:html => {:method => :put, :id => 'custom_field_form'} do |f| %>
-<%= render :partial => 'form', :locals => { :f => f } %>
-<%= submit_tag l(:button_save), class: 'button -highlight' %>
+ <%= render :partial => 'form', :locals => { :f => f } %>
+ <%= submit_tag l(:button_save), class: 'button -highlight' %>
<% end %>
diff --git a/app/views/enumerations/destroy.html.erb b/app/views/enumerations/destroy.html.erb
index ea8c06a297..b6c2b5be31 100644
--- a/app/views/enumerations/destroy.html.erb
+++ b/app/views/enumerations/destroy.html.erb
@@ -26,17 +26,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= l(@enumeration.option_name) %>: <%=h @enumeration %>
-
<%= form_tag({}, :method => :delete) do %>
-
-
<%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %>
-
<%= l(:text_enumeration_category_reassign_to) %>
-<%= select_tag 'reassign_to_id', options_from_collection_for_select(@enumerations, 'id', 'name') %>
-
-
-<%= submit_tag l(:button_apply), class: 'button -highlight' %>
-<%= link_to l(:button_cancel), { :controller => '/enumerations', :action => 'index' },
+
+
<%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %>
+
<%= l(:text_enumeration_category_reassign_to) %>
+ <%= select_tag 'reassign_to_id', options_from_collection_for_select(@enumerations, 'id', 'name') %>
+
+ <%= submit_tag l(:button_apply), class: 'button -highlight' %>
+ <%= link_to l(:button_cancel), { :controller => '/enumerations', :action => 'index' },
class: 'button' %>
<% end %>
diff --git a/app/views/enumerations/index.html.erb b/app/views/enumerations/index.html.erb
index 78cea99f8a..2cf815279c 100644
--- a/app/views/enumerations/index.html.erb
+++ b/app/views/enumerations/index.html.erb
@@ -26,41 +26,38 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% html_title l(:label_administration), l(:label_enumerations) %>
-
<%=l(:label_enumerations)%>
-
<% Enumeration.descendants.each do |klass| %>
-
<%= l(klass::OptionName) %>
-
-<% enumerations = klass.shared %>
-<% if enumerations.any? %>
-
-
- <%= Enumeration.human_attribute_name(:name) %>
- <%= Enumeration.human_attribute_name(:is_default) %>
- <%= Enumeration.human_attribute_name(:active) %>
-
-
-
-<% enumerations.each do |enumeration| %>
-
- <%= link_to h(enumeration), :action => 'edit', :id => enumeration %>
- <%= checked_image enumeration.is_default? %>
- <%= checked_image enumeration.active? %>
- <%= reorder_links('enumeration', {:action => 'update', :id => enumeration}, :method => :put) %>
-
- <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration },
+ <%= l(klass::OptionName) %>
+ <% enumerations = klass.shared %>
+ <% if enumerations.any? %>
+
+
+
+ <%= Enumeration.human_attribute_name(:name) %>
+ <%= Enumeration.human_attribute_name(:is_default) %>
+ <%= Enumeration.human_attribute_name(:active) %>
+
+
+
+
+ <% enumerations.each do |enumeration| %>
+
+ <%= link_to h(enumeration), :action => 'edit', :id => enumeration %>
+ <%= checked_image enumeration.is_default? %>
+ <%= checked_image enumeration.active? %>
+ <%= reorder_links('enumeration', {:action => 'update', :id => enumeration}, :method => :put) %>
+
+ <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration },
:method => :delete,
:confirm => l(:text_are_you_sure),
:class => 'icon icon-delete' %>
-
-
-<% end %>
-
-<% reset_cycle %>
-<% end %>
-
-<%= link_to l(:label_enumeration_new), { :action => 'new', :type => klass.name } %>
+
+
+ <% end %>
+
+ <% reset_cycle %>
+ <% end %>
+
<%= link_to l(:label_enumeration_new), { :action => 'new', :type => klass.name } %>
<% end %>
diff --git a/app/views/groups/_memberships.html.erb b/app/views/groups/_memberships.html.erb
index b4a8c212c4..2a047636f8 100644
--- a/app/views/groups/_memberships.html.erb
+++ b/app/views/groups/_memberships.html.erb
@@ -26,69 +26,68 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% roles = Role.find_all_givable %>
<% projects = Project.active.find(:all, :order => 'lft') %>
-
-<% if @group.memberships.any? %>
-
-
- <%= Project.model_name.human %>
- <%= l(:label_role_plural) %>
-
-
-
- <% @group.memberships.each do |membership| %>
- <% next if membership.new_record? %>
-
- <%=h membership.project %>
-
- <%=h membership.roles.sort.collect(&:to_s).join(', ') %>
- <%= form_tag(membership_of_group_path(@group, membership),
+ <% if @group.memberships.any? %>
+
+
+
+ <%= Project.model_name.human %>
+ <%= l(:label_role_plural) %>
+
+
+
+
+ <% @group.memberships.each do |membership| %>
+ <% next if membership.new_record? %>
+
+ <%=h membership.project %>
+
+ <%=h membership.roles.sort.collect(&:to_s).join(', ') %>
+ <%= form_tag(membership_of_group_path(@group, membership),
:method => :put,
:remote => true,
:id => "member-#{membership.id}-roles-form",
:style => 'display:none;') do %>
- <% roles.each do |role| %>
- <%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role) %> <%=h role %>
- <% end %>
- <%= submit_tag l(:button_change), class: 'button -highlight -small' %>
- <%= link_to_function l(:button_cancel), "$('member-#{membership.id}-roles').show(); $('member-#{membership.id}-roles-form').hide(); return false;",
+
<% roles.each do |role| %>
+ <%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role) %> <%=h role %>
+ <% end %>
+ <%= submit_tag l(:button_change), class: 'button -highlight -small' %>
+ <%= link_to_function l(:button_cancel), "$('member-#{membership.id}-roles').show(); $('member-#{membership.id}-roles-form').hide(); return false;",
class: 'button -small' %>
- <% end %>
-
-
- <%= link_to_function l(:button_edit), "$('member-#{membership.id}-roles').hide(); $('member-#{membership.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
- <%= link_to l(:button_delete), membership_of_group_path(@group, membership),
+ <% end %>
+
+
+ <%= link_to_function l(:button_edit), "$('member-#{membership.id}-roles').hide(); $('member-#{membership.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
+ <%= link_to l(:button_delete), membership_of_group_path(@group, membership),
:method => :delete,
:remote => true,
:class => 'icon icon-delete' %>
-
-
-
-<% end; reset_cycle %>
-
-<% else %>
-<%= l(:label_no_data) %>
-<% end %>
-
-
-
-<% if projects.any? %>
-
- <%=l(:label_project_new)%>
- <%= form_tag(memberships_of_group_path(@group),
+
+
+
+ <% end; reset_cycle %>
+
+ <% else %>
+
<%= l(:label_no_data) %>
+ <% end %>
+
+
+ <% if projects.any? %>
+
+ <%=l(:label_project_new)%>
+ <%= form_tag(memberships_of_group_path(@group),
:method => :post,
:remote => true) do %>
- <%= label_tag "membership_project_id", l(:description_choose_project), :class => "hidden-for-sighted" %>
- <%= select_tag 'membership[project_id]', options_for_membership_project_select(@group, projects) %>
-
- <%= l(:label_role_plural) %>:
+ <%= label_tag "membership_project_id", l(:description_choose_project), :class => "hidden-for-sighted" %>
+ <%= select_tag 'membership[project_id]', options_for_membership_project_select(@group, projects) %>
+
+ <%= l(:label_role_plural) %>:
<%= labeled_check_box_tags 'membership[role_ids][]', roles %>
-
- <%= submit_tag l(:button_add), class: 'button -highlight' %>
+
+ <%= submit_tag l(:button_add), class: 'button -highlight' %>
+ <% end %>
+
<% end %>
-
-<% end %>
-
+
diff --git a/app/views/groups/_users.html.erb b/app/views/groups/_users.html.erb
index 7a40ae1ac3..542bb3d728 100644
--- a/app/views/groups/_users.html.erb
+++ b/app/views/groups/_users.html.erb
@@ -26,56 +26,51 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
-<% if @group.users.any? %>
-
-
- <%= User.model_name.human %>
-
-
-
- <% @group.users.sort.each do |user| %>
-
- <%= link_to_user user %>
-
- <%= link_to l(:button_delete), member_of_group_path(@group, user),
+ <% if @group.users.any? %>
+
+
+
+ <%= User.model_name.human %>
+
+
+
+
+ <% @group.users.sort.each do |user| %>
+
+ <%= link_to_user user %>
+
+ <%= link_to l(:button_delete), member_of_group_path(@group, user),
:method => :delete,
:remote => :true,
:class => 'icon icon-delete' %>
-
-
-
- <% end %>
-
-
-<% else %>
- <%= l(:label_no_data) %>
-<% end %>
+
+
+ <% end %>
+
+
+ <% else %>
+
<%= l(:label_no_data) %>
+ <% end %>
-
-<% users = User.active.not_in_group(@group).all(:limit => 100) %>
-<% if users.any? %>
- <%= form_tag(members_of_group_path(@group), :method => :post, :remote => true) do |f| %>
-
<%=l(:label_user_new)%>
-
- <%= label_tag "user_search", l(:label_user_search) %><%= text_field_tag 'user_search', nil %>
- <%= observe_field(:user_search,
+ <% users = User.active.not_in_group(@group).all(:limit => 100) %>
+ <% if users.any? %>
+ <%= form_tag(members_of_group_path(@group), :method => :post, :remote => true) do |f| %>
+ <%=l(:label_user_new)%>
+ <%= label_tag "user_search", l(:label_user_search) %><%= text_field_tag 'user_search', nil %>
+ <%= observe_field(:user_search,
:frequency => 0.5,
:update => :users,
:url => { :controller => '/groups', :action => 'autocomplete_for_user', :id => @group },
:with => 'q',
:method => :get)
%>
-
-
- <%= principals_check_box_tags 'user_ids[]', users %>
-
-
- <%= submit_tag l(:button_add), class: 'button -highlight' %>
-
+
+ <%= principals_check_box_tags 'user_ids[]', users %>
+
+ <%= submit_tag l(:button_add), class: 'button -highlight' %>
+
+ <% end %>
<% end %>
-<% end %>
-
diff --git a/app/views/groups/index.html.erb b/app/views/groups/index.html.erb
index cbe0a4a066..bf0243bba1 100644
--- a/app/views/groups/index.html.erb
+++ b/app/views/groups/index.html.erb
@@ -30,29 +30,27 @@ See doc/COPYRIGHT.rdoc for more details.
<% content_for :action_menu_specific do %>
<%= link_to l(:label_group_new), new_group_path, :class => 'icon icon-add' %>
<% end %>
-
<% html_title l(:label_administration), l("label_group_plural") %>
-
<%= l(:label_group_plural) %>
-
<%= render :partial => 'layouts/action_menu_specific' %>
-
<% if @groups.any? %>
-
-
- <%= Group.model_name.human %>
- <%=l(:label_user_plural)%>
-
-
-
-<% @groups.each do |group| %>
-
- <%= link_to h(group), :action => 'edit', :id => group %>
- <%= group.users.size %>
- <%= link_to l(:button_delete), group, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-delete' %>
-
-<% end %>
-
-<% else %>
-
<%= l(:label_no_data) %>
-<% end %>
+
+
+
+ <%= Group.model_name.human %>
+ <%=l(:label_user_plural)%>
+
+
+
+
+ <% @groups.each do |group| %>
+
+ <%= link_to h(group), :action => 'edit', :id => group %>
+ <%= group.users.size %>
+ <%= link_to l(:button_delete), group, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-delete' %>
+
+ <% end %>
+
+ <% else %>
+
<%= l(:label_no_data) %>
+ <% end %>
diff --git a/app/views/groups/show.html.erb b/app/views/groups/show.html.erb
index 9109b67bb8..770120d461 100644
--- a/app/views/groups/show.html.erb
+++ b/app/views/groups/show.html.erb
@@ -26,11 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= link_to l(:label_group_plural), groups_path %> » <%=h @group %>
-
-<% @group.users.each do |user| %>
+ <% @group.users.each do |user| %>
<%=h user %>
-<% end %>
+ <% end %>
diff --git a/app/views/help/wiki_syntax.html.erb b/app/views/help/wiki_syntax.html.erb
index 9fb4fc5ef2..b0e231eb10 100644
--- a/app/views/help/wiki_syntax.html.erb
+++ b/app/views/help/wiki_syntax.html.erb
@@ -26,9 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% content_for :styles do %>
- h1 { font-family: Verdana, sans-serif; font-size: 14px; text-align: center; color: #444; }
+ h1 { font-family: Verdana, sans-serif; font-size: 14px; text-align: center; color: #444; }
body { font-family: Verdana, sans-serif; font-size: 12px; color: #444; }
table th { padding-top: 1em; }
table td { vertical-align: top; background-color: #f5f5f5; height: 2em; vertical-align: middle;}
@@ -77,9 +76,12 @@ See doc/COPYRIGHT.rdoc for more details.
<%= image_tag 'jstoolbar/bt_pre.png', :style => 'border: 1px solid #bbb', :alt => 'Preformatted text' %>
- <pre> lines of code </pre>
+ <pre>
+ lines
+ of code
+ </pre>
-
+
lines
of code
@@ -91,7 +93,8 @@ See doc/COPYRIGHT.rdoc for more details.
<%= image_tag 'jstoolbar/bt_ul.png', :style => 'border: 1px solid #bbb', :alt => 'Unordered list' %>
- * Item 1 * Item 2
+ * Item 1
+ * Item 2
Item 1
@@ -101,7 +104,8 @@ See doc/COPYRIGHT.rdoc for more details.
<%= image_tag 'jstoolbar/bt_ol.png', :style => 'border: 1px solid #bbb', :alt => 'Ordered list' %>
- # Item 1 # Item 2
+ # Item 1
+ # Item 2
Item 1
@@ -116,19 +120,24 @@ See doc/COPYRIGHT.rdoc for more details.
<%= image_tag 'jstoolbar/bt_h1.png', :style => 'border: 1px solid #bbb', :alt => 'Heading 1' %>
h1. Title 1
- Title 1
+
+ Title 1
+
<%= image_tag 'jstoolbar/bt_h2.png', :style => 'border: 1px solid #bbb', :alt => 'Heading 2' %>
h2. Title 2
- Title 2
+
+ Title 2
+
<%= image_tag 'jstoolbar/bt_h3.png', :style => 'border: 1px solid #bbb', :alt => 'Heading 3' %>
h3. Title 3
- Title 3
+
+ Title 3
+
-
Links
@@ -170,6 +179,7 @@ See doc/COPYRIGHT.rdoc for more details.
WorkPackage ###12
WorkPackage Bug #12: WorkPackage Subject 2012-06-06 – 2013-06-06
+
Responsible: John Doe
Assigned to: John Doe
@@ -177,7 +187,7 @@ See doc/COPYRIGHT.rdoc for more details.
I am the description of this work package.
-
+
diff --git a/app/views/help/wiki_syntax_detailed.html.erb b/app/views/help/wiki_syntax_detailed.html.erb
index 828e14ddd7..cb671406bf 100644
--- a/app/views/help/wiki_syntax_detailed.html.erb
+++ b/app/views/help/wiki_syntax_detailed.html.erb
@@ -26,9 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% content_for :styles do %>
- body { font:80% Verdana,Tahoma,Arial,sans-serif; }
+ body { font:80% Verdana,Tahoma,Arial,sans-serif; }
h1, h2, h3, h4 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
pre, code { font-size:120%; }
pre code { font-size:100%; }
@@ -57,125 +56,103 @@ See doc/COPYRIGHT.rdoc for more details.
.CodeRay .s { background-color:#fff0f0 }
.CodeRay .s .dl { color:#710 }
<% end %>
-
<% html_title "Wiki Formatting" %>
Wiki Formatting
-
- Links
-
- OpenProject links
-
- OpenProject allows hyperlinking between work packages, changesets and wiki pages from anywhere wiki formatting is used.
-
- #124 displays a link to a work package: #124 (link is striked-through if the work package is closed)
- ##124 displays a link to a work package with context information: Bug #12: Work package subject 2012-05-14 - 2012-05-23
- ###124 displays a link to a work package with context information and an excerpt (first 3 lines) of the description
- r758 displays a link to a changeset: r758
- commit:c6f4d0fd displays a link to a changeset with a non-numeric hash: c6f4d0fd
- sandbox:r758 displays a link to a changeset of another project: sandbox:r758
- sandbox:c6f4d0fd displays a link to a changeset with a non-numeric hash: sandbox:c6f4d0fd
-
-
- Wiki links:
-
-
- [[Guide]] displays a link to the page named 'Guide': Guide
- [[Guide#further-reading]] takes you to the anchor "further-reading". Headings get automatically assigned anchors so that you can refer to them: Guide
- [[Guide|User manual]] displays a link to the same page but with a different text: User manual
-
-
- You can also link to pages of an other project wiki:
-
-
- [[sandbox:some page]] displays a link to the page named 'Some page' of the Sandbox wiki
- [[sandbox:]] displays a link to the Sandbox wiki main page
-
-
- Wiki links are displayed in red if the page doesn't exist yet, eg: Nonexistent page .
-
- Links to other resources:
-
-
- Versions:
-
- version#3 (link to version with id 3)
- version:1.0.0 (link to version named "1.0.0")
- version:"1.0 beta 2"
- sandbox:version:1.0.0 (link to version "1.0.0" in the project "sandbox")
-
-
-
-
- Attachments:
-
- attachment:file.zip (link to the attachment of the current object named file.zip)
- For now, attachments of the current object can be referenced only (if you're on a work package, it's possible to reference attachments of this work package only)
-
-
-
-
- Repository files:
-
- source:some/file (link to the file located at /some/file in the project's repository)
- source:some/file@52 (link to the file's revision 52)
- source:some/file#L120 (link to line 120 of the file)
- source:some/file@52#L120 (link to line 120 of the file's revision 52)
- source:"some file@52#L120" (use double quotes when the URL contains spaces
- export:some/file (force the download of the file)
- sandbox:source:some/file (link to the file located at /some/file in the repository of the project "sandbox")
- sandbox:export:some/file (force the download of the file)
-
-
-
-
- Forum messages:
-
- message#1218 (link to message with id 1218)
-
-
-
-
- Projects:
-
- project#3 (link to project with id 3)
- project:someproject (link to project named "someproject")
-
-
-
-
- Escaping:
-
-
- You can prevent OpenProject links from being parsed by preceding them with an exclamation mark: !
-
-
-
- External links
-
- HTTP URLs and email addresses are automatically turned into clickable links:
-
+ Links
+ OpenProject links
+OpenProject allows hyperlinking between work packages, changesets and wiki pages from anywhere wiki formatting is used.
+
+ #124 displays a link to a work package: #124 (link is striked-through if the work package is closed)
+ ##124 displays a link to a work package with context information: Bug #12: Work package subject 2012-05-14 - 2012-05-23
+ ###124 displays a link to a work package with context information and an excerpt (first 3 lines) of the description
+ r758 displays a link to a changeset: r758
+ commit:c6f4d0fd displays a link to a changeset with a non-numeric hash: c6f4d0fd
+ sandbox:r758 displays a link to a changeset of another project: sandbox:r758
+ sandbox:c6f4d0fd displays a link to a changeset with a non-numeric hash: sandbox:c6f4d0fd
+
+Wiki links:
+
+ [[Guide]] displays a link to the page named 'Guide': Guide
+ [[Guide#further-reading]] takes you to the anchor "further-reading". Headings get automatically assigned anchors so that you can refer to them: Guide
+ [[Guide|User manual]] displays a link to the same page but with a different text: User manual
+
+You can also link to pages of an other project wiki:
+
+ [[sandbox:some page]] displays a link to the page named 'Some page' of the Sandbox wiki
+ [[sandbox:]] displays a link to the Sandbox wiki main page
+
+Wiki links are displayed in red if the page doesn't exist yet, eg: Nonexistent page .
+Links to other resources:
+
+ Versions:
+
+
+ version#3 (link to version with id 3)
+ version:1.0.0 (link to version named "1.0.0")
+ version:"1.0 beta 2"
+ sandbox:version:1.0.0 (link to version "1.0.0" in the project "sandbox")
+
+
+
+
+ Attachments:
+
+
+ attachment:file.zip (link to the attachment of the current object named file.zip)
+ For now, attachments of the current object can be referenced only (if you're on a work package, it's possible to reference attachments of this work package only)
+
+
+
+
+ Repository files:
+
+
+ source:some/file (link to the file located at /some/file in the project's repository)
+ source:some/file@52 (link to the file's revision 52)
+ source:some/file#L120 (link to line 120 of the file)
+ source:some/file@52#L120 (link to line 120 of the file's revision 52)
+ source:"some file@52#L120" (use double quotes when the URL contains spaces
+ export:some/file (force the download of the file)
+ sandbox:source:some/file (link to the file located at /some/file in the repository of the project "sandbox")
+ sandbox:export:some/file (force the download of the file)
+
+
+
+
+ Forum messages:
+
+
+ message#1218 (link to message with id 1218)
+
+
+
+
+ Projects:
+
+
+ project#3 (link to project with id 3)
+ project:someproject (link to project named "someproject")
+
+
+
+Escaping:
+
+ You can prevent OpenProject links from being parsed by preceding them with an exclamation mark: !
+
+ External links
+HTTP URLs and email addresses are automatically turned into clickable links:
https://www.openproject.org, someone@foo.bar
-
- displays: https://www.openproject.org , someone@foo.bar
-
- If you want to display a specific text instead of the URL, you can use the standard textile syntax:
-
+displays: https://www.openproject.org , someone@foo.bar
+If you want to display a specific text instead of the URL, you can use the standard textile syntax:
"OpenProject web site":https://www.openproject.org
-
- displays: OpenProject web site
-
-
- Text formatting
-
-
- For things such as headlines, bold, tables, lists, OpenProject supports Textile syntax. See http://www.textism.com/tools/textile/ for information on using any of these features. A few samples are included below, but the engine is capable of much more of that.
-
- Font style
-
+displays: OpenProject web site
+ Text formatting
+For things such as headlines, bold, tables, lists, OpenProject supports Textile syntax. See http://www.textism.com/tools/textile/ for information on using any of these features. A few samples are included below, but the engine is capable of much more of that.
+ Font style
* *bold*
* _italic_
@@ -183,125 +160,110 @@ https://www.openproject.org, someone@foo.bar
* +underline+
* -strike-through-
-
- Display:
-
-
- bold
- italic
- *bold italic*
- underline
- strike-through
-
-
- Inline images
-
-
- !image_url! displays an image located at image_url (textile syntax)
- !>image_url! right floating image
- If you have an image attached to your wiki page, it can be displayed inline using its filename: !attached_image.png!
-
-
- Headings
- Prefixing a line with h1.
, h2.
etc. will create a heading:
+Display:
+
+ bold
+ italic
+ *bold italic*
+ underline
+ strike-through
+
+ Inline images
+
+ !image_url! displays an image located at image_url (textile syntax)
+ !>image_url! right floating image
+ If you have an image attached to your wiki page, it can be displayed inline using its filename: !attached_image.png!
+
+ Headings
+Prefixing a line with h1.
, h2.
etc. will create a heading:
h1. Heading
h2. Subheading
h3. Subsubheading
- OpenProject assigns an anchor to each of those headings thus you can link to them with "#Heading", "#Subheading" and so forth.
- Numbered Headings
-
-
- You may also define numbered headings by prefixing lines with h1#.
, h2#.
etc. The heading numbers are then automatically managed by OpenProject for you.
+
OpenProject assigns an anchor to each of those headings thus you can link to them with "#Heading", "#Subheading" and so forth.
+Numbered Headings
+
+ You may also define numbered headings by prefixing lines with h1#.
, h2#.
etc. The heading numbers are then automatically managed by OpenProject for you.
-
-
-
-
- Wiki format
+
+
+
+
+ Wiki format
-
- Resulting Text
+
+ Resulting Text
-
-
-
-
-
-
+
+
+
+
+
+
h1#. Topic Foo
h2#. Sub-Topic Foo Bar
h1#. Topic Baz
-
-
- 1. Topic A
- 1.2. Sub-Topic 1
- 2. Topic B
-
-
-
-
-
-
-
- Paragraphs
-
+
+
+ 1. Topic A
+ 1.2. Sub-Topic 1
+ 2. Topic B
+
+
+
+
+ Paragraphs
p>. right aligned
p=. centered
-
- This is a centered paragraph.
-
-
- Blockquotes
-
- Start the paragraph with bq.
-
+This is a centered paragraph.
+ Blockquotes
+Start the paragraph with bq.
bq. Rails is a full-stack framework for developing database-backed web applications according to the Model-View-Control pattern.
To go live, all you need to add is a database and a web server.
-
- Display:
-
-
- Rails is a full-stack framework for developing database-backed web applications according to the Model-View-Control pattern. To go live, all you need to add is a database and a web server.
-
-
-
- Table of content
-
+Display:
+
+ Rails is a full-stack framework for developing database-backed web applications according to the Model-View-Control pattern.
+ To go live, all you need to add is a database and a web server.
+
+ Table of content
{{toc}} => left aligned toc
{{>toc}} => right aligned toc
-
- Macros
-
- OpenProject has the following builtin macros:
-
-
hello_world
Sample macro.
include
Include a wiki page. Example:
-
- {{include(Foo)}}
macro_list
Displays a list of all available macros, including description if available.
-
-
- Code highlighting
-
- Code highlighting relies on CodeRay , a fast syntax highlighting library written completely in Ruby. It currently supports c, cpp, css, delphi, groovy, html, java, javascript, json, php, python, rhtml, ruby, scheme, sql, xml and yaml languages.
-
- You can highlight code in your wiki page using this syntax:
-
+ Macros
+OpenProject has the following builtin macros:
+
+
+ hello_world
+
+ Sample macro.
+
+ include
+
+ Include a wiki page. Example:
+ {{include(Foo)}}
+
+ macro_list
+
+ Displays a list of all available macros, including description if available.
+
+
+
+ Code highlighting
+Code highlighting relies on CodeRay , a fast syntax highlighting library written completely in Ruby. It currently supports c, cpp, css, delphi, groovy, html, java, javascript, json, php, python, rhtml, ruby, scheme, sql, xml and yaml languages.
+You can highlight code in your wiki page using this syntax:
<pre><code class="ruby">
Place you code here.
</code></pre>
-
- Example:
-
+Example:
1 # The Greeter class
2 class Greeter
3 def initialize (name)
diff --git a/app/views/layouts/angular.html.erb b/app/views/layouts/angular.html.erb
index 1db9946609..7e8c6b01c5 100644
--- a/app/views/layouts/angular.html.erb
+++ b/app/views/layouts/angular.html.erb
@@ -28,128 +28,116 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% show_decoration = params["layout"].nil? %>
-
-
-<%= html_title %>
-
-
-
-
-
-
-<%= csrf_meta_tags %>
-<%= favicon_link_tag 'favicon.ico' %>
-<%= stylesheet_link_tag current_theme.stylesheet_manifest, :media => "all" %>
-<% if User.current.impaired? && accessibility_css_enabled? %>
- <%= stylesheet_link_tag 'accessibility' %>
-<% end %>
-
-<%= include_gon %>
-<%= javascript_include_tag 'application' %>
-
-<%= call_hook :view_work_package_overview_attributes %>
-
-<%= user_specific_javascript_includes %>
-
-<%= call_hook :view_layouts_base_html_head %>
-
-<%= content_for(:header_tags) if content_for?(:header_tags) %>
-
-
-
-
-
<%=l(:noscript_heading)%>
-
- <%=l(:noscript_description)%>
-
-
-
-
-<% main_menu = render_main_menu(@project) %>
-<% side_displayed = content_for?(:sidebar) || content_for?(:main_menu) || !main_menu.blank? %>
-
-<%= (show_decoration) ? '' : 'nomenus' %>"
+
+
+
<%= html_title %>
+
+
+
+
+
+
+ <%= csrf_meta_tags %>
+ <%= favicon_link_tag 'favicon.ico' %>
+ <%= stylesheet_link_tag current_theme.stylesheet_manifest, :media => "all" %>
+ <% if User.current.impaired? && accessibility_css_enabled? %>
+ <%= stylesheet_link_tag 'accessibility' %>
+ <% end %>
+ <%= include_gon %>
+ <%= javascript_include_tag 'application' %>
+
+ <%= call_hook :view_work_package_overview_attributes %>
+
+ <%= user_specific_javascript_includes %>
+
+ <%= call_hook :view_layouts_base_html_head %>
+
+ <%= content_for(:header_tags) if content_for?(:header_tags) %>
+
+
+
+
+
<%=l(:noscript_heading)%>
+
+ <%=l(:noscript_description)%>
+
+
+
+
+ <% main_menu = render_main_menu(@project) %>
+ <% side_displayed = content_for?(:sidebar) || content_for?(:main_menu) || !main_menu.blank? %>
+
<%= (show_decoration) ? '' : 'nomenus' %>"
ng-class="{ 'hidden-navigation': !showNavigation }">
- <% if show_decoration %>
-
+
+ <%= hidden_field_tag 'f[]', '' %>
diff --git a/app/views/reportings/edit.html.erb b/app/views/reportings/edit.html.erb
index df8a4cfb58..45a0a74175 100644
--- a/app/views/reportings/edit.html.erb
+++ b/app/views/reportings/edit.html.erb
@@ -57,7 +57,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= Reporting.human_attribute_name(:reported_project_status_id) %>:
- <%= f.select :reported_project_status_id,
+ <%= f.select :reported_project_status_id,
@reporting.possible_reported_project_statuses.map { |s|
[s.name, s.id]
}.unshift(["-",""]) %>
diff --git a/app/views/reportings/index.html.erb b/app/views/reportings/index.html.erb
index 7464f026ef..7b81269827 100644
--- a/app/views/reportings/index.html.erb
+++ b/app/views/reportings/index.html.erb
@@ -26,12 +26,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= header_tags %>
<%= javascript_include_tag 'contextual_fieldset.js' %>
-
<% content_for :action_menu_specific do %>
- <%= link_to_if_authorized(l("timelines.new_reporting"),
+ <%= link_to_if_authorized(l("timelines.new_reporting"),
{ :action => :new },
{ :title => l("timelines.new_reporting"),
:class => ("icon icon-add")
diff --git a/app/views/repositories/_dir_list.html.erb b/app/views/repositories/_dir_list.html.erb
index 5a5cfc418d..0774701e4f 100644
--- a/app/views/repositories/_dir_list.html.erb
+++ b/app/views/repositories/_dir_list.html.erb
@@ -26,19 +26,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
-
-
-<%= Attachment.human_attribute_name(:filename) %>
-<%= Attachment.human_attribute_name(:filesize) %>
-<%= l(:label_revision) %>
-<%= l(:label_age) %>
-<%= Changeset.human_attribute_name(:author) %>
-<%= Changeset.human_attribute_name(:comments) %>
-
-
-
-<%= render :partial => 'dir_list_content' %>
-
+
+
+ <%= Attachment.human_attribute_name(:filename) %>
+ <%= Attachment.human_attribute_name(:filesize) %>
+ <%= l(:label_revision) %>
+ <%= l(:label_age) %>
+ <%= Changeset.human_attribute_name(:author) %>
+ <%= Changeset.human_attribute_name(:comments) %>
+
+
+
+ <%= render :partial => 'dir_list_content' %>
+
diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index afd0671ffe..a4ccccaf3f 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -26,31 +26,30 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% @entries.each do |entry| %>
-<% tr_id = Digest::MD5.hexdigest(entry.path)
+ <% tr_id = Digest::MD5.hexdigest(entry.path)
depth = params[:depth].to_i %>
-<% ent_path = replace_invalid_utf8(entry.path) %>
-<% ent_name = replace_invalid_utf8(entry.name) %>
-
-
-<% if entry.is_dir? %>
-" class="<%= h params[:parent_id] %> entry <%= h(entry.kind) %>">
+
+ <% if entry.is_dir? %>
+ "scmEntryClick('#{tr_id}')"%>"> 
-<% end %>
-<%= link_to h(ent_name),
+ <% end %>
+ <%= link_to h(ent_name),
{:action => (entry.is_dir? ? 'show' : 'changes'), :project_id => @project, :path => to_path_param(ent_path), :rev => @rev},
:class => (entry.is_dir? ? 'icon-context icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
-
-<%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %>
-<% changeset = @project.repository.find_changeset_by_name(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>
-<%= link_to_revision(changeset, @project) if changeset %>
-<%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %>
-<%= changeset.nil? ? h(replace_invalid_utf8(entry.lastrev.author.to_s.split('<').first)) : h(changeset.author) if entry.lastrev %>
-
-
+
+
<%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %>
+ <% changeset = @project.repository.find_changeset_by_name(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>
+
<%= link_to_revision(changeset, @project) if changeset %>
+
<%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %>
+
<%= changeset.nil? ? h(replace_invalid_utf8(entry.lastrev.author.to_s.split('<').first)) : h(changeset.author) if entry.lastrev %>
+
+
<% end %>
diff --git a/app/views/repositories/_link_to_functions.html.erb b/app/views/repositories/_link_to_functions.html.erb
index 72f52ce4ae..fa4282ef3d 100644
--- a/app/views/repositories/_link_to_functions.html.erb
+++ b/app/views/repositories/_link_to_functions.html.erb
@@ -26,19 +26,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% if @entry && @entry.kind == 'file' %>
-
-
-<%= link_to_if action_name != 'changes', l(:label_history), {:action => 'changes', :project_id => @project, :path => to_path_param(@path), :rev => @rev } %> |
-<% if @repository.supports_cat? %>
- <%= link_to_if action_name != 'entry', l(:button_view), {:action => 'entry', :project_id => @project, :path => to_path_param(@path), :rev => @rev } %> |
-<% end %>
-<% if @repository.supports_annotate? %>
- <%= link_to_if action_name != 'annotate', l(:button_annotate), {:action => 'annotate', :project_id => @project, :path => to_path_param(@path), :rev => @rev } %> |
-<% end %>
-<%= link_to(l(:button_download), {:action => 'entry', :project_id => @project, :path => to_path_param(@path), :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
-<%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
-
-
+
+ <%= link_to_if action_name != 'changes', l(:label_history), {:action => 'changes', :project_id => @project, :path => to_path_param(@path), :rev => @rev } %> |
+ <% if @repository.supports_cat? %>
+ <%= link_to_if action_name != 'entry', l(:button_view), {:action => 'entry', :project_id => @project, :path => to_path_param(@path), :rev => @rev } %> |
+ <% end %>
+ <% if @repository.supports_annotate? %>
+ <%= link_to_if action_name != 'annotate', l(:button_annotate), {:action => 'annotate', :project_id => @project, :path => to_path_param(@path), :rev => @rev } %> |
+ <% end %>
+ <%= link_to(l(:button_download), {:action => 'entry', :project_id => @project, :path => to_path_param(@path), :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
+ <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
+
<% end %>
diff --git a/app/views/repositories/_navigation.html.erb b/app/views/repositories/_navigation.html.erb
index 6589dea231..cd08c15553 100644
--- a/app/views/repositories/_navigation.html.erb
+++ b/app/views/repositories/_navigation.html.erb
@@ -36,21 +36,18 @@ See doc/COPYRIGHT.rdoc for more details.
<%= link_to l(:label_statistics), stats_project_repository_path(@project),
:class => 'icon icon-stats' %> |
-
- <%# rev => nil prevents overwriting the rev parameter queried for in the form with the parameter from the request %>
- <%= form_tag({:action => controller.action_name, :project_id => @project, :path => to_path_param(@path), :rev => nil}, {:method => :get, :id => 'revision_selector'}) do -%>
-
- <% if !@repository.branches.nil? && @repository.branches.length > 0 -%>
- <%= l(:label_branch) %>:
+ <%# rev => nil prevents overwriting the rev parameter queried for in the form with the parameter from the request %>
+ <%= form_tag({:action => controller.action_name, :project_id => @project, :path => to_path_param(@path), :rev => nil}, {:method => :get, :id => 'revision_selector'}) do -%>
+
+ <% if !@repository.branches.nil? && @repository.branches.length > 0 -%>
+ <%= l(:label_branch) %>:
<%= select_tag :branch, options_for_select([''] + @repository.branches,@rev), :id => 'branch' %> |
<% end -%>
-
- <% if !@repository.tags.nil? && @repository.tags.length > 0 -%>
- <%= l(:label_tag) %>:
+ <% if !@repository.tags.nil? && @repository.tags.length > 0 -%>
+ <%= l(:label_tag) %>:
<%= select_tag :tag, options_for_select([''] + @repository.tags,@rev), :id => 'tag' %> |
<% end -%>
-
- <%= l(:label_revision) %>:
+ <%= l(:label_revision) %>:
<%= text_field_tag 'rev', @rev, :size => 8 %>
- <% end -%>
-<% end %>
+ <% end -%>
+ <% end %>
diff --git a/app/views/repositories/_revisions.html.erb b/app/views/repositories/_revisions.html.erb
index 0cac9d6399..a350c6c1b8 100644
--- a/app/views/repositories/_revisions.html.erb
+++ b/app/views/repositories/_revisions.html.erb
@@ -43,27 +43,27 @@ See doc/COPYRIGHT.rdoc for more details.
<% show_diff = revisions.size > 1 %>
<% line_num = 1 %>
<% revisions.each do |changeset| %>
-
-
- <%= link_to_revision(changeset, project) %>
-
-
- <%= radio_button_tag('rev', changeset.identifier, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %>
-
-
- <%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %>
-
-
- <%= format_time(changeset.committed_on) %>
-
-
- <%=h changeset.author %>
-
-
-
- <% line_num += 1 %>
+
+
+ <%= link_to_revision(changeset, project) %>
+
+
+ <%= radio_button_tag('rev', changeset.identifier, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %>
+
+
+ <%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %>
+
+
+ <%= format_time(changeset.committed_on) %>
+
+
+ <%=h changeset.author %>
+
+
+
+ <% line_num += 1 %>
<% end %>
diff --git a/app/views/repositories/annotate.html.erb b/app/views/repositories/annotate.html.erb
index 175eb92996..6fcce26d33 100644
--- a/app/views/repositories/annotate.html.erb
+++ b/app/views/repositories/annotate.html.erb
@@ -26,36 +26,30 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
-
<%= render :partial => 'navigation' %>
-
<%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'file', :revision => @rev } %>
-
<%= render :partial => 'layouts/action_menu_specific' %>
-
<%= render :partial => 'link_to_functions' %>
-
<% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
-
-
<% html_title(l(:button_annotate)) -%>
diff --git a/app/views/repositories/committers.html.erb b/app/views/repositories/committers.html.erb
index 2d1f7c412a..b2671caa25 100644
--- a/app/views/repositories/committers.html.erb
+++ b/app/views/repositories/committers.html.erb
@@ -26,38 +26,33 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= l(:label_repository) %>
-
<%= simple_format(l(:text_repository_usernames_mapping)) %>
-
<% if @committers.empty? %>
-
<%= l(:label_no_data) %>
+
<%= l(:label_no_data) %>
<% else %>
-
-<%= form_tag({}) do %>
-
-
-
- <%= User.human_attribute_name(:login) %>
- <%= User.model_name.human %>
-
-
-
-<% i = 0 -%>
-<% @committers.each do |committer, user_id| -%>
-
- <%=h committer %>
-
- <%= hidden_field_tag "committers[#{i}][]", committer %>
- <%= select_tag "committers[#{i}][]", content_tag('option', "-- #{l :actionview_instancetag_blank_option} --", :value => '') + options_from_collection_for_select(@users, 'id', 'name', user_id.to_i) %>
-
-
- <% i += 1 -%>
-<% end -%>
-
-
-
<%= submit_tag l(:button_update), class: 'button -highlight' %>
-<% end %>
-
+ <%= form_tag({}) do %>
+
+
+
+ <%= User.human_attribute_name(:login) %>
+ <%= User.model_name.human %>
+
+
+
+ <% i = 0 -%>
+ <% @committers.each do |committer, user_id| -%>
+
+ <%=h committer %>
+
+ <%= hidden_field_tag "committers[#{i}][]", committer %>
+ <%= select_tag "committers[#{i}][]", content_tag('option', "-- #{l :actionview_instancetag_blank_option} --", :value => '') + options_from_collection_for_select(@users, 'id', 'name', user_id.to_i) %>
+
+
+ <% i += 1 -%>
+ <% end -%>
+
+
+
<%= submit_tag l(:button_update), class: 'button -highlight' %>
+ <% end %>
<% end %>
diff --git a/app/views/repositories/diff.html.erb b/app/views/repositories/diff.html.erb
index d11d16589b..c968ec09af 100644
--- a/app/views/repositories/diff.html.erb
+++ b/app/views/repositories/diff.html.erb
@@ -34,13 +34,11 @@ See doc/COPYRIGHT.rdoc for more details.
<%= hidden_field_tag('rev', params[:rev]) if params[:rev] %>
<%= hidden_field_tag('rev_to', params[:rev_to]) if params[:rev_to] %>
<%= l(:label_view_diff) %>
- <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %>
+ <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %>
<% end %>
-
<% cache(@cache_key) do -%>
-<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
+ <%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
<% end -%>
-
<%= other_formats_links do |f| %>
<%= f.link_to 'Diff', :url => params, :caption => 'Unified diff' %>
<% end %>
diff --git a/app/views/repositories/revision.html.erb b/app/views/repositories/revision.html.erb
index 5e4a05e325..785cec11d3 100644
--- a/app/views/repositories/revision.html.erb
+++ b/app/views/repositories/revision.html.erb
@@ -34,7 +34,7 @@ See doc/COPYRIGHT.rdoc for more details.
<% else -%>
<%= l(:label_previous) %>
<% end -%>
-|
+ |
<% unless @changeset.next.nil? -%>
<%= link_to_revision(@changeset.next, @project, :text => l(:label_next)) %>
<% else -%>
@@ -47,40 +47,32 @@ See doc/COPYRIGHT.rdoc for more details.
<%= submit_tag 'OK', :name => nil, class: 'button -highlight' %>
<% end %>
<% end %>
-
<%= l(:label_revision) %> <%= format_revision(@changeset) %>
-
<%= render :partial => 'layouts/action_menu_specific' %>
-
-
<% if @changeset.scmid %>ID: <%= h(@changeset.scmid) %> <% end %>
-<%= authoring(@changeset.committed_on, @changeset.author) %>
-
+
<% if @changeset.scmid %>ID: <%= h(@changeset.scmid) %>
+ <% end %>
+ <%= authoring(@changeset.committed_on, @changeset.author) %>
<%= format_text @changeset.comments %>
-
<% if @changeset.work_packages.visible.any? %>
-
<%= l(:label_related_work_packages) %>
-
-<% @changeset.work_packages.visible.each do |work_package| %>
- <%= link_to_work_package work_package %>
+ <%= l(:label_related_work_packages) %>
+
+ <% @changeset.work_packages.visible.each do |work_package| %>
+ <%= link_to_work_package work_package %>
+ <% end %>
+
<% end %>
-
-<% end %>
-
<% if User.current.allowed_to?(:browse_repository, @project) %>
-
<%= l(:label_attachment_plural) %>
-
-<%= l(:label_added) %>
-<%= l(:label_modified) %>
-<%= l(:label_copied) %>
-<%= l(:label_renamed) %>
-<%= l(:label_deleted) %>
-
-
-
<%= link_to(l(:label_view_diff), :action => 'diff', :project_id => @project, :path => nil, :rev => @changeset.identifier) if @changeset.changes.any? %>
-
-
-<%= render_changeset_changes %>
-
+
<%= l(:label_attachment_plural) %>
+
+ <%= l(:label_added) %>
+ <%= l(:label_modified) %>
+ <%= l(:label_copied) %>
+ <%= l(:label_renamed) %>
+ <%= l(:label_deleted) %>
+
+
<%= link_to(l(:label_view_diff), :action => 'diff', :project_id => @project, :path => nil, :rev => @changeset.identifier) if @changeset.changes.any? %>
+
+ <%= render_changeset_changes %>
+
<% end %>
-
<% html_title("#{l(:label_revision)} #{format_revision(@changeset)}") -%>
diff --git a/app/views/repositories/revisions.html.erb b/app/views/repositories/revisions.html.erb
index bfa955f68f..8ef0337fea 100644
--- a/app/views/repositories/revisions.html.erb
+++ b/app/views/repositories/revisions.html.erb
@@ -26,26 +26,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% content_for :action_menu_specific do %>
<%= form_tag({:action => 'revision', :id => @project}) do %>
- <%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 8 %>
- <%= submit_tag 'OK', class: 'button -highlight' %>
+ <%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 8 %>
+ <%= submit_tag 'OK', class: 'button -highlight' %>
<% end %>
<% end %>
-
<%= l(:label_revision_plural) %>
-
<%= render :partial => 'layouts/action_menu_specific' %>
-
<%= render :partial => 'revisions', :locals => {:project => @project, :path => '', :revisions => @changesets, :entry => nil }%>
-
<%= pagination_links_full @changesets %>
-
<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
+ <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
<% end %>
-
<%= other_formats_links do |f| %>
<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
<% end %>
diff --git a/app/views/roles/_form.html.erb b/app/views/roles/_form.html.erb
index 50fd0fa623..df42d0dcd2 100644
--- a/app/views/roles/_form.html.erb
+++ b/app/views/roles/_form.html.erb
@@ -26,33 +26,31 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= error_messages_for 'role' %>
-
<% unless @role.builtin? %>
-
-
<%= f.text_field :name, :required => true %>
-
<%= f.check_box :assignable %>
-<% if @role.new_record? && @roles.any? %>
-
<%= l(:label_copy_workflow_from) %>
-<%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@roles, :id, :name)) %>
-<% end %>
-
+
+
<%= f.text_field :name, :required => true %>
+
<%= f.check_box :assignable %>
+ <% if @role.new_record? && @roles.any? %>
+
<%= l(:label_copy_workflow_from) %>
+ <%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@roles, :id, :name)) %>
+ <% end %>
+
<% end %>
-
<%= l(:label_permissions) %>
-<% perms_by_module = @permissions.group_by {|p| p.project_module.to_s} %>
-<% perms_by_module.keys.sort.each do |mod| %>
+ <% perms_by_module = @permissions.group_by {|p| p.project_module.to_s} %>
+ <% perms_by_module.keys.sort.each do |mod| %>
<%= mod.blank? ? Project.model_name.human : l_or_humanize(mod, :prefix => 'project_module_') %>
- <% perms_by_module[mod].each do |permission| %>
+ <% perms_by_module[mod].each do |permission| %>
- <%= check_box_tag 'role[permissions][]', permission.name, (@role.permissions.include? permission.name) %>
- <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
+ <%= check_box_tag 'role[permissions][]', permission.name, (@role.permissions.include? permission.name) %>
+ <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
- <% end %>
+ <% end %>
-<% end %>
- <%= check_all_links 'permissions' %>
-<%= hidden_field_tag 'role[permissions][]', '' %>
+ <% end %>
+
+ <%= check_all_links 'permissions' %>
+ <%= hidden_field_tag 'role[permissions][]', '' %>
diff --git a/app/views/roles/autocomplete_for_role.json.erb b/app/views/roles/autocomplete_for_role.json.erb
index 4403fa0d97..cdb1aecf97 100644
--- a/app/views/roles/autocomplete_for_role.json.erb
+++ b/app/views/roles/autocomplete_for_role.json.erb
@@ -32,12 +32,12 @@ See doc/COPYRIGHT.rdoc for more details.
{
"items":[
<% @roles.each_with_index do |role, ix| %>
- {
+ {
"id": <%= role.id.to_json.html_safe %>,
"name": <%= role.name.to_json.html_safe %>
- } <%= "," unless ix == @roles.length - 1 %>
- <% end %> ],
+ } <%= "," unless ix == @roles.length - 1 %>
+<% end %> ],
"total": <%= @total ? @total : @roles.size %>,
"more": <%= @more ? @more : 0 %>
- }
+}
}
diff --git a/app/views/roles/index.html.erb b/app/views/roles/index.html.erb
index 4236b12f40..b0912ec27d 100644
--- a/app/views/roles/index.html.erb
+++ b/app/views/roles/index.html.erb
@@ -30,41 +30,36 @@ See doc/COPYRIGHT.rdoc for more details.
<% content_for :action_menu_specific do %>
<%= link_to l(:label_role_new), {:action => 'new'}, :class => 'icon icon-add' %>
<% end %>
-
<% html_title l(:label_administration), l("label_role_plural") %>
-
<%=l(:label_role_plural)%>
-
<%= render :partial => 'layouts/action_menu_specific' %>
-
-
- <%= Role.model_name.human %>
- <%=l(:button_sort)%>
-
-
+
+
+ <%= Role.model_name.human %>
+ <%=l(:button_sort)%>
+
+
+
-<% for role in @roles %>
- ">
- <%= content_tag(role.builtin? ? 'em' : 'span', link_to(h(role.name), :action => 'edit', :id => role)) %>
-
- <% unless role.builtin? %>
- <%= reorder_links('role', {:action => 'update', :id => role}, :method => :put) %>
- <% end %>
-
-
- <%= link_to(l(:button_delete), role_path(role),
+ <% for role in @roles %>
+ ">
+ <%= content_tag(role.builtin? ? 'em' : 'span', link_to(h(role.name), :action => 'edit', :id => role)) %>
+
+ <% unless role.builtin? %>
+ <%= reorder_links('role', {:action => 'update', :id => role}, :method => :put) %>
+ <% end %>
+
+
+ <%= link_to(l(:button_delete), role_path(role),
:method => :delete,
:confirm => l(:text_are_you_sure),
:class => 'icon icon-delete') unless role.builtin? %>
-
-
-<% end %>
+
+
+ <% end %>
-
<%= pagination_links_full @roles %>
-
<%= link_to l(:label_permissions_report), :action => 'report' %>
-
<% html_title(l(:label_role_plural)) -%>
diff --git a/app/views/roles/report.html.erb b/app/views/roles/report.html.erb
index b4c57eaa24..9a87c7fdf6 100644
--- a/app/views/roles/report.html.erb
+++ b/app/views/roles/report.html.erb
@@ -26,58 +26,56 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= link_to l(:label_role_plural), roles_path %> » <%=l(:label_permissions_report)%>
-
<%= form_tag(roles_path, :method => :put, :id => 'permissions_form') do %>
-<%= hidden_field_tag 'permissions[0]', '', :id => nil %>
-
+
<%= check_all_links 'permissions_form' %>
+
<%= submit_tag l(:button_save), class: 'button -highlight' %>
<% end %>
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 41870399b4..a7a85692b8 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -30,52 +30,43 @@ See doc/COPYRIGHT.rdoc for more details.
<% content_for :header_tags do %>
<%= call_hook :search_index_head %>
<% end %>
-
<%= l(:label_search) %>
-
-<%= form_tag(search_path(@project), :method => :get) do %>
-<%= label_tag "search-input", l(:description_search), :class => "hidden-for-sighted" %>
-
<%= text_field_tag 'q', @question, :size => 60, :id => 'search-input' %>
-<%= javascript_tag "Field.focus('search-input')" %>
-<%= project_select_tag %>
-<%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %>
-<%= check_box_tag 'titles_only', 1, @titles_only %> <%= l(:label_search_titles_only) %>
-
-
-<% @object_types.each do |t| %>
-<%= check_box_tag t, 1, @scope.include?(t) %> <%= type_label(t) %>
-<% end %>
-
-
-
<%= submit_tag l(:button_submit), :name => 'submit', class: 'button -highlight' %>
-<% end %>
+ <%= form_tag(search_path(@project), :method => :get) do %>
+ <%= label_tag "search-input", l(:description_search), :class => "hidden-for-sighted" %>
+
<%= text_field_tag 'q', @question, :size => 60, :id => 'search-input' %>
+ <%= javascript_tag "Field.focus('search-input')" %>
+ <%= project_select_tag %>
+ <%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %>
+ <%= check_box_tag 'titles_only', 1, @titles_only %> <%= l(:label_search_titles_only) %>
+
+
+ <% @object_types.each do |t| %>
+ <%= check_box_tag t, 1, @scope.include?(t) %> <%= type_label(t) %>
+ <% end %>
+
+
<%= submit_tag l(:button_submit), :name => 'submit', class: 'button -highlight' %>
+ <% end %>
-
<% if @results %>
-
+
<%= render_results_by_type(@results_by_type) unless @scope.size == 1 %>
-
-
-
<%= l(:label_result_plural) %> (<%= @results_by_type.values.sum %>)
-
- <%= render :partial => 'pagination', :locals => {:pagination_previous_date => @pagination_previous_date, :pagination_next_date => @pagination_next_date } %>
-
-
- <% @results.each do |e| %>
-
- <%= icon_wrapper("icon-context icon-#{e.event_type}", e.event_name) %>
- <% if e.project != @project %>
- <%= e.project %>
- <% end %>
- <%= link_to highlight_tokens(truncate(e.event_title, :length => 255), @tokens), with_notes_anchor(e, @tokens) %>
-
- <%= highlight_first([last_journal(e).try(:notes), e.event_description], @tokens) %>
+
+
<%= l(:label_result_plural) %> (<%= @results_by_type.values.sum %>)
+ <%= render :partial => 'pagination', :locals => {:pagination_previous_date => @pagination_previous_date, :pagination_next_date => @pagination_next_date } %>
+
+ <% @results.each do |e| %>
+
+ <%= icon_wrapper("icon-context icon-#{e.event_type}", e.event_name) %>
+ <% if e.project != @project %>
+ <%= e.project %>
+ <% end %>
+ <%= link_to highlight_tokens(truncate(e.event_title, :length => 255), @tokens), with_notes_anchor(e, @tokens) %>
+
+ <%= highlight_first([last_journal(e).try(:notes), e.event_description], @tokens) %>
<%= format_time(e.event_datetime) %>
- <% end %>
-
+ <% end %>
+
<% end %>
-
<%= render :partial => 'pagination', :locals => {:pagination_previous_date => @pagination_previous_date, :pagination_next_date => @pagination_next_date } %>
-
<% html_title(l(:label_search)) -%>
diff --git a/app/views/settings/_authentication.html.erb b/app/views/settings/_authentication.html.erb
index f28c09a2f6..32d7f84c4a 100644
--- a/app/views/settings/_authentication.html.erb
+++ b/app/views/settings/_authentication.html.erb
@@ -97,12 +97,10 @@ See doc/COPYRIGHT.rdoc for more details.
<%= setting_check_box :rest_api_enabled %>
- <%= link_to l(:label_ldap_authentication), {:controller => '/ldap_auth_sources', :action => 'index'}, :class => 'icon icon-server-key' %>
+ <%= link_to l(:label_ldap_authentication), {:controller => '/ldap_auth_sources', :action => 'index'}, :class => 'icon icon-server-key' %>
<% end %>
-
<%= submit_tag l(:button_save), class: 'button -highlight' %>
<% end %>
diff --git a/app/views/settings/_general.html.erb b/app/views/settings/_general.html.erb
index 0b6e9d1708..9c52261122 100644
--- a/app/views/settings/_general.html.erb
+++ b/app/views/settings/_general.html.erb
@@ -26,63 +26,46 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= form_tag({:action => 'edit'}) do %>
-
-
+ <%= submit_tag l(:button_save), class: 'button -highlight' %>
<% end %>
diff --git a/app/views/settings/_mail_handler.html.erb b/app/views/settings/_mail_handler.html.erb
index 6447c2aab4..8cb829aad6 100644
--- a/app/views/settings/_mail_handler.html.erb
+++ b/app/views/settings/_mail_handler.html.erb
@@ -26,27 +26,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= form_tag({:action => 'edit', :tab => 'mail_handler'}) do %>
-
-
+ <%= submit_tag l(:button_save), class: 'button -highlight' %>
<% end %>
diff --git a/app/views/settings/_notifications.html.erb b/app/views/settings/_notifications.html.erb
index 24f74d7728..67de158532 100644
--- a/app/views/settings/_notifications.html.erb
+++ b/app/views/settings/_notifications.html.erb
@@ -26,58 +26,45 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% if @deliveries %>
-<%= form_tag({:action => 'edit', :tab => 'notifications'}) do %>
-
-
<%= l(:setting_emails_header) %> & <%= l(:setting_emails_footer) %>
- <%= select_tag 'lang', options_for_select(lang_options_for_select(false), current_language.to_s), :id => 'emails_decorators_switch', :onchange => "toggleEmailDecoratorFields()" %>
-
- <% Setting.available_languages.each do |lang| %>
-
- <%= label_tag "settings[emails_header][#{lang}]", l(:setting_emails_header) %>
- <%= text_area_tag("settings[emails_header][#{lang}]", Setting.emails_header[lang], :label => false, :class => 'wiki-edit', :rows => 5) %>
-
- <%= label_tag "settings[emails_footer][#{lang}]", l(:setting_emails_footer) %>
- <%= text_area_tag("settings[emails_footer][#{lang}]", Setting.emails_footer[lang], :label => false, :class => 'wiki-edit', :rows => 5) %>
+ <%= form_tag({:action => 'edit', :tab => 'notifications'}) do %>
+
+
<%= setting_text_field :mail_from, :size => 60 %>
+
<%= setting_check_box :bcc_recipients %>
+
<%= setting_check_box :plain_text_mail %>
+
<%= setting_select(:default_notification_option, User.valid_notification_options.collect {|o| [l(o.last), o.first.to_s]}) %>
- <% end %>
-
-
-<%= javascript_tag do -%>
- jQuery(document).ready(function () {
+
<%=l(:text_select_mail_notifications)%>
+ <%= hidden_field_tag 'settings[notified_events][]', '' %>
+ <% @notifiables.each do |notifiable| %>
+ <%= notification_field notifiable %>
+
+ <% end %>
+ <%= check_all_links('notified_events') %>
+
+
<%= l(:setting_emails_header) %> & <%= l(:setting_emails_footer) %>
+ <%= select_tag 'lang', options_for_select(lang_options_for_select(false), current_language.to_s), :id => 'emails_decorators_switch', :onchange => "toggleEmailDecoratorFields()" %>
+ <% Setting.available_languages.each do |lang| %>
+
+ <%= label_tag "settings[emails_header][#{lang}]", l(:setting_emails_header) %>
+ <%= text_area_tag("settings[emails_header][#{lang}]", Setting.emails_header[lang], :label => false, :class => 'wiki-edit', :rows => 5) %>
+ <%= label_tag "settings[emails_footer][#{lang}]", l(:setting_emails_footer) %>
+ <%= text_area_tag("settings[emails_footer][#{lang}]", Setting.emails_footer[lang], :label => false, :class => 'wiki-edit', :rows => 5) %>
+
+ <% end %>
+
+ <%= javascript_tag do -%>
+ jQuery(document).ready(function () {
toggleEmailDecoratorFields();
});
-<% end -%>
-
-
-<%= link_to l(:label_send_test_email), :controller => '/admin', :action => 'test_email' %>
-
-
-<%= submit_tag l(:button_save), class: 'button -highlight' %>
-<% end %>
+ <% end -%>
+
+ <%= link_to l(:label_send_test_email), :controller => '/admin', :action => 'test_email' %>
+
+ <%= submit_tag l(:button_save), class: 'button -highlight' %>
+ <% end %>
<% else %>
-
-<%= simple_format(l(:text_email_delivery_not_configured)) %>
-
+
+ <%= simple_format(l(:text_email_delivery_not_configured)) %>
+
<% end %>
diff --git a/app/views/settings/_projects.html.erb b/app/views/settings/_projects.html.erb
index df09aaaca7..f05626b50a 100644
--- a/app/views/settings/_projects.html.erb
+++ b/app/views/settings/_projects.html.erb
@@ -26,21 +26,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= form_tag({:action => 'edit', :tab => 'projects'}) do %>
-
-
-
<%= setting_check_box :default_projects_public %>
-
-
<%= setting_multiselect(:default_projects_modules,
+
+
<%= setting_check_box :default_projects_public %>
+
<%= setting_multiselect(:default_projects_modules,
Redmine::AccessControl.available_project_modules.collect {|m| [l_or_humanize(m, :prefix => "project_module_"), m.to_s]}) %>
-
-
<%= setting_check_box :sequential_project_identifiers %>
-
-
<%= setting_select :new_project_user_role_id,
+
<%= setting_check_box :sequential_project_identifiers %>
+
<%= setting_select :new_project_user_role_id,
Role.find_all_givable.collect {|r| [r.name, r.id.to_s]},
:blank => "--- #{l(:actionview_instancetag_blank_option)} ---" %>
-
-
-<%= submit_tag l(:button_save), class: 'button -highlight' %>
+
+ <%= submit_tag l(:button_save), class: 'button -highlight' %>
<% end %>
diff --git a/app/views/settings/_repositories.html.erb b/app/views/settings/_repositories.html.erb
index 80fa28f4de..5627fa6c78 100644
--- a/app/views/settings/_repositories.html.erb
+++ b/app/views/settings/_repositories.html.erb
@@ -26,56 +26,44 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= form_tag({:action => 'edit', :tab => 'repositories'}) do %>
-
-
-
<%= setting_check_box :autofetch_changesets %>
-
-
<%= setting_check_box :sys_api_enabled,
+
+
<%= setting_check_box :autofetch_changesets %>
+
<%= setting_check_box :sys_api_enabled,
:onclick => "if (this.checked) { Form.Element.enable('settings_sys_api_key'); } else { Form.Element.disable('settings_sys_api_key'); }" %>
-
-
<%= setting_text_field :sys_api_key, :size => 30,
+
<%= setting_text_field :sys_api_key, :size => 30,
:id => 'settings_sys_api_key',
:disabled => !Setting.sys_api_enabled?,
:label => :setting_mail_handler_api_key %>
- <%= link_to_function l(:label_generate_key), "if ($('settings_sys_api_key').disabled == false) { $('settings_sys_api_key').value = randomKey(20) }" %>
-
-
-
<%= setting_multiselect(:enabled_scm, Redmine::Scm::Base.all) %>
-
-
<%= setting_text_field :repositories_encodings, :size => 60 %>
-<%= l(:text_comma_separated) %>
-
-
<%= setting_text_field :repository_log_display_limit, :size => 6 %>
-
-
<%= setting_check_box :repository_authentication_caching_enabled %>
-
-
-
<%= l(:text_work_packages_ref_in_commit_messages) %>
-<%= setting_text_field :commit_ref_keywords, :size => 30 %>
-<%= l(:text_comma_separated) %>
-
-<%= setting_text_field :commit_fix_keywords, :size => 30 %>
-
-
- <%= l(:label_applied_status) %>:
+ <%= link_to_function l(:label_generate_key), "if ($('settings_sys_api_key').disabled == false) { $('settings_sys_api_key').value = randomKey(20) }" %>
+
+ <%= setting_multiselect(:enabled_scm, Redmine::Scm::Base.all) %>
+ <%= setting_text_field :repositories_encodings, :size => 60 %>
+ <%= l(:text_comma_separated) %>
+ <%= setting_text_field :repository_log_display_limit, :size => 6 %>
+ <%= setting_check_box :repository_authentication_caching_enabled %>
+
+
<%= l(:text_work_packages_ref_in_commit_messages) %>
+ <%= setting_text_field :commit_ref_keywords, :size => 30 %>
+ <%= l(:text_comma_separated) %>
+ <%= setting_text_field :commit_fix_keywords, :size => 30 %>
+
+
+ <%= l(:label_applied_status) %>:
<%= setting_select :commit_fix_status_id, [["", 0]] + Status.all.collect{|status| [status.name, status.id.to_s]}, :label => false %>
-
-
- <%= WorkPackage.human_attribute_name(:done_ratio) %>:
+
+
+ <%= WorkPackage.human_attribute_name(:done_ratio) %>:
<%= setting_select :commit_fix_done_ratio, (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, :blank => :label_no_change_option, :label => false %>
-
-
-<%= l(:text_comma_separated) %>
-
-<%= setting_check_box :commit_logtime_enabled,
+
+
+
+ <%= l(:text_comma_separated) %>
+ <%= setting_check_box :commit_logtime_enabled,
:onclick => "if (this.checked) { Form.Element.enable('settings_commit_logtime_activity_id'); } else { Form.Element.disable('settings_commit_logtime_activity_id'); }"%>
-
-<%= setting_select :commit_logtime_activity_id,
+
<%= setting_select :commit_logtime_activity_id,
[[l(:label_default), 0]] + TimeEntryActivity.shared.all.collect{|activity| [activity.name, activity.id.to_s]},
:disabled => !Setting.commit_logtime_enabled?%>
-
-
-<%= submit_tag l(:button_save), class: 'button -highlight' %>
+
+ <%= submit_tag l(:button_save), class: 'button -highlight' %>
<% end %>
diff --git a/app/views/settings/_users.html.erb b/app/views/settings/_users.html.erb
index 90d2d27728..c8598aff38 100644
--- a/app/views/settings/_users.html.erb
+++ b/app/views/settings/_users.html.erb
@@ -37,7 +37,6 @@ See doc/COPYRIGHT.rdoc for more details.
<%= setting_check_box :users_deletable_by_self %>
-
-<%= submit_tag l(:button_save), class: 'button -highlight' %>
+ <%= submit_tag l(:button_save), class: 'button -highlight' %>
<% end %>
diff --git a/app/views/settings/_work_packages.html.erb b/app/views/settings/_work_packages.html.erb
index 7d523622e9..b25c0df550 100644
--- a/app/views/settings/_work_packages.html.erb
+++ b/app/views/settings/_work_packages.html.erb
@@ -26,27 +26,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= form_tag({:action => 'edit', :tab => 'work_packages'}) do %>
-
-
-
<%= setting_check_box :cross_project_work_package_relations %>
-
-
<%= setting_check_box :work_package_group_assignment %>
-
-
<%= setting_check_box :display_subprojects_work_packages %>
-
-
<%= setting_check_box :work_package_startdate_is_adddate %>
-
-
<%= setting_select :work_package_done_ratio, WorkPackage::DONE_RATIO_OPTIONS.collect {|i| [l("setting_work_package_done_ratio_#{i}"), i]} %>
-
-
<%= setting_text_field :work_packages_export_limit, :size => 6 %>
-
-
-<%= l(:setting_column_options) %>
-<%= settings_multiselect([:work_package_list_default_columns, :work_package_list_summable_columns],
+
+
<%= setting_check_box :cross_project_work_package_relations %>
+
<%= setting_check_box :work_package_group_assignment %>
+
<%= setting_check_box :display_subprojects_work_packages %>
+
<%= setting_check_box :work_package_startdate_is_adddate %>
+
<%= setting_select :work_package_done_ratio, WorkPackage::DONE_RATIO_OPTIONS.collect {|i| [l("setting_work_package_done_ratio_#{i}"), i]} %>
+
<%= setting_text_field :work_packages_export_limit, :size => 6 %>
+
+ <%= l(:setting_column_options) %>
+ <%= settings_multiselect([:work_package_list_default_columns, :work_package_list_summable_columns],
Query.new.available_columns.collect {|c| [c.caption, c.name.to_s]}, :label_choices => :setting_work_package_properties) %>
-
-
-<%= submit_tag l(:button_save), class: 'button -highlight' %>
+
+ <%= submit_tag l(:button_save), class: 'button -highlight' %>
<% end %>
diff --git a/app/views/settings/plugin.html.erb b/app/views/settings/plugin.html.erb
index 956e5b0c03..dab839f582 100644
--- a/app/views/settings/plugin.html.erb
+++ b/app/views/settings/plugin.html.erb
@@ -26,14 +26,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= l(:label_settings) %>: <%=h @plugin.name %>
-
-<%= form_tag({:action => 'plugin'}) do %>
-
-<%= render :partial => @partial, :locals => {:settings => @settings}%>
-
-<%= submit_tag l(:button_apply), class: 'button -highlight' %>
-<% end %>
+ <%= form_tag({:action => 'plugin'}) do %>
+
+ <%= render :partial => @partial, :locals => {:settings => @settings}%>
+
+ <%= submit_tag l(:button_apply), class: 'button -highlight' %>
+ <% end %>
diff --git a/app/views/statuses/index.html.erb b/app/views/statuses/index.html.erb
index 265229d05a..4be9c7107e 100644
--- a/app/views/statuses/index.html.erb
+++ b/app/views/statuses/index.html.erb
@@ -31,40 +31,37 @@ See doc/COPYRIGHT.rdoc for more details.
<%= link_to l(:label_work_package_status_new), new_status_path, :class => 'icon icon-add' %>
<%= link_to(l(:label_update_work_package_done_ratios), update_work_package_done_ratio_statuses_path, :class => 'icon icon-reload2', :method => 'post', :confirm => l(:text_are_you_sure)) if WorkPackage.use_status_for_done_ratio? %>
<% end %>
-
<% html_title l(:label_administration), l(:label_work_package_status_plural) -%>
-
<%=l(:label_work_package_status_plural)%>
-
<%= render :partial => 'layouts/action_menu_specific' %>
-
-
- <%= Status.model_name.human %>
- <% if WorkPackage.use_status_for_done_ratio? %>
- <%= WorkPackage.human_attribute_name(:done_ratio) %>
- <% end %>
- <%= Status.human_attribute_name(:is_default) %>
- <%= Status.human_attribute_name(:is_closed) %>
- <%=l(:button_sort)%>
-
-
+
+
+ <%= Status.model_name.human %>
+ <% if WorkPackage.use_status_for_done_ratio? %>
+ <%= WorkPackage.human_attribute_name(:done_ratio) %>
+ <% end %>
+ <%= Status.human_attribute_name(:is_default) %>
+ <%= Status.human_attribute_name(:is_closed) %>
+ <%=l(:button_sort)%>
+
+
+
-<% for status in @statuses %>
- ">
- <%= link_to h(status.name), edit_status_path(status) %>
- <% if WorkPackage.use_status_for_done_ratio? %>
- <%= h status.default_done_ratio %>
- <% end %>
- <%= checked_image status.is_default? %>
- <%= checked_image status.is_closed? %>
-
- <%= reorder_links('status', {:action => 'update', :id => status}, :method => :put) %>
-
- <%= delete_link status_path(status) %>
-
-<% end %>
+ <% for status in @statuses %>
+ ">
+ <%= link_to h(status.name), edit_status_path(status) %>
+ <% if WorkPackage.use_status_for_done_ratio? %>
+ <%= h status.default_done_ratio %>
+ <% end %>
+ <%= checked_image status.is_default? %>
+ <%= checked_image status.is_closed? %>
+
+ <%= reorder_links('status', {:action => 'update', :id => status}, :method => :put) %>
+
+ <%= delete_link status_path(status) %>
+
+ <% end %>
-
<%= pagination_links_full @statuses %>
diff --git a/app/views/time_entries/reports/_report_criteria.html.erb b/app/views/time_entries/reports/_report_criteria.html.erb
index d055266db1..678e6d17f7 100644
--- a/app/views/time_entries/reports/_report_criteria.html.erb
+++ b/app/views/time_entries/reports/_report_criteria.html.erb
@@ -30,18 +30,18 @@ See doc/COPYRIGHT.rdoc for more details.
<% @hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value| %>
<% hours_for_value = select_hours(hours, criterias[level], value) -%>
<% next if hours_for_value.empty? -%>
-
- <%= (' ' * level).html_safe %>
- <%= h(format_criteria_value(criterias[level], value)) %>
- <%= (' ' * (criterias.length - level - 1)).html_safe -%>
- <% total = 0 -%>
- <% @periods.each do |period| -%>
- <% sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s)); total += sum -%>
- <%= html_hours("%.2f" % sum) if sum > 0 %>
+
+ <%= (' ' * level).html_safe %>
+ <%= h(format_criteria_value(criterias[level], value)) %>
+ <%= (' ' * (criterias.length - level - 1)).html_safe -%>
+ <% total = 0 -%>
+ <% @periods.each do |period| -%>
+ <% sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s)); total += sum -%>
+ <%= html_hours("%.2f" % sum) if sum > 0 %>
+ <% end -%>
+ <%= html_hours("%.2f" % total) if total > 0 %>
+
+ <% if criterias.length > level+1 -%>
+ <%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %>
<% end -%>
- <%= html_hours("%.2f" % total) if total > 0 %>
-
- <% if criterias.length > level+1 -%>
- <%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %>
- <% end -%>
-<% end %>
+ <% end %>
diff --git a/app/views/time_entries/reports/show.html.erb b/app/views/time_entries/reports/show.html.erb
index 1e6acb28ab..ee97d53295 100644
--- a/app/views/time_entries/reports/show.html.erb
+++ b/app/views/time_entries/reports/show.html.erb
@@ -52,15 +52,13 @@ See doc/COPYRIGHT.rdoc for more details.
[l(:label_month), 'month'],
[l(:label_week), 'week'],
[l(:label_day_plural).titleize, 'day']], @columns) %>
-
- <%= l(:button_add) %> : <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l_or_humanize(@available_criterias[k][:label]), k]}),
+ <%= l(:button_add) %> : <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l_or_humanize(@available_criterias[k][:label]), k]}),
:style => 'width: 200px',
:id => nil,
:disabled => (@criterias.length >= 3), :id => "criterias") %>
- <%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-yes' %>
- <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns}, :class => 'icon icon-undo' %>
+ <%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-yes' %>
+ <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns}, :class => 'icon icon-undo' %>
<% end %>
-
<% unless @criterias.empty? %>
<%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %>
diff --git a/app/views/timelines/_custom_fields.html.erb b/app/views/timelines/_custom_fields.html.erb
index babf7f1653..f6a96e48d1 100644
--- a/app/views/timelines/_custom_fields.html.erb
+++ b/app/views/timelines/_custom_fields.html.erb
@@ -48,7 +48,7 @@ custom_fields.each do |custom_field|
{ :class => "cf_boolean_select", :multiple => false, :size => 1}
%>
<% elsif custom_field.field_format == "list" then %>
- <%= hidden_field_tag("timeline[options][custom_fields][#{custom_field.id.to_s}][]",
+ <%= hidden_field_tag("timeline[options][custom_fields][#{custom_field.id.to_s}][]",
timeline.custom_field_list_value(custom_field.id.to_s),
{
:"data-values" => list_to_select_object_with_none(custom_field.possible_values).to_json,
@@ -57,7 +57,7 @@ custom_fields.each do |custom_field|
) %>
<% end %>
-<%
+ <%
end
end
%>
diff --git a/app/views/timelines/_timeline.html.erb b/app/views/timelines/_timeline.html.erb
index 8a92904866..5de6c5c942 100644
--- a/app/views/timelines/_timeline.html.erb
+++ b/app/views/timelines/_timeline.html.erb
@@ -47,12 +47,11 @@ See doc/COPYRIGHT.rdoc for more details.
<%= javascript_include_tag "autocompleter.js" %>
<%= javascript_include_tag "timelines_select_boxes.js" %>
<% end %>
-
<% unless @timeline_header_included %>
<% content_for :header_tags do %>
-
- <%= stylesheet_link_tag 'timelines.css', :media => "all" %>
- <%=
+
+ <%= stylesheet_link_tag 'timelines.css', :media => "all" %>
+ <%=
case I18n.locale
when :de
javascript_include_tag 'date-de-DE.js'
@@ -60,12 +59,9 @@ See doc/COPYRIGHT.rdoc for more details.
javascript_include_tag 'date-en-US.js'
end
%>
-
- <%= include_calendar_headers_tags %>
-
- <%= javascript_include_tag 'timelines_modal.js' %>
-
- <% @timeline_header_included = true %>
+ <%= include_calendar_headers_tags %>
+ <%= javascript_include_tag 'timelines_modal.js' %>
+ <% @timeline_header_included = true %>
<% end %>
<% end %>
<% end %>
diff --git a/app/views/timelines/filter/_projects.html.erb b/app/views/timelines/filter/_projects.html.erb
index 739032e643..cf4a414eff 100644
--- a/app/views/timelines/filter/_projects.html.erb
+++ b/app/views/timelines/filter/_projects.html.erb
@@ -103,9 +103,8 @@ See doc/COPYRIGHT.rdoc for more details.
timeline.selected_project_status,
:name, :id).to_json
}) %>
- <% end %>
+ <% end %>
-
<%= label_tag 'timeline_options_project_responsibles',
l("timelines.filter.project_responsible") %>
diff --git a/app/views/timelog/_date_range.html.erb b/app/views/timelog/_date_range.html.erb
index f267c4f5c6..3004491afd 100644
--- a/app/views/timelog/_date_range.html.erb
+++ b/app/views/timelog/_date_range.html.erb
@@ -26,23 +26,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= l(:label_date_range) %>
-
-
-<%= label_tag "period_type_list", l(:description_date_range_list), :class => "hidden-for-sighted" %>
-<%= radio_button_tag 'period_type', '1', !@free_period, :onclick => 'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");', :id => "period_type_list"%>
-<%= select_tag 'period', options_for_period_select(params[:period]),
+
+
+ <%= label_tag "period_type_list", l(:description_date_range_list), :class => "hidden-for-sighted" %>
+ <%= radio_button_tag 'period_type', '1', !@free_period, :onclick => 'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");', :id => "period_type_list"%>
+ <%= select_tag 'period', options_for_period_select(params[:period]),
:onfocus => '$("period_type_1").checked = true;',
:disabled => @free_period %>
-
-
-<%= label_tag "period_type_interval", l(:description_date_range_interval), :class => "hidden-for-sighted" %>
-<%= radio_button_tag 'period_type', '2', @free_period, :onclick => 'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");', :id => "period_type_interval" %>
-
-
-<%=
+
+
+ <%= label_tag "period_type_interval", l(:description_date_range_interval), :class => "hidden-for-sighted" %>
+ <%= radio_button_tag 'period_type', '2', @free_period, :onclick => 'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");', :id => "period_type_interval" %>
+
+ <%=
raw l(:label_date_from_to,
:start => raw(
label_tag("from", l(:description_date_from), :class => "hidden-for-sighted") +
@@ -56,9 +54,9 @@ raw l(:label_date_from_to,
)
)
%>
-
-
-
+
+
+
<%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-yes' %>
diff --git a/app/views/timelog/_time_entry_tab.html.erb b/app/views/timelog/_time_entry_tab.html.erb
index a064b1614c..cecbe80c52 100644
--- a/app/views/timelog/_time_entry_tab.html.erb
+++ b/app/views/timelog/_time_entry_tab.html.erb
@@ -26,10 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
-<%= link_to(tab_path, :class => (tab_selected ? 'selected' : nil)) do %>
- <%= tab_selected ? you_are_here_info : nil %>
- <%= tab_title %>
-<% end %>
+ <%= link_to(tab_path, :class => (tab_selected ? 'selected' : nil)) do %>
+ <%= tab_selected ? you_are_here_info : nil %>
+ <%= tab_title %>
+ <% end %>
diff --git a/app/views/timelog/edit.html.erb b/app/views/timelog/edit.html.erb
index bd2633870c..ddba517a08 100644
--- a/app/views/timelog/edit.html.erb
+++ b/app/views/timelog/edit.html.erb
@@ -26,25 +26,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= l(:label_spent_time) %>
-
<%= labelled_tabular_form_for [@time_entry.project, @time_entry], :as => :time_entry do |f| %>
-<%= error_messages_for 'time_entry' %>
-<%= back_url_hidden_field_tag %>
-
-
-
<%= f.text_field :work_package_id, :size => 6 %> <%= h("#{(@time_entry.work_package.kind.nil?) ? '' : @time_entry.work_package.kind.name} ##{@time_entry.work_package.id}: #{@time_entry.work_package.subject}") if @time_entry.work_package%>
-
<%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %>
-
<%= f.text_field :hours, :size => 6, :required => true %>
-
<%= f.text_field :comments, :size => 100 %>
-
<%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %>
-<% @time_entry.custom_field_values.each do |value| %>
-
<%= custom_field_tag_with_label :time_entry, value %>
-<% end %>
-<%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>
-
-
-<%= submit_tag l(:button_save), class: 'button -highlight' %>
-
+ <%= error_messages_for 'time_entry' %>
+ <%= back_url_hidden_field_tag %>
+
+
<%= f.text_field :work_package_id, :size => 6 %> <%= h("#{(@time_entry.work_package.kind.nil?) ? '' : @time_entry.work_package.kind.name} ##{@time_entry.work_package.id}: #{@time_entry.work_package.subject}") if @time_entry.work_package%>
+
<%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %>
+
<%= f.text_field :hours, :size => 6, :required => true %>
+
<%= f.text_field :comments, :size => 100 %>
+
<%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %>
+ <% @time_entry.custom_field_values.each do |value| %>
+
<%= custom_field_tag_with_label :time_entry, value %>
+ <% end %>
+ <%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>
+
+ <%= submit_tag l(:button_save), class: 'button -highlight' %>
<% end %>
diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb
index 4f78cf7977..12bf7550ec 100644
--- a/app/views/timelog/index.html.erb
+++ b/app/views/timelog/index.html.erb
@@ -45,13 +45,10 @@ See doc/COPYRIGHT.rdoc for more details.
<%= form_tag(polymorphic_path([@issue || @project, :time_entries]), :method => :get, :id => 'query_form') do %>
<%= render :partial => 'date_range' %>
<% end %>
-
<%= render 'time_entry_tabs' %>
-
-
<%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %>
+
<%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %>
-
<% unless @entries.empty? %>
<%= render :partial => 'list', :locals => { :entries => @entries }%>
@@ -65,9 +62,7 @@ See doc/COPYRIGHT.rdoc for more details.
<% end %>
<% end %>
-
<% html_title l(:label_spent_time), l(:label_details) %>
-
<% content_for :header_tags do %>
- <%= auto_discovery_link_tag(:atom, {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :title => l(:label_spent_time)) %>
+ <%= auto_discovery_link_tag(:atom, {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :title => l(:label_spent_time)) %>
<% end %>
diff --git a/app/views/types/_form.html.erb b/app/views/types/_form.html.erb
index 783986de17..22b526d665 100644
--- a/app/views/types/_form.html.erb
+++ b/app/views/types/_form.html.erb
@@ -26,50 +26,45 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= error_messages_for 'type' %>
-
-
-
-
<%= f.text_field :name, :required => true, :disabled => @type.is_standard? %>
-
<%= f.check_box :is_in_roadmap %>
-
<%= f.select :color_id, options_for_colors(controller.type) %>
-
<%= f.check_box :in_aggregation %>
-
<%= f.check_box :is_default %>
-
<%= f.check_box :is_milestone %>
-
-<% if WorkPackageCustomField.all.any? %>
-
- <%= l(:label_custom_field_plural) %>
- <% WorkPackageCustomField.all.each do |field| %>
-
- <%= check_box_tag 'type[custom_field_ids][]',field.id, @type.custom_fields.include?(field) %>
- <%= field.name %>
-
- <% end %>
-
-<%= hidden_field_tag 'type[custom_field_ids][]', '' %>
-<% end %>
-
-<% if controller.type.new_record? && @types.any? %>
-
<%= l(:label_copy_workflow_from) %>
-<%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@types, :id, :name)) %>
-<% end %>
-
-
-<%= submit_tag l(controller.type.new_record? ? :button_create : :button_save),
+
+
+
<%= f.text_field :name, :required => true, :disabled => @type.is_standard? %>
+
<%= f.check_box :is_in_roadmap %>
+
<%= f.select :color_id, options_for_colors(controller.type) %>
+
<%= f.check_box :in_aggregation %>
+
<%= f.check_box :is_default %>
+
<%= f.check_box :is_milestone %>
+ <% if WorkPackageCustomField.all.any? %>
+
+ <%= l(:label_custom_field_plural) %>
+ <% WorkPackageCustomField.all.each do |field| %>
+
+ <%= check_box_tag 'type[custom_field_ids][]',field.id, @type.custom_fields.include?(field) %>
+ <%= field.name %>
+
+ <% end %>
+
+ <%= hidden_field_tag 'type[custom_field_ids][]', '' %>
+ <% end %>
+ <% if controller.type.new_record? && @types.any? %>
+
<%= l(:label_copy_workflow_from) %>
+ <%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@types, :id, :name)) %>
+ <% end %>
+
+
+ <%= submit_tag l(controller.type.new_record? ? :button_create : :button_save),
class: 'button -highlight' %>
-
-<% if @projects.any? %>
-
<%= l(:label_project_plural) %>
-<%= project_nested_ul(@projects) do |p|
+ <% if @projects.any? %>
+ <%= l(:label_project_plural) %>
+ <%= project_nested_ul(@projects) do |p|
content_tag('label', check_box_tag('type[project_ids][]', p.id, controller.type.projects.include?(p), :id => nil) + ' ' + h(p))
end %>
-<%= hidden_field_tag('type[project_ids][]', '', :id => nil) %>
-<%= check_all_links 'type_project_ids' %>
-
-<% end %>
+ <%= hidden_field_tag('type[project_ids][]', '', :id => nil) %>
+ <%= check_all_links 'type_project_ids' %>
+
+ <% end %>
diff --git a/app/views/types/index.html.erb b/app/views/types/index.html.erb
index bb68a4866c..0ed7ec6c38 100644
--- a/app/views/types/index.html.erb
+++ b/app/views/types/index.html.erb
@@ -45,7 +45,8 @@ See doc/COPYRIGHT.rdoc for more details.
<%= Type.human_attribute_name(:name) %>
-
+
+
<%= Type.human_attribute_name(:color) %>
@@ -60,29 +61,28 @@ See doc/COPYRIGHT.rdoc for more details.
<%=l(:button_sort)%>
-
+
-<% for type in @types %>
- ">
- <%= link_to type.name, edit_type_path(type) %>
- <% if type.workflows.empty? %><%= l(:text_type_no_workflow) %> (<%= link_to l(:button_edit), {:controller => '/workflows', :action => 'edit', :type_id => type} %>) <% end %>
- <%= icon_for_type type %>
- <%= checked_image(type.is_default) %>
- <%= checked_image(type.in_aggregation) %>
- <%= checked_image(type.is_milestone) %>
- <%= reorder_links('type', {:action => 'move', :id => type}) %>
-
- <% if !type.is_standard? %>
- <%= link_to type, :method => :delete, :confirm => t(:text_are_you_sure), :class => 'icon-context icon-delete' do %>
- <%= t(:button_delete) %>
- <%=h type.name %>
- <% end %>
- <% end %>
-
-
-<% end %>
+ <% for type in @types %>
+ ">
+ <%= link_to type.name, edit_type_path(type) %>
+ <% if type.workflows.empty? %><%= l(:text_type_no_workflow) %> (<%= link_to l(:button_edit), {:controller => '/workflows', :action => 'edit', :type_id => type} %>) <% end %>
+ <%= icon_for_type type %>
+ <%= checked_image(type.is_default) %>
+ <%= checked_image(type.in_aggregation) %>
+ <%= checked_image(type.is_milestone) %>
+ <%= reorder_links('type', {:action => 'move', :id => type}) %>
+
+ <% if !type.is_standard? %>
+ <%= link_to type, :method => :delete, :confirm => t(:text_are_you_sure), :class => 'icon-context icon-delete' do %>
+ <%= t(:button_delete) %>
+ <%=h type.name %>
+ <% end %>
+ <% end %>
+
+
+ <% end %>
-
<%= pagination_links_full @types %>
diff --git a/app/views/user_mailer/account_information.html.erb b/app/views/user_mailer/account_information.html.erb
index ac0c8f31db..58d2c15c36 100644
--- a/app/views/user_mailer/account_information.html.erb
+++ b/app/views/user_mailer/account_information.html.erb
@@ -26,15 +26,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% if @user.auth_source %>
-
<%= t(:mail_body_account_information_external, :value => @user.auth_source.name) %>
+
<%= t(:mail_body_account_information_external, :value => @user.auth_source.name) %>
<% else %>
-
<%= t(:mail_body_account_information) %>:
-
- <%= User.human_attribute_name(:login) %>: <%= @user.login %>
- <%= User.human_attribute_name(:password) %>: <%= @password %>
-
+
<%= t(:mail_body_account_information) %>:
+
+ <%= User.human_attribute_name(:login) %>: <%= @user.login %>
+ <%= User.human_attribute_name(:password) %>: <%= @password %>
+
<% end %>
-
<%= t(:label_login) %>: <%= link_to signin_url, signin_url %>
diff --git a/app/views/user_mailer/account_information.text.erb b/app/views/user_mailer/account_information.text.erb
index 0f52c83ba3..8c38640340 100644
--- a/app/views/user_mailer/account_information.text.erb
+++ b/app/views/user_mailer/account_information.text.erb
@@ -26,12 +26,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% if @user.auth_source %>
-<%= t(:mail_body_account_information_external, :value => @user.auth_source.name) %>
+ <%= t(:mail_body_account_information_external, :value => @user.auth_source.name) %>
<% else %>
-<%= t(:mail_body_account_information) %>:
+ <%= t(:mail_body_account_information) %>:
* <%= User.human_attribute_name(:login) %>: <%= @user.login %>
-* <%= User.human_attribute_name(:password) %>: <%= @password %>
+ * <%= User.human_attribute_name(:password) %>: <%= @password %>
<% end %>
<%= l(:label_login) %>: <%= signin_url %>
diff --git a/app/views/user_mailer/attachments_added.html.erb b/app/views/user_mailer/attachments_added.html.erb
index 86d67e45c9..e1399bb5eb 100644
--- a/app/views/user_mailer/attachments_added.html.erb
+++ b/app/views/user_mailer/attachments_added.html.erb
@@ -30,8 +30,8 @@ See doc/COPYRIGHT.rdoc for more details.
<%= link_to @added_to, @added_to_url %>
- <% @attachments.each do |attachment | %>
- <%= attachment.filename %>
- <% end %>
+ <% @attachments.each do |attachment | %>
+ <%= attachment.filename %>
+ <% end %>
diff --git a/app/views/user_mailer/attachments_added.text.erb b/app/views/user_mailer/attachments_added.text.erb
index 87d8cd552b..0fa3053adf 100644
--- a/app/views/user_mailer/attachments_added.text.erb
+++ b/app/views/user_mailer/attachments_added.text.erb
@@ -26,10 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= @added_to %>
<% @attachments.each do |attachment | %>
-* <%= attachment.filename %>
+ * <%= attachment.filename %>
<% end %>
-
<%= @added_to_url %>
diff --git a/app/views/user_mailer/copy_project_succeeded.text.erb b/app/views/user_mailer/copy_project_succeeded.text.erb
index 1afe6aec24..8253e069c4 100644
--- a/app/views/user_mailer/copy_project_succeeded.text.erb
+++ b/app/views/user_mailer/copy_project_succeeded.text.erb
@@ -26,13 +26,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= @target_project.name %>
<%= project_url(@target_project) %>
-
<%= t('copy_project.text.succeeded', source_project_name: @source_project.name, target_project_name: @target_project.name) %>
-
<% unless @errors.empty? %>
-----------------------------------------
-<%= render partial: 'errors', locals: { errors: @errors } %>
+ ----------------------------------------
+ <%= render partial: 'errors', locals: { errors: @errors } %>
<% end %>
diff --git a/app/views/user_mailer/password_lost.html.erb b/app/views/user_mailer/password_lost.html.erb
index eb30d2bad0..d20be9b877 100644
--- a/app/views/user_mailer/password_lost.html.erb
+++ b/app/views/user_mailer/password_lost.html.erb
@@ -26,8 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= t(:mail_body_lost_password) %>
-<%= link_to(@reset_password_url, @reset_password_url) %>
-
+ <%= link_to(@reset_password_url, @reset_password_url) %>
<%= User.human_attribute_name(:login) %>: <%= @token.user.login %>
diff --git a/app/views/user_mailer/reminder_mail.html.erb b/app/views/user_mailer/reminder_mail.html.erb
index 7f894e7ff1..582898ba97 100644
--- a/app/views/user_mailer/reminder_mail.html.erb
+++ b/app/views/user_mailer/reminder_mail.html.erb
@@ -26,13 +26,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= t(:mail_body_reminder, :count => @issues.size, :days => @days) %>
-
-<% @issues.each do |issue| -%>
- <%= issue.project %> - <%= link_to "#{issue.type} ##{issue.id}", work_package_url(issue) %>: <%= issue.subject %>
-<% end -%>
+ <% @issues.each do |issue| -%>
+ <%= issue.project %> - <%= link_to "#{issue.type} ##{issue.id}", work_package_url(issue) %>: <%= issue.subject %>
+ <% end -%>
-
<%= link_to t(:label_work_package_view_all), @assigned_issues_url %>
diff --git a/app/views/user_mailer/reminder_mail.text.erb b/app/views/user_mailer/reminder_mail.text.erb
index 7c39cbbc22..4b15aebcfa 100644
--- a/app/views/user_mailer/reminder_mail.text.erb
+++ b/app/views/user_mailer/reminder_mail.text.erb
@@ -26,11 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= t(:mail_body_reminder, :count => @issues.size, :days => @days) %>
-
<% @issues.each do |issue| -%>
-* <%= "#{issue.project} - #{issue.type} ##{issue.id}: #{issue.subject}" %>
+ * <%= "#{issue.project} - #{issue.type} ##{issue.id}: #{issue.subject}" %>
<% end -%>
-
<%= @assigned_issues_url %>
diff --git a/app/views/user_mailer/test_mail.html.erb b/app/views/user_mailer/test_mail.html.erb
index 73a3876334..41d9f1440e 100644
--- a/app/views/user_mailer/test_mail.html.erb
+++ b/app/views/user_mailer/test_mail.html.erb
@@ -26,6 +26,5 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
This is a test email sent by OpenProject.
-OpenProject URL: <%= link_to @welcome_url, @welcome_url %>
+ OpenProject URL: <%= link_to @welcome_url, @welcome_url %>
diff --git a/app/views/user_mailer/user_signed_up.html.erb b/app/views/user_mailer/user_signed_up.html.erb
index 76331a8109..843ba1dcb0 100644
--- a/app/views/user_mailer/user_signed_up.html.erb
+++ b/app/views/user_mailer/user_signed_up.html.erb
@@ -26,6 +26,5 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= l(:mail_body_register) %>
-<%= link_to @activation_url, @activation_url %>
+ <%= link_to @activation_url, @activation_url %>
diff --git a/app/views/user_mailer/work_package_updated.html.erb b/app/views/user_mailer/work_package_updated.html.erb
index 4b6861bf0f..1c260f2a96 100644
--- a/app/views/user_mailer/work_package_updated.html.erb
+++ b/app/views/user_mailer/work_package_updated.html.erb
@@ -26,15 +26,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= t(:text_work_package_updated, :id => "##{@issue.id}", :author => @journal.user) %>
-
-<% @journal.details.each do |detail| %>
- <%= @journal.render_detail(detail, :only_path => false) %>
-<% end %>
+ <% @journal.details.each do |detail| %>
+ <%= @journal.render_detail(detail, :only_path => false) %>
+ <% end %>
-
<%= format_text(@journal.notes, :only_path => false) %>
<%= render :partial => 'issue_details', :locals => { :issue => @issue } %>
diff --git a/app/views/users/_groups.html.erb b/app/views/users/_groups.html.erb
index 72f3ec57bd..c42a55f8cc 100644
--- a/app/views/users/_groups.html.erb
+++ b/app/views/users/_groups.html.erb
@@ -26,13 +26,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= form_for(:user, :url => { :action => 'update' }, :html => {:method => :put}) do %>
-
-<% Group.all.sort.each do |group| %>
-<%= check_box_tag 'user[group_ids][]', group.id, @user.groups.include?(group) %> <%=h group %>
-<% end %>
-<%= hidden_field_tag 'user[group_ids][]', '' %>
-
-<%= submit_tag l(:button_save), class: 'button -highlight' %>
+
+ <% Group.all.sort.each do |group| %>
+ <%= check_box_tag 'user[group_ids][]', group.id, @user.groups.include?(group) %> <%=h group %>
+ <% end %>
+ <%= hidden_field_tag 'user[group_ids][]', '' %>
+
+ <%= submit_tag l(:button_save), class: 'button -highlight' %>
<% end %>
diff --git a/app/views/users/_mail_notifications.html.erb b/app/views/users/_mail_notifications.html.erb
index a5646dbecf..05a0666675 100644
--- a/app/views/users/_mail_notifications.html.erb
+++ b/app/views/users/_mail_notifications.html.erb
@@ -26,16 +26,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
-<%= label_tag "user_mail_notification", l(:description_user_mail_notification), :class => "hidden-for-sighted" %>
-<%= select_tag 'user[mail_notification]', options_for_select(user_mail_notification_options(@user), @user.mail_notification),
+ <%= label_tag "user_mail_notification", l(:description_user_mail_notification), :class => "hidden-for-sighted" %>
+ <%= select_tag 'user[mail_notification]', options_for_select(user_mail_notification_options(@user), @user.mail_notification),
:onchange => 'if (this.value == "selected") {Element.show("notified-projects")} else {Element.hide("notified-projects")}' %>
<%= content_tag 'div', :id => 'notified-projects', :style => (@user.mail_notification == 'selected' ? '' : 'display:none;') do %>
-
<% @user.projects.each do |project| %>
- <%= check_box_tag 'notified_project_ids[]', project.id, @user.notified_projects_ids.include?(project.id) %> <%=h project.name %>
-<% end %>
-
<%= l(:text_user_mail_option) %>
+
<% @user.projects.each do |project| %>
+ <%= check_box_tag 'notified_project_ids[]', project.id, @user.notified_projects_ids.include?(project.id) %> <%=h project.name %>
+ <% end %>
+
<%= l(:text_user_mail_option) %>
<% end %>
<%= l(:label_user_mail_no_self_notified) %><%= check_box_tag 'no_self_notified', 1, @user.pref[:no_self_notified] %>
diff --git a/app/views/users/_memberships.html.erb b/app/views/users/_memberships.html.erb
index d9d9c4098d..1cb7c79c80 100644
--- a/app/views/users/_memberships.html.erb
+++ b/app/views/users/_memberships.html.erb
@@ -26,76 +26,75 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% roles = Role.find_all_givable %>
<% projects = Project.active.find(:all, :order => 'lft') %>
-
-<% if @user.memberships.any? %>
-
-
- <%= Project.model_name.human %>
- <%= l(:label_role_plural) %>
-
- <%= call_hook(:view_users_memberships_table_header, :user => @user )%>
-
-
- <% @user.memberships.each do |membership| %>
- <% next if membership.new_record? %>
-
-
- <%= link_to_project membership.project %>
-
-
- <%=h membership.roles.sort.collect(&:to_s).join(', ') %>
- <%= form_for(:membership, :remote => true,
+ <% if @user.memberships.any? %>
+
+
+
+ <%= Project.model_name.human %>
+ <%= l(:label_role_plural) %>
+
+ <%= call_hook(:view_users_memberships_table_header, :user => @user )%>
+
+
+
+ <% @user.memberships.each do |membership| %>
+ <% next if membership.new_record? %>
+
+
+ <%= link_to_project membership.project %>
+
+
+ <%=h membership.roles.sort.collect(&:to_s).join(', ') %>
+ <%= form_for(:membership, :remote => true,
:url => edit_membership_user_path(:id => @user, :membership_id => membership),
:html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %>
- <% roles.each do |role| %>
- <%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role),
+ <% roles.each do |role| %>
+ <%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role),
:disabled => membership.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %>
- <% end %>
- <%= submit_tag l(:button_change), class: 'button -highlight' %>
- <%= link_to_function l(:button_cancel),
+ <% end %>
+ <%= submit_tag l(:button_change), class: 'button -highlight' %>
+ <%= link_to_function l(:button_cancel),
"$('member-#{membership.id}-roles').show(); $('member-#{membership.id}-roles-form').hide(); return false;",
class: 'button' %>
- <% end %>
-
-
- <%= link_to_function l(:button_edit), "$('member-#{membership.id}-roles').hide(); $('member-#{membership.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
- <%= link_to(l(:button_delete), { :controller => 'users',
+ <% end %>
+
+
+ <%= link_to_function l(:button_edit), "$('member-#{membership.id}-roles').hide(); $('member-#{membership.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
+ <%= link_to(l(:button_delete), { :controller => 'users',
:action => 'destroy_membership',
:id => @user,
:membership_id => membership },
:remote => true,
:method => :post,
:class => 'icon icon-delete') if membership.deletable? %>
-
- <%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => roles, :projects => projects )%>
-
- <% end; reset_cycle %>
-
-
-<% else %>
-<%= l(:label_no_data) %>
-<% end %>
-
-
-
-<% if projects.any? %>
-
<%=l(:label_project_new)%>
-<%= form_for(:membership, :url => {:controller => 'users',
+
+ <%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => roles, :projects => projects )%>
+
+ <% end; reset_cycle %>
+
+
+ <% else %>
+
<%= l(:label_no_data) %>
+ <% end %>
+
+
+ <% if projects.any? %>
+
<%=l(:label_project_new)%>
+ <%= form_for(:membership, :url => {:controller => 'users',
:action => 'edit_membership',
:id => @user,
:membership_id => nil },
:remote => true, :html => {:id => "new_project_membership"}) do %>
-<%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects) %>
-
- <%= l(:label_role_plural) %>:
+ <%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects) %>
+
+ <%= l(:label_role_plural) %>:
<%= labeled_check_box_tags 'membership[role_ids][]', roles %>
-
-
<%= submit_tag l(:button_add), class: 'button -highlight' %>
-<% end %>
-
-<% end %>
-
+
+
<%= submit_tag l(:button_add), class: 'button -highlight' %>
+ <% end %>
+
+ <% end %>
+
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 3bf9637447..9a65182158 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -33,24 +33,20 @@ See doc/COPYRIGHT.rdoc for more details.
<% end %>
<%= call_hook(:user_admin_action_menu) %>
<% end %>
-
<%=l(:label_user_plural)%>
-
<%= render :partial => 'layouts/action_menu_specific' %>
-
<%= form_tag({}, :method => :get) do %>
-<%= l(:label_filter_plural) %>
-
-
-
- <%= User.human_attribute_name(:status) %>:
- <%= select_tag 'status', users_status_options_for_select(@status), :class => "form--select -small", :onchange => "this.form.submit(); return false;" %>
-
-
- <% if @groups.present? %>
+
<%= l(:label_filter_plural) %>
+
+
- <%= Group.model_name.human %>:
- <%= collection_select :group,
+ <%= User.human_attribute_name(:status) %>:
+ <%= select_tag 'status', users_status_options_for_select(@status), :class => "form--select -small", :onchange => "this.form.submit(); return false;" %>
+
+ <% if @groups.present? %>
+
+ <%= Group.model_name.human %>:
+ <%= collection_select :group,
:id,
@groups,
:id,
@@ -60,63 +56,59 @@ See doc/COPYRIGHT.rdoc for more details.
{ :name => "group_id",
:onchange => "this.form.submit(); return false;",
class: 'form--select -small' } %>
+
+ <% end %>
+
+ <%= User.model_name.human %>:
+ <%= text_field_tag 'name', params[:name], :size => 30, class: 'form--text-field -small' %>
- <% end %>
-
+
- <%= User.model_name.human %>:
- <%= text_field_tag 'name', params[:name], :size => 30, class: 'form--text-field -small' %>
+ <%= submit_tag l(:button_apply), :class => 'button -highlight -small', :name => nil %>
+ <%= link_to l(:button_clear), users_path, :class => 'button -small icon icon-undo' %>
-
-
- <%= submit_tag l(:button_apply), :class => 'button -highlight -small', :name => nil %>
- <%= link_to l(:button_clear), users_path, :class => 'button -small icon icon-undo' %>
-
-
-
+
<% end %>
-
<%= pagination_links_full @users %>
-
<% html_title(l(:label_user_plural)) -%>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 37bc53f7a0..cf660a3327 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -49,9 +49,9 @@ See doc/COPYRIGHT.rdoc for more details.
<%= User.human_attribute_name(:mail) %>: <%= mail_to(h(escape_javascript(@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 %>
+ <% if !custom_value.value.blank? %>
+
<%=h custom_value.custom_field.name%>: <%=h show_value(custom_value) %>
+ <% end %>
<% end %>
<% unless @user.last_login_on.nil? %>
<%= User.human_attribute_name(:last_login_on) %>: <%= format_date(@user.last_login_on) %>
diff --git a/app/views/versions/_form.html.erb b/app/views/versions/_form.html.erb
index 1bc02a3bd6..a8411e8c88 100644
--- a/app/views/versions/_form.html.erb
+++ b/app/views/versions/_form.html.erb
@@ -26,22 +26,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= error_messages_for 'version' %>
-
<%= back_url_hidden_field_tag %>
-
-
<%= f.text_field :name, :size => 60, :required => true %>
-
<%= f.text_field :description, :size => 60 %>
-
<%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %>
-
<%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %>
-
<%= f.text_field :start_date, :size => 10 %><%= calendar_for('version_start_date') %>
-
<%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %>
-
<%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %>
-
-<% @version.custom_field_values.each do |value| %>
-
<%= custom_field_tag_with_label :version, value %>
-<% end %>
-
+
<%= f.text_field :name, :size => 60, :required => true %>
+
<%= f.text_field :description, :size => 60 %>
+
<%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %>
+
<%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %>
+
<%= f.text_field :start_date, :size => 10 %><%= calendar_for('version_start_date') %>
+
<%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %>
+
<%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %>
+ <% @version.custom_field_values.each do |value| %>
+
<%= custom_field_tag_with_label :version, value %>
+ <% end %>
diff --git a/app/views/versions/_work_package_counts.html.erb b/app/views/versions/_work_package_counts.html.erb
index 9299cc6814..d1c539ccf5 100644
--- a/app/views/versions/_work_package_counts.html.erb
+++ b/app/views/versions/_work_package_counts.html.erb
@@ -44,20 +44,16 @@ See doc/COPYRIGHT.rdoc for more details.
<%= l(:label_no_data) %>
-
<% else %>
-
-
<% counts.each do |count| %>
-
- <%= link_to h(count[:group]),
+ <%= link_to h(count[:group]),
project_version_property_path(version, "#{criteria}_id", count[:group].id) %>
- <%= progress_bar((count[:closed].to_f / count[:total])*100,
+ <%= progress_bar((count[:closed].to_f / count[:total])*100,
:legend => "#{count[:closed]}/#{count[:total]}",
:width => "#{(count[:total].to_f / max * 200).floor}px;") %>
diff --git a/app/views/versions/edit.html.erb b/app/views/versions/edit.html.erb
index 7af2a3357d..b8f6c48c2a 100644
--- a/app/views/versions/edit.html.erb
+++ b/app/views/versions/edit.html.erb
@@ -26,12 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% html_title l("label_roadmap_edit", name: @version.name) %>
-
<%= Version.model_name.human %>
-
<%= labelled_tabular_form_for @version do |f| %>
-<%= render :partial => 'form', :locals => { :f => f } %>
-<%= submit_tag l(:button_save), class: 'button -highlight' %>
+ <%= render :partial => 'form', :locals => { :f => f } %>
+ <%= submit_tag l(:button_save), class: 'button -highlight' %>
<% end %>
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index 648c058f7f..6421ead6db 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -26,59 +26,53 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%=l(:label_roadmap)%>
-
<% if @versions.empty? %>
-<%= l(:label_no_data) %>
+ <%= l(:label_no_data) %>
<% else %>
-
-<% @versions.each do |version| %>
-
- <%= link_to_version version, :name => h(version.name) %>
-
- <%= render :partial => 'versions/overview', :locals => {:version => version} %>
- <%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
-
- <% if (issues = @issues_by_version[version]) && issues.size > 0 %>
-
<%= l(:label_related_work_packages) %>
- <%= form_tag({}) do -%>
-
- <% end %>
+
+ <% @versions.each do |version| %>
+
+ <%= link_to_version version, :name => h(version.name) %>
+
+ <%= render :partial => 'versions/overview', :locals => {:version => version} %>
+ <%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
+ <% if (issues = @issues_by_version[version]) && issues.size > 0 %>
+
<%= l(:label_related_work_packages) %>
+ <%= form_tag({}) do -%>
+
+ <% end %>
+ <% end %>
+ <%= call_hook :view_projects_roadmap_version_bottom, :version => version %>
<% end %>
- <%= call_hook :view_projects_roadmap_version_bottom, :version => version %>
+
<% end %>
-
-<% end %>
-
<% content_for :sidebar do %>
-<%= form_tag({}, :method => :get) do %>
-<%= l(:description_filter) %>
-<% @types.each do |type| %>
- <%= check_box_tag "type_ids[]", type.id, (@selected_type_ids.include? type.id.to_s), :id => nil %>
- <%=h type.name %>
-<% end %>
-
-<%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %>
-<% if @project.descendants.active.any? %>
- <%= hidden_field_tag 'with_subprojects', 0 %>
- <%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%>
-<% end %>
-<%= submit_tag l(:button_apply), :class => 'button -tiny -round -highlight', :name => nil %>
-<% end %>
-
-<%= l(:label_version_plural) %>
-<% @versions.each do |version| %>
-<%= link_to format_version_name(version), "##{version.name}" %>
-<% end %>
-
+ <%= form_tag({}, :method => :get) do %>
+ <%= l(:description_filter) %>
+ <% @types.each do |type| %>
+ <%= check_box_tag "type_ids[]", type.id, (@selected_type_ids.include? type.id.to_s), :id => nil %>
+ <%=h type.name %>
+ <% end %>
+
+ <%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %>
+ <% if @project.descendants.active.any? %>
+ <%= hidden_field_tag 'with_subprojects', 0 %>
+
+ <%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%>
+ <% end %>
+ <%= submit_tag l(:button_apply), :class => 'button -tiny -round -highlight', :name => nil %>
+ <% end %>
+ <%= l(:label_version_plural) %>
+ <% @versions.each do |version| %>
+ <%= link_to format_version_name(version), "##{version.name}" %>
+ <% end %>
<% end %>
-
<% html_title(l(:label_roadmap)) %>
diff --git a/app/views/versions/new.html.erb b/app/views/versions/new.html.erb
index 7a6bed6491..9eb8b038ee 100644
--- a/app/views/versions/new.html.erb
+++ b/app/views/versions/new.html.erb
@@ -26,12 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% html_title l("label_version_new") %>
-
<%=l(:label_version_new)%>
-
<%= labelled_tabular_form_for [@project, @version] do |f| %>
-<%= render :partial => 'versions/form', :locals => { :f => f } %>
-<%= submit_tag l(:button_create), class: 'button -highlight' %>
+ <%= render :partial => 'versions/form', :locals => { :f => f } %>
+ <%= submit_tag l(:button_create), class: 'button -highlight' %>
<% end %>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 55c6e979d4..3c22740890 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -49,23 +49,22 @@ See doc/COPYRIGHT.rdoc for more details.
<%=l(:label_project_latest)%>
- <% for project in @projects %>
- <% @project = project %>
-
- <%= link_to_project project %> (<%= format_time(project.created_on) %>)
+ <% for project in @projects %>
+ <% @project = project %>
+
+ <%= link_to_project project %> (<%= format_time(project.created_on) %>)
<%= format_text project.short_description, :project => project %>
-
- <% end %>
- <% @project = nil %>
+
+ <% end %>
+ <% @project = nil %>
<% end %>
<%= call_hook(:view_welcome_index_right, :projects => @projects) %>
-
<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, {:controller => '/news', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
+ <%= auto_discovery_link_tag(:atom, {:controller => '/news', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
:title => "#{Setting.app_title}: #{l(:label_news_latest)}") %>
-<%= auto_discovery_link_tag(:atom, {:controller => '/activities', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
+ <%= auto_discovery_link_tag(:atom, {:controller => '/activities', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
:title => "#{Setting.app_title}: #{l(:label_activity)}") %>
<% end %>
diff --git a/app/views/welcome/robots.text.erb b/app/views/welcome/robots.text.erb
index aed9469070..162bd767a9 100644
--- a/app/views/welcome/robots.text.erb
+++ b/app/views/welcome/robots.text.erb
@@ -26,10 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
User-agent: *
<% @projects.each do |p| -%>
-Disallow: /projects/<%= p.to_param %>/repository
+ Disallow: /projects/<%= p.to_param %>/repository
Disallow: /projects/<%= p.to_param %>/issues
Disallow: /projects/<%= p.to_param %>/activity
<% end -%>
diff --git a/app/views/wiki/annotate.html.erb b/app/views/wiki/annotate.html.erb
index 0dffd7f14d..f7b48fff2c 100644
--- a/app/views/wiki/annotate.html.erb
+++ b/app/views/wiki/annotate.html.erb
@@ -34,29 +34,26 @@ See doc/COPYRIGHT.rdoc for more details.
:accesskey => accesskey(:edit)) %>
<%= link_to(l(:label_history), {:action => 'history', :id => @page}, :class => 'icon icon-wiki') %>
<% end %>
-
<%= h(@page.pretty_title) %>
-
<%= render :partial => 'layouts/action_menu_specific' %>
-
-<%= Version.model_name.human %> <%= link_to h(@annotate.content.version), :action => 'show', :id => @page, :version => @annotate.content.version %>
-(<%= h(@annotate.content.journable.author ? @annotate.content.journable.author.name : l(:label_user_anonymous)) %>, <%= format_time(@annotate.content.journable.updated_on) %>)
+ <%= Version.model_name.human %> <%= link_to h(@annotate.content.version), :action => 'show', :id => @page, :version => @annotate.content.version %>
+ (<%= h(@annotate.content.journable.author ? @annotate.content.journable.author.name : l(:label_user_anonymous)) %>, <%= format_time(@annotate.content.journable.updated_on) %>)
-
<% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
-
-
-<% line_num = 1 %>
-<% @annotate.lines.each do |line| -%>
-
- <%= line_num %>
- <%= link_to line[0], :controller => '/wiki', :action => 'show', :project_id => @project, :id => @page, :version => line[0] %>
- <%= h(line[1]) %>
- <%=h line[2] %>
-
-<% line_num += 1 %>
-<% end -%>
-
+
+ <% line_num = 1 %>
+ <% @annotate.lines.each do |line| -%>
+
+ <%= line_num %>
+ <%= link_to line[0], :controller => '/wiki', :action => 'show', :project_id => @project, :id => @page, :version => line[0] %>
+ <%= h(line[1]) %>
+
+ <%=h line[2] %>
+
+
+ <% line_num += 1 %>
+ <% end -%>
+
diff --git a/app/views/wiki/date_index.html.erb b/app/views/wiki/date_index.html.erb
index b894181502..a5f249ad18 100644
--- a/app/views/wiki/date_index.html.erb
+++ b/app/views/wiki/date_index.html.erb
@@ -30,35 +30,28 @@ See doc/COPYRIGHT.rdoc for more details.
<% content_for :action_menu_specific do %>
<%= watcher_link(@wiki, User.current) %>
<% end %>
-
<%= l(:label_index_by_date) %>
-
<%= render :partial => 'layouts/action_menu_specific' %>
-
<% if @pages.empty? %>
-<%= l(:label_no_data) %>
+ <%= l(:label_no_data) %>
<% end %>
-
<% @pages_by_date.keys.sort.reverse.each do |date| %>
-<%= format_date(date) %>
-
-<% @pages_by_date[date].each do |page| %>
- <%= link_to page.pretty_title, project_wiki_path(page.project, page) %>
-<% end %>
-
+ <%= format_date(date) %>
+
+ <% @pages_by_date[date].each do |page| %>
+ <%= link_to page.pretty_title, project_wiki_path(page.project, page) %>
+ <% end %>
+
<% end %>
-
<% content_for :sidebar do %>
<%= render :partial => 'sidebar' %>
<% end %>
-
<% unless @pages.empty? %>
-<%= other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => {:controller => '/activities', :action => 'index', :show_wiki_edits => 1, :key => User.current.rss_key} %>
- <%= f.link_to('HTML', :url => {:action => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
+ <%= other_formats_links do |f| %>
+ <%= f.link_to 'Atom', :url => {:controller => '/activities', :action => 'index', :show_wiki_edits => 1, :key => User.current.rss_key} %>
+ <%= f.link_to('HTML', :url => {:action => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
+ <% end %>
<% end %>
-<% end %>
-
<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, :controller => '/activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+ <%= auto_discovery_link_tag(:atom, :controller => '/activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
<% end %>
diff --git a/app/views/wiki/destroy.html.erb b/app/views/wiki/destroy.html.erb
index 7df186d922..401f09baab 100644
--- a/app/views/wiki/destroy.html.erb
+++ b/app/views/wiki/destroy.html.erb
@@ -26,26 +26,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%=h @page.pretty_title %>
-
<%= form_tag({}, :method => :delete) do %>
-
-
<%= l(:text_wiki_page_destroy_question, :descendants => @descendants_count) %>
-
<%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_wiki_page_nullify_children) %>
-<%= radio_button_tag 'todo', 'destroy', false %> <%= l(:text_wiki_page_destroy_children) %>
-<% if @reassignable_to.any? %>
-
-<%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_wiki_page_reassign_children) %> :
-<%= label_tag "reassign_to_id", l(:description_wiki_subpages_reassign), :class => "hidden-for-sighted" %>
-<%= select_tag 'reassign_to_id', wiki_page_options_for_select(@reassignable_to),
+
+
<%= l(:text_wiki_page_destroy_question, :descendants => @descendants_count) %>
+
<%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_wiki_page_nullify_children) %>
+ <%= radio_button_tag 'todo', 'destroy', false %> <%= l(:text_wiki_page_destroy_children) %>
+ <% if @reassignable_to.any? %>
+
+ <%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_wiki_page_reassign_children) %> :
+ <%= label_tag "reassign_to_id", l(:description_wiki_subpages_reassign), :class => "hidden-for-sighted" %>
+ <%= select_tag 'reassign_to_id', wiki_page_options_for_select(@reassignable_to),
:onclick => "$('todo_reassign').checked = true;" %>
-<% end %>
-
-
-
-<%= submit_tag l(:button_apply), class: 'button -highlight' %>
-<%= link_to l(:button_cancel),
+ <% end %>
+
+
+ <%= submit_tag l(:button_apply), class: 'button -highlight' %>
+ <%= link_to l(:button_cancel),
{ controller: '/wiki', action: 'show', project_id: @project, id: @page },
class: 'button' %>
<% end %>
diff --git a/app/views/wiki/diff.html.erb b/app/views/wiki/diff.html.erb
index 78d6c446f6..bd4fbe5904 100644
--- a/app/views/wiki/diff.html.erb
+++ b/app/views/wiki/diff.html.erb
@@ -30,19 +30,15 @@ See doc/COPYRIGHT.rdoc for more details.
<% content_for :action_menu_specific do %>
<%= link_to(l(:label_history), {:action => 'history', :id => @page}, :class => 'icon icon-wiki') %>
<% end %>
-
<%= h(@page.pretty_title) %>
-
<%= render :partial => 'layouts/action_menu_specific' %>
-
-<%= Version.model_name.human %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page, :project_id => @page.project, :version => @diff.content_from.version %>/<%= @page.content.version %>
-(<%= @diff.content_from.user ? link_to_user(@diff.content_from.user) : l(:label_user_anonymous) %>, <%= format_time(@diff.content_from.created_at) %>)
-→
-<%= Version.model_name.human %> <%= link_to @diff.content_to.version, :action => 'show', :id => @page, :project_id => @page.project, :version => @diff.content_to.version %>/<%= @page.content.version %>
-(<%= @diff.content_to.user ? link_to_user(@diff.content_to.user) : l(:label_user_anonymous) %>, <%= format_time(@diff.content_to.created_at) %>)
+ <%= Version.model_name.human %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page, :project_id => @page.project, :version => @diff.content_from.version %>/<%= @page.content.version %>
+ (<%= @diff.content_from.user ? link_to_user(@diff.content_from.user) : l(:label_user_anonymous) %>, <%= format_time(@diff.content_from.created_at) %>)
+ →
+ <%= Version.model_name.human %> <%= link_to @diff.content_to.version, :action => 'show', :id => @page, :project_id => @page.project, :version => @diff.content_to.version %>/<%= @page.content.version %>
+ (<%= @diff.content_to.user ? link_to_user(@diff.content_to.user) : l(:label_user_anonymous) %>, <%= format_time(@diff.content_to.created_at) %>)
-
<%= nl2br @html_diff %>
diff --git a/app/views/wiki/edit.html.erb b/app/views/wiki/edit.html.erb
index 38513131a1..8b0cf6e340 100644
--- a/app/views/wiki/edit.html.erb
+++ b/app/views/wiki/edit.html.erb
@@ -26,29 +26,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%=h @page.pretty_title %>
-
<%= form_for @content, :as => :content, :url => {:action => 'update', :id => @page}, :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %>
-<%= f.hidden_field :lock_version %>
-<%= error_messages_for 'content' %>
-
-
- <%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit),
+ <%= f.hidden_field :lock_version %>
+ <%= error_messages_for 'content' %>
+
+ <%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit),
:value => format_text(@content, :text, :attachments => @content.page.attachments, :edit => true),
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json),
:'ng-non-bindable' => '' %>
-
-<%= Version.human_attribute_name(:comments) %> <%= f.text_field :comments, :size => 120 %>
-<%=l(:label_attachment_plural)%> <%= render :partial => 'attachments/form' %>
-<%= submit_tag l(:button_save), class: 'button -highlight' %>
- <%= preview_link preview_project_wiki_path(@project, @page), 'wiki_form', class: 'button' %>
-
-<%= wikitoolbar_for 'content_text' %>
+
+ <%= Version.human_attribute_name(:comments) %>
+ <%= f.text_field :comments, :size => 120 %>
+ <%=l(:label_attachment_plural)%>
+ <%= render :partial => 'attachments/form' %>
+ <%= submit_tag l(:button_save), class: 'button -highlight' %>
+ <%= preview_link preview_project_wiki_path(@project, @page), 'wiki_form', class: 'button' %>
+
+ <%= wikitoolbar_for 'content_text' %>
<% end %>
-
-
<% content_for :header_tags do %>
<%= robot_exclusion_tag %>
<% end %>
diff --git a/app/views/wiki/export.html.erb b/app/views/wiki/export.html.erb
index e896097419..4de9d9d63a 100644
--- a/app/views/wiki/export.html.erb
+++ b/app/views/wiki/export.html.erb
@@ -26,26 +26,25 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
-
-<%=h @page.pretty_title %>
-
- " />
-
-
-
-<%= format_text @content, :text, :wiki_links => :local, :only_path => false %>
-
+
+ <%=h @page.pretty_title %>
+
+ " />
+
+
+
+ <%= format_text @content, :text, :wiki_links => :local, :only_path => false %>
+
diff --git a/app/views/wiki/export_multiple.html.erb b/app/views/wiki/export_multiple.html.erb
index c762c702d1..5e4e0dc0ed 100644
--- a/app/views/wiki/export_multiple.html.erb
+++ b/app/views/wiki/export_multiple.html.erb
@@ -26,38 +26,34 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
-
-<%=h @wiki.project.name %>
-
-
-
-
-
-<%= l(:label_index_by_title) %>
-
-
-<% @pages.each do |page| %>
-
-
-<%= format_text page.content ,:text, :wiki_links => :anchor %>
-<% end %>
-
-
-
+
+ <%=h @wiki.project.name %>
+
+
+
+
+ <%= l(:label_index_by_title) %>
+
+ <% @pages.each do |page| %>
+
+
+ <%= format_text page.content ,:text, :wiki_links => :anchor %>
+ <% end %>
+
+
diff --git a/app/views/wiki/history.html.erb b/app/views/wiki/history.html.erb
index d9c86548f3..05814b3b79 100644
--- a/app/views/wiki/history.html.erb
+++ b/app/views/wiki/history.html.erb
@@ -26,51 +26,48 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= h(@page.pretty_title) %>
-
<%= l(:label_history) %>
-
<%= form_tag({:action => "diff"}, :method => :get) do %>
-
-
- #
-
-
- <%= Journal.human_attribute_name(:updated_on) %>
- <%= Journal.human_attribute_name(:author) %>
- <%= Journal.human_attribute_name(:comments) %>
-
-
-
-<% show_diff = @versions.size > 1 %>
-<% line_num = 1 %>
-<% @versions.each do |ver| %>
-">
- <%= link_to h(ver.version), :action => 'show', :id => @page, :project_id => @page.project, :version => ver.version %>
-
- <% if show_diff && (line_num < @versions.size) %>
- " class="hidden-for-sighted"><%=l(:description_compare_from) + " " + h(ver.version.to_s) %>
- <%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") %>
- <% end %>
-
-
- <% if show_diff && (line_num > 1) %>
- " class="hidden-for-sighted"><%=l(:description_compare_to) + " " + h(ver.version.to_s) %>
- <%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") %>
+
+
+
+ #
+
+
+ <%= Journal.human_attribute_name(:updated_on) %>
+ <%= Journal.human_attribute_name(:author) %>
+ <%= Journal.human_attribute_name(:comments) %>
+
+
+
+
+ <% show_diff = @versions.size > 1 %>
+ <% line_num = 1 %>
+ <% @versions.each do |ver| %>
+ ">
+ <%= link_to h(ver.version), :action => 'show', :id => @page, :project_id => @page.project, :version => ver.version %>
+
+ <% if show_diff && (line_num < @versions.size) %>
+ " class="hidden-for-sighted"><%=l(:description_compare_from) + " " + h(ver.version.to_s) %>
+ <%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") %>
+ <% end %>
+
+
+ <% if show_diff && (line_num > 1) %>
+ " class="hidden-for-sighted"><%=l(:description_compare_to) + " " + h(ver.version.to_s) %>
+ <%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") %>
+ <% end %>
+
+ <%= format_time(ver.created_at) %>
+ <%= link_to_user ver.user %>
+
+ <%= link_to l(:button_annotate), :action => 'annotate', :id => @page, :version => ver.version %>
+
+ <% line_num += 1 %>
<% end %>
-
- <%= format_time(ver.created_at) %>
- <%= link_to_user ver.user %>
-
- <%= link_to l(:button_annotate), :action => 'annotate', :id => @page, :version => ver.version %>
-
-<% line_num += 1 %>
-<% end %>
-
-
-<%= submit_tag l(:label_view_diff), :class => 'button -highlight -small' if show_diff %>
-
-<%= pagination_links_full @versions %>
-
+
+
+ <%= submit_tag l(:label_view_diff), :class => 'button -highlight -small' if show_diff %>
+ <%= pagination_links_full @versions %>
<% end %>
diff --git a/app/views/wiki/index.html.erb b/app/views/wiki/index.html.erb
index 4d2bfcc2b3..cde25822c3 100644
--- a/app/views/wiki/index.html.erb
+++ b/app/views/wiki/index.html.erb
@@ -36,30 +36,22 @@ See doc/COPYRIGHT.rdoc for more details.
<% content_for :action_menu_specific do %>
<%= watcher_link(@wiki, User.current) %>
<% end %>
-
<% html_title l(:label_wiki_toc) %>
-
<%= l(:label_index_by_title) %>
-
<%= render :partial => 'layouts/action_menu_specific' %>
-
<% if @pages.empty? %>
-<%= l(:label_no_data) %>
+ <%= l(:label_no_data) %>
<% end %>
-
<%= render_page_hierarchy(@pages_by_parent_id, nil, :timestamp => true) %>
-
<% content_for :sidebar do %>
<%= render :partial => 'sidebar' %>
<% end %>
-
<% unless @pages.empty? %>
-<%= other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => {:controller => '/activities', :action => 'index', :show_wiki_edits => 1, :key => User.current.rss_key} %>
- <%= f.link_to('HTML', :url => {:action => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
+ <%= other_formats_links do |f| %>
+ <%= f.link_to 'Atom', :url => {:controller => '/activities', :action => 'index', :show_wiki_edits => 1, :key => User.current.rss_key} %>
+ <%= f.link_to('HTML', :url => {:action => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
+ <% end %>
<% end %>
-<% end %>
-
<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, :controller => '/activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+ <%= auto_discovery_link_tag(:atom, :controller => '/activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
<% end %>
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
index 69c353f69d..ae5f64ced2 100644
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@@ -56,13 +56,10 @@ See doc/COPYRIGHT.rdoc for more details.
<% end %>
<%= li_unless_nil(link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page}, :class => 'icon-context icon-wiki')) %>
<%= li_unless_nil(link_to_if_authorized(l(:button_manage_menu_entry), {:controller => '/wiki_menu_items', :action => 'edit', :project_id => @project.identifier, :id => @page}, :class => 'icon-context icon-settings')) %>
-
<% end %>
-
<% breadcrumb_paths(*(@page.ancestors.reverse.collect {|parent| link_to h(parent.breadcrumb_title), {:id => parent, :project_id => parent.project}} + [h(@page.breadcrumb_title)])) %>
-
<% if @content.version != @page.content.version %>
-
+
<%= link_to(l(:label_previous), { :action => 'show', :id => @page, :project_id => @page.project, :version => (@content.version - 1) }, :class => 'navigate-left') + " - " if @content.version > 1 %>
<%= "#{Version.model_name.human} #{@content.version}/#{@page.content.version}" %>
<%= '(' + link_to(l(:label_diff), :controller => '/wiki', :action => 'diff', :id => @page, :project_id => @page.project, :version => @content.version) + ')' if @content.version > 1 %> -
@@ -71,30 +68,26 @@ See doc/COPYRIGHT.rdoc for more details.
<%= @content.author ? link_to_user(@content.author) : l(:label_user_anonymous) %>, <%= format_time(@content.updated_on) %>
<%=h @content.comments %>
-
-
+
+
<% end %>
-
<%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
-
<%= link_to_attachments @page %>
-
<% if @editable && authorize_for('wiki', 'add_attachment') %>
-
-
<%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
+
+
<%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
:id => 'attach_files_link' %>
-<%= form_tag({ :controller => '/wiki', :action => 'add_attachment', :project_id => @project, :id => @page }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
-
-
<%= render :partial => 'attachments/form' %>
-
-<%= submit_tag l(:button_add), class: 'button -highlight' %>
-<%= link_to l(:button_cancel), {},
+ <%= form_tag({ :controller => '/wiki', :action => 'add_attachment', :project_id => @project, :id => @page }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
+
+
<%= render :partial => 'attachments/form' %>
+
+ <%= submit_tag l(:button_add), class: 'button -highlight' %>
+ <%= link_to l(:button_cancel), {},
:onclick => "Element.hide('add_attachment_form'); Element.show('attach_files_link'); return false;",
class: 'button' %>
+ <% end %>
+
<% end %>
-
-<% end %>
-
<%= other_formats_links do |f| %>
<%= f.link_to 'Atom', :url => { :controller => '/activities',
:action => 'index',
diff --git a/app/views/wikis/destroy.html.erb b/app/views/wikis/destroy.html.erb
index 49e090d128..99b9434975 100644
--- a/app/views/wikis/destroy.html.erb
+++ b/app/views/wikis/destroy.html.erb
@@ -26,14 +26,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%=l(:label_confirmation)%>
-
-<%= h(@project.name) %> <%=l(:text_wiki_destroy_confirmation)%>
-
-<%= form_tag({:controller => '/wikis', :action => 'destroy', :id => @project}) do %>
-<%= hidden_field_tag "confirm", 1 %>
-<%= submit_tag l(:button_delete), class: 'button -highlight' %>
-<% end %>
-
+ <%= h(@project.name) %>
+ <%=l(:text_wiki_destroy_confirmation)%>
+ <%= form_tag({:controller => '/wikis', :action => 'destroy', :id => @project}) do %>
+ <%= hidden_field_tag "confirm", 1 %>
+ <%= submit_tag l(:button_delete), class: 'button -highlight' %>
+ <% end %>
+
diff --git a/app/views/work_packages/_changesets.html.erb b/app/views/work_packages/_changesets.html.erb
index aa4c4bb787..720f4eb095 100644
--- a/app/views/work_packages/_changesets.html.erb
+++ b/app/views/work_packages/_changesets.html.erb
@@ -26,14 +26,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% changesets.each do |changeset| %>
-
+
<%= link_to_revision(changeset, changeset.project,
:text => "#{l(:label_revision)} #{changeset.format_identifier}") %>
- <%= authoring(changeset.committed_on, changeset.author) %>
+
<%= authoring(changeset.committed_on, changeset.author) %>
- <%= format_text(changeset, :comments) %>
-
+ <%= format_text(changeset, :comments) %>
+
<% end %>
diff --git a/app/views/work_packages/_list_simple.html.erb b/app/views/work_packages/_list_simple.html.erb
index 3518edd712..618f438c51 100644
--- a/app/views/work_packages/_list_simple.html.erb
+++ b/app/views/work_packages/_list_simple.html.erb
@@ -26,33 +26,34 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% if work_packages && work_packages.any? %>
-<%= form_tag({}) do %>
-
-
- #
- <%= WorkPackage.human_attribute_name(:project)%>
- <%= WorkPackage.human_attribute_name(:type)%>
- <%= WorkPackage.human_attribute_name(:subject)%>
-
-
- <% for work_package in work_packages %>
-
+ <% end %>
+
+
+ <% end %>
<% else %>
<%= l(:label_no_data) %>
<% end %>
diff --git a/app/views/work_packages/_two_column_attributes.html.erb b/app/views/work_packages/_two_column_attributes.html.erb
index c96e8374c0..161c8a0df5 100644
--- a/app/views/work_packages/_two_column_attributes.html.erb
+++ b/app/views/work_packages/_two_column_attributes.html.erb
@@ -27,20 +27,15 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% left_attributes, right_attributes = attributes.in_groups(2, false) %>
-
- <% left_attributes.each do |attribute| %>
-
+ <% left_attributes.each do |attribute| %>
<%= attribute.field %>
-
<% end %>
-
- <% right_attributes.each do |attribute| %>
-
+ <% right_attributes.each do |attribute| %>
<%= attribute.field %>
diff --git a/app/views/work_packages/auto_completes/index.html.erb b/app/views/work_packages/auto_completes/index.html.erb
index 626feb65d7..cba812e34b 100644
--- a/app/views/work_packages/auto_completes/index.html.erb
+++ b/app/views/work_packages/auto_completes/index.html.erb
@@ -26,13 +26,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
-<% if @work_packages.any? -%>
- <% @work_packages.each do |work_package| -%>
- <%= content_tag 'li', h(work_package.to_s), id: work_package.id %>
+ <% if @work_packages.any? -%>
+ <% @work_packages.each do |work_package| -%>
+ <%= content_tag 'li', h(work_package.to_s), id: work_package.id %>
+ <% end -%>
+ <% else -%>
+ <%= content_tag("li", l(:label_none), style: 'display:none') %>
<% end -%>
-<% else -%>
- <%= content_tag("li", l(:label_none), style: 'display:none') %>
-<% end -%>
diff --git a/app/views/work_packages/bulk/edit.html.erb b/app/views/work_packages/bulk/edit.html.erb
index c08ad9d283..f13c6ceab6 100644
--- a/app/views/work_packages/bulk/edit.html.erb
+++ b/app/views/work_packages/bulk/edit.html.erb
@@ -26,108 +26,98 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= l(:label_bulk_edit_selected_work_packages) %>
-
<%= @work_packages.collect {|i| content_tag('li', link_to(h("#{i.type} ##{i.id}"), work_package_path(i)) + h(": #{i.subject}")) }.join("\n").html_safe %>
-
<%= form_tag(url_for(controller: '/work_packages/bulk', action: :update, ids: @work_packages),
method: :put) do %>
-<%= @work_packages.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %>
-
-
-<%= l(:label_change_properties) %>
-
-
-
- <%= WorkPackage.human_attribute_name(:type) %>
- <%= select_tag('work_package[type_id]', "#{l(:label_no_change_option)} ".html_safe + options_from_collection_for_select(@types, :id, :name)) %>
-
-<% if @available_statuses.any? %>
-
- <%= WorkPackage.human_attribute_name(:status) %>
- <%= select_tag('work_package[status_id]', "#{l(:label_no_change_option)} ".html_safe + options_from_collection_for_select(@available_statuses, :id, :name)) %>
-
-<% end %>
-
- <%= WorkPackage.human_attribute_name(:priority) %>
- <%= select_tag('work_package[priority_id]', "#{l(:label_no_change_option)} ".html_safe + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>
-
-
- <%= WorkPackage.human_attribute_name(:assigned_to) %>
- <%= select_tag('work_package[assigned_to_id]', content_tag('option', l(:label_no_change_option), :value => '') +
+ <%= @work_packages.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %>
+
+
+ <%= l(:label_change_properties) %>
+
+
+ <%= WorkPackage.human_attribute_name(:type) %>
+ <%= select_tag('work_package[type_id]', "#{l(:label_no_change_option)} ".html_safe + options_from_collection_for_select(@types, :id, :name)) %>
+
+ <% if @available_statuses.any? %>
+
+ <%= WorkPackage.human_attribute_name(:status) %>
+ <%= select_tag('work_package[status_id]', "#{l(:label_no_change_option)} ".html_safe + options_from_collection_for_select(@available_statuses, :id, :name)) %>
+
+ <% end %>
+
+ <%= WorkPackage.human_attribute_name(:priority) %>
+ <%= select_tag('work_package[priority_id]', "#{l(:label_no_change_option)} ".html_safe + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>
+
+
+ <%= WorkPackage.human_attribute_name(:assigned_to) %>
+ <%= select_tag('work_package[assigned_to_id]', content_tag('option', l(:label_no_change_option), :value => '') +
content_tag('option', l(:label_nobody), :value => 'none') +
options_from_collection_for_select(@assignables, :id, :name)) %>
-
-
- <%= WorkPackage.human_attribute_name(:responsible) %>
- <%= select_tag('work_package[responsible_id]', content_tag('option', l(:label_no_change_option), :value => '') +
+
+
+ <%= WorkPackage.human_attribute_name(:responsible) %>
+ <%= select_tag('work_package[responsible_id]', content_tag('option', l(:label_no_change_option), :value => '') +
content_tag('option', l(:label_nobody), :value => 'none') +
options_from_collection_for_select(@responsibles, :id, :name)) %>
-
-<% if @project %>
-
- <%= WorkPackage.human_attribute_name(:category) %>
- <%= select_tag('work_package[category_id]', content_tag('option', l(:label_no_change_option), :value => '') +
+
+ <% if @project %>
+
+ <%= WorkPackage.human_attribute_name(:category) %>
+ <%= select_tag('work_package[category_id]', content_tag('option', l(:label_no_change_option), :value => '') +
content_tag('option', l(:label_none), :value => 'none') +
options_from_collection_for_select(@project.categories, :id, :name)) %>
-
-<% end %>
-<% #TODO: allow editing versions when multiple projects %>
-<% if @project %>
-
- <%= WorkPackage.human_attribute_name(:fixed_version) %>
- <%= select_tag('work_package[fixed_version_id]', content_tag('option', l(:label_no_change_option), :value => '') +
+
+ <% end %>
+ <% #TODO: allow editing versions when multiple projects %>
+ <% if @project %>
+
+ <%= WorkPackage.human_attribute_name(:fixed_version) %>
+ <%= select_tag('work_package[fixed_version_id]', content_tag('option', l(:label_no_change_option), :value => '') +
content_tag('option', l(:label_none), :value => 'none') +
version_options_for_select(@project.shared_versions.open.sort)) %>
-
-<% end %>
-
-<% @custom_fields.each do |custom_field| %>
-
- <%= blank_custom_field_label_tag('work_package', custom_field) %>
- <%= custom_field_tag_for_bulk_edit('work_package', custom_field) %>
-
-<% end %>
-
-<%= call_hook(:view_work_packages_bulk_edit_details_bottom, { work_packages: @work_packages }) %>
-
-
-
-<% if @project && User.current.allowed_to?(:manage_subtasks, @project) %>
-
- <%= WorkPackage.human_attribute_name(:parent) %>
- <%= text_field_tag 'work_package[parent_id]', '', :size => 10 %>
-
-
-<%= javascript_tag "observeParentIssueField('#{work_packages_auto_complete_path(project_id: @project.id)}')" %>
-<% end %>
-
- <%= WorkPackage.human_attribute_name(:start_date) %>
- <%= text_field_tag 'work_package[start_date]', '', :size => 10 %><%= calendar_for('work_package_start_date') %>
-
-
- <%= WorkPackage.human_attribute_name(:due_date) %>
- <%= text_field_tag 'work_package[due_date]', '', :size => 10 %><%= calendar_for('work_package_due_date') %>
-
-<% if WorkPackage.use_field_for_done_ratio? %>
-
- <%= WorkPackage.human_attribute_name(:done_ratio) %>
- <%= select_tag 'work_package[done_ratio]', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>
-
-<% end %>
-
-
-
-
-
<%= Journal.human_attribute_name(:notes) %>
-<%= label_tag 'notes', Journal.human_attribute_name(:notes), :class => 'hidden-for-sighted' %>
-<%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit',
+
+ <% end %>
+ <% @custom_fields.each do |custom_field| %>
+
+ <%= blank_custom_field_label_tag('work_package', custom_field) %>
+ <%= custom_field_tag_for_bulk_edit('work_package', custom_field) %>
+
+ <% end %>
+ <%= call_hook(:view_work_packages_bulk_edit_details_bottom, { work_packages: @work_packages }) %>
+
+
+ <% if @project && User.current.allowed_to?(:manage_subtasks, @project) %>
+
+ <%= WorkPackage.human_attribute_name(:parent) %>
+ <%= text_field_tag 'work_package[parent_id]', '', :size => 10 %>
+
+
+ <%= javascript_tag "observeParentIssueField('#{work_packages_auto_complete_path(project_id: @project.id)}')" %>
+ <% end %>
+
+ <%= WorkPackage.human_attribute_name(:start_date) %>
+ <%= text_field_tag 'work_package[start_date]', '', :size => 10 %><%= calendar_for('work_package_start_date') %>
+
+
+ <%= WorkPackage.human_attribute_name(:due_date) %>
+ <%= text_field_tag 'work_package[due_date]', '', :size => 10 %><%= calendar_for('work_package_due_date') %>
+
+ <% if WorkPackage.use_field_for_done_ratio? %>
+
+ <%= WorkPackage.human_attribute_name(:done_ratio) %>
+ <%= select_tag 'work_package[done_ratio]', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>
+
+ <% end %>
+
+
+
<%= Journal.human_attribute_name(:notes) %>
+ <%= label_tag 'notes', Journal.human_attribute_name(:notes), :class => 'hidden-for-sighted' %>
+ <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit',
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json) %>
-<%= wikitoolbar_for 'notes' %>
-<%= send_notification_option %>
-
-
-
-<%= submit_tag l(:button_submit), class: 'button -highlight' %>
+ <%= wikitoolbar_for 'notes' %>
+ <%= send_notification_option %>
+
+
+
<%= submit_tag l(:button_submit), class: 'button -highlight' %>
<% end %>
diff --git a/app/views/work_packages/calendars/index.html.erb b/app/views/work_packages/calendars/index.html.erb
index 2a426544bb..57b51037db 100644
--- a/app/views/work_packages/calendars/index.html.erb
+++ b/app/views/work_packages/calendars/index.html.erb
@@ -26,59 +26,51 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= @query.new_record? ? l(:label_calendar) : h(@query.name) %>
-
<%= form_tag(work_packages_calendar_index_path, :method => :get, :id => 'query_form') do %>
<%= hidden_field_tag('project_id', @project.to_param) if @project%>
-
-
-
- <%= link_to_previous_month(@year, @month, :project => @project) %> | <%= link_to_next_month(@year, @month, :project => @project) %>
-
-
-
-
- <%= label_tag('month', l(:label_month)) %>
- <%= select_month(@month, { :prefix => "month", :discard_type => true }, class: 'form--select -small') %>
-
-
- <%= label_tag('year', l(:label_year)) %>
- <%= select_year(@year, { :prefix => "year", :discard_type => true }, class: 'form--select -small') %>
-
-
- <%= link_to_remote l(:button_apply),
+
+
+ <%= link_to_previous_month(@year, @month, :project => @project) %> | <%= link_to_next_month(@year, @month, :project => @project) %>
+
+
+
+ <%= label_tag('month', l(:label_month)) %>
+ <%= select_month(@month, { :prefix => "month", :discard_type => true }, class: 'form--select -small') %>
+
+
+ <%= label_tag('year', l(:label_year)) %>
+ <%= select_year(@year, { :prefix => "year", :discard_type => true }, class: 'form--select -small') %>
+
+
+ <%= link_to_remote l(:button_apply),
{ :url => { :set_filter => 1 },
:method => :get,
:update => "content",
:with => "jQuery('#query_form').serialize()"
}, :class => 'button -small icon icon-yes' %>
-
- <%= link_to_remote l(:button_clear),
+ <%= link_to_remote l(:button_clear),
{ :url => { :project_id => @project, :set_filter => 1 },
:method => :get,
:update => "content",
}, :class => 'button -small icon icon-undo' %>
+
-
<% end %>
-
<%= error_messages_for 'query' %>
<% if @query.valid? %>
-<%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %>
-
-
- <%= l(:text_tip_work_package_begin_day) %>
- <%= l(:text_tip_work_package_end_day) %>
- <%= l(:text_tip_work_package_begin_end_day) %>
-
+ <%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %>
+
+ <%= l(:text_tip_work_package_begin_day) %>
+ <%= l(:text_tip_work_package_end_day) %>
+ <%= l(:text_tip_work_package_begin_end_day) %>
+
<% end %>
-
<% content_for :sidebar do %>
<%= render :partial => 'work_packages/sidebar' %>
<% end %>
diff --git a/app/views/work_packages/moves/new.html.erb b/app/views/work_packages/moves/new.html.erb
index 111c5d6a53..b76d9e0b18 100644
--- a/app/views/work_packages/moves/new.html.erb
+++ b/app/views/work_packages/moves/new.html.erb
@@ -26,102 +26,85 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= header_tags %>
-
<%= @copy ? l(:button_copy) : l(:button_move) %>
-
-<% @work_packages.each do |work_package| -%>
- <%= link_to_work_package work_package %>
-<% end -%>
+ <% @work_packages.each do |work_package| -%>
+ <%= link_to_work_package work_package %>
+ <% end -%>
-
<%= form_tag({:action => 'create'}, :id => 'move_form') do %>
-<%= @work_packages.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %>
-
-
-
-<%= l(:label_change_properties) %>
-
-
-
<%= WorkPackage.human_attribute_name(:project) %>:
-<%= select_tag "new_project_id",
+ <%= @work_packages.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %>
+
+
+ <%= l(:label_change_properties) %>
+
+
<%= WorkPackage.human_attribute_name(:project) %>:
+ <%= select_tag "new_project_id",
project_tree_options_for_select(@allowed_projects, :selected => @target_project),
:onchange => remote_function(:url => { :action => 'new' },
:method => :get,
:update => 'content',
:with => "Form.serialize('move_form')") %>
-
-
<%= WorkPackage.human_attribute_name(:type) %>:
- <%= select_tag("new_type_id",
+
<%= WorkPackage.human_attribute_name(:type) %>:
+ <%= select_tag("new_type_id",
content_tag('option', l(:label_no_change_option), :value => '') +
options_from_collection_for_select(@types, "id", "name")) %>
-
-
-
- <%= WorkPackage.human_attribute_name(:status) %>
- <%= select_tag('status_id',
+
+
+ <%= WorkPackage.human_attribute_name(:status) %>
+ <%= select_tag('status_id',
content_tag('option', l(:label_no_change_option), :value => '') +
options_from_collection_for_select(@available_statuses, :id, :name)) %>
-
-
-
- <%= WorkPackage.human_attribute_name(:priority) %>
- <%= select_tag('priority_id',
+
+
+ <%= WorkPackage.human_attribute_name(:priority) %>
+ <%= select_tag('priority_id',
content_tag('option', l(:label_no_change_option), :value => '') +
options_from_collection_for_select(IssuePriority.all, :id, :name)) %>
-
-
-
- <%= WorkPackage.human_attribute_name(:assigned_to) %>
- <%= select_tag('assigned_to_id',
+
+
+ <%= WorkPackage.human_attribute_name(:assigned_to) %>
+ <%= select_tag('assigned_to_id',
content_tag('option', l(:label_no_change_option), :value => '') +
content_tag('option', l(:label_nobody), :value => 'none') +
options_from_collection_for_select(@target_project.possible_assignees, :id, :name)) %>
-
-
- <%= WorkPackage.human_attribute_name(:responsible) %>
- <%= select_tag('responsible_id',
+
+
+ <%= WorkPackage.human_attribute_name(:responsible) %>
+ <%= select_tag('responsible_id',
content_tag('option', l(:label_no_change_option), :value => '') +
content_tag('option', l(:label_nobody), :value => 'none') +
options_from_collection_for_select(@target_project.possible_responsibles, :id, :name)) %>
-
-
-
-
-
- <%= WorkPackage.human_attribute_name(:start_date) %>
- <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %>
-
-
-
- <%= WorkPackage.human_attribute_name(:due_date) %>
- <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %>
-
-
-
-
-
-
<%= Journal.human_attribute_name(:notes) %>
-
-<%= label_tag 'notes', Journal.human_attribute_name(:notes), :class => 'hidden-for-sighted' %>
-<%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit',
+
+
+
+
+ <%= WorkPackage.human_attribute_name(:start_date) %>
+ <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %>
+
+
+ <%= WorkPackage.human_attribute_name(:due_date) %>
+ <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %>
+
+
+
+
<%= Journal.human_attribute_name(:notes) %>
+ <%= label_tag 'notes', Journal.human_attribute_name(:notes), :class => 'hidden-for-sighted' %>
+ <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit',
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @target_project, :format => :json) %>
-<%= wikitoolbar_for 'notes' %>
-
-
-<%= call_hook(:view_work_packages_move_bottom, :work_packages => @work_packages, :target_project => @target_project, :copy => !!@copy) %>
-
-
-<% if @copy %>
- <%= hidden_field_tag("copy") %>
- <%= submit_tag l(:button_copy), class: 'button -highlight' %>
- <%= submit_tag l(:button_copy_and_follow), :name => 'follow', class: 'button -highlight' %>
-<% else %>
- <%= submit_tag l(:button_move), class: 'button -highlight' %>
- <%= submit_tag l(:button_move_and_follow), :name => 'follow', class: 'button -highlight' %>
-<% end %>
+ <%= wikitoolbar_for 'notes' %>
+
+ <%= call_hook(:view_work_packages_move_bottom, :work_packages => @work_packages, :target_project => @target_project, :copy => !!@copy) %>
+
+ <% if @copy %>
+ <%= hidden_field_tag("copy") %>
+ <%= submit_tag l(:button_copy), class: 'button -highlight' %>
+ <%= submit_tag l(:button_copy_and_follow), :name => 'follow', class: 'button -highlight' %>
+ <% else %>
+ <%= submit_tag l(:button_move), class: 'button -highlight' %>
+ <%= submit_tag l(:button_move_and_follow), :name => 'follow', class: 'button -highlight' %>
+ <% end %>
<% end %>
<% content_for :header_tags do %>
<%= robot_exclusion_tag %>
diff --git a/app/views/work_packages/reports/_report.html.erb b/app/views/work_packages/reports/_report.html.erb
index 9fe59c800f..f3085836f1 100644
--- a/app/views/work_packages/reports/_report.html.erb
+++ b/app/views/work_packages/reports/_report.html.erb
@@ -31,59 +31,59 @@ See doc/COPYRIGHT.rdoc for more details.
<%=l(:label_no_data)%>
<% else %>
<% column_names = report.statuses.map(&:name) + [l(:label_open_work_packages), l(:label_closed_work_packages), l(:label_total)] %>
-<% col_width = 70 / (column_names.length+3) %>
-
-
-
-
-<% column_names.each do |name| %>
- <%= name %>
-<% end %>
-
-
-
-<% for row in report.rows %>
-">
-
- <%= link_to h(row.name),
+ <% col_width = 70 / (column_names.length+3) %>
+
+
+
+
+ <% column_names.each do |name| %>
+ <%= name %>
+ <% end %>
+
+
+
+ <% for row in report.rows %>
+ ">
+
+ <%= link_to h(row.name),
project_report_property_path((row.is_a?(Project) ? row : @project),
"#{report.field}",
row.id) %>
-
-<% for status in report.statuses %>
-
- <%= aggregate_link report.data,
+
+ <% for status in report.statuses %>
+
+ <%= aggregate_link report.data,
{ report.field => row.id, "status_id" => status.id },
project_report_property_status_path((row.is_a?(Project) ? row : @project),
status.id,
"#{report.field}",
row.id) %>
-
-<% end %>
-
- <%= aggregate_link report.data,
+
+ <% end %>
+
+ <%= aggregate_link report.data,
{ report.field => row.id, "closed" => 0 },
project_report_property_open_path((row.is_a?(Project) ? row : @project),
"#{report.field}",
row.id) %>
-
-
- <%= aggregate_link report.data,
+
+
+ <%= aggregate_link report.data,
{ report.field => row.id, "closed" => 1 },
project_report_property_closed_path((row.is_a?(Project) ? row : @project),
"#{report.field}",
row.id) %>
-
-
- <%= aggregate_link report.data,
+
+
+ <%= aggregate_link report.data,
{ report.field => row.id },
project_report_property_path((row.is_a?(Project) ? row : @project),
"#{report.field}",
row.id) %>
-
-
-<% end %>
-
-
+
+
+ <% end %>
+
+
<% end
reset_cycle %>
diff --git a/app/views/work_packages/reports/report.html.erb b/app/views/work_packages/reports/report.html.erb
index 64a8aad216..12afafe206 100644
--- a/app/views/work_packages/reports/report.html.erb
+++ b/app/views/work_packages/reports/report.html.erb
@@ -26,29 +26,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<% html_title l(:label_summary) %>
-
<%=l(:label_summary)%>
-
-<%
+ <%
[@type_report, @priority_report, @assignee_report, @responsible_report, @author_report].each do |report| %>
- <%= render :partial => 'report_category', :locals => { report: report} %>
-<% end %>
-<%= call_hook(:view_reports_issue_report_split_content_left, :project => @project) %>
+ <%= render :partial => 'report_category', :locals => { report: report} %>
+ <% end %>
+ <%= call_hook(:view_reports_issue_report_split_content_left, :project => @project) %>
-
-<%
+ <%
additional_reports = [@version_report]
additional_reports << @subproject_report if @project.children.any?
additional_reports << @category_report
%>
-
-<% additional_reports.each do |report| %>
- <%= render :partial => 'report_category', :locals => { report: report } %>
-
-<% end %>
-<%= call_hook(:view_reports_issue_report_split_content_right, :project => @project) %>
+ <% additional_reports.each do |report| %>
+ <%= render :partial => 'report_category', :locals => { report: report } %>
+
+ <% end %>
+ <%= call_hook(:view_reports_issue_report_split_content_right, :project => @project) %>
diff --git a/app/views/workflows/_form.html.erb b/app/views/workflows/_form.html.erb
index ba9e70f5c0..d56d4313d5 100644
--- a/app/views/workflows/_form.html.erb
+++ b/app/views/workflows/_form.html.erb
@@ -26,50 +26,48 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
-
-
-
- <%= link_to_function(icon_wrapper('icon-context icon-yes',"#{l(:button_check_all)}/#{l(:button_uncheck_all)}"), "toggleCheckboxesBySelector('table.transitions-#{name} input')",
+
+
+
+ <%= link_to_function(icon_wrapper('icon-context icon-yes',"#{l(:button_check_all)}/#{l(:button_uncheck_all)}"), "toggleCheckboxesBySelector('table.transitions-#{name} input')",
:class => 'no-decoration-on-hover',
:title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
:alt => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
- <%=l(:label_current_status)%>
-
- <%=l(:label_new_statuses_allowed)%>
-
-
-
- <% for new_status in @statuses %>
-
- <%= link_to_function(icon_wrapper('icon-context icon-yes',"#{l(:button_check_all)}/#{l(:button_uncheck_all)}"), "toggleCheckboxesBySelector('table.transitions-#{name} input.new-status-#{new_status.id}')",
+ <%=l(:label_current_status)%>
+
+ <%=l(:label_new_statuses_allowed)%>
+
+
+
+ <% for new_status in @statuses %>
+
+ <%= link_to_function(icon_wrapper('icon-context icon-yes',"#{l(:button_check_all)}/#{l(:button_uncheck_all)}"), "toggleCheckboxesBySelector('table.transitions-#{name} input.new-status-#{new_status.id}')",
:class => 'no-decoration-on-hover',
:title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
:alt => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
- <%=h new_status.name %>
-
- <% end %>
-
-
-
- <% for old_status in @statuses %>
- ">
-
- <%= link_to_function(icon_wrapper('icon-context icon-yes',"#{l(:button_check_all)}/#{l(:button_uncheck_all)}"), "toggleCheckboxesBySelector('table.transitions-#{name} input.old-status-#{old_status.id}')",
+ <%=h new_status.name %>
+
+ <% end %>
+
+
+
+ <% for old_status in @statuses %>
+ ">
+
+ <%= link_to_function(icon_wrapper('icon-context icon-yes',"#{l(:button_check_all)}/#{l(:button_uncheck_all)}"), "toggleCheckboxesBySelector('table.transitions-#{name} input.old-status-#{old_status.id}')",
:class => 'no-decoration-on-hover',
:title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
:alt => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
-
- <%=h old_status.name %>
-
- <% for new_status in @statuses -%>
-
- <%= check_box_tag "status[#{ old_status.id }][#{new_status.id}][]", name, workflows.detect {|w| w.old_status_id == old_status.id && w.new_status_id == new_status.id},
+ <%=h old_status.name %>
+
+ <% for new_status in @statuses -%>
+
+ <%= check_box_tag "status[#{ old_status.id }][#{new_status.id}][]", name, workflows.detect {|w| w.old_status_id == old_status.id && w.new_status_id == new_status.id},
:class => "old-status-#{old_status.id} new-status-#{new_status.id}" %>
-
- <% end -%>
-
- <% end %>
-
+
+ <% end -%>
+
+ <% end %>
+
diff --git a/app/views/workflows/copy.html.erb b/app/views/workflows/copy.html.erb
index c88e728142..429dc03880 100644
--- a/app/views/workflows/copy.html.erb
+++ b/app/views/workflows/copy.html.erb
@@ -51,7 +51,7 @@ See doc/COPYRIGHT.rdoc for more details.
"
--- #{l(:actionview_instancetag_blank_option)} --- ".html_safe +
"
--- #{ l(:label_copy_same_as_target) } --- ".html_safe +
options_from_collection_for_select(@roles, 'id', 'name', @source_role && @source_role.id)) %>
-
+
<%= l(:label_copy_target) %>
@@ -66,7 +66,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= Role.model_name.human %>
- <%= select_tag 'target_role_ids',
+ <%= select_tag 'target_role_ids',
"--- #{l(:actionview_instancetag_blank_option)} --- ".html_safe +
options_from_collection_for_select(@roles, 'id', 'name', @target_roles && @target_roles.map(&:id)), :multiple => true %>
diff --git a/app/views/workflows/edit.html.erb b/app/views/workflows/edit.html.erb
index 20b8dbc701..81cd0628b7 100644
--- a/app/views/workflows/edit.html.erb
+++ b/app/views/workflows/edit.html.erb
@@ -26,31 +26,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= render :partial => 'action_menu' %>
-
<%= Workflow.model_name.human %>
-
<%= render :partial => 'layouts/action_menu_specific' %>
-
<%=l(:text_workflow_edit)%>:
-
<%= form_tag({}, :method => 'get') do %>
-
- <%= Role.model_name.human %>:
+
+ <%= Role.model_name.human %>:
<%= select_tag 'role_id', options_from_collection_for_select(@roles, "id", "name", @role && @role.id) %>
-
- <%= Type.model_name.human %>:
+ <%= Type.model_name.human %>:
<%= select_tag 'type_id', options_from_collection_for_select(@types, "id", "name", @type && @type.id) %>
-
- <%= hidden_field_tag 'used_statuses_only', '0' %>
- <%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %>
-
-
-<%= submit_tag l(:button_edit), :name => nil, :accesskey => accesskey(:edit), class: 'button' %>
-
+ <%= hidden_field_tag 'used_statuses_only', '0' %>
+ <%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %>
+
+
+ <%= submit_tag l(:button_edit), :name => nil, :accesskey => accesskey(:edit), class: 'button' %>
+
<% end %>
-
<% if @type && @role && @statuses.any? %>
<%= form_tag({}, :id => 'workflow_form' ) do %>
<%= hidden_field_tag 'type_id', @type.id %>
@@ -69,7 +61,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= l(:label_additional_workflow_transitions_for_assignee) %>
- <%= render :partial => 'form', :locals => {:name => 'assignee', :workflows => @workflows['assignee']} %>
+ <%= render :partial => 'form', :locals => {:name => 'assignee', :workflows => @workflows['assignee']} %>
<%= javascript_tag "hideFieldset($('assignee_workflows'))" unless @workflows['assignee'].present? %>
diff --git a/app/views/workflows/index.html.erb b/app/views/workflows/index.html.erb
index fc2d0059f9..e80fa8dfd7 100644
--- a/app/views/workflows/index.html.erb
+++ b/app/views/workflows/index.html.erb
@@ -26,43 +26,37 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-
<%= render :partial => 'action_menu' %>
-
<% html_title l(:label_administration), l(:label_workflow_plural) -%>
-
<%= l(:label_workflow_plural) %>
-
<%= render :partial => 'layouts/action_menu_specific' %>
-
<% if @workflow_counts.empty? %>
-
<%= l(:label_no_data) %>
+
<%= l(:label_no_data) %>
<% else %>
-
+
<% end %>