Link head panel titles to relevant root page.
This commit is contained in:
parent
529188e478
commit
34cc4c5982
|
@ -50,6 +50,7 @@ v 7.8.0 (unreleased)
|
||||||
- Prevent losing unsaved comments by automatically restoring them when comment page is loaded again.
|
- Prevent losing unsaved comments by automatically restoring them when comment page is loaded again.
|
||||||
- Don't allow page to be scaled on mobile.
|
- Don't allow page to be scaled on mobile.
|
||||||
- Clean the username acquired from OAuth/LDAP so it doesn't fail username validation and block signing up.
|
- Clean the username acquired from OAuth/LDAP so it doesn't fail username validation and block signing up.
|
||||||
|
- Link head panel titles to relevant root page.
|
||||||
|
|
||||||
v 7.7.2
|
v 7.7.2
|
||||||
- Update GitLab Shell to version 2.4.2 that fixes a bug when developers can push to protected branch
|
- Update GitLab Shell to version 2.4.2 that fixes a bug when developers can push to protected branch
|
||||||
|
|
|
@ -106,6 +106,7 @@ class SnippetsController < ApplicationController
|
||||||
|
|
||||||
def set_title
|
def set_title
|
||||||
@title = 'Snippets'
|
@title = 'Snippets'
|
||||||
|
@title_url = snippets_path
|
||||||
end
|
end
|
||||||
|
|
||||||
def snippet_params
|
def snippet_params
|
||||||
|
|
|
@ -19,6 +19,7 @@ class UsersController < ApplicationController
|
||||||
where(project_id: authorized_projects_ids).limit(30)
|
where(project_id: authorized_projects_ids).limit(30)
|
||||||
|
|
||||||
@title = @user.name
|
@title = @user.name
|
||||||
|
@title_url = user_path(@user)
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html
|
format.html
|
||||||
|
|
|
@ -2,5 +2,5 @@
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: "Admin area"
|
= render "layouts/head", title: "Admin area"
|
||||||
%body{class: "#{app_theme} #{theme_type} admin", :'data-page' => body_data_page}
|
%body{class: "#{app_theme} #{theme_type} admin", :'data-page' => body_data_page}
|
||||||
= render "layouts/head_panel", title: "Admin area"
|
= render "layouts/head_panel", title: link_to("Admin area", admin_root_path)
|
||||||
= render 'layouts/page', sidebar: 'layouts/nav/admin'
|
= render 'layouts/page', sidebar: 'layouts/nav/admin'
|
||||||
|
|
|
@ -2,5 +2,5 @@
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: "Dashboard"
|
= render "layouts/head", title: "Dashboard"
|
||||||
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page }
|
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page }
|
||||||
= render "layouts/head_panel", title: "Dashboard"
|
= render "layouts/head_panel", title: link_to("Dashboard", root_path)
|
||||||
= render 'layouts/page', sidebar: 'layouts/nav/dashboard'
|
= render 'layouts/page', sidebar: 'layouts/nav/dashboard'
|
||||||
|
|
|
@ -5,9 +5,9 @@
|
||||||
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
||||||
= render "layouts/broadcast"
|
= render "layouts/broadcast"
|
||||||
- if current_user
|
- if current_user
|
||||||
= render "layouts/head_panel", title: page_title
|
= render "layouts/head_panel", title: link_to(page_title, explore_root_path)
|
||||||
- else
|
- else
|
||||||
= render "layouts/public_head_panel", title: page_title
|
= render "layouts/public_head_panel", title: link_to(page_title, explore_root_path)
|
||||||
.container.navless-container
|
.container.navless-container
|
||||||
.content
|
.content
|
||||||
.explore-title
|
.explore-title
|
||||||
|
|
|
@ -2,5 +2,5 @@
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: group_head_title
|
= render "layouts/head", title: group_head_title
|
||||||
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
||||||
= render "layouts/head_panel", title: @group.name
|
= render "layouts/head_panel", title: link_to(@group.name, group_path(@group))
|
||||||
= render 'layouts/page', sidebar: 'layouts/nav/group'
|
= render 'layouts/page', sidebar: 'layouts/nav/group'
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
= render "layouts/head", title: @title
|
= render "layouts/head", title: @title
|
||||||
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
||||||
= render "layouts/broadcast"
|
= render "layouts/broadcast"
|
||||||
= render "layouts/head_panel", title: @title
|
= render "layouts/head_panel", title: defined?(@title_url) ? link_to(@title, @title_url) : @title
|
||||||
.container.navless-container
|
.container.navless-container
|
||||||
.content
|
.content
|
||||||
= render "layouts/flash"
|
= render "layouts/flash"
|
||||||
|
|
|
@ -2,5 +2,5 @@
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: "Profile"
|
= render "layouts/head", title: "Profile"
|
||||||
%body{class: "#{app_theme} #{theme_type} profile", :'data-page' => body_data_page}
|
%body{class: "#{app_theme} #{theme_type} profile", :'data-page' => body_data_page}
|
||||||
= render "layouts/head_panel", title: "Profile"
|
= render "layouts/head_panel", title: link_to("Profile", profile_path)
|
||||||
= render 'layouts/page', sidebar: 'layouts/nav/profile'
|
= render 'layouts/page', sidebar: 'layouts/nav/profile'
|
||||||
|
|
|
@ -2,5 +2,5 @@
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: group_head_title
|
= render "layouts/head", title: group_head_title
|
||||||
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
||||||
= render "layouts/public_head_panel", title: "group: #{@group.name}"
|
= render "layouts/public_head_panel", title: link_to(@group.name, group_path(@group))
|
||||||
= render 'layouts/page', sidebar: 'layouts/nav/group'
|
= render 'layouts/page', sidebar: 'layouts/nav/group'
|
||||||
|
|
|
@ -2,5 +2,5 @@
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: @title
|
= render "layouts/head", title: @title
|
||||||
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
||||||
= render "layouts/public_head_panel", title: @title
|
= render "layouts/public_head_panel", title: defined?(@title_url) ? link_to(@title, @title_url) : @title
|
||||||
= render 'layouts/page'
|
= render 'layouts/page'
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
= render "layouts/head", title: "Search"
|
= render "layouts/head", title: "Search"
|
||||||
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
||||||
= render "layouts/broadcast"
|
= render "layouts/broadcast"
|
||||||
= render "layouts/head_panel", title: "Search"
|
= render "layouts/head_panel", title: link_to("Search", search_path)
|
||||||
.container.navless-container
|
.container.navless-container
|
||||||
.content
|
.content
|
||||||
= render "layouts/flash"
|
= render "layouts/flash"
|
||||||
|
|
Loading…
Reference in New Issue