summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/helpers/application_helper.rb13
-rw-r--r--app/views/layouts/application.html.haml2
2 files changed, 14 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index db70109..a236a0a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,6 +1,19 @@
module ApplicationHelper
#
+ # determine title for the page
+ #
+ def html_title
+ if content_for?(:title)
+ yield(:title)
+ elsif @title
+ [@title, ' - ', APP_CONFIG[:domain]].join
+ else
+ APP_CONFIG[:domain]
+ end
+ end
+
+ #
# markup for bootstrap icon
#
# http://twitter.github.io/bootstrap/base-css.html#icons
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 719d699..71364fc 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -2,7 +2,7 @@
%html
%head
%meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"}
- %title= content_for?(:title) ? yield(:title) : "Leap Web"
+ %title= html_title
%meta{:content => content_for?(:description) ? yield(:description) : "Leap Web", :name => "description"}
= stylesheet_link_tag "application", :media => "all"
= javascript_include_tag "application"