From 26ad250989d82b496b131811f8a0ddd7e662b650 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 30 Apr 2015 19:06:18 +0200 Subject: Add a page title to every page. --- app/controllers/help_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/controllers/help_controller.rb') diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index 35ece5b270b..b405cc7e689 100644 --- a/app/controllers/help_controller.rb +++ b/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') -- cgit v1.2.1 From 8c4b6d426d11de682db601a5ca585c11bcd0cd23 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 30 Apr 2015 21:28:07 +0200 Subject: Set head panel title of help section. --- app/controllers/help_controller.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'app/controllers/help_controller.rb') diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index b405cc7e689..2842151e3bd 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -1,4 +1,6 @@ class HelpController < ApplicationController + before_action :set_title + def index end @@ -44,6 +46,11 @@ class HelpController < ApplicationController private + def set_title + @title = "Help" + @title_url = help_path + end + def path_params params.require(:category) params.require(:file) -- cgit v1.2.1 From 92fd3ccee05acdfd5e498734ed287458a8dd21a3 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 1 May 2015 10:39:11 +0200 Subject: Add helpers for header title and sidebar, and move setting those from controllers to layouts. --- app/controllers/help_controller.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'app/controllers/help_controller.rb') diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index 2842151e3bd..8a45dc8860d 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -1,5 +1,5 @@ class HelpController < ApplicationController - before_action :set_title + layout 'help' def index end @@ -46,11 +46,6 @@ class HelpController < ApplicationController private - def set_title - @title = "Help" - @title_url = help_path - end - def path_params params.require(:category) params.require(:file) -- cgit v1.2.1