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

Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"

Browse source
This commit is contained in:
Luka Murn 2017-10-17 13:10:02 +02:00 committed by GitHub
parent 66e9e60c9d
commit 4d8f2665d3
6 changed files with 1 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +0,0 @@
module Users
module Settings
module Account
class AddonsController < ApplicationController
end
end
end
end

7
app/helpers/user_settings_helper.rb
View file

@ -1,8 +1,7 @@
module UserSettingsHelper
def on_settings_account_page?
controller_name == 'registrations' && action_name == 'edit' ||
controller_name == 'preferences' && action_name == 'index' ||
controller_name == 'addons' && action_name == 'index'
controller_name == 'preferences' && action_name == 'index'
end
def on_settings_account_profile_page?
@ -13,10 +12,6 @@ module UserSettingsHelper
controller_name == 'preferences'
end
def on_settings_account_addons_page?
controller_name == 'addons'
end
def on_settings_team_page?
controller_name.in?(%w(teams audits)) &&
action_name.in?(%w(index new create show audits_index))

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

@ -5,7 +5,4 @@
<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>

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

@ -1,22 +0,0 @@
<% provide(:head_title, t('users.settings.account.addons.head_title')) %>
<%= render partial: 'users/settings/navigation.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">
<h4><%= t('users.settings.account.addons.title') %></h4>
<div data-hook="settings-addons-container">
<em data-hook="settings-addons-no-addons">
<%= t('users.settings.account.addons.no_addons') %>
</em>
</div>
</div>
</div>
</div>
<div class="tab-pane tab-pane-settings" role="tabpanel"></div>
</div>

5
config/locales/en.yml
View file

@ -1287,7 +1287,6 @@ en:
navigation:
profile: "Profile"
preferences: "Preferences"
addons: "Add-ons"
preferences:
head_title: "Settings | My preferences"
edit:
@ -1303,10 +1302,6 @@ en:
select_team: "Select team"
tutorial_reset_flash: "Tutorial can now be repeated."
tutorial_reset_error: "Tutorial could not be repeated."
addons:
head_title: "Settings | Add-ons"
title: "Add-ons"
no_addons: "You have no sciNote Add-ons."
teams:
head_title: "Settings | Teams"
breadcrumbs:

3
config/routes.rb
View file

@ -28,9 +28,6 @@ Rails.application.routes.draw do
get 'users/settings/account/preferences',
to: 'users/settings/account/preferences#index',
as: 'preferences'
get 'users/settings/account/addons',
to: 'users/settings/account/addons#index',
as: 'addons'
put 'users/settings/account/preferences',
to: 'users/settings/account/preferences#update',
as: 'update_preferences'