scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1263 from mlorb/ml-sci-2652

Browse source 
fix time zone selector [SCI-2652]
This commit is contained in:
mlorb 2018-08-08 15:00:11 +02:00 committed by GitHub
parent 29f0f2afeb a6dd577b4e
commit 30091da94f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/users/settings/account/preferences/index.js
View file

@ -8,6 +8,7 @@
*/
function toggleFormVisibility(form, edit) {
if (edit) {
form.find('.selectpicker').selectpicker();
form.find("[data-part='view']").hide();
form.find("[data-part='edit']").show();
form.find("[data-part='edit'] input:not([type='file']):not([type='submit']):first").focus();

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

@ -39,7 +39,7 @@
<div class="form-group" style="max-width: 500px;">
<%= f.select :time_zone, ActiveSupport::TimeZone.all.collect { |tz|
[tz.formatted_offset + " " + tz.name, tz.name]
}, {}, {class: 'form-control selectpicker', 'ata-role' => 'clear'} %>
}, {}, {class: 'form-control selectpicker', 'data-role': 'clear'} %>
<small><%= t("users.settings.account.preferences.edit.time_zone_sublabel") %></small>
</div>
<div>