radiant-templates-extension 1.0.4 → 1.0.5

data/Rakefile

@@ -7,7 +7,7 @@ begin
     gem.email = "avonderluft@avlux.net"
     gem.homepage = "https://github.com/avonderluft/radiant-templates-extension"
     gem.authors = ['Andrew vonderLuft','Sean Cribbs']
-    gem.add_dependency 'radiant', ">=1.0.0.rc2"
+    gem.add_dependency 'radiant', ">=1.0.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/templates/helper.rb

@@ -54,23 +54,24 @@ module Templates::Helper
     field_html.join("\n")
   end
 
-  def children_for(page)
-    page.allowed_children
-  end
-
   def child_menu_for(page)
     children = children_for(page)
+    templates = Template.all
+    unless children.size == 0 || templates.empty?
+      children << templates.unshift(:separator)
+      children.flatten!
+    end
     return nil if children.size < 2
     children.unshift(children.delete(page.default_child), :separator) if children.include?(page.default_child)
-    name_for = proc { |p| (name = p.name.to_name('Page')).blank? ? t('blank_page') : name }
+    name_for = proc { |p| (name = p.name.to_name('Page')).blank? ? t('normal_page') : name }
     content_tag :ul, :class => 'menu', :id => "allowed_children_#{page.id}" do
       children.map do |child|
         if child == :separator
           content_tag :li, nil, :class => 'separator'
+        elsif child.is_a?(Template)
+          content_tag :li, link_to(image('template') + ' ' + child.name, new_admin_page_child_path(page, :template => child), :title => "Add child using #{child.name} Template")
         else
-          info = child.name.eql?("Page") ? "Add child as 'Blank Page'" : "Add child as '#{child.name}' Page"
-          link = child.name.eql?("Page") ? name_for[child] : image('template') + ' ' + name_for[child]
-          content_tag :li, link_to(link, new_admin_page_child_path(page, :template => child), :title => info)
+          content_tag :li, link_to(name_for[child], new_admin_page_child_path(page, :page_class => child), :title => clean_page_description(child))
         end
       end
     end

data/lib/templates/page_extensions.rb

@@ -3,9 +3,6 @@ module Templates::PageExtensions
   def self.included(base)
     base.class_eval do
       before_save :match_with_template
-      def allowed_children
-        [default_child, Template.all].flatten
-      end
     end
   end
 

data/radiant-templates-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-templates-extension}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew vonderLuft", "Sean Cribbs"]
-  s.date = %q{2011-06-28}
+  s.date = %q{2011-07-18}
   s.description = %q{Imposes structure on pages via content templates.}
   s.email = %q{avonderluft@avlux.net}
   s.extra_rdoc_files = [
@@ -144,7 +144,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{https://github.com/avonderluft/radiant-templates-extension}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Templates Extension for Radiant CMS}
   s.test_files = [
     "spec/controllers/admin_page_controller_extensions_spec.rb",
@@ -165,12 +165,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<radiant>, [">= 1.0.0.rc2"])
+      s.add_runtime_dependency(%q<radiant>, [">= 1.0.0"])
     else
-      s.add_dependency(%q<radiant>, [">= 1.0.0.rc2"])
+      s.add_dependency(%q<radiant>, [">= 1.0.0"])
     end
   else
-    s.add_dependency(%q<radiant>, [">= 1.0.0.rc2"])
+    s.add_dependency(%q<radiant>, [">= 1.0.0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-templates-extension
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Andrew vonderLuft
@@ -16,27 +16,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 -07:00
+date: 2011-07-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15424049
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        - rc
-        - 2
-        version: 1.0.0.rc2
+        version: 1.0.0
   name: radiant
   version_requirements: *id001
+  prerelease: false
 description: Imposes structure on pages via content templates.
 email: avonderluft@avlux.net
 executables: []
@@ -201,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Templates Extension for Radiant CMS