lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated language dropdown to look nicer (#2171)

This commit is contained in:
Ahmad Farhat 2020-10-07 16:26:38 -04:00 committed by GitHub
parent 92d6c285c4
commit bc9867566c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/user_edit.js
View File

@ -32,5 +32,15 @@ $(document).on('turbolinks:load', function(){
$("#role-dropdown").on("changed.bs.select", function(){
$("#user_role_id").val($("#role-dropdown").selectpicker('val'))
})
// Update hidden field with new value
// $("#language-dropdown").on("show.bs.select", function(){
// $("#language-dropdown").selectpicker('val', $("#user_language").val())
// })
// Update hidden field with new value
$("#language-dropdown").on("changed.bs.select", function(){
$("#user_language").val($("#language-dropdown").selectpicker('val'))
})
}
})

8
app/views/users/components/_account.html.erb
View File

@ -36,7 +36,13 @@
<%= f.text_field :provider, class: "form-control", readonly: "" %>
<br>
<%= f.label :language, t("settings.account.language"), class: "form-label" %>
<%= f.select :language, language_options, {}, { class: "form-control custom-select" } %>
<select id="language-dropdown" class="selectpicker show-tick w-50">
<% language_options.each do |lang| %>
<option value="<%=lang[1]%>" <%= 'selected' if lang[1] == @user.language %>><%= lang[0] %></option>
<% end %>
</select>
<%= f.hidden_field :language, id: "user_language", value: @user.language %>
<%= f.label :roles, t("settings.account.roles"), class: "form-label mt-5" %>
<% if current_user.role.get_permission("can_manage_users") %>