scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-11 15:45:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

refactoring

Browse source
This commit is contained in:
mlorb 2018-04-06 14:20:40 +02:00
parent b8e91e91a1
commit 70dfe66b2d
6 changed files with 30 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/users/settings/list_toggle.js
View file

@ -1,11 +0,0 @@
function listToggleShow() {
$('#triangleDown').show();
$('#triangleRight').hide();
$('#accountNavigation').show();
}
function listToggleHide() {
$('#triangleDown').hide();
$('#triangleRight').show();
$('#accountNavigation').hide();
}

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();
}
});
})();

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>

26
app/views/users/settings/_sidebar.html.erb
View file

@ -10,29 +10,25 @@
<!-- Account -->
<li class="parent_li" >
<span class="tree-link line-wrap no-indent">
<i id="triangleRight"
title="Expand this branch"
class="glyphicon glyphicon-triangle-right"
<i title="Expand this branch"
class="glyphicon glyphicon-triangle-right triangleRight"
aria-hidden="true"
onclick="listToggleShow()"
style="<%= 'display: none;' if on_settings_account_page? %>"
></i>
<i id="triangleDown"
title="Collapse this branch"
class="glyphicon glyphicon-triangle-right expanded"
<i title="Collapse this branch"
class="glyphicon glyphicon-triangle-right expanded triangleDown"
aria-hidden="true"
onclick="listToggleHide()"
style="<%= 'display: none;' unless on_settings_account_page? %>"
></i>
<% style = 'font-weight: bold;' if on_settings_account_page? %>
<% account_style = 'font-weight: bold;' if on_settings_account_page? %>
<%= link_to t("users.settings.sidebar.account"),
edit_user_registration_path,
style: style,
style: account_style,
data: { 'no-turbolink' => 'true' } %>
</span>
<ul id="accountNavigation" style="<%= 'display: none;' unless on_settings_account_page? %>">
<li class="<%= 'active parent_li' if on_settings_account_profile_page? %>" >
<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>
@ -43,7 +39,7 @@
<% end %>
</span>
</li>
<li class="<%= 'active parent_li' if on_settings_account_preferences_page? %>" >
<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>
@ -54,7 +50,7 @@
<% end %>
</span>
</li>
<li class="<%= 'active parent_li' if on_settings_account_addons_page? %>" >
<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>
@ -69,7 +65,7 @@
</li>
<!-- Teams -->
<li class="<%= 'active parent_li' if on_settings_team_page? %>" >
<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>

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>

2
config/initializers/assets.rb
View file

@ -17,7 +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)
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)