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

Merge pull request #1081 from mlorb/ml-sci-2123

Browse source 
Refactor settings into the new navigation bar [SCI-2123]
This commit is contained in:
mlorb 2018-04-09 13:21:16 +02:00 committed by GitHub
parent bdb6554870 8a35ce5c58
commit a10f671184
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 137 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/sidebar.js.erb
View file

@ -128,7 +128,7 @@ function setupSidebarTree() {
}
el
.find(" > span i")
.attr("title", "Expand this branch")
.attr("title", I18n.t('sidebar.branch_expand'))
.removeClass("expanded");
} else {
if (animate) {
@ -138,7 +138,7 @@ function setupSidebarTree() {
}
el
.find(" > span i")
.attr("title", "Collapse this branch")
.attr("title", I18n.t('sidebar.branch_collapse'))
.addClass("expanded");
}
}
@ -147,7 +147,7 @@ function setupSidebarTree() {
$(".tree li:has(ul)")
.addClass("parent_li")
.find(" > span i")
.attr("title", "Collapse this branch");
.attr("title", I18n.t('sidebar.branch_collapse'));
$(".tree li.parent_li ")
.find("> span i")
.addClass("glyphicon glyphicon-triangle-right expanded");

18
app/assets/javascripts/users/settings/list_toggle.js.erb Normal file
View file

@ -0,0 +1,18 @@
(function() {
'use strict';
$(".tree li.parent_li ").find("> span i").on("click", function (e) {
e.stopPropagation();
var el = $(this).closest("li.parent_li");
if (el.find(" > ul.accountNavigation").is(":visible")) {
el.find(" > span > i.triangleDown").hide();
el.find(" > span > i.triangleRight").show();
el.find(" > ul.accountNavigation").hide();
} else {
el.find(" > span > i.triangleDown").show();
el.find(" > span > i.triangleRight").hide();
el.find(" > ul.accountNavigation").show();
}
});
})();

5
app/controllers/users/registrations_controller.rb
View file

@ -4,6 +4,7 @@ class Users::RegistrationsController < Devise::RegistrationsController
only: %i(new create new_with_provider create_with_provider)
before_action :sign_up_with_provider_enabled?,
only: %i(new_with_provider create_with_provider)
layout :layout
def avatar
user = User.find_by_id(params[:id]) || current_user
@ -291,6 +292,10 @@ class Users::RegistrationsController < Devise::RegistrationsController
private
def layout
'fluid' if action_name == 'edit'
end
def check_captcha
if Rails.configuration.x.enable_recaptcha
unless verify_recaptcha

1
app/controllers/users/settings/account/addons_controller.rb
View file

@ -2,6 +2,7 @@ module Users
module Settings
module Account
class AddonsController < ApplicationController
layout 'fluid'
end
end
end

1
app/controllers/users/settings/account/preferences_controller.rb
View file

@ -9,6 +9,7 @@ module Users
:reset_tutorial,
:notifications_settings
]
layout 'fluid'
def index
end

2
app/controllers/users/settings/teams_controller.rb
View file

@ -22,6 +22,8 @@ module Users
before_action :check_create_team_permission,
only: %i(new create)
layout 'fluid'
def index
@user_teams =
@user

7
app/views/users/registrations/edit.html.erb
View file

@ -1,14 +1,11 @@
<% provide(:head_title, t("users.registrations.edit.head_title")) %>
<%= render partial: "users/settings/navigation.html.erb" %>
<%= render partial: "users/settings/sidebar" %>
<div class="tab-content">
<div class="tab-pane tab-pane-settings active" role="tabpanel">
<div class="row">
<div class="col-xs-12 col-sm-3">
<%= render partial: 'users/settings/account/navigation.html.erb' %>
</div>
<div class="col-xs-12 col-sm-9">
<div class="col-xs-12 col-sm-12">
<div class="row">
<div class="col-md-4">
<h2><%=t "users.registrations.edit.title" %></h2>

9
app/views/users/settings/_navigation.html.erb
View file

@ -1,9 +0,0 @@
<ul data-hook="user-settings-navigation-html"
class="nav nav-tabs nav-settings">
<li role="presentation" class="<%= 'active' if on_settings_account_page? %>">
<%= link_to t("users.settings.navigation.account"), edit_user_registration_path %>
</li>
<li role="presentation" class="<%= "active" if on_settings_team_page? %>">
<%= link_to t("users.settings.navigation.teams"), teams_path %>
</li>
</ul>

91
app/views/users/settings/_sidebar.html.erb Normal file
View file

@ -0,0 +1,91 @@
<%= content_for :sidebar do %>
<div id="slide-panel" class="visible">
<div class="tree">
<ul data-hook="user-settings-navigation-html">
<li>
<span class="tree-link line-wrap no-indent">
<strong title="<%= t('users.settings.sidebar.title') %>"><%= t('users.settings.sidebar.title') %></strong>
</span>
</li>
<!-- Account -->
<li class="parent_li" >
<span class="tree-link line-wrap no-indent">
<i title="<%= t('sidebar.branch_expand') %>"
class="glyphicon glyphicon-triangle-right triangleRight"
aria-hidden="true"
style="<%= 'display: none;' if on_settings_account_page? %>"
></i>
<i title="<%= t('sidebar.branch_collapse') %>"
class="glyphicon glyphicon-triangle-right expanded triangleDown"
aria-hidden="true"
style="<%= 'display: none;' unless on_settings_account_page? %>"
></i>
<% account_style = 'font-weight: bold;' if on_settings_account_page? %>
<%= link_to t("users.settings.sidebar.account"),
edit_user_registration_path,
style: account_style,
data: { 'no-turbolink' => 'true' } %>
</span>
<ul class="accountNavigation" data-hook="user-settings-account-navigation-html" style="<%= 'display: none;' unless on_settings_account_page? %>">
<li class="<%= 'active' if on_settings_account_profile_page? %>" >
<span class="tree-link line-wrap first-indent">
<% if on_settings_account_profile_page? %>
<span title="<%= t("users.settings.sidebar.account_nav.profile") %>"><%= t("users.settings.sidebar.account_nav.profile") %></span>
<% else %>
<%= link_to t("users.settings.sidebar.account_nav.profile"),
edit_user_registration_path,
data: { 'no-turbolink' => 'true' } %>
<% end %>
</span>
</li>
<li class="<%= 'active' if on_settings_account_preferences_page? %>" >
<span class="tree-link line-wrap first-indent">
<% if on_settings_account_preferences_page? %>
<span title="<%= t("users.settings.sidebar.account_nav.preferences") %>"><%= t("users.settings.sidebar.account_nav.preferences") %></span>
<% else %>
<%= link_to t("users.settings.sidebar.account_nav.preferences"),
preferences_path,
data: { 'no-turbolink' => 'true' } %>
<% end %>
</span>
</li>
<li class="<%= 'active' if on_settings_account_addons_page? %>" >
<span class="tree-link line-wrap first-indent">
<% if on_settings_account_addons_page? %>
<span title="<%= t("users.settings.sidebar.account_nav.addons") %>"><%= t("users.settings.sidebar.account_nav.addons") %></span>
<% else %>
<%= link_to t("users.settings.sidebar.account_nav.addons"),
addons_path,
data: { 'no-turbolink' => 'true' } %>
<% end %>
</span>
</li>
</ul>
</li>
<!-- Teams -->
<li class="<%= 'active' if on_settings_team_page? %>" >
<span class="tree-link line-wrap no-indent">
<% if on_settings_team_page? %>
<span title="<%= t("users.settings.sidebar.teams") %>"><%= t("users.settings.sidebar.teams") %></span>
<% else %>
<%= link_to t("users.settings.sidebar.teams"),
teams_path,
data: { 'no-turbolink' => 'true' } %>
<% end %>
</span>
</li>
</ul>
</div>
</div>
<% end %>
<script>
$(document).ready(function() {
$('#wrapper').show();
})
</script>
<%= javascript_include_tag("users/settings/list_toggle") %>

11
app/views/users/settings/account/_navigation.html.erb
View file

@ -1,11 +0,0 @@
<ul class="nav nav-pills nav-stacked nav-stacked-arrow" data-hook="user-settings-account-navigation-html">
<li role="presentation" class="<%= 'active' if on_settings_account_profile_page? %>">
<%= link_to t('users.settings.account.navigation.profile'), edit_user_registration_path %>
</li>
<li role="presentation" class="<%= 'active' if on_settings_account_preferences_page? %>">
<%= link_to t('users.settings.account.navigation.preferences'), preferences_path %>
</li>
<li role="presentation" class="<%= 'active' if on_settings_account_addons_page? %>">
<%= link_to t('users.settings.account.navigation.addons'), addons_path %>
</li>
</ul>

7
app/views/users/settings/account/addons/index.html.erb
View file

@ -1,14 +1,11 @@
<% provide(:head_title, t('users.settings.account.addons.head_title')) %>
<%= render partial: 'users/settings/navigation.html.erb' %>
<%= render partial: 'users/settings/sidebar.html.erb' %>
<div class="tab-content">
<div class="tab-pane tab-pane-settings active" role="tabpanel">
<div class="row">
<div class="col-xs-12 col-sm-3">
<%= render partial: 'users/settings/account/navigation.html.erb' %>
</div>
<div class="col-xs-12 col-sm-9">
<div class="col-xs-12 col-sm-12">
<h4><%= t('users.settings.account.addons.title') %></h4>
<div data-hook="settings-addons-container">
<em data-hook="settings-addons-no-addons">

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

@ -1,14 +1,11 @@
<% provide(:head_title, t("users.settings.account.preferences.head_title")) %>
<%= render partial: "users/settings/navigation.html.erb" %>
<%= render partial: "users/settings/sidebar.html.erb" %>
<div class="tab-content">
<div class="tab-pane tab-pane-settings active" role="tabpanel">
<div class="row">
<div class="col-xs-12 col-sm-3">
<%= render partial: 'users/settings/account/navigation.html.erb' %>
</div>
<div class="col-xs-12 col-sm-9">
<div class="col-xs-12 col-sm-12">
<%= form_for(@user,
url: update_preferences_path(format: :json),
remote: true,

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

@ -1,6 +1,6 @@
<% provide(:head_title, t("users.settings.teams.head_title")) %>
<%= render partial: "users/settings/navigation.html.erb" %>
<%= render partial: "users/settings/sidebar.html.erb" %>
<div class="tab-content">
<div class="tab-pane tab-pane-settings" role="tabpanel"></div>
<div class="tab-pane tab-pane-settings active" role="tabpanel">

2
app/views/users/settings/teams/new.html.erb
View file

@ -1,6 +1,6 @@
<% provide(:head_title, t("users.settings.teams.head_title")) %>
<%= render partial: "users/settings/navigation.html.erb" %>
<%= render partial: "users/settings/sidebar.html.erb" %>
<div class="tab-content">
<div class="tab-pane tab-pane-settings" role="tabpanel"></div>
<div class="tab-pane tab-pane-settings active" role="tabpanel">

2
app/views/users/settings/teams/show.html.erb
View file

@ -2,7 +2,7 @@
<div data-hook="team-beginning"></div>
<%= render partial: "users/settings/navigation.html.erb" %>
<%= render partial: "users/settings/sidebar.html.erb" %>
<div class="tab-content">
<div class="tab-pane tab-pane-settings" role="tabpanel"></div>
<div class="tab-pane tab-pane-settings active" role="tabpanel">

1
config/initializers/assets.rb
View file

@ -17,6 +17,7 @@ Rails.application.config.assets.precompile += %w(underscore.js)
Rails.application.config.assets.precompile += %w(jsPlumb-2.0.4-min.js)
Rails.application.config.assets.precompile += %w(jsnetworkx.js)
Rails.application.config.assets.precompile += %w(handsontable.full.min.js)
Rails.application.config.assets.precompile += %w(users/settings/list_toggle.js.erb)
Rails.application.config.assets.precompile +=
%w(users/settings/account/preferences/index.js)
Rails.application.config.assets.precompile += %w(users/settings/teams/index.js)

9
config/locales/en.yml
View file

@ -111,6 +111,8 @@ en:
sidebar:
title: "Navigation"
branch_expand: "Expand this branch"
branch_collapse: "Collapse this branch"
no_module_group: "No workflow"
projects:
all: "All Projects"
@ -1354,14 +1356,15 @@ en:
changed_team_flash: "You are working on %{team} now!"
changed_team_error_flash: "Something went wrong! Try again later."
changed_team_in_search: "The searched item is not in your current team. You will be redirected to %{team} team!"
navigation:
sidebar:
title: "Settings"
account: "Account"
teams: "Teams"
account:
navigation:
account_nav:
profile: "Profile"
preferences: "Preferences"
addons: "Add-ons"
account:
preferences:
head_title: "Settings | My preferences"
edit: