orange 0.3.1 → 0.3.2

data/lib/orange-core/carton.rb

@@ -169,5 +169,10 @@ module Orange
       add_scaffold(name, my_type, type, opts)
     end
     
+    def to_s
+      <<-DOC
+      {"class": "#{self.class.to_s}", "id": "#{self.id}"}
+      DOC
+    end
   end
 end

data/lib/orange-core/core.rb

@@ -72,6 +72,7 @@ module Orange
       @file = __FILE__
       load(Orange::Parser.new, :parser)
       load(Orange::Mapper.new, :mapper)
+      load(Orange::Scaffold.new, :scaffold)
       load(Orange::PageParts.new, :page_parts)
       Orange.plugins.each{|p| p.resources.each{|args| load(*args)} if p.has_resources?}
       self.register(:stack_loaded) do |s| 

data/lib/orange-core/middleware/template.rb

@@ -23,7 +23,8 @@ module Orange::Middleware
     end
     
     def needs_wrapped?(packet)
-      packet['template.file'] && !packet['template.disable']
+      return false if packet.request.xhr? && !packet['template.enable'] # don't wrap xhr unless specifically asked to
+      packet['template.file'] && !packet['template.disable'] 
     end
     
     def wrap(packet, content = false)

data/lib/orange-core/resources/model_resource.rb

@@ -223,81 +223,4 @@ module Orange
   
   end
   
-  class Packet
-    # Adds view_[mode_name] magic methods to the packet
-    meta_methods(/view_([a-zA-Z_]+)/) do |packet, match, args|
-      model = args.shift
-      args = args.extract_with_defaults(:mode => match[1].to_sym)
-      packet.view(model, args)
-    end
-    
-    # Creates a button that appears to be a link but 
-    # does form submission with custom method (_method param in POST)
-    # This is to avoid issues of a destructive get.
-    # @param [String] text link text to show
-    # @param [String] link the actual href value of the link
-    # @param [String, false] confirm text of the javascript confirm (false for none [default])
-    # @param [optional, Array] args array of optional arguments, only opts[:method] defined
-    # @option opts [String] method method name (Should be 'DELETE', 'PUT' or 'POST')
-    def form_link(text, link, confirm = false, opts = {})
-      text = "<img src='#{opts[:img]}' alt='#{text}' />" if opts[:img]
-      css = opts[:class]? opts[:class] : 'form_button_link'
-      meth = (opts[:method]? "<input type='hidden' name='_method' value='#{opts[:method]}' />" : '')
-      if confirm
-        "<form action='#{link}' method='post' class='mini' onsubmit='return confirm(\"#{confirm}\")'><button class='link_button'><a href='#' class='#{css}'>#{text}</a></button>#{meth}</form>"
-      else
-        "<form action='#{link}' method='post' class='mini'><button class='link_button'><a href='#' class='#{css}'>#{text}</a></button>#{meth}</form>"
-      end
-    end
-    
-    # Calls view for an orange resource. 
-    def view(model_name, *args)
-      orange[model_name].view(self, *args)
-    end
-    
-    # Returns a scaffolded attribute
-    def view_attribute(prop, model_name, *args)
-      args = args.extract_options!
-      val = (args[:value] || '')
-      label = args[:label] || false
-      show = args[:show] || false
-      name = prop[:name]
-      human_readable_name = name.to_s.split('_').each{|w| w.capitalize!}.join(' ')
-      unless show
-        case prop[:type]
-        when :title
-          val.gsub!('"', '&quot;')
-          ret = "<input class=\"title\" type=\"text\" value=\"#{val}\" name=\"#{model_name}[#{name}]\" />"
-        when :text
-          val.gsub!('"', '&quot;')
-          ret = "<input type=\"text\" value=\"#{val}\" name=\"#{model_name}[#{name}]\" />"
-        when :fulltext
-          ret = "<textarea name='#{model_name}[#{name}]'>#{val}</textarea>"
-        when :boolean
-          human_readable_name = human_readable_name + '?'
-          ret = "<input type='hidden' name='#{model_name}[#{name}]' value='0' /><input type='checkbox' name='#{model_name}[#{name}]' value='1' #{'checked="checked"' if (val && val != '')}/>"
-        when :date
-          val.gsub!('"', '&quot;')
-          ret = "<input class=\"date\" type=\"text\" value=\"#{val}\" name=\"#{model_name}[#{name}]\" />"
-        else
-          val.gsub!('"', '&quot;')
-          ret = "<input type=\"text\" value=\"#{val}\" name=\"#{model_name}[#{name}]\" />"
-        end
-        display_name = prop[:display_name] || human_readable_name
-        ret = "<label for=''>#{display_name}</label><br />" + ret if label
-      else
-        case prop[:type]
-        when :title
-          ret = "<h3 class='#{model_name}-#{name}'>#{val}</h3>"
-        when :text
-          ret = "<p class='#{model_name}-#{name}'>#{val}</p>"
-        when :fulltext
-          ret = "<div class='#{model_name}-#{name}'>#{val}</div>"
-        else
-          ret = "<div class='#{model_name}-#{name}'>#{val}</div>"
-        end
-      end
-      return ret
-    end
-  end
 end

data/lib/orange-core/resources/scaffold.rb

@@ -0,0 +1,106 @@
+require 'orange-core/core'
+
+module Orange
+  class Scaffold < Resource
+    # Load the scaffold helpers
+    def afterLoad
+      orange.add_pulp Pulp::ScaffoldHelpers
+      Packet.meta_methods(/view_([a-zA-Z_]+)/) do |packet, match, args|
+        model = args.shift
+        args = args.extract_with_defaults(:mode => match[1].to_sym)
+        packet.view(model, args)
+      end
+      @scaffold_types = {}
+      add_scaffold_type(:boolean) do |name, val, opts|
+        if opts[:show]
+          val ? "true" : "false"
+        else
+          ret = "<input type='hidden' name='#{opts[:model_name]}[#{name}]' value='0' /><input type='checkbox' name='#{opts[:model_name]}[#{name}]' value='1' #{'checked="checked"' if (val && val != '')}/>"
+          ret = "<label for=''>#{opts[:display_name]}</label><br />" + ret if opts[:label]
+        end
+      end
+    end
+    
+    def add_scaffold_type(type, &block)
+      @scaffold_types[type] = Proc.new
+    end
+    
+    def scaffold_attribute(packet, prop, model_name, *args)
+      args = args.extract_options!
+      args.with_defaults!({:packet => packet, :value => '', :label => false, :show => false})
+      val = args[:value]
+      label = args[:label]
+      show = args[:show]
+      name = prop[:name]
+      human_readable_name = name.to_s.split('_').each{|w| w.capitalize!}.join(' ')
+      display_name = prop[:display_name] || human_readable_name
+      return @scaffold_types[prop[:type]].call(name, val, args.with_defaults!(:display_name => display_name, :model_name => model_name)) if @scaffold_types.has_key?(prop[:type])
+      unless show
+        case prop[:type]
+        when :title
+          val.gsub!('"', '&quot;')
+          ret = "<input class=\"title\" type=\"text\" value=\"#{val}\" name=\"#{model_name}[#{name}]\" />"
+        when :text
+          val.gsub!('"', '&quot;')
+          ret = "<input type=\"text\" value=\"#{val}\" name=\"#{model_name}[#{name}]\" />"
+        when :fulltext
+          ret = "<textarea name='#{model_name}[#{name}]'>#{val}</textarea>"
+        when :boolean
+          human_readable_name = human_readable_name + '?'
+          ret = "<input type='hidden' name='#{model_name}[#{name}]' value='0' /><input type='checkbox' name='#{model_name}[#{name}]' value='1' #{'checked="checked"' if (val && val != '')}/>"
+        when :date
+          val.gsub!('"', '&quot;')
+          ret = "<input class=\"date\" type=\"text\" value=\"#{val}\" name=\"#{model_name}[#{name}]\" />"
+        else
+          val.gsub!('"', '&quot;')
+          ret = "<input type=\"text\" value=\"#{val}\" name=\"#{model_name}[#{name}]\" />"
+        end
+        ret = "<label for=''>#{display_name}</label><br />" + ret if label
+      else
+        case prop[:type]
+        when :title
+          ret = "<h3 class='#{model_name}-#{name}'>#{val}</h3>"
+        when :text
+          ret = "<p class='#{model_name}-#{name}'>#{val}</p>"
+        when :fulltext
+          ret = "<div class='#{model_name}-#{name}'>#{val}</div>"
+        else
+          ret = "<div class='#{model_name}-#{name}'>#{val}</div>"
+        end
+      end
+      return ret
+    end
+  end
+  
+  module Pulp::ScaffoldHelpers
+    # Creates a button that appears to be a link but 
+    # does form submission with custom method (_method param in POST)
+    # This is to avoid issues of a destructive get.
+    # @param [String] text link text to show
+    # @param [String] link the actual href value of the link
+    # @param [String, false] confirm text of the javascript confirm (false for none [default])
+    # @param [optional, Array] args array of optional arguments, only opts[:method] defined
+    # @option opts [String] method method name (Should be 'DELETE', 'PUT' or 'POST')
+    def form_link(text, link, confirm = false, opts = {})
+      text = "<img src='#{opts[:img]}' alt='#{text}' />" if opts[:img]
+      css = opts[:class]? opts[:class] : 'form_button_link'
+      meth = (opts[:method]? "<input type='hidden' name='_method' value='#{opts[:method]}' />" : '')
+      if confirm
+        "<form action='#{link}' method='post' class='mini' onsubmit='return confirm(\"#{confirm}\")'><button class='link_button'><a href='#' class='#{css}'>#{text}</a></button>#{meth}</form>"
+      else
+        "<form action='#{link}' method='post' class='mini'><button class='link_button'><a href='#' class='#{css}'>#{text}</a></button>#{meth}</form>"
+      end
+    end
+    
+    # Calls view for an orange resource. 
+    def view(model_name, *args)
+      orange[model_name].view(self, *args)
+    end
+    
+    # Returns a scaffolded attribute
+    def view_attribute(prop, model_name, *args)
+      orange[:scaffold].scaffold_attribute(self, prop, model_name, *args)
+    end
+  end
+  
+end

data/lib/orange-core/views/default_resource/edit.haml

@@ -3,7 +3,7 @@
     = orange[:sitemap, true].sitemap_links(packet, {:slug_me => orange[:sitemap, true].slug_for(model, props)})
   %form{:action => packet.route_to(model_name, model[:id], 'save'), :method => 'post'}
     - for prop in props
-      %p!= view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]))
+      %p!= view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]), :model => model)
     %input{:type => 'submit', :value => 'Save Changes'}
 - else
   %p Couldn't find the item you're looking for.

data/lib/orange-core/views/default_resource/show.haml

@@ -1,4 +1,4 @@
 - if model
   %div{ :class => model_name}
     - for prop in props
-      = view_attribute(prop, model_name, :show => true, :value => model.attribute_get(prop[:name]))
+      = view_attribute(prop, model_name, :show => true, :value => model.attribute_get(prop[:name]), :model => model)

data/lib/orange-more/administration/middleware/access_control.rb

@@ -38,6 +38,14 @@ module Orange::Middleware
         return ret unless ret.blank? # unless handle_openid returns false, exit immediately
       end
       unless access_allowed?(packet)
+        if packet['user'] && packet['route.context'] == :admin
+          # User doesn't have permissions, try to get to a site that he does
+          site = packet['user'].orange_sites.first
+          if site.class.to_s == "OrangeSubsite" 
+            subsite = orange[:sitemap].url_for(packet, {:resource => 'subsites', :resource_id => site.id})
+            packet.reroute("/admin#{subsite}sitemap")
+          end
+        end
         packet.flash['user.after_login'] = packet.request.path
         packet.reroute(@login)
       end

data/lib/orange-more/administration/resources/user_resource.rb

@@ -28,7 +28,7 @@ module Orange
     def onSave(packet, obj, params ={})
       sites = params.delete 'sites'
       obj.update(params)
-      obj.orange_sites.delete_if{|i| true }
+      obj.orange_sites = []
       sites.each{|k,v| s = OrangeSite.first(:id => k); obj.orange_sites << s if s} if sites
       obj.save
     end

data/lib/orange-more/adverts/cartons/adverts_carton.rb

@@ -2,7 +2,7 @@ class OrangeAdvert < Orange::Carton
   id
   admin do
     title :title
-    text :asset_id
+    asset :asset_id
     text :link
     text :alt_text
   end

data/lib/orange-more/assets/cartons/asset_carton.rb

@@ -1,23 +1,27 @@
-module Orange
-  class Asset < Orange::Carton
-    id
-    admin do
-      title :name
-      text :caption
-    end
-    orange do
-      string :path, :length => 255
-      string :mime_type
-      string :secondary_path, :length => 255, :required => false
-      string :secondary_mime_type
-    end
-    
-    def file_path
-      File.join('', 'assets', 'uploaded', path)
-    end
-    
-    def to_asset_tag(alt = "")
-      "<img src=\"#{file_path}\" border=\"0\" alt=\"#{alt}\"/>"
-    end
+class OrangeAsset < Orange::Carton
+  id
+  admin do
+    title :name, :length => 255
+    text :caption, :length => 255
   end
-end
+  orange do
+    string :path, :length => 255
+    string :mime_type
+    string :secondary_path, :length => 255, :required => false
+    string :secondary_mime_type
+  end
+  
+  def file_path
+    File.join('', 'assets', 'uploaded', path)
+  end
+  
+  def to_s
+    <<-DOC
+    {"id": #{self.id}, "html": "#{self.to_asset_tag}"}
+    DOC
+  end
+  
+  def to_asset_tag(alt = "")
+    "<img src='#{file_path}' border='0' alt='#{alt}' />"
+  end
+end

data/lib/orange-more/assets/resources/asset_resource.rb

@@ -1,7 +1,15 @@
 require 'fileutils'
 module Orange
+  class Orange::Carton
+    # Define a helper for input type="text" type database stuff
+    # Show in a context if wrapped in one of the helpers
+    def self.asset(name, opts = {})
+      add_scaffold(name, :asset, Integer, opts)
+    end
+  end
+  
   class AssetResource < Orange::ModelResource
-    use Orange::Asset
+    use OrangeAsset
     call_me :assets
     
     def stack_init
@@ -13,6 +21,22 @@ module Orange
           ''
         end
       end
+      orange[:scaffold].add_scaffold_type(:asset) do |name, val, opts|
+        if opts[:show]
+          opts[:model].to_asset_tag
+        else
+          packet = opts[:packet]
+          
+          asset_html = val ? orange[:assets].asset_html(packet, val) : ""
+          ret = "<input type=\"hidden\" value=\"#{val}\" name=\"#{opts[:model_name]}[#{name}]\" />"
+          if val.blank?
+            ret += "<span class='asset_preview'></span><a class='insert_asset' rel=\"#{opts[:model_name]}[#{name}]\" href='/admin/assets/insert'>Insert Asset</a>"
+          else
+            ret += "<span class='asset_preview'>#{asset_html}</span><a class='insert_asset' rel=\"#{opts[:model_name]}[#{name}]\" href='/admin/assets/#{val}/change'>Change Asset</a>"
+          end
+          ret = "<label for=''>#{opts[:display_name]}</label><br />" + ret if opts[:label]
+        end
+      end
     end
     
     def onNew(packet, params = {})
@@ -41,6 +65,35 @@ module Orange
       m
     end
     
+    # Creates a new model object and saves it (if a post), then reroutes to the main page
+    # @param [Orange::Packet] packet the packet being routed
+    def new(packet, opts = {})
+      no_reroute = opts.delete(:no_reroute) 
+      xhr = packet.request.xhr? || packet.request.params["fake_xhr"]
+      if packet.request.post? || !opts.blank?
+        params = opts.with_defaults(opts.delete(:params) || packet.request.params[@my_orange_name.to_s] || {})
+        before = beforeNew(packet, params)
+        obj = onNew(packet, params) if before
+        afterNew(packet, obj, params) if before
+        obj.save if obj && before
+      end
+      packet.reroute(@my_orange_name, :orange) unless (xhr || no_reroute)
+      packet['template.disable'] = true if xhr
+      (xhr ? obj.to_s : obj) || false
+    end
+    
+    def insert(packet, opts = {})
+      do_view(packet, :insert, opts)
+    end
+    
+    def change(packet, opts = {})
+      do_view(packet, :change, opts)
+    end
+    
+    def find_extras(packet, mode, opts = {})
+      {:list => model_class.all}
+    end
+    
     def onDelete(packet, m, opts = {})
       begin
         FileUtils.rm(orange.app_dir('assets','uploaded', m.path)) if m.path
@@ -51,7 +104,8 @@ module Orange
       m.destroy if m
     end
     
-    def asset_html(packet, id)
+    def asset_html(packet, id = false)
+      id ||= packet['route.resource_id']
       m = model_class.get(id)
       m ? m.to_asset_tag : false
     end

data/lib/orange-more/assets/views/assets/change.haml

@@ -0,0 +1 @@
+%h2 Change an Asset

data/lib/orange-more/assets/views/assets/insert.haml

@@ -0,0 +1 @@
+%h2 Insert an Asset

data/lib/orange-more/debugger/middleware/debugger.rb

@@ -4,6 +4,7 @@ module Orange::Middleware
   class Debugger < Base
     def init(opts = {})
       orange.add_pulp Orange::Pulp::DebuggerHelpers if orange.options[:development_mode]
+      orange.mixin Orange::Mixins::DebuggerMixin if orange.options[:development_mode]
     end
     
     # Passes packet then parses the return
@@ -34,6 +35,13 @@ module Orange::Pulp::DebuggerHelpers
   end
 end
 
+
+module Orange::Mixins::DebuggerMixin
+  def resources
+    @resources
+  end
+end
+
 class Rack::Builder 
   def inspect
     "#<Rack::Builder:#{self.object_id.to_s(16)} @ins=#{@ins.map{|x| x.instance_of?(Proc)? x.call(nil) : x }.inspect} >"

data/lib/orange-more/debugger/views/debug_bar.haml

@@ -73,6 +73,10 @@
           %td Middleware
           %td.code
             %div #{h_debug packet.env['orange.core'].middleware}
+        %tr
+          %td Resources
+          %td.code
+            %div #{h_debug packet.env['orange.core'].resources}
         %tr
           %td Application
           %td.code

data/lib/orange-more/events/resources/event_resource.rb

@@ -33,7 +33,7 @@ module Orange
         ev_json = {} if ev
         ev.each{|v| ev_json[v.id] = v.attributes.merge(:id => v.id)} if ev
         ee_json = {} if ee
-        ee.each{|v| ee_json[v.id] = v.attributes.merge(:id => v.id)} if ee
+        ee.each{|v| ee_json[v.id] = v.attributes.merge(:id => v.id).reject{|k,v| [:venue, :organizer].include? k}} if ee
         extras.merge!(:eventbrite_venues => ev, :venues_json => ev_json.to_json, 
                       :eventbrite_events => ee, :events_json => ee_json.to_json
                       ) if options[:eventbrite_key]
@@ -116,6 +116,9 @@ module Orange
       venue.save
     end
     
+    def find_list(packet, mode, opts = {})
+      model_class.all(:order => [:starts.desc]) || []
+    end
     
     def post_to_eventbrite
       

data/lib/orange-more/members/resources/members_resource.rb

@@ -145,8 +145,8 @@ module Orange
         params = packet.request.params["members"]
         login = params["login_email"]
         password = params["login_password"]
-        tester = model_class.new({:password => password})
         member = model_class.first({:email => login})
+        tester = model_class.new({:password => password, :salt => member.salt})
         if member && tester.hashed_password == member.hashed_password
           packet.session["member"] = member.id
           packet.reroute(@my_orange_name, :orange, :profile)
@@ -155,6 +155,7 @@ module Orange
           do_view(packet, :login, opts)
         end
       else
+        packet.reroute(@my_orange_name, :orange, :profile) if packet.session["member"]
         do_view(packet, :login, opts)
       end
     end

data/lib/orange-more/news/cartons/news.rb

@@ -2,7 +2,7 @@ require 'dm-timestamps'
 class OrangeNews < Orange::Carton
   id
   front do
-    title :title
+    title :title, :length => 255
     text :link, :length => 255
     fulltext :description
   end

data/lib/orange-more/pages/cartons/page_carton.rb

@@ -4,7 +4,7 @@ require 'orange-more/administration/cartons/site_carton'
 class OrangePage < Orange::SiteCarton
   id
   front do
-    title :title
+    title :title, :length => 255
     fulltext :body
   end
   boolean :published, :default => false

data/lib/orange-more/pages/cartons/page_version_carton.rb

@@ -3,7 +3,7 @@ require 'orange-more/administration/cartons/site_carton'
 
 class OrangePageVersion < Orange::SiteCarton
   id
-  title :title
+  title :title, :length => 255
   fulltext :body
   property :updated_at, DateTime
   boolean :published

data/lib/orange-more/pages/resources/page_resource.rb

@@ -37,7 +37,7 @@ module Orange
       no_reroute = opts[:no_reroute]
       if packet.request.post? || !opts.blank?
         my_id = opts[:resource_id] || packet['route.resource_id']
-        m = model_class.get(my_id)
+        m = opts[:model] || model_class.get(my_id)
         if m
           params = {}
           params[:published] = true
@@ -49,15 +49,16 @@ module Orange
           m.versions.new(params.merge(:version => max + 1))
           m.save
           
-          r = orange[:sitemap].routes_for(packet, :resource_id => m.id, :resource => @my_orange_name)
-          if r.blank?
+          r = orange[:sitemap, true].routes_for(packet, :resource_id => m.id, :resource => @my_orange_name)
+          # Add route if none.
+          if (r.blank? && orange.loaded?(:sitemap))
             route_hash = {
               :orange_site_id => m.orange_site_id, 
               :resource => @my_orange_name, 
               :resource_id => m.id,
               :slug => orange[:sitemap].slug_for(m, params), 
               :show_in_nav => false,
-              :link_text => m.title
+              :link_text => "{title}"
             }
             parents = orange[:sitemap].routes_for(packet, :resource => '', :resource_id => '', :slug => "pages")
             route_hash[:parent] = parents.first unless parents.blank?
@@ -73,7 +74,7 @@ module Orange
     def onNew(packet, params = {})
       params[:published] = false
       m = model_class.new(params)
-      m.orange_site = packet['site'] unless m.orange_site
+      m.orange_site = packet['subsite', false] ? packet['subsite'] : packet['site'] unless m.orange_site
       # m.versions.new(params.merge(:version => 1))
       m
     end
@@ -81,16 +82,31 @@ module Orange
     # Saves updates to an object specified by packet['route.resource_id'], then reroutes to main
     # @param [Orange::Packet] packet the packet being routed
     def onSave(packet, m, params = {})
+      r = orange[:sitemap, true].routes_for(packet, :resource_id => m.id, :resource => @my_orange_name)
+      # Add route if none.
+      if (r.blank? && orange.loaded?(:sitemap))
+        route_hash = {
+          :orange_site_id => m.orange_site_id, 
+          :resource => @my_orange_name, 
+          :resource_id => m.id,
+          :slug => orange[:sitemap].slug_for(m, params), 
+          :show_in_nav => false,
+          :link_text => "{title}"
+        }
+        parents = orange[:sitemap].routes_for(packet, :resource => '', :resource_id => '', :slug => "pages")
+        route_hash[:parent] = parents.first unless parents.blank?
+        orange[:sitemap].add_route_for(packet, route_hash)
+      end
       if (params["published"] == "1")
         params["published"] = true
+        m.orange_site = packet['subsite', false] ? packet['subsite'] : packet['site'] unless m.orange_site
+        
         m.update(params)
-        m.orange_site = packet['site'] unless m.orange_site
-        orange[:pages].publish(packet, :no_reroute => true)
+        orange[:pages].publish(packet, :no_reroute => true, :model => m)
       else
         params["published"] = false
+        m.orange_site = packet['subsite', false] ? packet['subsite'] : packet['site'] unless m.orange_site
         m.update(params)
-        m.orange_site = packet['site'] unless m.orange_site
-        m.save
       end
     end
     
@@ -116,7 +132,7 @@ module Orange
           [:version, :orange_page_id, :page_id, :id].each { |i| attrs.delete(i) }
           m.attributes = attrs
         end
-      end
+      end # end if version
       if mode == :show
         case packet['route.context']  
         when :live
@@ -133,19 +149,24 @@ module Orange
           end
           m
         end
-      else {}
-      end
+      end # end if show
       m
     end
     
     def find_extras(packet, mode, opts = {})
       case mode
       when :edit
-        return {:routes => orange[:sitemap].routes_for(packet)}
+        return {:routes => orange[:sitemap, true].routes_for(packet)}
       else {}
       end
     end
     
+    def routes(packet, opts = {})
+      model = opts if opts.is_a? model_class
+      model ||= opts[:model] || model_class.get(opts[:resource_id])
+      orange[:sitemap].routes_for(packet, {:resource => :pages, :resource_id => model.id})
+    end
+    
     def sitemap_row(packet, opts = {})
       do_view(packet, :sitemap_row, opts)
     end

data/lib/orange-more/sitemap/cartons/route.rb

@@ -4,8 +4,8 @@ require 'dm-is-awesome_set'
 class OrangeRoute < Orange::SiteCarton
   id
   admin do
-    text :slug, :display_name => "Search Engine Friendly Page URL"
-    text :link_text
+    text :slug, :display_name => "Search Engine Friendly Page URL", :length => 255
+    text :link_text, :length => 255
     text :reroute_to, :length => 255
     boolean :show_in_nav, :default => false, :display_name => 'Show in Navigation?'
   end

data/lib/orange-more/sitemap/resources/sitemap_resource.rb

@@ -90,6 +90,26 @@ module Orange
       packet.reroute(@my_orange_name, :orange) unless (packet.request.xhr? || no_reroute)
     end
     
+    def show_in_nav(packet, opts = {})
+      no_reroute = opts.delete(:no_reroute)
+      if packet.request.post? || !opts.blank?
+        obj = find_one(packet, :show_in_nav, (opts[:id] || opts[:resource_id] || packet['route.resource_id']))
+        obj.show_in_nav = true
+        obj.save
+      end
+      packet.reroute(@my_orange_name, :orange) unless (packet.request.xhr? || no_reroute)
+    end
+    
+    def unshow_in_nav(packet, opts = {})
+      no_reroute = opts.delete(:no_reroute)
+      if packet.request.post? || !opts.blank?
+        obj = find_one(packet, :unshow_in_nav, (opts[:id] || opts[:resource_id] || packet['route.resource_id']))
+        obj.show_in_nav = false
+        obj.save
+      end
+      packet.reroute(@my_orange_name, :orange) unless (packet.request.xhr? || no_reroute)
+    end
+    
     def higher(packet, opts = {})
       move(packet, false, :direction => :higher)
     end
@@ -208,6 +228,17 @@ module Orange
       return 'route-'+model.id
     end
     
+    def link_text_for(route)
+      return route.link_text unless route.resource && route.resource_id
+      if match = route.link_text.match(/^\{([-a-z0-9A-Z_]+)\}$/)
+        resource = route.resource.to_sym
+        return route.link_text unless orange.loaded?(resource)
+        orange[resource].model_class.get(route.resource_id).__send__(match[1])
+      else
+        route.link_text
+      end
+    end
+    
     def slug(str)
       str.downcase.gsub(/[']+/, "").gsub(/[^a-z0-9]+/, "-")
     end

data/lib/orange-more/sitemap/views/sitemap/one_level.haml

@@ -4,4 +4,4 @@
   - for item in model.children
     - next unless item.show_in_nav
     %li
-      %a{:href => item.full_path}= item.link_text
+      %a{:href => item.full_path}= orange[:sitemap].link_text_for(item)

data/lib/orange-more/sitemap/views/sitemap/table_row.haml

@@ -16,7 +16,7 @@
       .move_actions.dent_actions
         = form_link('Indent', route_to(model_name, model.id, 'indent'), false, {:method => 'post', :class => 'indent arrow'}) if model.previous_sibling && model.previous_sibling.level == model.level
         %p= ' '
-    %h4 #{model.link_text} <span>(#{model.full_path})</span>
+    %h4 #{orange[:sitemap].link_text_for(item)} <span>(#{model.full_path})</span>
     .linked_to
       %p 
         Linked to: 

data/lib/orange-more/sitemap/views/sitemap/two_level.haml

@@ -4,9 +4,10 @@
   - for item in model.children
     - next unless item.show_in_nav
     %li
-      %a{:href => item.full_path}= item.link_text
+      %a{:href => item.full_path}= orange[:sitemap].link_text_for(item)
       - unless item.descendants.empty?
         %ul.subnav
           - for x in item.children
+            - next unless x.show_in_nav
             %li
-              %a{:href => x.full_path}= x.link_text
+              %a{:href => x.full_path}= orange[:sitemap].link_text_for(x)

data/lib/orange-more/subsites/resources/subsite_resource.rb

@@ -23,8 +23,8 @@ module Orange
       packet.reroute(@my_orange_name, :orange)
     end
     
-    def url_for(packet)
-      orange[:sitemap].url_for(packet, {:resource => 'subsites', :resource_id => packet['subsite'].id})
+    def url_for(packet, opts = {})
+      orange[:sitemap].url_for(packet, {:resource => 'subsites', :resource_id => (opts.is_a?(model_class) ? opts.id : packet['subsite'].id)})
     end
     
     def subsite_nav(packet, opts = {})

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - David Haslem
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 -04:00
+date: 2010-06-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,6 +107,7 @@ files:
 - lib/orange-core/resources/page_parts.rb
 - lib/orange-core/resources/parser.rb
 - lib/orange-core/resources/routable_resource.rb
+- lib/orange-core/resources/scaffold.rb
 - lib/orange-core/stack.rb
 - lib/orange-core/templates/exceptions.haml
 - lib/orange-core/views/default_resource/create.haml
@@ -148,7 +149,9 @@ files:
 - lib/orange-more/assets/cartons/asset_carton.rb
 - lib/orange-more/assets/plugin.rb
 - lib/orange-more/assets/resources/asset_resource.rb
+- lib/orange-more/assets/views/assets/change.haml
 - lib/orange-more/assets/views/assets/create.haml
+- lib/orange-more/assets/views/assets/insert.haml
 - lib/orange-more/blog.rb
 - lib/orange-more/blog/cartons/blog.rb
 - lib/orange-more/blog/cartons/blog_post.rb