Remove calendar_for entries

https://github.com/opf/openproject/pull/6497
pull/6827/head
Oliver Günther 6 years ago
parent 93b4b8be9e
commit 7cbeba98ec
No known key found for this signature in database
GPG Key ID: A3A8BDAD7C0C552C
  1. 3
      app/views/cost_objects/_form.html.erb
  2. 3
      app/views/cost_types/_rate.html.erb
  3. 3
      app/views/cost_types/index.html.erb
  4. 6
      app/views/costlog/_date_range.html.erb
  5. 3
      app/views/costlog/edit.html.erb
  6. 3
      app/views/hourly_rates/_rate.html.erb

@ -32,8 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
resource: resource %>
</div>
<div class="form--field">
<%= f.text_field :fixed_date, container_class: '-xslim' %>
<%= calendar_for :cost_object_fixed_date %>
<%= f.text_field :fixed_date, container_class: '-xslim', class: '-augmented-datepicker' %>
</div>
<% if @cost_object.kind == "VariableCostObject" -%>

@ -42,10 +42,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<td>
<label class="hidden-for-sighted" for="<%= "#{id_prefix}_valid_from" %>"><%= Rate.human_attribute_name(:valid_from) %></label>
<%= rate_form.text_field :valid_from,
class: 'date costs-date-picker',
class: 'date costs-date-picker -augmented-calendar',
index: id_or_index,
required: true %>
<%= calendar_for("#{id_prefix}_valid_from") unless templated %>
</td>
<td class="currency">
<span class="inline-label">

@ -37,9 +37,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<li class="simple-filters--filter">
<%= styled_label_tag :fixed_date, t(:label_fixed_date), class: 'simple-filters--filter-name' %>
<div class='simple-filters--filter-value'>
<%= styled_text_field_tag :fixed_date, @fixed_date %>
<%= styled_text_field_tag :fixed_date, @fixed_date, class: '-augmented-datepicker' %>
</div>
<%= calendar_for :fixed_date %>
</li>
<li class="simple-filters--filter">
<%= styled_label_tag :include_deleted, t(:caption_show_locked), class: 'simple-filters--filter-name -small' %>

@ -40,14 +40,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<h4><%= t(:label_date_from) %></h4>
<div class="form--field">
<%= styled_label_tag :from, t(:description_date_range_list) %>
<%= styled_text_field_tag :from, @from %>
<%= calendar_for :from %>
<%= styled_text_field_tag :from, @from, class: '-augmented-datepicker' %>
</div>
<h4><%= t(:label_date_to) %></h4>
<div class="form--field">
<%= styled_label_tag :to, t(:description_date_range_interval) %>
<%= styled_text_field_tag :to, @to %>
<%= calendar_for :to %>
<%= styled_text_field_tag :to, @to, class: '-augmented-datepicker' %>
</div>
</div>
<%= styled_button_tag t(:button_apply), class: '-with-icon icon-checkmark' %>

@ -57,11 +57,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<%= f.text_field :spent_on,
size: 10,
required: true,
class: 'remote-field--input',
class: 'remote-field--input -augmented-datepicker',
data: { :'remote-field-key' =>'fixed_date' },
container_class: '-xslim' %>
<label for="cost_entry_spent_on" class="hidden-for-sighted"><%= l(:label_date) %> <%=l(:text_hint_date_format) %></label>
<%= calendar_for('cost_entry_spent_on') %>
</div>
<% if User.current.allowed_to? :log_costs, @project %>
<div class="form--field">

@ -35,10 +35,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<td>
<label class="hidden-for-sighted" for="<%= "#{id_prefix}_valid_from" %>"><%= Rate.human_attribute_name(:valid_from) %></label>
<%= rate_form.text_field :valid_from,
class: 'date costs-date-picker',
class: 'date costs-date-picker -augmented-datepicker',
index: id_or_index,
required: true %>
<%= calendar_for("#{id_prefix}_valid_from") unless templated %>
</td>
<td class="currency">
<span class="inline-label">

Loading…
Cancel
Save