orange 0.2.6 → 0.2.7

data/README.markdown

@@ -104,6 +104,7 @@ Required Gems
 * openid_dm_store
 * radius
 * crack
+* eventbright
 
 All dependencies should be loaded if you install the gem except for the datamapper
 adapter relevant to your set up. If, for example, you want to use a mysql database,

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

@@ -3,8 +3,9 @@ require 'orange-core/middleware/base'
 module Orange::Middleware
   class RestfulRouter < Base
     def init(*args)
-      opts = args.extract_options!.with_defaults(:contexts => [:admin, :orange], :not_found => false)
-      @contexts = opts[:contexts]
+      opts = args.extract_options!.with_defaults(:restful_contexts => [:admin, :orange], :not_found => false, :exposed_actions => {:admin => :all, :orange => :all})
+      @exposed = opts[:exposed_actions]
+      @contexts = opts[:restful_contexts]
       @not_found = opts[:not_found]
     end
     
@@ -16,43 +17,77 @@ module Orange::Middleware
     def packet_call(packet)
       return (pass packet) if packet['route.router']  # Don't route if other middleware
                                                       # already has
-      if(@contexts.include?(packet['route.context']))
-        path = packet['route.path'] || packet.request.path_info
-        parts = path.split('/')
-        pad = parts.shift
-        if !parts.empty?
-          resource = parts.shift
-          if orange.loaded?(resource.to_sym)
-            packet['route.resource'] = resource.to_sym
-            if !parts.empty?
-              second = parts.shift
-              if second =~ /^\d+$/
-                packet['route.resource_id'] = second
-                if !parts.empty?
-                  packet['route.resource_action'] = parts.shift.to_sym
-                end
-              else
-                packet['route.resource_action'] = second.to_sym
-              end 
-            end # end check for second part
-          else
-            parts.unshift(resource)
-          end # end check for loaded resource
-        end # end check for nonempty route
+      parts = route_parts(packet)
+      if(should_route?(packet, parts))
+        # Take parts of route and set packet info
+        packet['route.resource'] = parts[:resource] if parts[:resource]
+        packet['route.resource_id'] = parts[:resource_id] if parts[:resource_id]
+        packet['route.resource_action'] = parts[:resource_action] if parts[:resource_action]
+        
+        # Take remainder and set to resource_path
+        packet['route.resource_path'] = parts[:remainder]
         
+        # Set self as router if resource was found
         if(packet['route.resource', false]) 
-          packet['route.resource_path'] = parts.unshift(pad).join('/')
           packet['route.router'] = self
         elsif(@not_found)
           packet['route.resource'] = @not_found
-          packet['route.resource_path'] = parts.unshift(pad).join('/')
           packet['route.router'] = self
         end
-      end # End context match if
+      end 
       
       pass packet
     end
     
+    def route_parts(packet)
+      return_parts = {}
+      path = packet['route.path'] || packet.request.path_info
+      parts = path.split('/')
+      pad = parts.shift
+      if !parts.empty?
+        resource = parts.shift
+        if orange.loaded?(resource.to_sym)
+          return_parts[:resource] = resource.to_sym
+          if !parts.empty?
+            second = parts.shift
+            if second =~ /^\d+$/
+              return_parts[:resource_id] = second
+              if !parts.empty?
+                return_parts[:resource_action] = parts.shift.to_sym
+              else
+                return_parts[:resource_action] = :show
+              end
+            else
+              return_parts[:resource_action] = second.to_sym
+            end 
+          else
+            return_parts[:resource_action] = :list
+          end # end check for second part
+        else
+          parts.unshift(resource)
+        end # end check for loaded resource
+      end # end check for nonempty route
+      return_parts[:remainder] = parts.unshift(pad).join('/')
+      return_parts
+    end
+    
+    def should_route?(packet, parts)
+      return false unless @exposed.has_key?(packet['route.context'])
+      action_exposed?(@exposed[packet['route.context']], parts)      
+    end
+    
+    def action_exposed?(list, route_parts)
+      return true if list == :all
+      return true if list == route_parts[:resource_action]
+      return true if list.is_a?(Array) && list.include?(route_parts[:resource_action])
+      if list.is_a?(Hash)
+        all = list.has_key?(:all) ? action_exposed?(list[:all], route_parts) : false
+        one = list.has_key?(route_parts[:resource]) ? action_exposed?(list[route_parts[:resource]], route_parts) : false
+        return all || one
+      end
+      false
+    end
+    
     def route(packet)
       resource = packet['route.resource']
       raise 'resource not found' unless orange.loaded? resource

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

@@ -7,7 +7,7 @@ module Orange::Middleware
   class RouteContext < Base
     def initialize(app, core, *args)
       opts = args.extract_options!
-      opts.with_defaults!(:contexts => [:live, :admin, :orange], 
+      opts.with_defaults!(:contexts => [:preview, :live, :admin, :orange], 
                           :default => :live,
                           :urls => {})
       @app = app

data/lib/orange-core/stack.rb

@@ -140,12 +140,12 @@ module Orange
     def routing(opts ={})
       stack Orange::Middleware::RestfulRouter, opts.dup
       Orange.plugins.each{|p| p.middleware(:routing).each{|m| stack m, opts.dup} if p.has_middleware?}
-      stack Orange::Middleware::FourOhFour, opts.dup
     end
     
     def postrouting(opts ={})
       Orange.plugins.each{|p| p.middleware(:postrouting).each{|m| stack m, opts.dup} if p.has_middleware?}
       stack Orange::Middleware::Template
+      stack Orange::Middleware::FourOhFour, opts.dup # Last ditch, send route to 404 page.
     end
     
     def responders(opts ={})

data/lib/orange-core/templates/exceptions.haml

@@ -6,7 +6,7 @@
 %html
   %head
     %meta{:name=>"robots", :content=>"NONE,NOARCHIVE"}
-    %title Orange rasied #{h exception.class} at #{h path}
+    %title Orange raised #{h exception.class} at #{h path}
     %link{:rel=>"stylesheet", :href=>"/assets/_orange_/css/exceptions.css", :type=>"text/css"}
     %script{:type=>"text/javascript", :src=>"/assets/_orange_/js/exceptions.js"}
   %body

data/lib/orange-more.rb

@@ -12,6 +12,7 @@ require File.join(libdir, 'orange-more', 'blog')
 require File.join(libdir, 'orange-more', 'news')
 require File.join(libdir, 'orange-more', 'disqus')
 require File.join(libdir, 'orange-more', 'testimonials')
+require File.join(libdir, 'orange-more', 'adverts')
 require File.join(libdir, 'orange-more', 'cloud')
 require File.join(libdir, 'orange-more', 'debugger')
 require File.join(libdir, 'orange-more', 'subsites')

data/lib/orange-more/administration/assets/css/admin.css

@@ -65,7 +65,7 @@ caption {background:#eee;}
 .top {margin-top:0;padding-top:0;}
 .bottom {margin-bottom:0;padding-bottom:0;}
 li.nobullet {list-style-type: none;}
-div.version_container {width:300px;margin:2px 0;padding:10px;border:1px solid #CECECE;-moz-border-radius:4px;-webkit-border-radius:4px;background: #EFEFEF;}
+div.version_container {width:377px;margin:2px 0;padding:10px;border:1px solid #CECECE;-moz-border-radius:4px;-webkit-border-radius:4px;background: #EFEFEF;}
 span.version_info {padding: 0 5px;}
 /* forms.css */
 label {font-weight:bold;}
@@ -273,4 +273,14 @@ br.clear {
 	clear:both;
 }
 
-.sitemap_links_list{}
+.sitemap_links_list{}
+
+ul.version_list {
+	margin-left: 0;
+	padding-left: 0;
+	list-style-type: none;
+}
+
+ul.version_list li {
+	padding: 5px 0 0;
+}

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

@@ -16,7 +16,7 @@ module Orange::Middleware
     # @option opts [Boolean] :config_id Whether to use the id set in a config file
     
     def init(opts = {})
-      defs = {:locked => [:admin, :orange], :login => '/login', :logout => '/logout',
+      defs = {:locked => [:preview, :admin, :orange], :login => '/login', :logout => '/logout',
               :handle_login => true, :openid => true, :single_user => false}
       opts = opts.with_defaults!(defs)
       @openid = opts[:openid]

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.destroy
+      obj.orange_sites.delete_if{|i| true }
       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.rb

@@ -0,0 +1 @@
+require File.join('orange-more', 'adverts', 'plugin')

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

@@ -0,0 +1,14 @@
+class OrangeAdvert < Orange::Carton
+  id
+  admin do
+    title :title
+    text :asset_id
+    text :link
+    text :alt_text
+  end
+  
+  def self.with_tag(tag)
+    all(:tags.like => "%#{tag}%")
+  end
+
+end

data/lib/orange-more/adverts/plugin.rb

@@ -0,0 +1,13 @@
+Dir.glob(File.join(File.dirname(__FILE__), 'cartons', '*.rb')).each {|f| require f }
+Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
+
+module Orange::Plugins
+  class Adverts < Base
+    views_dir   File.join(File.dirname(__FILE__), 'views')
+    
+    resource    Orange::AdvertsResource.new
+  end
+end
+
+Orange.plugin(Orange::Plugins::Adverts.new)
+

data/lib/orange-more/adverts/resources/adverts_resource.rb

@@ -0,0 +1,27 @@
+module Orange
+  class AdvertsResource < Orange::ModelResource
+    use OrangeAdvert
+    call_me :adverts
+    def stack_init
+      orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Advertisements')
+      orange[:radius].define_tag "adverts" do |tag|
+     	  if tag.attr["tag"] && model_class.with_tag(tag.attr["tag"]).count >0
+          m = model_class.with_tag(tag.attr["tag"]).first(:offset => rand(model_class.with_tag(tag.attr["tag"]).count)) #selects advert based on tag
+	      elsif model_class.all.count > 0
+      	  m = model_class.first(:offset => rand(model_class.all.count)) #selects a random advert
+	      end
+        unless m.nil?
+          template = tag.attr["template"] || "adverts"
+          orange[:adverts].advert(tag.locals.packet, {:model => m, :template => template})
+        else
+          ""
+        end
+      end
+    end
+    
+    def advert(packet, opts = {})
+      template = opts[:template].to_sym || :adverts
+      do_view(packet, template, opts)
+    end
+  end
+end

data/lib/orange-more/adverts/views/adverts/adverts.haml

@@ -0,0 +1,2 @@
+%a{ :href => model.link, :target => "_blank", :rel => "external" }
+  = orange[:assets].asset_html(packet, model.asset_id)

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

@@ -17,7 +17,7 @@ module Orange
     end
     
     def to_asset_tag
-      "<img src=\"#{file_path}\" />"
+      "<img src=\"#{file_path}\" border=\"0\"/>"
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Orange
     
     def stack_init
       orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Assets')
-      orange[:radius, true].context.define_tag "asset" do |tag|
+      orange[:radius, true].define_tag "asset" do |tag|
         if tag.attr['id']
           (m = model_class.first(:id => tag.attr['id'])) ? m.to_asset_tag : 'Invalid Asset'
         else
@@ -50,5 +50,10 @@ module Orange
       end
       m.destroy if m
     end
+    
+    def asset_html(packet, id)
+      m = model_class.get(id)
+      m ? m.to_asset_tag : false
+    end
   end
 end

data/lib/orange-more/events/assets/js/events.js

@@ -0,0 +1,55 @@
+$(function(){
+	$('.new-venue').hide();
+	$('.show-venue-details').toggle(venue_details_show, venue_details_hide);
+	$("#events-venue").change(function(){
+		if($(this).val() == "new"){
+			venue_details_blank();
+			if($('.new-venue').css('display') == 'none') $('.show-venue-details').click();
+		}
+		else{
+			load_venue_details($(this).val());
+		}
+	});
+	$('input[name*=link_to_eventbrite]').change(function(){ 
+		if($(this).attr('checked')){
+			$('p.eventbrite-link').show();
+		}
+		else{
+			$('p.eventbrite-link').hide();
+		}
+	});
+	$('#events-eventbrite-id').change(function(){ 
+		load_event_details($(this).val());
+	});
+	$("input[name*='location']").change(function(){$("#events-venue").val("new")});
+});
+
+function venue_details_show(){
+	$('.show-venue-details').text('Hide'); 
+	$('.new-venue').show();
+}
+
+function venue_details_hide(){
+	$('.show-venue-details').text('(Details)'); 
+	$('.new-venue').hide();
+}
+
+function load_venue_details(id){
+	var obj = venues[id];
+	$("input[name*=location_name]").val(obj.name);
+	$("input[name*=location_address]").val(obj.address);
+	$("input[name*=location_address2]").val(obj.address_2);
+	$("input[name*=location_city]").val(obj.city);
+	$("input[name*=location_state]").val(obj.region);
+	$("input[name*=location_zip]").val(obj.postal_code);
+}
+
+function load_event_details(id){
+	var obj = events[id];
+	$("input[name*='events[name]']").val(obj.title);
+	$("textarea[name*=description]").val(obj.description);
+}
+
+function venue_details_blank(){
+	$("input[name*='location']").val('');
+}

data/lib/orange-more/events/cartons/orange_calendar.rb

@@ -2,6 +2,7 @@ class OrangeCalendar < Orange::SiteCarton
   id
   admin do
     title :name
+    boolean :main, :default => false, :display_name =>'Main Calendar?'
   end
   has n, :events, "OrangeEvent"
 end

data/lib/orange-more/events/cartons/orange_event.rb

@@ -8,6 +8,9 @@ class OrangeEvent < Orange::Carton
     text :location_city
     text :location_state
     text :location_zip
+    boolean :link_to_eventbrite, :default => false
+    text :eventbrite_id
+    fulltext :blurb
     fulltext :description
   end
   orange do
@@ -31,9 +34,12 @@ class OrangeEvent < Orange::Carton
     time_attr(attribute, false, datestr)
   end
   
+  def attribute_time_get(attribute)
+    attribute_get(attribute) || Time.now
+  end
   def time_attr(attribute, timestr = false, datestr = false)
-    date = datestr || attribute_get(attribute).strftime("%m/%d/%Y")
-    time = timestr || attribute_get(attribute).strftime("%I:%M %p")
+    date = datestr || attribute_time_get(attribute).strftime("%m/%d/%Y")
+    time = timestr || attribute_time_get(attribute).strftime("%I:%M %p")
     attribute_set(attribute, Time.parse(date + " " + time))
   end
   

data/lib/orange-more/events/plugin.rb

@@ -4,7 +4,7 @@ Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| requi
 module Orange::Plugins
   class Events < Base
     views_dir       File.join(File.dirname(__FILE__), 'views')
-    
+    assets_dir      File.join(File.dirname(__FILE__), 'assets')
     resource    Orange::CalendarResource.new
     resource    Orange::EventResource.new
   end

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

@@ -2,6 +2,27 @@ module Orange
   class CalendarResource < ModelResource
     use OrangeCalendar
     call_me :calendar
+    def stack_init
+      orange[:admin, true].add_link("Settings", :resource => @my_orange_name, :text => 'Calendars')
+      orange[:radius].define_tag "calendar" do |tag|
+     	  template = tag.attr["template"] || false
+     	  if tag.attr["name"]
+     	    calendars = tag.attr["name"].split.map{|x| model_class.first(:name => x)}
+          unless tag.attr["main"] && tag.attr["main"] == "false"
+            calendars << model_class.all(:main => true)
+          end
+        else
+          calendars = model_class.all
+        end
+        events = OrangeEvent.all(:calendar => calendars, :order => [:starts.asc], :limit => 10)
+        orange[:calendar].calendar(tag.locals.packet, {:list => events, :template => template})
+      end
+    end
+    
+    def calendar(packet, opts = {})
+      template = (opts[:template] || "calendar").to_sym
+      do_list_view(packet, template, opts)
+    end
     
     def afterNew(packet, obj, opts = {})
       obj.orange_site = packet['site'] unless obj.orange_site

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

@@ -1,5 +1,5 @@
-require 'rest_client'
-
+require 'eventbright'
+require 'json'
 module Orange
   class EventResource < ModelResource
     # For integration with Eventbrite. Application key needs user
@@ -10,19 +10,96 @@ module Orange
     call_me :events
     
     def stack_init
+      orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Events')
+      EventBright.setup(ORANGE_EVENTBRITE_KEY)
       options[:eventbrite_key] = orange.options['eventbrite_key'] || false
     end
     
+    def eventbrite_user
+      return false unless options[:eventbrite_key]
+      begin
+        @eventbrite_user = EventBright::User.new(options[:eventbrite_key]) 
+      rescue # If EventBright gem throws error, we're probably having issues connecting
+        false
+      end
+    end
+    
     def find_extras(packet, mode, opts = {})
       extras = {:calendars => OrangeCalendar.all}
       case mode
-      when :create
+      when :create, :edit
         ev = eventbrite_venues
-        extras.merge!(:eventbrite_venues => eventbrite_venues) if options[:eventbrite_key]
+        ee = eventbrite_events
+        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
+        extras.merge!(:eventbrite_venues => ev, :venues_json => ev_json.to_json, 
+                      :eventbrite_events => ee, :events_json => ee_json.to_json
+                      ) if options[:eventbrite_key]
+      
       end
       extras
     end
     
+    def beforeNew(packet, params = {})
+      eventbrite_synchronize(packet, params)
+    end
+    
+    def beforeSave(packet, model, params = {})
+      eventbrite_synchronize(packet, params)
+    end
+    
+    def eventbrite_synchronize(packet, params = {})
+      venue_id = params.delete('orange_venue_id')
+      if params['link_to_eventbrite'] != "0" 
+        if venue_id == "new"
+          v = EventBright::Venue.new(eventbrite_user)
+          v.organizer_id = eventbrite_user.organizers.first.id
+        else
+          v = eventbrite_user.venues.select{|v| v.id == venue_id.to_i }.first
+        end
+        update_venue(v, params)
+        if params['eventbrite_id'] == "new"
+          e = EventBright::Event.new(eventbrite_user)
+          e.organizer = eventbrite_user.organizers.first
+        else
+          e = eventbrite_user.events.select{|e| e.id == params['eventbrite_id'].to_i }.first
+        end
+        params['eventbrite_id'] = update_event(e, params, v)
+      else
+        params['eventbrite_id'] = nil
+      end
+      params
+    end
+    
+    def update_event(event, params, venue)
+      event.venue = venue
+      event.title = params["name"]
+      event.description = params["description"]
+      event.start_date = params["starts_date"] + " " + params["starts_time"]
+      event.end_date = params["ends_date"] + " " + params["ends_time"]
+      if(event.start_date > event.end_date)
+        raise "An event can't end before it starts."
+      else
+        event.status = "live"
+        event.save
+      end
+      return event.id
+    end
+    
+    def update_venue(venue, params)
+      venue.name = params["location_name"]
+      venue.address = params["location_address"]
+      venue.address_2 = params["location_address2"]
+      venue.city = params["location_city"]
+      venue.region = params["location_state"]
+      venue.postal_code = params["location_zip"]
+      venue.country_code = "US"
+      venue.save
+    end
+    
+    
     def post_to_eventbrite
       
     end
@@ -30,9 +107,17 @@ module Orange
     def eventbrite_venues
       list = []
       begin
-        response = RestClient.get("https://www.eventbrite.com/xml/user_list_venues?app_key=#{ORANGE_EVENTBRITE_KEY}&user_key=#{options[:eventbrite_key]}")
-        xml = orange[:parser].xml(response.body)
-        list = xml["venues"]["venue"].select{|x| !x['country'].blank? }
+        list = eventbrite_user.venues
+      rescue
+        return false
+      end
+      list
+    end
+    
+    def eventbrite_events
+      list = []
+      begin
+        list = eventbrite_user.events
       rescue
         return false
       end

data/lib/orange-more/events/views/calendar/calendar.haml

@@ -0,0 +1,5 @@
+-# Given a list of events...
+- for event in list
+  .event
+    %h2 #{event.name}
+    .description= event.description

data/lib/orange-more/events/views/events/create.haml

@@ -1,6 +1,38 @@
+- packet.add_js('events.js', :module => '_events_')
 %form{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post'}
-  - for prop in props
+  - for prop in props.reject{|v| v[:name].to_s =~ /location_/ || v[:name].to_s =~ /eventbrite/}
     %p= view_attribute(prop, model_name, :label => true)
+  %fieldset
+    %legend Venue
+    %p
+      %select{:id => "#{model_name}-venue", :name => "#{model_name}[orange_venue_id]"}
+        %option(disabled) Choose a venue
+        - for venue in eventbrite_venues
+          %option{:value => venue.id}= venue.name
+        %option{:value => "new"} New...
+      %a.show-venue-details{:href=>"#"} (Details)
+    .new-venue
+      :javascript
+        var venues = #{venues_json};
+      - for prop in props.select{|v| v[:name].to_s =~ /location_/}
+        %p= view_attribute(prop, model_name, :label => true)
+  %fieldset
+    %legend EventBrite
+    %p
+      %label Link to EventBrite?
+      %input(type="hidden" value="0" name="events[link_to_eventbrite]")
+      %input(type="checkbox" value="1" name="events[link_to_eventbrite]")
+    %p.eventbrite-link(style="display:none;")
+      :javascript
+        var events = #{events_json};
+      %label Which EventBrite Event?
+      %br
+      %select{:id => "#{model_name}-eventbrite-id", :name => "#{model_name}[eventbrite_id]"}
+        %optgroup(label="Create a new event")
+          %option{:value => "new"} New...
+        %optgroup(label="Existing event")
+          - for event in eventbrite_events
+            %option{:value => event.id}= event.title
   %p
     %label{:for => "#{model_name}-calendar"} Calendar
     %br

data/lib/orange-more/events/views/events/edit.haml

@@ -1,25 +1,58 @@
-- if model
-  %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]))
+-if model
+  - my_event = eventbrite_events.select{|e| e.id == model.eventbrite_id.to_i }.first || nil
+  - packet.add_js('events.js', :module => '_events_')
+  %form{:action => "#{packet.route_to(model_name, model[:id], 'save')}", :method => 'post'}
+    - for prop in props.reject{|v| v[:name].to_s =~ /location_/ || v[:name].to_s =~ /eventbrite/}
+      %p= view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]))
+    %fieldset
+      %legend Venue
+      %p
+        %select{:id => "#{model_name}-venue", :name => "#{model_name}[orange_venue_id]"}
+          %option(disabled) Choose a venue
+          - for venue in eventbrite_venues
+            %option{:value => venue.id, :selected => ((my_event && (venue.id == my_event.venue.id)) || venue.name == model.location_name)}= venue.name
+          %option{:value => "new"} New...
+        %a.show-venue-details{:href=>"#"} (Details)
+      .new-venue
+        :javascript
+          var venues = #{venues_json};
+        - for prop in props.select{|v| v[:name].to_s =~ /location_/}
+          %p= view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]))
+    %fieldset
+      %legend EventBrite
+      %p
+        %label Link to EventBrite?
+        %input(type="hidden" value="0" name="events[link_to_eventbrite]")
+        %input{:type=>"checkbox", :value=>"1", :name=>"events[link_to_eventbrite]", :checked=>(model.link_to_eventbrite ? true : false)}
+      %p.eventbrite-link{:style => (model.link_to_eventbrite ? "" : "display:none;")}
+        :javascript
+          var events = #{events_json};
+        %label Which EventBrite Event?
+        %br
+        %select{:id => "#{model_name}-eventbrite-id", :name => "#{model_name}[eventbrite_id]"}
+          %optgroup(label="Create a new event")
+            %option{:value => "new"} New...
+          %optgroup(label="Existing event")
+            - for event in eventbrite_events
+              %option{:value => event.id, :selected => (my_event && (my_event.id == event.id))}= event.title
     %p
       %label{:for => "#{model_name}-calendar"} Calendar
       %br
       %select{:id => "#{model_name}-calendar", :name => "#{model_name}[orange_calendar_id]"}
         - for calendar in calendars
-          %option{:value => calendar.id}= calendar.name
+          %option{:value => calendar.id, :selected => (model.calendar.id == calendar.id)}= calendar.name
     %p
       %label{:for => "#{model_name}-starts"} Starts
       %br
-      %input{:type => 'text', :id => "#{model_name}-starts", :size => 10, :class => 'date', :name => "#{model_name}[starts_date]", :value => model.starts_date}
+      %input{:type => 'text', :id => "#{model_name}-starts", :class => 'date', :name => "#{model_name}[starts_date]", :size => 10, :value => model.starts_date }
       at
-      %input{:type => 'text', :name => "#{model_name}[starts_time]", :size => 8, :value => model.starts_time}
+      %input{:type => 'text', :name => "#{model_name}[starts_time]", :size => 8, :value => model.starts_time }
     %p
       %label{:for => "#{model_name}-ends"} Ends
       %br
-      %input{:type => 'text', :id => "#{model_name}-ends", :size => 10, :class => 'date', :name => "#{model_name}[ends_date]", :value => model.ends_date}
+      %input{:type => 'text', :id => "#{model_name}-ends", :size => 10, :class => 'date', :name => "#{model_name}[ends_date]", :value => model.ends_date }
       at
-      %input{:type => 'text', :name => "#{model_name}[ends_time]", :size => 8, :value => model.ends_time}
-    %input{:type => 'submit', :value => 'Save Changes'}
+      %input{:type => 'text', :name => "#{model_name}[ends_time]", :size => 8, :value => model.ends_time }
+    %input{:type => 'submit', :value => 'Save Event'}
 - else
-  %p Couldn't find the item you're looking for.
+  %p Couldn't find the event.

data/lib/orange-more/events/views/events/list.haml

@@ -0,0 +1,13 @@
+%table
+  %thead
+    %tr
+      %th Name
+      %th Description
+      %th Location
+      %th Calendar
+      %th EventBrite Link
+      %th
+  %tbody
+    - for obj in list
+      = view_table_row(model_name, :model => obj)
+%a{:href => route_to(model_name, 'create')} New

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

@@ -0,0 +1,17 @@
+- if model
+  %tr
+    %td= model.name
+    %td= model.description
+    %td= model.location_name
+    %td= model.calendar.blank? ? "None" : model.calendar.name
+    %td
+      - if model.link_to_eventbrite
+        - if model.eventbrite_id && model.eventbrite_id != "new"
+          %a{:href => "http://www.eventbrite.com/myevent?eid="+model.eventbrite_id}= model.name
+        - else
+          N/A
+      - else
+        N/A
+    %td.actions
+      = form_link('Delete', route_to(model_name, model.id, 'delete'), 'Are you sure you want to delete this?', {:method => 'delete'})
+      %a{:href => route_to(model_name, model.id, 'edit')} Edit

data/lib/orange-more/news/resources/news_resource.rb

@@ -36,9 +36,10 @@ module Orange
       end
     end
     
-    def latest(packet)
+    def latest(packet, opts = {})
+      limit = packet['news.latest_news_limit', 3]
       do_list_view(packet, :latest, {
-        :list => model_class.all(:order => :created_at.desc, :limit => 3)
+        :list => model_class.all(:order => :created_at.desc, :limit => limit)
       })
     end
     

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

@@ -36,7 +36,8 @@ module Orange
     def publish(packet, opts = {})
       no_reroute = opts[:no_reroute]
       if packet.request.post? || !opts.blank?
-        m = model_class.get(packet['route.resource_id'])
+        my_id = opts[:resource_id] || packet['route.resource_id']
+        m = model_class.get(my_id)
         if m
           params = {}
           params[:published] = true
@@ -56,7 +57,7 @@ module Orange
     def onNew(packet, params = {})
       params[:published] = false
       m = model_class.new(params)
-      m.orange_site = packet['site']
+      m.orange_site = packet['site'] unless m.orange_site
       # m.versions.new(params.merge(:version => 1))
       m
     end
@@ -66,7 +67,7 @@ module Orange
     def onSave(packet, m, params = {})
       params[:published] = false
       m.update(params)
-      m.orange_site = packet['site']
+      m.orange_site = packet['site'] unless m.orange_site
       m.save
     end
     
@@ -91,6 +92,16 @@ module Orange
           m.attributes = attrs
         end
       end
+      if mode == :show
+        case packet['route.context']  
+        when :live
+          m = m.versions.last(:published => '1')
+          raise Orange::NotFoundException unless m
+        when :preview
+          m
+        end
+      else {}
+      end
       m
     end
     
@@ -105,5 +116,9 @@ module Orange
     def sitemap_row(packet, opts = {})
       do_view(packet, :sitemap_row, opts)
     end
+    
+    def route_for(packet, id, opts = {})
+      return orange[:sitemap].url_for(packet, {:resource => 'pages', :resource_id => id})
+    end
   end
 end

data/lib/orange-more/pages/views/pages/edit.haml

@@ -4,19 +4,21 @@
   %form{:action => 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]))
+    %a{:href => route_to(model_name, model['id'], {:context => 'preview', :mode => 'show'}), :rel => 'external', :target => "_blank"}Preview
     %input{:type => 'submit', :value => 'Save Changes'}
-    = route_to(model_name, model[:id], 'publish')
+    / = route_to(model_name, model[:id], 'publish')
   = form_link('Publish', packet.route_to(model_name, model[:id], 'publish'))
-  %h3 Versions
-  %ul
-    %li (Current Draft)
+  %h3 Published Versions
+  %ul.version_list
+    / %li (Current Draft)
     - for version in model.versions.all(:order => :version.desc, :limit=> 3)
       %li 
         .version_container
           %span.version_info
             %strong Version #{version.version} 
           %span.version_info  
-            Last Updated: #{version.updated_at}
+            Last Updated: 
+            %strong #{fuzzy_time(version.updated_at)}
           %span.version_info
             %a{:href => route_to(model_name, model[:id], 'edit', "version", version.version)}Edit
 - else

data/lib/orange-more/pages/views/pages/show.haml

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

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

@@ -110,8 +110,19 @@ module Orange
       end
     end
     
-    def two_level(packet)
-      do_view(packet, :two_level, :model => home(packet))
+    def one_level(packet, opts = {})
+      opts.with_defaults!(:model => home(packet))
+      do_view(packet, :one_level, opts)
+    end
+    
+    def two_level(packet, opts = {})
+      opts.with_defaults!(:model => home(packet))
+      do_view(packet, :two_level, opts)
+    end
+    
+    def breadcrumb(packet, opts = {})
+      opts.with_defaults!(:model => packet['route.route'])
+      do_view(packet, :breadcrumb, opts)
     end
     
     def routes_for(packet, opts = {})
@@ -119,6 +130,7 @@ module Orange
       keys[:resource] = opts[:resource] || packet['route.resource'] 
       keys[:resource_id] = opts[:resource_id] || packet['route.resource_id'] 
       keys[:orange_site_id] = opts[:orange_site_id] || packet['subsite'].blank? ? packet['site'].id : packet['subsite'].id
+      keys[:slug] = opts[:slug]
       keys.delete_if{|k,v| v.blank? }
       model_class.all(keys)
     end
@@ -133,9 +145,10 @@ module Orange
     
     def add_route_for(packet, opts = {})
       unless opts.blank?
+        parent = opts.delete(:parent) || home(packet, opts)
         me = model_class.new(opts)
         me.save
-        me.move(:into => home(packet, opts))
+        me.move(:into => parent)
       end
     end
     
@@ -180,7 +193,7 @@ module Orange
     def table_row(packet, opts ={})
       opts[:route] = opts[:model] || find_one(packet, :table_row, opts[:id])
       resource = opts[:route].resource
-      resource = resource.to_sym if resource
+      resource = resource.to_sym unless resource.blank?
       if resource && orange[resource].respond_to?(:sitemap_row)
         opts.delete(:model)
         orange[resource].sitemap_row(packet, opts.merge(:resource_name => resource, :id => opts[:route].resource_id))

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

@@ -0,0 +1,5 @@
+%p
+  - for a in model.ancestors
+    %a{:href => a.full_path}= a.link_text
+    >
+  %span.here= model.link_text

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

@@ -0,0 +1,7 @@
+%ul.nav
+  %li.first
+    %a{:href => model.full_path} Home
+  - for item in model.children
+    - next unless item.show_in_nav
+    %li
+      %a{:href => item.full_path}= item.link_text

data/lib/orange-more/slices/resources/radius.rb

@@ -7,6 +7,7 @@ module Orange
     call_me :radius
     def afterLoad
       @context = ::Radius::PacketContext.new
+      @defined_tags = []
       orange.fire(:radius_loaded, self)
     end
     
@@ -14,7 +15,12 @@ module Orange
       @context
     end
     
+    def defined_tags
+      @defined_tags
+    end
+    
     def define_tag(*args, &block)
+      @defined_tags << args.first unless @defined_tags.include? args.first
       @context.define_tag(*args, &block)
     end
     

data/lib/orange-more/subsites/middleware/subsite_load.rb

@@ -15,6 +15,7 @@ module Orange::Middleware
         # If matched, update the loaded site and trim the path down a bit
         if !matched.resource.blank? && matched.resource.to_sym == :subsites
           if(m = site.subsites.first(:id => matched.resource_id))
+            packet['route.main_site_route'] = matched
             packet['route.path'] = extras
             packet['subsite'] = m
           end

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

@@ -27,6 +27,9 @@ module Orange
       orange[:sitemap].url_for(packet, {:resource => 'subsites', :resource_id => packet['subsite'].id})
     end
     
+    def subsite_nav(packet, opts = {})
+      orange[:sitemap].one_level(packet, :model => orange[:sitemap].home(packet, :subsite => true))
+    end
     
   end
   

data/lib/orange-more/testimonials/cartons/testimonials_carton.rb

@@ -1,4 +1,4 @@
-class OrangeTestimonial < Orange::Carton
+class OrangeTestimonial < Orange::SiteCarton
   id
   admin do
     title :name

data/lib/orange-more/testimonials/resources/testimonials_resource.rb

@@ -5,20 +5,31 @@ module Orange
     def stack_init
       orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Testimonials')
       orange[:radius].define_tag "testimonials" do |tag|
-     	  if tag.attr["tag"] && model_class.all.count >0
-          m = model_class.with_tag(tag.attr["tag"]).first(:offset => rand(model_class.with_tag(tag.attr["tag"]).count)) #selects testimonial based on tag
-	      elsif model_class.all.count > 0
-      	  m = model_class.first(:offset => rand(model_class.all.count)) #selects a random testimonial
+        packet = tag.locals.packet
+     	  if tag.attr["tag"] && for_site(packet).with_tag(tag.attr["tag"]).count >0
+          m = for_site(packet).with_tag(tag.attr["tag"]).first(:offset => rand(for_site(packet).with_tag(tag.attr["tag"]).count)) #selects testimonial based on tag
+	      elsif for_site(packet).count > 0
+      	  m = for_site(packet).first(:offset => rand(for_site(packet).count)) #selects a random testimonial
 	      end
         unless m.nil?
           template = tag.attr["template"] || "testimonials"
-          orange[:testimonials].testimonial(tag.locals.packet, {:model => m, :template => template})
+          orange[:testimonials].testimonial(packet, {:model => m, :template => template})
         else
           ""
         end
       end
     end
     
+    def for_site(packet, opts = {})
+      site_filtered = model_class.all(:orange_site => packet['subsite'].blank? ? packet['site'] : packet['subsite'])
+      if site_filtered.count > 0
+        site_filtered
+      else
+        # Return unfiltered if no site-specific ones
+        model_class.all
+      end
+    end
+    
     def testimonial(packet, opts = {})
       template = opts[:template].to_sym || :testimonials
       do_view(packet, template, opts)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - David Haslem
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-09 00:00:00 -04:00
+date: 2010-05-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -135,6 +135,11 @@ files:
 - lib/orange-more/administration/views/openid_login.haml
 - lib/orange-more/administration/views/users/create.haml
 - lib/orange-more/administration/views/users/edit.haml
+- lib/orange-more/adverts.rb
+- lib/orange-more/adverts/cartons/adverts_carton.rb
+- lib/orange-more/adverts/plugin.rb
+- lib/orange-more/adverts/resources/adverts_resource.rb
+- lib/orange-more/adverts/views/adverts/adverts.haml
 - lib/orange-more/assets.rb
 - lib/orange-more/assets/cartons/asset_carton.rb
 - lib/orange-more/assets/plugin.rb
@@ -164,13 +169,17 @@ files:
 - lib/orange-more/disqus/resources/disqus_resource.rb
 - lib/orange-more/disqus/views/disqus/comment_thread.haml
 - lib/orange-more/events.rb
+- lib/orange-more/events/assets/js/events.js
 - lib/orange-more/events/cartons/orange_calendar.rb
 - lib/orange-more/events/cartons/orange_event.rb
 - lib/orange-more/events/plugin.rb
 - lib/orange-more/events/resources/calendar_resource.rb
 - lib/orange-more/events/resources/event_resource.rb
+- lib/orange-more/events/views/calendar/calendar.haml
 - lib/orange-more/events/views/events/create.haml
 - lib/orange-more/events/views/events/edit.haml
+- lib/orange-more/events/views/events/list.haml
+- lib/orange-more/events/views/events/table_row.haml
 - lib/orange-more/news.rb
 - lib/orange-more/news/cartons/news.rb
 - lib/orange-more/news/plugin.rb
@@ -185,6 +194,7 @@ files:
 - lib/orange-more/pages/plugin.rb
 - lib/orange-more/pages/resources/page_resource.rb
 - lib/orange-more/pages/views/pages/edit.haml
+- lib/orange-more/pages/views/pages/show.haml
 - lib/orange-more/sitemap.rb
 - lib/orange-more/sitemap/assets/img/sitemap_down.png
 - lib/orange-more/sitemap/assets/img/sitemap_down_d.png
@@ -200,7 +210,9 @@ files:
 - lib/orange-more/sitemap/plugin.rb
 - lib/orange-more/sitemap/resources/sitemap_resource.rb
 - lib/orange-more/sitemap/views/default_resource/sitemap_row.haml
+- lib/orange-more/sitemap/views/sitemap/breadcrumb.haml
 - lib/orange-more/sitemap/views/sitemap/list.haml
+- lib/orange-more/sitemap/views/sitemap/one_level.haml
 - lib/orange-more/sitemap/views/sitemap/route_actions.haml
 - lib/orange-more/sitemap/views/sitemap/sitemap_links.haml
 - lib/orange-more/sitemap/views/sitemap/table_row.haml