diff options
| author | hukl <contact@smyck.org> | 2009-03-04 23:13:03 +0100 |
|---|---|---|
| committer | hukl <contact@smyck.org> | 2009-03-04 23:13:03 +0100 |
| commit | cc0375b25f5fcc3efbfa7550e013c29fec467278 (patch) | |
| tree | 34b7f701f90d5e565b300a7bd75c4df9347695af | |
| parent | 477cad7b1c68298cc2fe85bd62d2719d0725c8c9 (diff) | |
renamed render_page template to standard_template
| -rw-r--r-- | app/models/page.rb | 2 | ||||
| -rw-r--r-- | app/views/custom/page_templates/public/standard_template.html.erb (renamed from app/views/custom/page_templates/public/render_page.html.erb) | 0 | ||||
| -rw-r--r-- | test/functional/content_controller_test.rb | 2 |
3 files changed, 2 insertions, 2 deletions
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 | |||
| 90 | if template_name && template_exists? | 90 | if template_name && template_exists? |
| 91 | public_template_path | 91 | public_template_path |
| 92 | else | 92 | else |
| 93 | File.join(PUBLIC_TEMPLATE_PATH, 'render_page') | 93 | File.join(PUBLIC_TEMPLATE_PATH, 'standard_template') |
| 94 | end | 94 | end |
| 95 | end | 95 | end |
| 96 | 96 | ||
diff --git a/app/views/custom/page_templates/public/render_page.html.erb b/app/views/custom/page_templates/public/standard_template.html.erb index 4c21667..4c21667 100644 --- a/app/views/custom/page_templates/public/render_page.html.erb +++ b/app/views/custom/page_templates/public/standard_template.html.erb | |||
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 | |||
| 76 | 76 | ||
| 77 | get :render_page, :locale => 'de', :page_path => ["fnord"] | 77 | get :render_page, :locale => 'de', :page_path => ["fnord"] |
| 78 | assert_response :success | 78 | assert_response :success |
| 79 | assert_template "custom/page_templates/public/render_page.html.erb" | 79 | assert_template "custom/page_templates/public/standard_template.html.erb" |
| 80 | end | 80 | end |
| 81 | 81 | ||
| 82 | def test_custom_template_no_date_and_author | 82 | def test_custom_template_no_date_and_author |
