Add a page title to every page.

CHANGELOG

@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 7.11.0 (unreleased)
   - Don't allow a merge request to be merged when its title starts with "WIP".
+  - Add a page title to every page.
   - Get Gitorious importer to work again.
   - Fix clone URL field and X11 Primary selection (Dmitry Medvinsky)
   - Ignore invalid lines in .gitmodules

app/controllers/admin/application_controller.rb

@@ -2,10 +2,16 @@
 #
 # Automatically sets the layout and ensures an administrator is logged in
 class Admin::ApplicationController < ApplicationController
-  layout 'admin'
   before_action :authenticate_admin!
+  before_action :set_title
   def authenticate_admin!
     return render_404 unless current_user.is_admin?
   end
+
+  def set_title
+    @title      = "Admin area"
+    @title_url  = admin_root_path
+    @sidebar    = "admin"
+  end
 end

app/controllers/dashboard/application_controller.rb

+class Dashboard::ApplicationController < ApplicationController
+  before_action :set_title
+
+  private
+
+  def set_title
+    @title      = "Dashboard"
+    @title_url  = root_path
+    @sidebar    = "dashboard"
+  end
+end

app/controllers/dashboard/groups_controller.rb

-class Dashboard::GroupsController < ApplicationController
+class Dashboard::GroupsController < Dashboard::ApplicationController
   def index
     @group_members = current_user.group_members.page(params[:page]).per(PER_PAGE)
   end

app/controllers/dashboard/milestones_controller.rb

-class Dashboard::MilestonesController < ApplicationController
+class Dashboard::MilestonesController < Dashboard::ApplicationController
   before_action :load_projects
   def index

app/controllers/dashboard/projects_controller.rb

-class Dashboard::ProjectsController < ApplicationController
+class Dashboard::ProjectsController < Dashboard::ApplicationController
   before_action :event_filter
   def starred

app/controllers/dashboard_controller.rb

-class DashboardController < ApplicationController
-  respond_to :html
-
+class DashboardController < Dashboard::ApplicationController
   before_action :load_projects, except: [:projects]
   before_action :event_filter, only: :show
+  
+  respond_to :html
   def show
     @projects = @projects.includes(:namespace)

app/controllers/explore/application_controller.rb

+class Explore::ApplicationController < ApplicationController
+  before_action :set_title
+
+  private
+
+  def set_title
+    @title      = "Explore GitLab"
+    @title_url  = explore_root_path
+    @sidebar    = "explore"
+  end
+end

app/controllers/explore/groups_controller.rb

-class Explore::GroupsController < ApplicationController
+class Explore::GroupsController < Explore::ApplicationController
   skip_before_action :authenticate_user!,
                      :reject_blocked, :set_current_user_for_observers
-  layout "explore"
-
   def index
     @groups = GroupsFinder.new.execute(current_user)
     @groups = @groups.search(params[:search]) if params[:search].present?

app/controllers/explore/projects_controller.rb

-class Explore::ProjectsController < ApplicationController
+class Explore::ProjectsController < Explore::ApplicationController
   skip_before_action :authenticate_user!,
                      :reject_blocked
-  layout 'explore'
-
   def index
     @projects = ProjectsFinder.new.execute(current_user)
     @tags = @projects.tags_on(:tags)

app/controllers/groups/application_controller.rb

 class Groups::ApplicationController < ApplicationController
+  before_action :set_title
   private
   
@@ -18,11 +19,9 @@ class Groups::ApplicationController < ApplicationController
     end
   end
-  def determine_layout
-    if current_user
-      'group'
-    else
-      'public_group'
-    end
+  def set_title
+    @title      = group.name
+    @title_url  = group_path(group)
+    @sidebar    = "group"
   end
 end

app/controllers/groups/avatars_controller.rb

 class Groups::AvatarsController < ApplicationController
-  layout "profile"
-
   def destroy
     @group = Group.find_by(path: params[:group_id])
     @group.remove_avatar!

app/controllers/groups/milestones_controller.rb

-class Groups::MilestonesController < ApplicationController
-  layout 'group'
-
+class Groups::MilestonesController < Groups::ApplicationController
   before_action :authorize_group_milestone!, only: :update
   def index

app/controllers/groups_controller.rb

@@ -11,9 +11,6 @@ class GroupsController < Groups::ApplicationController
   # Load group projects
   before_action :load_projects, except: [:new, :create, :projects, :edit, :update]
   before_action :event_filter, only: :show
-  before_action :set_title, only: [:new, :create]
-
-  layout :determine_layout
   def new
     @group = Group.new
@@ -120,16 +117,10 @@ class GroupsController < Groups::ApplicationController
   end
   def set_title
-    @title = 'New Group'
-  end
-
-  def determine_layout
     if [:new, :create].include?(action_name.to_sym)
-      'navless'
-    elsif current_user
-      'group'
+      @title = 'New Group'
     else
-      'public_group'
+      super
     end
   end

app/controllers/help_controller.rb

@@ -3,12 +3,12 @@ class HelpController < ApplicationController
   end
   def show
-    category = clean_path_info(path_params[:category])
-    file = path_params[:file]
+    @category = clean_path_info(path_params[:category])
+    @file = path_params[:file]
     respond_to do |format|
       format.any(:markdown, :md, :html) do
-        path = Rails.root.join('doc', category, "#{file}.md")
+        path = Rails.root.join('doc', @category, "#{@file}.md")
         if File.exist?(path)
           @markdown = File.read(path)
@@ -22,7 +22,7 @@ class HelpController < ApplicationController
       # Allow access to images in the doc folder
       format.any(:png, :gif, :jpeg) do
-        path = Rails.root.join('doc', category, "#{file}.#{params[:format]}")
+        path = Rails.root.join('doc', @category, "#{@file}.#{params[:format]}")
         if File.exist?(path)
           send_file(path, disposition: 'inline')

app/controllers/invites_controller.rb

@@ -4,8 +4,6 @@ class InvitesController < ApplicationController
   respond_to :html
-  layout 'navless'
-
   def show
   end

app/controllers/oauth/applications_controller.rb

 class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
   before_action :authenticate_user!
-  layout "profile"
+  before_action :set_title
   def index
     head :forbidden and return
@@ -36,4 +36,10 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
   rescue_from ActiveRecord::RecordNotFound do |exception|
     render "errors/not_found", layout: "errors", status: 404
   end
+
+  def set_title
+    @title      = "Profile"
+    @title_url  = profile_path
+    @sidebar    = "profile"
+  end
 end

app/controllers/oauth/authorizations_controller.rb

 class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
   before_action :authenticate_resource_owner!
-  layout "profile"
+  before_action :set_title
   def new
     if pre_auth.authorizable?
@@ -54,4 +54,10 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
   def strategy
     @strategy ||= server.authorization_request(pre_auth.response_type)
   end
+  
+  def set_title
+    @title      = "Profile"
+    @title_url  = profile_path
+    @sidebar    = "profile"
+  end
 end

app/controllers/oauth/authorized_applications_controller.rb

 class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicationsController
-  layout "profile"
+  before_filter :set_title
   def destroy
     Doorkeeper::AccessToken.revoke_all_for(params[:id], current_resource_owner)
     redirect_to applications_profile_url, notice: I18n.t(:notice, scope: [:doorkeeper, :flash, :authorized_applications, :destroy])
   end
+
+  private
+  
+  def set_title
+    @title      = "Profile"
+    @title_url  = profile_path
+    @sidebar    = "profile"
+  end
 end

app/controllers/profiles/accounts_controller.rb

-class Profiles::AccountsController < ApplicationController
-  layout "profile"
-
+class Profiles::AccountsController < Profiles::ApplicationController
   def show
     @user = current_user
   end