merenber
/
greenlight
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes #278 (#282) 

* <Fixed the main ui glitch>

* <Fixed issue>

* <Fixed code style>

* <Some more code style fixes>

* Update sessions_helper.rb
This commit is contained in:
John Ma 2018-10-03 11:42:14 -04:00 committed by Jesus Federico
parent f0f0638be3
commit 5c281a1a3f
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/settings.js
View File

@ -20,12 +20,12 @@ $(document).on('turbolinks:load', function(){
var action = $("body").data('action'); var action = $("body").data('action');
// Only run on the settings page. // Only run on the settings page.
if (controller == "users" && action == "edit"){ if ((controller == "users" && action == "edit") || (controller == "users" && action == "update")){
settingsButtons = $('.setting-btn'); settingsButtons = $('.setting-btn');
settingsViews = $('.setting-view'); settingsViews = $('.setting-view');
settingsButtons.each(function(i, btn) { settingsButtons.each(function(i, btn) {
if(i != 0){ $(settingsViews[i]).hide(); } if(!$(btn).hasClass("active")){ $(settingsViews[i]).hide(); }
$(btn).click(function(){ $(btn).click(function(){
$(btn).addClass("active"); $(btn).addClass("active");
settingsViews.each(function(i, view){ settingsViews.each(function(i, view){

4
app/controllers/users_controller.rb
View File

@ -79,12 +79,12 @@ class UsersController < ApplicationController
else else
# Append custom errors. # Append custom errors.
errors.each { |k, v| @user.errors.add(k, v) } errors.each { |k, v| @user.errors.add(k, v) }
render :edit render :edit, params: { settings: params[:settings] }
end end
elsif @user.update_attributes(user_params) elsif @user.update_attributes(user_params)
redirect_to edit_user_path(@user), notice: I18n.t("info_update_success") redirect_to edit_user_path(@user), notice: I18n.t("info_update_success")
else else
render :edit render :edit, params: { settings: params[:settings] }
end end
end end

9
app/views/users/edit.html.erb
View File

@ -19,21 +19,22 @@
<div class="row"> <div class="row">
<div class="col-lg-3 mb-4"> <div class="col-lg-3 mb-4">
<div class="list-group list-group-transparent mb-0"> <div class="list-group list-group-transparent mb-0">
<button id="account" class="list-group-item list-group-item-action setting-btn active">
<button id="account" class="list-group-item list-group-item-action setting-btn <%= "active" if !params[:setting] || params[:setting] == "account"%>">
<span class="icon mr-3"><i class="fas fa-user"></i></span><%= t("settings.account.title") %> <span class="icon mr-3"><i class="fas fa-user"></i></span><%= t("settings.account.title") %>
</button> </button>
<% if @user.social_uid.nil? %> <% if @user.social_uid.nil? %>
<button id="password" class="list-group-item list-group-item-action setting-btn"> <button id="password" class="list-group-item list-group-item-action setting-btn <%= "active" if params[:setting] == "password"%>">
<span class="icon mr-3"><i class="fas fa-lock"></i></span><%= t("settings.password.title") %> <span class="icon mr-3"><i class="fas fa-lock"></i></span><%= t("settings.password.title") %>
</button> </button>
<% end %> <% end %>
<button id="design" class="list-group-item list-group-item-action setting-btn"> <button id="design" class="list-group-item list-group-item-action setting-btn <%= "active" if params[:setting] == "design"%>">
<span class="icon mr-3"><i class="fas fa-edit"></i></span><%= t("settings.design.title") %> <span class="icon mr-3"><i class="fas fa-edit"></i></span><%= t("settings.design.title") %>
</button> </button>
<button id="delete" class="list-group-item list-group-item-action setting-btn"> <button id="delete" class="list-group-item list-group-item-action setting-btn <%= "active" if params[:setting] == "delete"%>">
<span class="icon mr-3"><i class="fas fa-trash-alt"></i></span><%= t("settings.delete.title") %> <span class="icon mr-3"><i class="fas fa-trash-alt"></i></span><%= t("settings.delete.title") %>
</button> </button>
</div> </div>