From cc0375b25f5fcc3efbfa7550e013c29fec467278 Mon Sep 17 00:00:00 2001 From: hukl Date: Wed, 4 Mar 2009 23:13:03 +0100 Subject: renamed render_page template to standard_template --- app/models/page.rb | 2 +- app/views/custom/page_templates/public/render_page.html.erb | 7 ------- app/views/custom/page_templates/public/standard_template.html.erb | 7 +++++++ test/functional/content_controller_test.rb | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 app/views/custom/page_templates/public/render_page.html.erb create mode 100644 app/views/custom/page_templates/public/standard_template.html.erb diff --git a/app/models/page.rb b/app/models/page.rb index 7ac0b60..0d4da5d 100644 --- a/app/models/page.rb +++ b/app/models/page.rb @@ -90,7 +90,7 @@ class Page < ActiveRecord::Base if template_name && template_exists? public_template_path else - File.join(PUBLIC_TEMPLATE_PATH, 'render_page') + File.join(PUBLIC_TEMPLATE_PATH, 'standard_template') end end diff --git a/app/views/custom/page_templates/public/render_page.html.erb b/app/views/custom/page_templates/public/render_page.html.erb deleted file mode 100644 index 4c21667..0000000 --- a/app/views/custom/page_templates/public/render_page.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -
-

<%= @page.title %>

-

<%= date_for_page @page %>, <%= @page.user.try(:login) %>

-
-

<%= @page.abstract %>

- <%= aggregate?(@page.body) %> -
\ No newline at end of file diff --git a/app/views/custom/page_templates/public/standard_template.html.erb b/app/views/custom/page_templates/public/standard_template.html.erb new file mode 100644 index 0000000..4c21667 --- /dev/null +++ b/app/views/custom/page_templates/public/standard_template.html.erb @@ -0,0 +1,7 @@ +
+

<%= @page.title %>

+

<%= date_for_page @page %>, <%= @page.user.try(:login) %>

+
+

<%= @page.abstract %>

+ <%= aggregate?(@page.body) %> +
\ No newline at end of file diff --git a/test/functional/content_controller_test.rb b/test/functional/content_controller_test.rb index 2f390c6..b76e1d5 100644 --- a/test/functional/content_controller_test.rb +++ b/test/functional/content_controller_test.rb @@ -76,7 +76,7 @@ class ContentControllerTest < ActionController::TestCase get :render_page, :locale => 'de', :page_path => ["fnord"] assert_response :success - assert_template "custom/page_templates/public/render_page.html.erb" + assert_template "custom/page_templates/public/standard_template.html.erb" end def test_custom_template_no_date_and_author -- cgit v1.3