scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 06:56:54 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1425 from okriuchykhin/ok_SCI_2907

Browse source 
Use fixed date example in date format drop down [SCI-2907]
This commit is contained in:
Alex Kriuchykhin 2018-12-16 20:11:58 +01:00 committed by GitHub
commit 94e6143ac0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/users/settings/account/preferences/index.html.erb
View file

@ -65,7 +65,7 @@
disabled="disabled" disabled="disabled"
autocomplete="off" autocomplete="off"
type="text" type="text"
value="<%= l(Time.now, format: :full_date) %>" value="<%= l(Time.new(2014, 5, 16), format: :full_date) %>"
name="fake_user[settings][time_zone]" name="fake_user[settings][time_zone]"
id="fake_user_settings_date_format"> id="fake_user_settings_date_format">
<span class="input-group-btn"> <span class="input-group-btn">
@ -80,7 +80,7 @@
<h4><%=t "users.settings.account.preferences.edit.date_format_title" %></h4> <h4><%=t "users.settings.account.preferences.edit.date_format_title" %></h4>
<div class="form-group" style="max-width: 500px;"> <div class="form-group" style="max-width: 500px;">
<%= f.select :date_format, Constants::SUPPORTED_DATE_FORMATS.collect { |df| <%= f.select :date_format, Constants::SUPPORTED_DATE_FORMATS.collect { |df|
["#{l(Time.now, format: :full_date, date_format: df)}", df] ["#{l(Time.new(2014, 5, 16), format: :full_date, date_format: df)}", df]
}, {}, { class: 'form-control selectpicker', 'data-role': 'clear' } %> }, {}, { class: 'form-control selectpicker', 'data-role': 'clear' } %>
<small><%= t("users.settings.account.preferences.edit.date_format_sublabel") %></small> <small><%= t("users.settings.account.preferences.edit.date_format_sublabel") %></small>
</div> </div>