diff --git a/app/views/work_packages/calendars/index.html.erb b/app/views/work_packages/calendars/index.html.erb index 26c99ef645..a269363727 100644 --- a/app/views/work_packages/calendars/index.html.erb +++ b/app/views/work_packages/calendars/index.html.erb @@ -28,55 +28,55 @@ See doc/COPYRIGHT.rdoc for more details. ++#%> <%= toolbar title: (@query.new_record? ? l(:label_calendar) : @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 %> - <%= hidden_field_tag('set_filter', 1) %> - -
- <%= l('timeframe.show') %> - - -
+ <%= hidden_field_tag('project_id', @project.to_param) if @project %> + <%= hidden_field_tag('set_filter', 1) %> +
+ + <%= l(:label_filter_plural) %> + +
+ <%= render partial: 'queries/filters', locals: { query: @query } %> +
+
+
+ <%= l('timeframe.show') %> + +
<% end %> <%= error_messages_for 'query' %> <% if @query.valid? %> -

- <%= link_to_previous_month(@year, @month, project: @project) %> - | <%= link_to_next_month(@year, @month, project: @project) %> -

- <%= 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) %> -

+

+ <%= link_to_previous_month(@year, @month, project: @project) %> + | <%= link_to_next_month(@year, @month, project: @project) %> +

+ <%= 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' %> + <%= render partial: 'work_packages/sidebar' %> <% end %> <% html_title(l(:label_calendar)) -%>