Skip to content
Snippets Groups Projects
Commit ddb3692a authored by Phil Hughes's avatar Phil Hughes Committed by Tim Zallmann
Browse files

Clean up new navigation templates

parent f497f170
No related branches found
No related tags found
No related merge requests found
Showing
with 21 additions and 46 deletions
- page_title "User Settings"
- header_title "User Settings", profile_path unless header_title
- sidebar "dashboard"
- if show_new_nav?
- nav "new_profile_sidebar"
- @new_sidebar = true
- else
- nav "profile"
- nav "profile"
- @left_sidebar = true
 
= render template: "layouts/application"
- page_title @project.name_with_namespace
- page_description @project.description unless page_description
- header_title project_title(@project) unless header_title
- if show_new_nav?
- nav "new_project_sidebar"
- @new_sidebar = true
- else
- nav "project"
- nav "project"
- @left_sidebar = true
 
- content_for :project_javascripts do
- project = @target_project || @project
Loading
Loading
- page_title 'Two-Factor Authentication', 'Account'
- if show_new_nav?
- add_to_breadcrumbs("Account", profile_account_path)
- else
- header_title "Two-Factor Authentication", profile_two_factor_auth_path
- add_to_breadcrumbs("Account", profile_account_path)
- @content_class = "limit-container-width" unless fluid_layout
 
= render 'profiles/head'
Loading
Loading
- project = local_assigns.fetch(:project)
- flash_message_container = show_new_nav? ? :new_global_flash : :flash_message
 
= content_for flash_message_container do
= content_for :flash_message do
= render partial: 'deletion_failed', locals: { project: project }
- if current_user && can?(current_user, :download_code, project)
= render 'shared/no_ssh'
Loading
Loading
- @no_container = true
- if show_new_nav?
- add_to_breadcrumbs(_("Project"), project_path(@project))
- add_to_breadcrumbs(_("Project"), project_path(@project))
 
- page_title _("Activity")
= render "projects/head"
Loading
Loading
Loading
Loading
@@ -2,9 +2,7 @@
- @no_container = true
- @content_class = "issue-boards-content"
- page_title "Boards"
- if show_new_nav?
- add_to_breadcrumbs("Issues", project_issues_path(@project))
- add_to_breadcrumbs("Issues", project_issues_path(@project))
 
- content_for :page_specific_javascripts do
= webpack_bundle_tag 'common_vue'
Loading
Loading
- @no_container = true
- page_title "Branches"
= render "projects/commits/head"
- add_to_breadcrumbs("Repository", project_tree_path(@project))
 
- if show_new_nav?
- add_to_breadcrumbs("Repository", project_tree_path(@project))
= render "projects/commits/head"
 
%div{ class: container_class }
.top-area.adjust
Loading
Loading
Loading
Loading
@@ -5,8 +5,7 @@
= content_for :meta_tags do
= auto_discovery_link_tag(:atom, project_commits_url(@project, @ref, rss_url_options), title: "#{@project.name}:#{@ref} commits")
 
- if show_new_nav?
- add_to_breadcrumbs("Repository", project_tree_path(@project))
- add_to_breadcrumbs("Repository", project_tree_path(@project))
 
= content_for :sub_nav do
= render "head"
Loading
Loading
- @no_container = true
- page_title "Compare"
- if show_new_nav?
- add_to_breadcrumbs("Repository", project_tree_path(@project))
- add_to_breadcrumbs("Repository", project_tree_path(@project))
= render "projects/commits/head"
 
%div{ class: container_class }
Loading
Loading
- @no_container = true
- breadcrumb_title "Compare"
- page_title "#{params[:from]}...#{params[:to]}"
- if show_new_nav?
- add_to_breadcrumbs("Repository", project_tree_path(@project))
- add_to_breadcrumbs("Repository", project_tree_path(@project))
= render "projects/commits/head"
 
%div{ class: container_class }
Loading
Loading
- @no_container = true
- page_title "Cycle Analytics"
- if show_new_nav?
- add_to_breadcrumbs("Project", project_path(@project))
- add_to_breadcrumbs("Project", project_path(@project))
- content_for :page_specific_javascripts do
= page_specific_javascript_bundle_tag('common_vue')
= page_specific_javascript_bundle_tag('cycle_analytics')
Loading
Loading
- @no_container = true
- page_title "Environments"
- add_to_breadcrumbs("Pipelines", project_pipelines_path(@project))
= render "projects/pipelines/head"
 
- if show_new_nav?
- add_to_breadcrumbs("Pipelines", project_pipelines_path(@project))
- content_for :page_specific_javascripts do
= page_specific_javascript_bundle_tag('common_vue')
= page_specific_javascript_bundle_tag("environments")
Loading
Loading
- @no_container = true
- page_title "Charts"
- if show_new_nav?
- add_to_breadcrumbs("Repository", project_tree_path(@project))
- add_to_breadcrumbs("Repository", project_tree_path(@project))
- content_for :page_specific_javascripts do
= webpack_bundle_tag('common_d3')
= webpack_bundle_tag('graphs')
Loading
Loading
Loading
Loading
@@ -5,8 +5,7 @@
= webpack_bundle_tag('graphs')
= webpack_bundle_tag('graphs_show')
 
- if show_new_nav?
- add_to_breadcrumbs("Repository", project_tree_path(@project))
- add_to_breadcrumbs("Repository", project_tree_path(@project))
 
= render 'projects/commits/head'
 
Loading
Loading
Loading
Loading
@@ -13,15 +13,14 @@
= content_for :meta_tags do
= auto_discovery_link_tag(:atom, params.merge(rss_url_options), title: "#{@project.name} issues")
 
- if show_new_nav?
- content_for :breadcrumbs_extra do
= render "projects/issues/nav_btns"
- content_for :breadcrumbs_extra do
= render "projects/issues/nav_btns"
 
- if project_issues(@project).exists?
%div{ class: (container_class) }
.top-area
= render 'shared/issuable/nav', type: :issues
.nav-controls{ class: ("visible-xs" if show_new_nav?) }
.nav-controls.visible-xs
= render "projects/issues/nav_btns"
= render 'shared/issuable/search_bar', type: :issues
 
Loading
Loading
Loading
Loading
@@ -2,8 +2,7 @@
- page_title "Jobs"
= render "projects/pipelines/head"
 
- if show_new_nav?
- add_to_breadcrumbs("Pipelines", project_pipelines_path(@project))
- add_to_breadcrumbs("Pipelines", project_pipelines_path(@project))
 
%div{ class: container_class }
.top-area
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment