kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Combine 'turn on/off' user dropdown links into 'experimental features' link and andded 'experimental features' heading for user preferences page

Browse source
This commit is contained in:
Luke "Jared" Bennett 2017-07-28 21:23:54 +01:00
parent d7636a995e
commit 75f490a4c9
No known key found for this signature in database
GPG key ID: 402ED51FB5D306C2
5 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/layouts/header/_default.html.haml
View file

@ -74,9 +74,7 @@
= link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username }
%li
= link_to "Settings", profile_path
%li
= link_to "Turn on new navigation", profile_preferences_path(anchor: "new-navigation")
= render 'shared/repo/user_dropdown_link'
= render 'shared/user_dropdown_experimental_features'
%li.divider
%li
= link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link"

4
app/views/layouts/header/_new.html.haml
View file

@ -68,9 +68,7 @@
= link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username }
%li
= link_to "Settings", profile_path
%li
= link_to "Turn off new navigation", profile_preferences_path(anchor: "new-navigation")
= render 'shared/repo/user_dropdown_link'
= render 'shared/user_dropdown_experimental_features'
%li.divider
%li
= link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link"

2
app/views/profiles/preferences/show.html.haml
View file

@ -18,6 +18,8 @@
= scheme.name
.col-sm-12
%hr
%h3#experimental-features Experimental features
%hr
.col-lg-4.profile-settings-sidebar#new-navigation
%h4.prepend-top-0
New Navigation

1
app/views/shared/_user_dropdown_experimental_features.html.haml Normal file
View file

@ -0,0 +1 @@
%li= link_to 'Experimental features', profile_preferences_path(anchor: 'experimental-features')

1
app/views/shared/repo/_user_dropdown_link.html.haml
View file

@ -1 +0,0 @@
%li= link_to "Turn #{show_new_repo? ? 'off' : 'on'} new repository", profile_preferences_path(anchor: "new-repository")