summaryrefslogtreecommitdiffstats
path: root/app/views/activities
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2020-06-18 02:49:30 +0000
committerGo MAEDA <maeda@farend.jp>2020-06-18 02:49:30 +0000
commit2b92d02e5755af4b572c6537b4aabe9c35eb8852 (patch)
tree8d037685a4f2d01c3cad89f343c234bf92fe0378 /app/views/activities
parent60767ffb180cf7a44b9ed993ceb192b06528394b (diff)
downloadredmine-2b92d02e5755af4b572c6537b4aabe9c35eb8852.tar.gz
redmine-2b92d02e5755af4b572c6537b4aabe9c35eb8852.zip
Date selection for Activity page (#1422).
Patch by Mizuki ISHIKAWA. git-svn-id: http://svn.redmine.org/redmine/trunk@19828 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/activities')
-rw-r--r--app/views/activities/index.html.erb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb
index 64f7f6a85..f71266004 100644
--- a/app/views/activities/index.html.erb
+++ b/app/views/activities/index.html.erb
@@ -32,6 +32,10 @@
<% content_for :sidebar do %>
<%= form_tag({}, :method => :get, :id => 'activity_scope_form') do %>
<h3><%= l(:label_activity) %></h3>
+<p>
+ <%= t(:label_days_to_html, :days => @days, :date => date_field_tag('from', '', :value => (@date_to - 1), :size => 10)) %>
+ <%= calendar_for('from') %>
+</p>
<ul>
<% @activity.event_types.each do |t| %>
<li>
@@ -48,7 +52,6 @@
<p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
<% end %>
<%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>
-<%= hidden_field_tag('from', params[:from]) unless params[:from].blank? %>
<p><%= submit_tag l(:button_apply), :class => 'button-small', :name => 'submit' %></p>
<% end %>
<% end %>