about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/navigation.rb4
-rw-r--r--config/routes.rb6
2 files changed, 6 insertions, 4 deletions
diff --git a/config/navigation.rb b/config/navigation.rb
index 45e5bc562..df1024189 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -10,10 +10,10 @@ SimpleNavigation::Configuration.run do |navigation|
       s.item :identity_proofs, safe_join([fa_icon('key fw'), t('settings.identity_proofs')]), settings_identity_proofs_path, highlights_on: %r{/settings/identity_proofs*}, if: proc { current_account.identity_proofs.exists? }
     end
 
-    n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_appearance_url do |s|
+    n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_url do |s|
       s.item :appearance, safe_join([fa_icon('desktop fw'), t('settings.appearance')]), settings_preferences_appearance_url
       s.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_preferences_notifications_url
-      s.item :other, safe_join([fa_icon('cog fw'), t('preferences.other')]), settings_preferences_url
+      s.item :other, safe_join([fa_icon('cog fw'), t('preferences.other')]), settings_preferences_other_url
     end
 
     n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_url
diff --git a/config/routes.rb b/config/routes.rb
index 2b35472bd..145079c69 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -87,15 +87,17 @@ Rails.application.routes.draw do
   get '/explore', to: 'directories#index', as: :explore
   get '/explore/:id', to: 'directories#show', as: :explore_hashtag
 
-  get '/settings', to: redirect('/settings/preferences')
+  get '/settings', to: redirect('/settings/profile')
 
   namespace :settings do
     resource :profile, only: [:show, :update]
-    resource :preferences, only: [:show, :update]
+
+    get :preferences, to: redirect('/settings/preferences/appearance')
 
     namespace :preferences do
       resource :appearance, only: [:show, :update], controller: :appearance
       resource :notifications, only: [:show, :update]
+      resource :other, only: [:show, :update], controller: :other
     end
 
     resource :import, only: [:show, :create]