summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-07-07 16:04:23 +0100
committerPhil Hughes <me@iamphill.com>2017-07-07 16:04:23 +0100
commitc70bf95c2a5cc0bd8a70d8b65fc678ee1c631420 (patch)
tree963c9361cd172b229e6e702a411b4efed973ffd5
parentfee26d777cd89aa26f7530cfe116defeb9f2c551 (diff)
downloadgitlab-ce-c70bf95c2a5cc0bd8a70d8b65fc678ee1c631420.tar.gz
fixed up more breadcrumbs
-rw-r--r--app/views/admin/services/index.html.haml2
-rw-r--r--app/views/profiles/two_factor_auths/show.html.haml2
-rw-r--r--app/views/projects/blob/edit.html.haml1
-rw-r--r--app/views/projects/blob/new.html.haml1
-rw-r--r--app/views/projects/blob/show.html.haml1
-rw-r--r--app/views/projects/project_members/index.html.haml4
-rw-r--r--app/views/projects/settings/integrations/show.html.haml2
-rw-r--r--app/views/projects/settings/repository/show.html.haml4
8 files changed, 15 insertions, 2 deletions
diff --git a/app/views/admin/services/index.html.haml b/app/views/admin/services/index.html.haml
index 438907e2345..4b5147b9cac 100644
--- a/app/views/admin/services/index.html.haml
+++ b/app/views/admin/services/index.html.haml
@@ -1,4 +1,4 @@
-- @breadcrumb_title = "Services Templates"
+- @breadcrumb_title = "Service Templates"
- page_title "Service Templates"
%h3.page-title Service templates
%p.light Service template allows you to set default values for project services
diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml
index e759d0d0a4a..5e4bf4297e0 100644
--- a/app/views/profiles/two_factor_auths/show.html.haml
+++ b/app/views/profiles/two_factor_auths/show.html.haml
@@ -1,6 +1,6 @@
- page_title 'Two-Factor Authentication', 'Account'
- if show_new_nav?
- - breadcrumbs_extra_links("Account", profile_path)
+ - breadcrumbs_extra_links("Account", profile_account_path)
- else
- header_title "Two-Factor Authentication", profile_two_factor_auth_path
- @breadcrumb_title = "Two-Factor Authentication"
diff --git a/app/views/projects/blob/edit.html.haml b/app/views/projects/blob/edit.html.haml
index f8cb612a2b4..43fef9f134f 100644
--- a/app/views/projects/blob/edit.html.haml
+++ b/app/views/projects/blob/edit.html.haml
@@ -1,3 +1,4 @@
+- @breadcrumb_title = "Repository"
- @no_container = true
- page_title "Edit", @blob.path, @ref
- content_for :page_specific_javascripts do
diff --git a/app/views/projects/blob/new.html.haml b/app/views/projects/blob/new.html.haml
index 8620a470041..4433aed2023 100644
--- a/app/views/projects/blob/new.html.haml
+++ b/app/views/projects/blob/new.html.haml
@@ -1,3 +1,4 @@
+- @breadcrumb_title = "Repository"
- page_title "New File", @path.presence, @ref
- content_for :page_specific_javascripts do
= page_specific_javascript_tag('lib/ace.js')
diff --git a/app/views/projects/blob/show.html.haml b/app/views/projects/blob/show.html.haml
index 6e2ae4717cd..a3c6c57607c 100644
--- a/app/views/projects/blob/show.html.haml
+++ b/app/views/projects/blob/show.html.haml
@@ -1,3 +1,4 @@
+- @breadcrumb_title = "Repository"
- @no_container = true
- page_title @blob.path, @ref
diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml
index 25153fd0b6f..e8f0a8ab24a 100644
--- a/app/views/projects/project_members/index.html.haml
+++ b/app/views/projects/project_members/index.html.haml
@@ -1,5 +1,9 @@
+- @breadcrumb_title = "Members"
- page_title "Members"
+- if show_new_nav?
+ - breadcrumbs_extra_links("Settings", edit_project_path(@project))
+
.row.prepend-top-default
.col-lg-12
%h4
diff --git a/app/views/projects/settings/integrations/show.html.haml b/app/views/projects/settings/integrations/show.html.haml
index 1d1d0849289..3bbbc0af017 100644
--- a/app/views/projects/settings/integrations/show.html.haml
+++ b/app/views/projects/settings/integrations/show.html.haml
@@ -1,5 +1,7 @@
- @content_class = "limit-container-width" unless fluid_layout
- page_title 'Integrations'
+- if show_new_nav?
+ - breadcrumbs_extra_links("Settings", edit_project_path(@project))
= render "projects/settings/head"
= render 'projects/hooks/index'
= render 'projects/services/index'
diff --git a/app/views/projects/settings/repository/show.html.haml b/app/views/projects/settings/repository/show.html.haml
index 40ea02abce9..516b126f029 100644
--- a/app/views/projects/settings/repository/show.html.haml
+++ b/app/views/projects/settings/repository/show.html.haml
@@ -1,5 +1,9 @@
- page_title "Repository"
- @content_class = "limit-container-width" unless fluid_layout
+
+- if show_new_nav?
+ - breadcrumbs_extra_links("Settings", edit_project_path(@project))
+
= render "projects/settings/head"
- content_for :page_specific_javascripts do