From 4d8f2665d340daf1ecf4bc67212060ad37963b47 Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Tue, 17 Oct 2017 13:10:02 +0200 Subject: [PATCH] Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]" --- .../settings/account/addons_controller.rb | 8 ------- app/helpers/user_settings_helper.rb | 7 +----- .../settings/account/_navigation.html.erb | 3 --- .../settings/account/addons/index.html.erb | 22 ------------------- config/locales/en.yml | 5 ----- config/routes.rb | 3 --- 6 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 app/controllers/users/settings/account/addons_controller.rb delete mode 100644 app/views/users/settings/account/addons/index.html.erb diff --git a/app/controllers/users/settings/account/addons_controller.rb b/app/controllers/users/settings/account/addons_controller.rb deleted file mode 100644 index 9b18d556a..000000000 --- a/app/controllers/users/settings/account/addons_controller.rb +++ /dev/null @@ -1,8 +0,0 @@ -module Users - module Settings - module Account - class AddonsController < ApplicationController - end - end - end -end diff --git a/app/helpers/user_settings_helper.rb b/app/helpers/user_settings_helper.rb index 448ef9b63..ce06ccf60 100644 --- a/app/helpers/user_settings_helper.rb +++ b/app/helpers/user_settings_helper.rb @@ -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)) diff --git a/app/views/users/settings/account/_navigation.html.erb b/app/views/users/settings/account/_navigation.html.erb index 63993494d..f890b5a5f 100644 --- a/app/views/users/settings/account/_navigation.html.erb +++ b/app/views/users/settings/account/_navigation.html.erb @@ -5,7 +5,4 @@ - \ No newline at end of file diff --git a/app/views/users/settings/account/addons/index.html.erb b/app/views/users/settings/account/addons/index.html.erb deleted file mode 100644 index de7c58a21..000000000 --- a/app/views/users/settings/account/addons/index.html.erb +++ /dev/null @@ -1,22 +0,0 @@ -<% provide(:head_title, t('users.settings.account.addons.head_title')) %> - -<%= render partial: 'users/settings/navigation.html.erb' %> -
-
- -
-
- <%= render partial: 'users/settings/account/navigation.html.erb' %> -
-
-

<%= t('users.settings.account.addons.title') %>

-
- - <%= t('users.settings.account.addons.no_addons') %> - -
-
-
-
-
-
diff --git a/config/locales/en.yml b/config/locales/en.yml index 459367f3b..4241aba35 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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: diff --git a/config/routes.rb b/config/routes.rb index c6b412da4..7aed6b3f9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -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'