orange 0.2.8 → 0.2.9

data/lib/orange-more/contactforms/assets/js/lib/jquery.metadata.js

@@ -0,0 +1,122 @@
+/*
+ * Metadata - jQuery plugin for parsing metadata from elements
+ *
+ * Copyright (c) 2006 John Resig, Yehuda Katz, J�örn Zaefferer, Paul McLanahan
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ *
+ * Revision: $Id: jquery.metadata.js 4187 2007-12-16 17:15:27Z joern.zaefferer $
+ *
+ */
+
+/**
+ * Sets the type of metadata to use. Metadata is encoded in JSON, and each property
+ * in the JSON will become a property of the element itself.
+ *
+ * There are three supported types of metadata storage:
+ *
+ *   attr:  Inside an attribute. The name parameter indicates *which* attribute.
+ *          
+ *   class: Inside the class attribute, wrapped in curly braces: { }
+ *   
+ *   elem:  Inside a child element (e.g. a script tag). The
+ *          name parameter indicates *which* element.
+ *          
+ * The metadata for an element is loaded the first time the element is accessed via jQuery.
+ *
+ * As a result, you can define the metadata type, use $(expr) to load the metadata into the elements
+ * matched by expr, then redefine the metadata type and run another $(expr) for other elements.
+ * 
+ * @name $.metadata.setType
+ *
+ * @example <p id="one" class="some_class {item_id: 1, item_label: 'Label'}">This is a p</p>
+ * @before $.metadata.setType("class")
+ * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
+ * @desc Reads metadata from the class attribute
+ * 
+ * @example <p id="one" class="some_class" data="{item_id: 1, item_label: 'Label'}">This is a p</p>
+ * @before $.metadata.setType("attr", "data")
+ * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
+ * @desc Reads metadata from a "data" attribute
+ * 
+ * @example <p id="one" class="some_class"><script>{item_id: 1, item_label: 'Label'}</script>This is a p</p>
+ * @before $.metadata.setType("elem", "script")
+ * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
+ * @desc Reads metadata from a nested script element
+ * 
+ * @param String type The encoding type
+ * @param String name The name of the attribute to be used to get metadata (optional)
+ * @cat Plugins/Metadata
+ * @descr Sets the type of encoding to be used when loading metadata for the first time
+ * @type undefined
+ * @see metadata()
+ */
+
+(function($) {
+
+$.extend({
+	metadata : {
+		defaults : {
+			type: 'class',
+			name: 'metadata',
+			cre: /({.*})/,
+			single: 'metadata'
+		},
+		setType: function( type, name ){
+			this.defaults.type = type;
+			this.defaults.name = name;
+		},
+		get: function( elem, opts ){
+			var settings = $.extend({},this.defaults,opts);
+			// check for empty string in single property
+			if ( !settings.single.length ) settings.single = 'metadata';
+			
+			var data = $.data(elem, settings.single);
+			// returned cached data if it already exists
+			if ( data ) return data;
+			
+			data = "{}";
+			
+			if ( settings.type == "class" ) {
+				var m = settings.cre.exec( elem.className );
+				if ( m )
+					data = m[1];
+			} else if ( settings.type == "elem" ) {
+				if( !elem.getElementsByTagName )
+					return undefined;
+				var e = elem.getElementsByTagName(settings.name);
+				if ( e.length )
+					data = $.trim(e[0].innerHTML);
+			} else if ( elem.getAttribute != undefined ) {
+				var attr = elem.getAttribute( settings.name );
+				if ( attr )
+					data = attr;
+			}
+			
+			if ( data.indexOf( '{' ) <0 )
+			data = "{" + data + "}";
+			
+			data = eval("(" + data + ")");
+			
+			$.data( elem, settings.single, data );
+			return data;
+		}
+	}
+});
+
+/**
+ * Returns the metadata object for the first member of the jQuery object.
+ *
+ * @name metadata
+ * @descr Returns element's metadata object
+ * @param Object opts An object contianing settings to override the defaults
+ * @type jQuery
+ * @cat Plugins/Metadata
+ */
+$.fn.metadata = function( opts ){
+	return $.metadata.get( this[0], opts );
+};
+
+})(jQuery);

data/lib/orange-more/contactforms/cartons/contactforms_carton.rb

@@ -0,0 +1,12 @@
+class OrangeContactForms < Orange::Carton
+  id
+  admin do
+    title :title
+    text :to_address
+  end
+  
+  def self.named(tag)
+    all(:title.like => "%#{tag}%")
+  end
+
+end

data/lib/orange-more/contactforms/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 ContactForms < Base
+    views_dir   File.join(File.dirname(__FILE__), 'views')
+    assets_dir  File.join(File.dirname(__FILE__), 'assets')
+    resource    Orange::ContactFormsResource.new
+  end
+end
+
+Orange.plugin(Orange::Plugins::ContactForms.new)
+

data/lib/orange-more/contactforms/resources/contactforms_resource.rb

@@ -0,0 +1,56 @@
+require 'mail'
+
+module Orange
+  class ContactFormsResource < Orange::ModelResource
+    use OrangeContactForms
+    call_me :contactforms
+    def stack_init
+      orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Contact Forms')
+      orange[:radius].define_tag "contactform" do |tag|
+     	  if tag.attr["name"] && model_class.named(tag.attr["name"]).count >0
+          m = model_class.named(tag.attr["name"]).first #selects contactform based on title
+	      elsif model_class.all.count > 0
+	        if tag.attr["id"]
+      	    m = model_class.get(tag.attr["id"])
+	        else
+	          m = model_class.first
+	        end
+	      end
+        unless m.nil?
+          template = tag.attr["template"] || "contactform"
+          orange[:contactforms].contactform(tag.locals.packet, {:model => m, :template => template, :id => m.id})
+        else
+          ""
+        end
+      end
+    end
+    
+    def contactform(packet, opts = {})
+      template = opts[:template].to_sym || :contactform
+      packet['route.return_path'] = packet.request.path.to_s
+      do_view(packet, template, opts)
+    end
+    
+    def mailer(packet, opts = {})
+      params = packet.request.params
+      route = params['r']
+      if params['contact_phone'] != ''
+        packet.flash['error'] = "An error has occurred. Please try your submission again."
+        packet.reroute(route)
+      end
+      path = packet['route.path']
+      parts = path.split('/')
+      form = model_class.get(parts.last.to_i)
+      mail = Mail.new do
+        from "WNSF <info@wnsf.org>"
+        to form.to_address
+        subject 'E-mail contact from WNSF.org - '+form.title
+        body "From: "+params['contact_from']+" ("+params['contact_email_address']+")\n\nMessage:\n"+params['contact_message']
+      end
+      mail.delivery_method :sendmail
+      mail.deliver
+      packet.flash['error'] = "Thanks for your submission. We will contact you as soon as possible."
+      packet.reroute(route)
+    end
+  end
+end

data/lib/orange-more/contactforms/views/contactforms/contactform.haml

@@ -0,0 +1,20 @@
+:javascript
+  $(function(){ 
+    $('.contact_form').validate();
+  });
+%p
+  %h3= model.title
+  - if(flash['error'])
+    .error= flash('error')
+  %form{ :class => 'contact_form', :id => 'contact_form_'+model.id.to_s, :action => route_to(:contactforms, :mailer, model.id), :method => 'POST' }
+    %label{ :for => 'contact_from'} Your Name
+    %input{ :type => 'text', :class => 'required', :minlength => '4', :maxlength => '80', :id => 'contact_from', :name => 'contact_from' }
+    %div.contact_phone
+      %label{ :for => 'contact_from'} Your Phone
+      %input{ :type => 'text', :class => '', :id => 'contact_phone', :name => 'contact_phone', :value => '' }
+    %label{ :for => 'contact_email_address'} Your E-mail
+    %input{ :type => 'text', :class => 'email required', :id => 'contact_email_address', :name => 'contact_email_address' }
+    %input{ :type => 'hidden', :id => 'r', :name => 'r', :value => packet['route.return_path'] }
+    %label{ :for => 'contact_message'} Message
+    %textarea{ :class =>'required', :id => 'contact_message', :name => 'contact_message', :minlength => '6', :maxlength => '300' }= " "
+    %input{ :type => 'submit', :value => 'Submit' }

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

@@ -50,8 +50,8 @@ module Orange
         end
       end
       packet.reroute(@my_orange_name, :orange) unless (packet.request.xhr? || no_reroute)
-    end
-    
+     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 onNew(packet, params = {})
@@ -65,13 +65,22 @@ 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 = {})
-      params[:published] = false
-      m.update(params)
-      m.orange_site = packet['site'] unless m.orange_site
-      m.save
+      if (params["published"] == "1")
+        params["published"] = true
+        m.update(params)
+        m.orange_site = packet['site'] unless m.orange_site
+        orange[:pages].publish(packet, :no_reroute => true)
+      else
+        params["published"] = false
+        m.update(params)
+        m.orange_site = packet['site'] unless m.orange_site
+        m.save
+      end
     end
     
-    
+    def find_list(packet, mode)
+      model_class.all(:orange_site => packet['site']) || []
+    end
     
     # Returns a single object found by the model class, given an id. 
     # If id isn't given, we return false.

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

@@ -5,9 +5,18 @@
     - 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
+    :javascript
+      $(function(){
+        $('button.link_button').click(
+          function(){
+            $('input[name="pages[published]"]').val('true');
+          }
+        );
+      });
+    %input{:type => 'hidden', :id => 'pages[published]', :name => 'pages[published]', :value => 'false'}
     %input{:type => 'submit', :value => 'Save Changes'}
     / = route_to(model_name, model[:id], 'publish')
-  = form_link('Publish', packet.route_to(model_name, model[:id], 'publish'))
+    = form_link('Publish', packet.route_to(model_name, model[:id], 'save'))
   %h3 Published Versions
   %ul.version_list
     / %li (Current Draft)

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

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

data/lib/orange-more/slices/middleware/radius_parser.rb

@@ -9,7 +9,7 @@ module Orange::Middleware
   # purpose of exposing the context object.
   class RadiusParser < Base
     def init(opts = {})
-      @contexts = opts[:contexts] || [:live]
+      @contexts = opts[:radius_contexts] || [:live]
       # orange.load Orange::Radius.new, :radius
     end
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - David Haslem
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 -04:00
+date: 2010-05-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -156,9 +156,20 @@ files:
 - lib/orange-more/blog/views/blog/blog_post_view.haml
 - lib/orange-more/blog/views/blog/sitemap_row.haml
 - lib/orange-more/blog/views/blog_posts/edit.haml
+- lib/orange-more/blog/views/blog_posts/show.haml
 - lib/orange-more/cloud.rb
 - lib/orange-more/cloud/plugin.rb
 - lib/orange-more/cloud/resources/cloud_resource.rb
+- lib/orange-more/contactforms.rb
+- lib/orange-more/contactforms/assets/js/jquery.validate.pack.js
+- lib/orange-more/contactforms/assets/js/lib/jquery-1.4.2.js
+- lib/orange-more/contactforms/assets/js/lib/jquery.form.js
+- lib/orange-more/contactforms/assets/js/lib/jquery.js
+- lib/orange-more/contactforms/assets/js/lib/jquery.metadata.js
+- lib/orange-more/contactforms/cartons/contactforms_carton.rb
+- lib/orange-more/contactforms/plugin.rb
+- lib/orange-more/contactforms/resources/contactforms_resource.rb
+- lib/orange-more/contactforms/views/contactforms/contactform.haml
 - lib/orange-more/debugger.rb
 - lib/orange-more/debugger/assets/css/debug_bar.css
 - lib/orange-more/debugger/middleware/debugger.rb