diff options
| author | Phil Hughes <me@iamphill.com> | 2017-09-06 09:45:33 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-09-06 09:45:33 +0100 |
| commit | a0932f93c3ef5001586dd09b9e47c9d8f3422d6f (patch) | |
| tree | 89fb9f84b3c787490a0bde95fc78c7151feba1a7 | |
| parent | dd35d33ac8a2b29f1ff339cd797033627436cecb (diff) | |
| download | gitlab-ce-clean-up-new-nav-templates.tar.gz | |
renamed new_sidebar variableclean-up-new-nav-templates
| -rw-r--r-- | app/views/layouts/admin.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/group.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_breadcrumbs.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/profile.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/project.html.haml | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index 645f0aa014b..8595157a997 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -1,6 +1,6 @@ - page_title "Admin Area" - header_title "Admin Area", admin_root_path - nav "admin" -- @new_sidebar = true +- @left_sidebar = true = render template: "layouts/application" diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml index 98e22f0e135..08bd6fc311e 100644 --- a/app/views/layouts/group.html.haml +++ b/app/views/layouts/group.html.haml @@ -2,6 +2,6 @@ - page_description @group.description unless page_description - header_title group_title(@group) unless header_title - nav "group" -- @new_sidebar = true +- @left_sidebar = true = render template: "layouts/application" diff --git a/app/views/layouts/nav/_breadcrumbs.html.haml b/app/views/layouts/nav/_breadcrumbs.html.haml index 653452871a0..ff0f6489861 100644 --- a/app/views/layouts/nav/_breadcrumbs.html.haml +++ b/app/views/layouts/nav/_breadcrumbs.html.haml @@ -4,7 +4,7 @@ %nav.breadcrumbs{ role: "navigation" } .breadcrumbs-container{ class: [container, @content_class] } - - if defined?(@new_sidebar) + - if defined?(@left_sidebar) = button_tag class: 'toggle-mobile-nav', type: 'button' do %span.sr-only Open sidebar = icon ('bars') diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml index eb24999ed1a..67aa05b655c 100644 --- a/app/views/layouts/profile.html.haml +++ b/app/views/layouts/profile.html.haml @@ -2,6 +2,6 @@ - header_title "User Settings", profile_path unless header_title - sidebar "dashboard" - nav "profile" -- @new_sidebar = true +- @left_sidebar = true = render template: "layouts/application" diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 3953b4d3967..6b847fb4b7c 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -2,7 +2,7 @@ - page_description @project.description unless page_description - header_title project_title(@project) unless header_title - nav "project" -- @new_sidebar = true +- @left_sidebar = true - content_for :project_javascripts do - project = @target_project || @project |