summaryrefslogtreecommitdiff
path: root/app/helpers/application_helper.rb
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-02-20 00:39:58 -0800
committerelijah <elijah@riseup.net>2013-02-20 00:39:58 -0800
commit10038e58efe3aa3c1725e2b5b0a0b7b2ce060df7 (patch)
tree53413a9cd679c6d22b405c1035f9c41546677c9a /app/helpers/application_helper.rb
parent9c4e765c8fe972a4a9f49c3de7991b3925ddb97c (diff)
added support for pandoc and page properties in static markup.
Diffstat (limited to 'app/helpers/application_helper.rb')
-rw-r--r--app/helpers/application_helper.rb30
1 files changed, 13 insertions, 17 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2933bd1..45e8228 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -69,13 +69,9 @@ module ApplicationHelper
def page_title
if @page
- if @page.props
- @page.props.title || @page.title
- else
- @page.title
- end
+ @page.title
else
- ""
+ nil
end
end
@@ -85,16 +81,16 @@ module ApplicationHelper
# they call two different 'render' methods (controller and view renders behave differently).
# TODO: figure out how to combine into one helper_method.
#
- def render_page(page)
- begin
- render :template => page.template_path
- rescue ActionView::MissingTemplate => exc
- begin
- render :template => page.template_path(DEFAULT_LOCALE)
- rescue
- raise exc
- end
- end
- end
+ # def render_page(page)
+ # begin
+ # render :template => page.template_path
+ # rescue ActionView::MissingTemplate => exc
+ # begin
+ # render :template => page.template_path(DEFAULT_LOCALE)
+ # rescue
+ # raise exc
+ # end
+ # end
+ # end
end