refinerycms-theming 0.9.8.1 → 0.9.8.2

data/app/models/theme.rb

@@ -1,7 +1,18 @@
 class Theme
 
-  def self.current_theme(env)
-    RefinerySetting[:theme]
+  def self.current_theme(env = nil)
+    ::RefinerySetting[:theme]
   end
 
+	def self.root
+		Pathname.new( File.expand_path('../../../', __FILE__) )
+	end
+
+	def self.current_theme_dir
+		theme = self.current_theme
+		theme_dir = Rails.root.join("themes",theme)
+		theme_dir = self.root.join('themes', theme) unless theme_dir.directory?
+		theme_dir
+	end
+
 end

data/lib/gemspec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-version = '0.9.8.1'
+version = '0.9.8.2'
 raise "Could not get version so gemspec can not be built" if version.nil?
 files = Dir[%q{**/*}].flatten.reject{|f| f =~ /\.gem$/}
 

data/lib/refinerycms-theming.rb

@@ -16,7 +16,7 @@ module Refinery
           # add back theme paths if there is a theme present.
           if (theme = ::Theme.current_theme(request.env)).present?
             # Set up view path again for the current theme.
-            view_paths.unshift Rails.root.join("themes", theme, "views").to_s
+            view_paths.unshift ::Theme.current_theme_dir.join("views").to_s
 
             # Ensure that routes within the application are top priority.
             # Here we grab all the routes that are under the application's view folder

data/lib/theme_server.rb

@@ -12,7 +12,7 @@ module Refinery
     def call(env)
       if env["PATH_INFO"] =~ /^\/theme\/(stylesheets|javascripts|images)/ and (theme = Theme.current_theme(env)).present?
         env["PATH_INFO"].gsub!(/^\/theme\//, '')
-        if (file_path = (dir = Rails.root.join("themes", theme)).join(env["PATH_INFO"])).exist?
+        if (file_path = (dir = Theme.current_theme_dir).join(env["PATH_INFO"])).exist?
           etag = Digest::MD5.hexdigest("#{file_path.to_s}#{file_path.mtime}")
           unless (etag == env["HTTP_IF_NONE_MATCH"])
             status, headers, body = Rack::File.new(dir).call(env)
@@ -29,4 +29,4 @@ module Refinery
     end
 
   end
-end
+end

data/readme.md

@@ -11,6 +11,17 @@ Think of a theme as your ``app/views`` directory with a few extra things like im
 
 It's worth noting you don't need to use a theme if you don't want to. Placing files in the ``app/views`` directory like any other Rails app will work just fine. It's only if you want to wrap your design up into a single location that you would use a theme or allow your client to easily change between designs.
 
+## How do I make my own Theme?
+
+__Uncomment the gem 'refinerycms-theming' in your project's Gemfile & run ``bundle install``__
+
+Then, simply use the Theme generator to make the basic structure of a new theme.
+
+    rails generate refinery_theme name_of_theme
+
+Don't forget to "activate" this new theme by setting the theme setting to the name of this new theme. The __first__ time you create a theme, this setting will be created and set for you. If you already have a theme from an earlier project but no setting, you can create it manually in the __refinery admin / settings__ section. __The setting name is ``theme``__.
+
+
 ## The Structure of a Theme
 
 Themes sit in your Rails app like this
@@ -46,7 +57,7 @@ Let's take the ``mytheme`` example theme shown above. This is how the theme is s
             |- layouts
                  |- application.html.erb
 
-   
+
 ### Images
 
 Usually this would be just what you have in ``public/images`` except we move that to the theme instead.
@@ -59,17 +70,43 @@ Same with javascripts, just what you normally have in ``public/javascripts`` but
 
 The ``README`` file is just a description of your theme.
 
-### Views
+### Partials && /shared Content
 
-This is exactly the same as how you lay your views out in ``app/views/`` just instead of putting them in ``app/views/`` you put them into ``themes/mytheme/views/``
+In the default views, you will notice lines such as:
 
-## How do I make my own Theme?
+    <%= render :partial => '/shared/header' %>
 
-Simply use the Theme generator to make the basic structure of a new theme.
+These are built-in partials for RefineryCMS. To __override__ these partials, run the command:
 
-    rails generate refinery_theme name_of_theme
+    rake refinery:override view=shared/* theme=theme-name
 
-Don't forget to "activate" this new theme by setting the theme setting to the name of this new theme.
+__theme=theme-name is optional__ but is convenient for keeping things together.
+
+
+### content_for :body\_content\_title, :body\_content\_left, etc.
+
+These are the default sections built up in __/shared/\_content\_page.html.erb__
+You can add your own sections or rename these as you'd like. Say you wanted to add a left side bar, you could modify the __/shared/\_content\_page partial__ like so:
+
+    sections = [
+       {:yield => :body_content_title, :fallback => page_title, :id => 'body_content_page_title', :title => true},
+       {:yield => :body_content_sidebar, :fallback => nil},
+       {:yield => :body_content_left, :fallback => (@page.present? ? @page[Page.default_parts.first.to_sym] : nil)},
+       {:yield => :body_content_right, :fallback => (@page.present? ? @page[Page.default_parts.second.to_sym] : nil)}.reject {|section| hide_sections.include?(section[:yield]) }
+
+Where you'll see I added "body_content_sidebar". And of course you could set the fallback to whatever you like.
+
+Including the partial /shared/content_page is what causes all your content_for blocks to work. So you would use
+
+    <% content_for :body_content_sidebar do -%>
+      blah
+    <% end -%>
+
+in this instance.
+
+### Views
+
+This is exactly the same as how you lay your views out in ``app/views/`` just instead of putting them in ``app/views/`` you put them into ``themes/mytheme/views/``
 
 ## How do I select which Theme Refinery should use?
 
@@ -87,7 +124,7 @@ Just copy their theme directory into your themes folder and Refinery will see it
 
 ## How can I Convert my Current Views into a Theme?
 
-This should be fairly straightforward, just follow the directory structure outlined in 'The structure of a Theme'. 
+This should be fairly straightforward, just follow the directory structure outlined in 'The structure of a Theme'.
 
 But there is one important difference that need to be addressed to convert your current site into a theme.
 
@@ -112,7 +149,7 @@ This is the same with linking to Javascript and Stylesheets in your view. Say ou
 You just need to change that to:
 
     <%= stylesheet_link_tag 'application', :theme => true %>
-    
+
 ## I'm Stuck, is there an Example Theme?
 
 Yep, there is an example theme called "demolicious" that comes with Refinery located in ``/themes/demolicious``. If you find yourself getting stuck, just check out that theme and get a feel for how it works.

data/refinerycms-theming.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-theming}
-  s.version           = %q{0.9.8.1}
+  s.version           = %q{0.9.8.2}
   s.description       = %q{Theming functionality for the Refinery CMS project, extracted from Refinery CMS core.}
-  s.date              = %q{2010-09-28}
+  s.date              = %q{2010-10-27}
   s.summary           = %q{Theming functionality for the Refinery CMS project.}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-theming
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: false
   segments: 
   - 0
   - 9
   - 8
-  - 1
-  version: 0.9.8.1
+  - 2
+  version: 0.9.8.2
 platform: ruby
 authors: 
 - Resolve Digital
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-28 00:00:00 +13:00
+date: 2010-10-27 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency