gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)

Browse source
This commit is contained in:
Eugen Rochko 2019-06-07 16:51:08 +02:00 • committed by GitHub
parent cdb420862e
commit 560ec24e58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/navigation.rb
View file

@ -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

6
config/routes.rb
View file

@ -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]