noodall-ui 0.5.10 → 0.5.11

data/app/controllers/noodall/nodes_controller.rb

@@ -37,9 +37,8 @@ module Noodall
     def sitemap
       if stale?(:last_modified => GlobalUpdateTime::Stamp.read, :public => true)
         @page_title = 'Sitemap'
+        @nodes = Node.all
       end
-
-      @nodes = Node.all
     end
 
     def search

data/app/helpers/noodall/admin/nodes_helper.rb

@@ -34,16 +34,22 @@ module Noodall
 
       def slot_link(node,type,index)
         link_to( "#{type.to_s.titleize} Slot", "##{type}_component_form_#{index}", :id=> "#{type}_slot_#{index}_selector", :class => 'slot_link') +
-          "<span id=\"#{type}_slot_#{index}_tag\" class=\"slot_tag\">#{node.send("#{type}_slot_#{index}").class.name.titleize unless @node.send("#{type}_slot_#{index}").nil?}</span>".html_safe
+          "<span id=\"#{type}_slot_#{index}_tag\" class=\"slot_tag\">#{node.send("#{type}_slot_#{index}").class.model_name.human.titleize unless @node.send("#{type}_slot_#{index}").nil?}</span>".html_safe
       end
 
       def slot_form(node,type,index)
         component = @node.send("#{type}_slot_#{index}")
-        options = options_for_select([''] + Component.positions_names(type), (component._type.titleize unless component.nil?))
+        options = options_for_select([''] + component_options(type), (component.class.name.titleize unless component.nil?))
 
         render :partial => 'slot_form', :locals => { :type => type, :index => index, :component => component, :options => options, :slot_name => "#{ type }_slot_#{ index }" }
       end
 
+      def component_options(type)
+        Component.positions_classes(type).map do |component|
+          [component.model_name.human.titleize, component.name.titleize]
+        end
+      end
+
       def can_change_templates?(node)
         can_publish?(node) and !node.is_a?(Home) and (node.parent.nil? ? Node.template_names : node.parent.class.template_names).length > 1
       end

data/lib/noodall/ui/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module UI
-    VERSION = "0.5.10"
+    VERSION = "0.5.11"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noodall-ui
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000Z
+date: 2012-04-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: noodall-core
-  requirement: &21384620 !ruby/object:Gem::Requirement
+  requirement: &2163076840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *21384620
+  version_requirements: *2163076840
 - !ruby/object:Gem::Dependency
   name: thoughtbot-sortable_table
-  requirement: &21384160 !ruby/object:Gem::Requirement
+  requirement: &2163076380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *21384160
+  version_requirements: *2163076380
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &21383700 !ruby/object:Gem::Requirement
+  requirement: &2163075740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *21383700
+  version_requirements: *2163075740
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &21383220 !ruby/object:Gem::Requirement
+  requirement: &2163074960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21383220
+  version_requirements: *2163074960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21382560 !ruby/object:Gem::Requirement
+  requirement: &2163074280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *21382560
+  version_requirements: *2163074280
 description: Noodall Rails User Interface Engine. Requires Noodall Core
 email:
 - steve@wearebeef.co.uk
@@ -697,7 +697,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3630525297992897720
+      hash: 3467906796003164382
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -706,7 +706,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Noodall Rails User Interface