lib/exceptions.rb themes/default/content/pages/default.html themes/default/content/pages/getting_started.html themes/default/content/protected-pages/default.html themes/default/content/protected-pages/get_bookmarklet.html @@ -10,15 +10,15 @@ class ContentController < ApplicationController render_page('protected-pages') end - protected - + def render_page page_path - page_locale = locale || params[:locale] || params[:language] || "en_US" url_key = params[:content_page].join('/') - content_page = "#{RAILS_ROOT}/content/#{page_path}/#{page_locale}/#{url_key}.html" + path = File.join(RAILS_ROOT, 'themes', current_theme, 'content', page_path, url_key) + content_page = Dir.glob("#{path}.*").first + raise Exceptions::MissingTemplateError, "Could not find template for: '#{path}'" if content_page.nil? render :file => content_page, :layout => true - rescue + rescue Exceptions::MissingTemplateError => ex render :file => "#{RAILS_ROOT}/public/404.html", :status => 404 end app/controllers/content_controller.rb content/pages/en_US/default.html content/pages/en_US/getting_started.html content/protected-pages/en_US/default.html content/protected-pages/en_US/get_bookmarklet.html eb91a12a80d29d8677423785971fa5426ecc7b6f Justin Ball justinball@gmail.com http://github.com/jbasdf/luvfoo/commit/666def79cbd63a6bf5c9447b91234bc701269c99 666def79cbd63a6bf5c9447b91234bc701269c99 2009-05-12T09:28:15-07:00 2009-03-06T15:59:53-08:00 updated content system to work with themes c48c63a7096a0fd430d46839ce16722869c9dffa Justin Ball justinball@gmail.com