diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-08-08 09:14:00 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-08-08 09:19:07 -0500 |
| commit | 1c2f22eb0b1f2005fda16e4708bbff82167c3d52 (patch) | |
| tree | 858a41472dd99ee1b45c1499a3e09951f53a5ae2 | |
| parent | feb8974cc87455328dea708be556e41b59e8ba26 (diff) | |
| download | gitlab-ce-1c2f22eb0b1f2005fda16e4708bbff82167c3d52.tar.gz | |
Revert "Combine 'turn on/off' user dropdown links into 'experimental features' link and andded 'experimental features' heading for user preferences page"
This reverts commit 75f490a4c95c41f9364e8e0cba443b312f01a686.
5 files changed, 7 insertions, 5 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index df1dc736571..c7aa97a351f 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -74,7 +74,9 @@ = link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username } %li = link_to "Settings", profile_path - = render 'shared/user_dropdown_experimental_features' + %li + = link_to "Turn on new navigation", profile_preferences_path(anchor: "new-navigation") + = render 'shared/repo/user_dropdown_link' %li.divider %li = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link" diff --git a/app/views/layouts/header/_new.html.haml b/app/views/layouts/header/_new.html.haml index fa94925d537..0734cdfc05e 100644 --- a/app/views/layouts/header/_new.html.haml +++ b/app/views/layouts/header/_new.html.haml @@ -68,7 +68,9 @@ = link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username } %li = link_to "Settings", profile_path - = render 'shared/user_dropdown_experimental_features' + %li + = link_to "Turn off new navigation", profile_preferences_path(anchor: "new-navigation") + = render 'shared/repo/user_dropdown_link' %li.divider %li = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link" diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 9bd8bf91d1c..084af0629ae 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -18,8 +18,6 @@ = 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 diff --git a/app/views/shared/_user_dropdown_experimental_features.html.haml b/app/views/shared/_user_dropdown_experimental_features.html.haml deleted file mode 100644 index 8e71407b748..00000000000 --- a/app/views/shared/_user_dropdown_experimental_features.html.haml +++ /dev/null @@ -1 +0,0 @@ -%li= link_to 'Experimental features', profile_preferences_path(anchor: 'experimental-features') diff --git a/app/views/shared/repo/_user_dropdown_link.html.haml b/app/views/shared/repo/_user_dropdown_link.html.haml new file mode 100644 index 00000000000..bddd83a123d --- /dev/null +++ b/app/views/shared/repo/_user_dropdown_link.html.haml @@ -0,0 +1 @@ +%li= link_to "Turn #{show_new_repo? ? 'off' : 'on'} new repository", profile_preferences_path(anchor: "new-repository") |