locomotive_cms 0.0.3.1 → 0.0.3.3

data/app/models/content_instance.rb

@@ -7,6 +7,7 @@ class ContentInstance
   include CustomFields::ProxyClassEnabler
   
   ## fields (dynamic fields) ##
+  field :_slug
   field :_position_in_list, :type => Integer, :default => 0
   
   ## validations ##
@@ -16,6 +17,7 @@ class ContentInstance
   embedded_in :content_type, :inverse_of => :contents
   
   ## callbacks ##
+  before_save :set_slug
   before_create :add_to_list_bottom
   
   ## named scopes ##
@@ -29,16 +31,29 @@ class ContentInstance
   
   protected
   
+  def set_slug
+    _alias = self.highlighted_field_alias
+    self._slug = self.send(_alias).parameterize('_')
+  end
+  
   def add_to_list_bottom
     Rails.logger.debug "add_to_list_bottom"
     self._position_in_list = self.content_type.contents.size
   end
   
   def require_highlighted_field
-    _alias = self.content_type.highlighted_field._alias.to_sym
+    _alias = self.highlighted_field_alias
     if self.send(_alias).blank?
       self.errors.add(_alias, :blank)
     end
   end
   
+  def highlighted_field_value
+    self.send(self.content_type.highlighted_field._name)
+  end
+  
+  def highlighted_field_alias
+    self.content_type.highlighted_field._alias.to_sym
+  end
+    
 end

data/app/models/extensions/page/templatized.rb

@@ -0,0 +1,32 @@
+module Models  
+  module Extensions    
+    module Page      
+      module Templatized  
+
+        extend ActiveSupport::Concern
+
+        included do
+                              
+          belongs_to_related :content_type
+          
+          field :templatized, :type => Boolean, :default => false
+          
+          field :content_type_visible_column
+          
+          before_validate :set_slug_if_templatized
+        end
+        
+        module InstanceMethods
+          
+          def set_slug_if_templatized
+            self.slug = 'content_type_template' if self.templatized?
+          end
+                  
+        end
+        
+      end
+    end
+  end
+end
+      
+      

data/app/models/page.rb

@@ -6,6 +6,7 @@ class Page
   include Models::Extensions::Page::Tree
   include Models::Extensions::Page::Parts
   include Models::Extensions::Page::Render
+  include Models::Extensions::Page::Templatized
   
   ## fields ##
   field :title
@@ -31,8 +32,8 @@ class Page
   
   ## named scopes ##
   named_scope :latest_updated, :order_by => [[:updated_at, :desc]], :limit => Locomotive.config.lastest_items_nb
-  named_scope :index, :where => { :slug => 'index', :depth => 0, :published => true }
-  named_scope :not_found, :where => { :slug => '404', :depth => 0, :published => true }
+  named_scope :index, :where => { :slug => 'index', :depth => 0 }
+  named_scope :not_found, :where => { :slug => '404', :depth => 0 }
   named_scope :published, :where => { :published => true }
   
   ## behaviours ##

data/app/uploaders/asset_uploader.rb

@@ -45,8 +45,6 @@ class AssetUploader < CarrierWave::Uploader::Base
       end
     end
     
-    puts "content_type = #{value}"
-    
     model.content_type = value
   end
   

data/app/views/admin/contents/_list.html.haml

@@ -1,7 +1,6 @@
 - if contents.empty?
   %p.no-items= t('.no_items', :url => new_admin_content_url(@content_type.slug))
 - else
-  - puts contents.inspect
   %ul{ :id => 'contents-list', :class => "list #{'sortable' if @content_type.order_by == '_position_in_list'}" }
     - contents.each do |content|
       %li.content{ :id => "content-#{content._id}" }

data/app/views/admin/my_accounts/edit.html.haml

@@ -1,5 +1,8 @@
 - title link_to(@account.name.blank? ? @account.name_was : @account.name, '#', :rel => 'my_account_name', :title => t('.ask_for_name'), :class => 'editable')
 
+- content_for :head do
+  = javascript_include_tag 'admin/account'
+
 - content_for :submenu do
   = render 'admin/shared/menu/settings'
 

data/app/views/admin/pages/_form.html.haml

@@ -11,8 +11,13 @@
   - if not @page.index? and not @page.not_found?
     = f.input :parent_id, :as => :select, :collection => parent_pages_options, :include_blank => false
       
-  = f.input :slug, :required => false, :hint => @page.slug.blank? ? ' ' : @page.url, :input_html => { :data_url => get_path_admin_pages_url, :disabled => @page.index? || @page.not_found? }
-  
+  = f.input :slug, :required => false, :hint => @page.slug.blank? ? ' ' : @page.url, :input_html => { :data_url => get_path_admin_pages_url, :disabled => @page.index? || @page.not_found? }, :wrapper_html => { :style => "#{'display: none' if @page.templatized?}" }
+        
+  = f.custom_input :templatized, :css => 'toggle' do
+    = f.check_box :templatized
+    
+  = f.input :content_type_id, :as => :select, :collection => current_site.content_types.all.to_a, :include_blank => false, :wrapper_html => { :style => "#{'display: none' unless @page.templatized?}" }
+      
   = f.custom_input :published, :css => 'toggle' do
     = f.check_box :published
     

data/app/views/admin/pages/_page.html.haml

@@ -1,4 +1,4 @@
-%li{ :id => "item-#{page.id}", :class => "#{'not-found' if page.not_found? }"}
+%li{ :id => "item-#{page.id}", :class => "#{'not-found' if page.not_found? } #{'templatized' if page.templatized?}"}
   - if not page.index? and not page.children.empty?
     = image_tag 'admin/list/icons/node_closed.png', :class => 'toggler'
   %em

data/app/views/admin/shared/_head.html.haml

@@ -10,7 +10,7 @@
   
 = stylesheet_link_tag 'admin/layout', 'admin/jquery/ui', 'admin/plugins/toggle', 'admin/menu', 'admin/buttons', 'admin/formtastic', 'admin/formtastic_changes', 'admin/application', :media => 'screen', :cache => Rails.env.production? && !Locomotive.heroku?
 
-= javascript_include_tag 'admin/jquery', 'admin/jquery.ui', 'admin/rails', 'admin/utils', 'admin/plugins/shortcut', 'admin/plugins/toggle', 'admin/plugins/growl', 'admin/plugins/cookie', 'admin/application', 'admin/locales/datepicker_fr', :cache => Rails.env.production? && !Locomotive.heroku?
+= javascript_include_tag 'admin/jquery', 'admin/jquery.ui', 'admin/rails', 'admin/utils', 'admin/plugins/subscribe', 'admin/plugins/shortcut', 'admin/plugins/toggle', 'admin/plugins/growl', 'admin/plugins/cookie', 'admin/application', 'admin/locales/datepicker_fr', :cache => Rails.env.production? && !Locomotive.heroku?
 
 %script{ :type => 'text/javascript' }
   = find_and_preserve(growl_message)

data/config/locales/admin_ui_en.yml

@@ -268,6 +268,7 @@ en:
       page:
         published: "Only authenticated accounts can view unpublished pages."
         cache_strategy: "Cache the page for better performance. The 'Simple' choice is a good compromise."
+        templatized: "Use the page as a template for a model you defined."
       snippet:
         slug: "You need to know it in order to insert the snippet inside a page or a layout"
       site:

data/config/locales/admin_ui_fr.yml

@@ -290,6 +290,7 @@ fr:
       page:
         published: "Seuls les administrateurs authentifiés peuvent voir une page non publiée."
         cache_strategy: "Cache la page pour de meilleure performance. L'option 'Simple' est le meilleur compromis."
+        templatized: "Utilise la page comme un template pour un modèle défini."
       snippet:
         slug: "Utilisé pour insérer le snippet dans une page ou un gabarit."
       site:

data/lib/locomotive.rb

@@ -10,7 +10,6 @@ require 'locomotive/httparty'
 require 'locomotive/inherited_resources'
 require 'locomotive/admin_responder'
 
-require 'redcloth'
 require 'mongo_session_store/mongoid'
 
 module Locomotive

data/lib/locomotive/engine.rb

@@ -8,6 +8,8 @@ require 'formtastic'
 require 'mongoid'
 require 'mongoid_acts_as_tree'
 require 'httparty'
+require 'redcloth'
+require 'actionmailer_with_request'
 
 # FIXME: get rid of it once custom_fields is a gem
 require File.dirname(__FILE__) + '/../../vendor/plugins/custom_fields/init.rb'

data/lib/locomotive/liquid/drops/content.rb

@@ -11,7 +11,9 @@ module Locomotive
           end
         end
         
-        
+        def highlighted_field_value
+          @source.highlighted_field_value
+        end
         
       end  
     end

data/lib/locomotive/liquid/drops/page.rb

@@ -3,7 +3,15 @@ module Locomotive
     module Drops    
       class Page < Base
         
-        liquid_attributes << :title << :slug
+        # liquid_attributes << :title << :slug
+        
+        def title
+          @source.templatized? ? @context['content_instance'].highlighted_field_value : @source.title
+        end
+        
+        def slug
+          @source.templatized? ? @source.content_type.slug.singularize : @source.slug
+        end
         
         def children
           @children ||= liquify(*@source.children)

data/lib/locomotive/liquid/tags/nav.rb

@@ -29,10 +29,12 @@ module Locomotive
           
           source = context.registers[@site_or_page.to_sym]
           
+          puts "#{@site_or_page.to_sym} / source = #{source.inspect}"
+          
           if source.respond_to?(:name) # site ?
-            source = source.pages.first # start from home page
+            source = source.pages.index.first # start from home page
           else
-            source = source.parent
+            source = source.parent || source
           end
 
           output = %{<ul id="nav">}

data/lib/locomotive/render.rb

@@ -23,13 +23,28 @@ module Locomotive
         path.gsub!(/^\//, '')
         path = 'index' if path.blank?
         
-        if page = current_site.pages.where(:fullpath => path).first
+        if path != 'index'
+          dirname = File.dirname(path).gsub(/^\.$/, '') # also look for templatized page path
+          path = [path, File.join(dirname, 'content_type_template').gsub(/^\//, '')]
+        end
+        
+        # TODO: path is not correctly built + find content instance in order to render a 404 page if not found
+        
+        if page = current_site.pages.any_in(:fullpath => [*path]).first
           if not page.published? and current_admin.nil?
             page = nil
+          else
+            if page.templatized?
+              @content_instance = page.content_type.contents.where(:_slug => File.basename(path.first)).first
+              
+              if @content_instance.nil? # content instance not found
+                page = nil
+              end
+            end
           end
         end
 
-        page || current_site.pages.not_found.first
+        page || current_site.pages.not_found.published.first
       end
       
       def locomotive_context
@@ -43,6 +58,11 @@ module Locomotive
           'current_page'      => self.params[:page]
         }
         
+        if @page.templatized? # add instance from content type
+          assigns['content_instance'] = @content_instance
+          assigns[@page.content_type.slug.singularize] = @content_instance # just here to help to write readable liquid code
+        end
+        
         registers = { :controller => self, :site => current_site, :page => @page }
           
         ::Liquid::Context.new(assigns, registers)

data/public/javascripts/admin/account.js

@@ -0,0 +1,5 @@
+$(document).ready(function() {
+	$.subscribe('form.saved.success', function(event, data) {
+		$('#global-actions-bar a:first').html($('#my_account_name').val());
+	}, []);
+});

data/public/javascripts/admin/pages.js

@@ -31,6 +31,19 @@ $(document).ready(function() {
 		} 
 	});
 	
+	// templatized feature
+	
+	$.subscribe('toggle.page_templatized.checked', function(event, data) {
+		$('#page_slug_input').hide();
+		$('#page_content_type_id_input').show();
+	}, []);
+	
+	$.subscribe('toggle.page_templatized.unchecked', function(event, data) {
+		$('#page_slug_input').show();
+		$('#page_slug').val(makeSlug($('#page_title').val())).addClass('touched');
+		$('#page_content_type_id_input').hide();
+	}, []);
+	
 	// automatic slug from page title
 	$('#page_title').keypress(function() {
 		var input = $(this);

data/public/javascripts/admin/plugins/shortcut.js

@@ -36,6 +36,7 @@ jQuery.fn.saveWithShortcut = function() {
 			form.find('li.error input').eq(0).focus();
 		} else {
 			$.growl('success', data.notice);
+			$.publish('form.saved.success', [data]);
 		}
 	};
 	

data/public/javascripts/admin/plugins/subscribe.js

@@ -0,0 +1,367 @@
+/*
+ * jquery.subscribe.1.1
+ * 
+ * Implementation of publish/subcription framework for jQuery
+ * Requires use of jQuery. Tested with jQuery 1.3 and above
+ *
+ *
+ * Copyright (c) 2008 Eric Chijioke (obinna a-t g mail dot c o m)
+ *
+ * 
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ *
+ *  Release Notes:
+ *  
+ *  version 1.1:
+ *  
+ *  Fixed unexpected behavior which can occur when a script in a embedded page (page loaded in div,tab etc.) subscribes a handler for a topic using
+ *  the jQuery subscribe ($.subscribe) or a no-id element but this subscribe plugin is not reloaded within that embedded page (for example, when
+ *  script is included in containing page) . In this case, if the embedded page is reloaded without reloading the entire page (and plugin), the
+ *  subscription could be made multiple times for the topic, which will call the handler multiple times each time the topic is published. 
+ *  Code has been added to prevent this when the subscription is made using the non-element subscribe ($.subscribe()), which assures that only one
+ *  subscription is made for a topic for a given window/frame. To prevent this from happening for an element subscription ($elem.subscribe()), make
+ *  sure that the element has an id attribute.
+ */
+
+
+(function($){
+
+	_subscribe_topics = {};
+	_subscribe_handlers = {}; 
+	
+	_subscribe_getDocumentWindow = function(document){
+
+		return document.parentWindow || document.defaultView;
+	};
+	
+	$.fn.extend({
+		
+		/**
+		 * Creates a new topic without any subscribers. 
+		 * Not usually used explicitly 
+		 */
+		createTopic :  function(topic) {	
+			if(topic && !_subscribe_topics[topic]) {
+				
+				_subscribe_topics[topic] = {};
+				_subscribe_topics[topic].objects = {};
+				_subscribe_topics[topic].objects['__noId__'] = [];
+			}
+			
+			return this;
+		},
+		
+		/**
+		 * Destroy an existing topic and unsubscribe all subscribers
+		 */
+		destroyTopic  :	 function(topic) {	
+		
+			if(topic && _subscribe_topics[topic]) {
+				
+				for(i in _subscribe_topics[topic].objects) {
+					
+					var object = _subscribe_topics[topic].objects[i];
+					
+					if($.isArray(object)) {		// handle '__noId__' elements
+
+						if(object.length > 0) {
+							
+							for(j in object) {
+								
+								object[j].unbind(topic);
+							}
+						}
+							
+					} else {
+						
+						object.unbind(topic,data);
+					}
+				}
+			}
+
+			delete _subscribe_topics[topic];
+			
+			return this;
+		},
+		
+		/**
+		 * Subscribes an object to particular topic with a handler.
+		 * When the topic is published, this handler will be executed.
+		 * 
+		 * Parameters:
+		 *  -topic- is the string name of the topic
+		 *  -handler- is a handler function and is of the form function(event, data), in which the 'this' refers to the element itself.
+		 *  		  handler can be a function or can be a string referring to a function previously registered using the $.subscribeHandler() function
+		 *            Note: returning 'false' from the handler will prevent subsequent handlers from being executed on this element during 
+		 *            this call.
+		 *  -data- (optional) is additional data that is passed to the event handler as event.data when the topic is published
+		 *
+		 * Note: Unexpected behavior can occur when a script in a embedded page (page loaded in div,tab etc.) subscribes a handler for a topic using
+		 *  the jQuery subscribe ($.subscribe) or a no-id element but this subscribe plugin is not reloaded within that embedded page (for example, when
+		 *  script is included in containing page) . In this case, if the embedded page is reloaded without reloading the entire page (and plugin), the
+		 *  subscription could be made multiple times for the topic, which will call the handler multiple times each time the topic is published. 
+		 *  Code has been added to prevent this when the subscription is made using the non-element subscribe ($.subscribe()), which assures that only one
+		 *  subscription is made for a topic for a given window/frame. To prevent this from happening for an element subscription ($elem.subscribe()), make
+		 *  sure that the element has an id attribute. 
+		 */
+		subscribe :  function(topic, handler, data) {	
+
+			if(this[0] && topic && handler) {
+
+				this.createTopic(topic);
+				
+				if(this.attr('id')) {
+					
+					_subscribe_topics[topic].objects[this.attr('id')] = this;
+					
+				} else {
+										
+					//do not subscribe the same window/frame document multiple times, this causes unexpected behavior of executing embedded scripts multiple times
+					var noIdObjects = _subscribe_topics[topic].objects['__noId__'];
+					
+					if(this[0].nodeType == 9) { //if document is being bound (the case for non-element jQuery subscribing ($.subscribe)
+					
+						for ( var index in noIdObjects) {
+							
+							var noIdObject = noIdObjects[index];
+														
+							if(noIdObject[0].nodeType == 9 && _subscribe_getDocumentWindow(this[0]).frameElement == _subscribe_getDocumentWindow(noIdObject[0]).frameElement ) {
+								
+								return this;	
+							}
+						}
+					}
+					
+					var exists = false;
+					for(var i = 0; i < noIdObjects.length; i++){
+						if(noIdObjects[i] == this){
+							exists = true;
+							break;
+						}
+					}
+					
+					if(!exists) {
+						
+						_subscribe_topics[topic].objects['__noId__'].push(this);
+					}
+				}
+				
+				if(typeof(handler) == 'function') {
+				
+					this.bind(topic, data, handler);
+				
+				} else if(typeof(handler) == 'string' && typeof(_subscribe_handlers[handler]) == 'function') {
+					
+					this.bind(topic, data, _subscribe_handlers[handler]);
+				}
+			}
+			
+			return this;
+		},
+		
+		/**
+		 * Remove a subscription of an element to a topic. 
+		 * This will unbind stop all handlers from executing on this element when the topic
+		 * is published
+		 */
+		unsubscribe :  function(topic) {	
+			
+			if(topic) {
+
+				if(_subscribe_topics[topic]) {
+					
+					if(this.attr('id')) {
+						
+						var object = _subscribe_topics[topic].objects[this.attr('id')];
+						
+						if(object) {
+							
+							delete _subscribe_topics[topic].objects[this.attr('id')];
+						}
+						
+					} else {
+	
+						var noIdObjects = _subscribe_topics[topic].objects['__noId__'];
+						
+						for(var i = 0; i < noIdObjects.length; i++){
+							
+							if(noIdObjects[i] == this){
+								
+								subscribe_topics[topic].objects['__noId__'].splice(index,1);
+								break;
+							}
+						}
+					}
+				}
+			
+				this.unbind(topic);
+			}
+			
+			return this;
+		},
+		
+		/**
+		 * Publishes a topic (triggers handlers on all topic subscribers)
+		 * This ends up calling any subscribed handlers which are functions of the form function (event, data)
+		 * where: event - is a standard jQuery event object
+		 *  	  data - is the data parameter that was passed to this publish() method
+		 *  	  event.data - is the data parameter passed to the subscribe() function when this published topic was subscribed to
+		 *  	  event.target  - is the dom element that subscribed to the event (or the document element if $.subscribe() was used)
+		 * 
+		 * Parameters:
+		 *  -topic- is the string name of the topic
+		 *  -data- (optional) is additional data that is passed to the event handler 'data' parameter when the topic is published
+		 *  		  handler can be a function or can be a string referring to a function previously registered using the $.subscribeHandler() function
+		 *  -originalEvent- (optional) may be passed in a reference to an event which triggered this publishing. This will be passed as the 
+		 * 			  'originalEvent' field of the triggered event which will allow for controlling the propagation of higher level events
+		 * 			  from within the topic handler. In other words, this allows one to cancel execution of all subsequent handlers on the originalEvent 
+		 *            for this element by return 'false' from a handler that is subscribed to the topic published here. This can be especially useful
+		 *            in conjunction with publishOnEvent(), where a topic is published when an event executes (such as a click) and we want our
+		 *            handler logic prevent additional topics from being published (For example if our topic displays a 'delete confirm' dialog on click and
+		 *            the user cancels, we may want to prevent subsequent topics bound to the original click event from being published).
+		 */
+		publish : function(topic, data, originalEvent) {	
+		
+			if(topic) {
+				
+				this.createTopic(topic);
+				
+				//if an orginal event exists, need to modify the event object to prevent execution of all
+				//other handlers if the result of the handler is false (which calls stopPropagation())
+								
+				var subscriberStopPropagation = function(){
+					
+					this.isImmediatePropagationStopped = function(){
+						return true;
+					};
+					
+					(new $.Event).stopPropagation();
+					
+					if(this.originalEvent) {
+						
+						this.originalEvent.isImmediatePropagationStopped = function(){
+							return true;
+						};
+						
+						this.originalEvent.stopPropagation = subscriberStopPropagation;
+					}
+				}
+				
+				var event = jQuery.Event(topic);
+				$.extend(event,{originalEvent: originalEvent, stopPropagation: subscriberStopPropagation});
+								
+				for(i in _subscribe_topics[topic].objects) {
+					
+					var object = _subscribe_topics[topic].objects[i];
+					
+					if($.isArray(object)) {		// handle '__noId__' elements (if any)
+	
+						if(object.length > 0) {
+						
+							for(j in object) {
+								
+								object[j].trigger( event,data);
+							}
+						}
+						
+					} else {
+						
+						object.trigger( event,data);
+					}
+				}
+			
+			}
+			
+			return this;
+		},
+		
+		/**
+		 * Binds an objects event handler to a publish call
+		 * 
+		 * Upon the event triggering, this ends up calling any subscribed handlers which are functions of the form function (event, data)
+		 * where: event- is a standard jQuery event object
+		 *  	  event.data- is the data parameter passed to the subscribe() function when this published topic was subscribed to
+		 *  	  data- is the data parameter that was passed to this publishOnEvent() method
+		 * Parameters:
+		 *  -event- is the string name of the event upon which to publish the topic
+		 *  -topic- is the string name of the topic to publish when the event occurs
+		 *  -data- (optional) is additional data which will be passed in to the publish() method ant hen available as the second ('data')
+		 *          parameter to the topic handler
+		 */
+		publishOnEvent : function(event, topic, data) {	
+		
+			if(event && topic) {
+				
+				this.createTopic(topic);
+				
+				this.bind(event, data, function (e) {
+					
+					$(this).publish(topic, e.data, e);
+				});
+			}
+			
+			return this;
+		}
+	});
+	
+	/**
+	 * Make publish(), createTopic() and destroyTopic() callable without an element context
+	 * Often don't need a context to subscribe, publish, create or destroy a topic. 
+	 * We will call from the document context
+	 */
+	$.extend({
+		
+		/**
+		 * Subscribe an event handler to a topic without an element context
+		 * 
+		 * Note: Caution about subscribing using same document to topic multiple time (maybe by loading subscribe script multiple times)
+		 * 
+		 */
+		subscribe :  function(topic, handler, data) {
+			return $(window).subscribe(topic, handler, data);
+			
+		},
+		
+		/**
+		 * Unsubscribe an event handler for a topic without an element context
+		 *    
+		 */
+		unsubscribe :  function(topic, handler, data) {
+			
+			return $(window).unsubscribe(topic, handler, data);
+			
+		},
+		
+		/**
+		 * Register a handler function which can then be referenced by name when calling subscribe()
+		 */
+		subscribeHandler: function(name, handler) { 
+			
+			if(name && handler && typeof(handler) == "function") {
+				
+				_subscribe_handlers[name] = handler;
+			}
+			
+			return $(window);
+		},
+		
+		publish: function(topic, data) { 
+			
+			return $(window).publish(topic,data);
+		},
+		
+		createTopic: function(topic) { 
+			
+			return $(window).createTopic(topic);
+		},
+		
+		destroyTopic: function(topic) { 
+			
+			return $(window).destroyTopic(topic);
+		}
+		
+	});
+					
+})(jQuery);

data/public/javascripts/admin/plugins/toggle.js

@@ -64,6 +64,8 @@
 					$(element).parent().css("background-color", settings.off_bg_color);
 					$(element).parent().parent().prev().removeAttr("checked");
 					$(element).removeClass("left").addClass("right");
+					
+					$.publish('toggle.' + $(element).parent().parent().prev().attr('id') + '.unchecked', []);
 				});
 			
 			}else{
@@ -78,6 +80,7 @@
 					$(element).parent().parent().prev().attr("checked","checked");
 					$(element).removeClass("right").addClass("left");
 					
+					$.publish('toggle.' + $(element).parent().parent().prev().attr('id') + '.checked', []);
 				});
 			
 			}

data/public/javascripts/admin/site.js

@@ -1,7 +1,7 @@
 $(document).ready(function() {
 	
 	var defaultValue = $('fieldset.editable-list li.template input[type=text]').val();
-
+	
 	/* __ fields ___ */
 	$('fieldset.editable-list li.template input[type=text]').focus(function() {
 		if ($(this).hasClass('void') && $(this).parents('li').hasClass('template'))
@@ -32,5 +32,8 @@ $(document).ready(function() {
 		e.preventDefault();
 		e.stopPropagation();
 	});
-
+	
+	$.subscribe('form.saved.success', function(event, data) {
+		$('#header h1 a').html($('#current_site_name').val());
+	}, []);
 });

data/public/stylesheets/admin/application.css

@@ -117,7 +117,7 @@ ul.assets li.asset.last {
 	margin-right: 0px;
 }
 
-ul.assets li.asset h4 { margin: 0px; height: 30px; }
+ul.assets li.asset h4 { margin: 0px; height: 30px; border-bottom: 1px solid #ccced7; }
 
 ul.assets li.asset h4 a {
 	position: relative;
@@ -205,6 +205,11 @@ div#uploadAssetsInputQueue { display: none; }
 	cursor: move;
 }
 
+#pages-list ul.folder li.templatized em {
+	background-position: left -62px;
+	cursor: pointer;
+}
+
 #pages-list li .toggler { 
 	position: absolute;
 	top: 9px;

data/public/stylesheets/admin/formtastic_changes.css

@@ -60,7 +60,7 @@ form.formtastic fieldset.foldable.folded legend span em {
 form.formtastic fieldset.foldable ol {
 	clear: both;
 	width: 100%;
-	overflow: hidden;
+	overflow: hidden;	
 }
 
 form.formtastic fieldset.foldable.folded ol { display: none; }
@@ -80,6 +80,7 @@ form.formtastic fieldset.inputs ol {
 	padding-top: 15px; 
 	padding-bottom: 5px;
 	background: #ebedf4 url(/images/admin/form/footer.png) no-repeat 0 bottom;
+	border-top: 1px solid #ccced7;
 }
 
 @media screen and (-webkit-min-device-pixel-ratio:0) {

data/public/stylesheets/admin/page_parts.css

@@ -2,6 +2,7 @@
 	background: #ebedf4 url(/images/admin/form/footer.png) no-repeat 0 bottom;
 	width: 880px;	
 	padding: 20px 20px;
+	border-top: 1px solid #ccced7;
 }
 
 #page-parts { 
@@ -12,6 +13,12 @@
 	height: 30px;
 }
 
+#page-parts .nav { 
+	position: relative;
+	top: 1px;
+	z-index: 990;
+}
+
 #page-parts .nav a {
 	float: left;
 	display: block;

data/spec/lib/locomotive/render_spec.rb

@@ -52,19 +52,19 @@ describe 'Locomotive rendering system' do
     
     it 'should retrieve the index page /' do
       @controller.request.fullpath = '/'
-      @controller.current_site.pages.expects(:where).with({ :fullpath => 'index' }).returns([@page])
+      @controller.current_site.pages.expects(:any_in).with({ :fullpath => %w{index} }).returns([@page])
       @controller.send(:locomotive_page).should_not be_nil
     end
     
     it 'should also retrieve the index page (index.html)' do
       @controller.request.fullpath = '/index.html'
-      @controller.current_site.pages.expects(:where).with({ :fullpath => 'index' }).returns([@page])
+      @controller.current_site.pages.expects(:any_in).with({ :fullpath => %w{index} }).returns([@page])
       @controller.send(:locomotive_page).should_not be_nil
     end
     
     it 'should retrieve it based on the full path' do
       @controller.request.fullpath = '/about_us/team.html'
-      @controller.current_site.pages.expects(:where).with({ :fullpath => 'about_us/team' }).returns([@page])
+      @controller.current_site.pages.expects(:any_in).with({ :fullpath => %w{about_us/team about_us/content_type_template} }).returns([@page])
       @controller.send(:locomotive_page).should_not be_nil
     end
     
@@ -74,6 +74,31 @@ describe 'Locomotive rendering system' do
       @controller.send(:locomotive_page).should be_true
     end
     
+    context 'templatized page' do
+      
+      before(:each) do
+        @content_type = Factory.build(:content_type, :site => nil)
+        @page.templatized = true        
+        @page.content_type = @content_type
+        @controller.request.fullpath = '/projects/edeneo.html'
+        @controller.current_site.pages.expects(:any_in).with({ :fullpath => %w{projects/edeneo projects/content_type_template} }).returns([@page])
+      end
+      
+      it 'sets the content_instance variable' do
+        @content_type.contents.stubs(:where).returns([42])
+        @controller.send(:locomotive_page).should_not be_nil
+        @controller.instance_variable_get(:@content_instance).should == 42
+      end
+      
+      it 'returns the 404 page if the instance does not exist' do
+        @content_type.contents.stubs(:where).returns([])
+        @controller.current_site.pages.expects(:not_found).returns([true])
+        @controller.send(:locomotive_page).should be_true
+        @controller.instance_variable_get(:@content_instance).should be_nil
+      end
+      
+    end
+        
     context 'non published page' do
       
       before(:each) do
@@ -83,7 +108,7 @@ describe 'Locomotive rendering system' do
     
       it 'should return the 404 page if the page has not been published yet' do
         @controller.request.fullpath = '/contact'        
-        @controller.current_site.pages.expects(:where).with({ :fullpath => 'contact' }).returns([@page])
+        @controller.current_site.pages.expects(:any_in).with({ :fullpath => %w{contact content_type_template} }).returns([@page])
         @controller.current_site.pages.expects(:not_found).returns([true])
         @controller.send(:locomotive_page).should be_true
       end
@@ -91,7 +116,7 @@ describe 'Locomotive rendering system' do
       it 'should not return the 404 page if the page has not been published yet and admin is logged in' do
         @controller.current_admin = true
         @controller.request.fullpath = '/contact'
-        @controller.current_site.pages.expects(:where).with({ :fullpath => 'contact' }).returns([@page])
+        @controller.current_site.pages.expects(:any_in).with({ :fullpath => %w{contact content_type_template} }).returns([@page])
         @controller.send(:locomotive_page).should == @page
       end
       

data/spec/models/page_spec.rb

@@ -333,4 +333,26 @@ describe Page do
     end
     
   end 
+  
+  describe 'templatized extension' do
+    
+    before(:each) do
+      @page = Factory.build(:page, :site => nil, :templatized => true, :content_type_id => 42)
+      ContentType.stubs(:find).returns(Factory.build(:content_type, :site => nil))
+    end
+    
+    it 'is considered as a templatized page' do
+      @page.templatized?.should be_true
+    end
+    
+    it 'fills in the slug field' do
+      @page.valid?
+      @page.slug.should == 'content_type_template'
+    end
+    
+    it 'does forget to set the content type id' do
+      @page.content_type_id.should == '42'
+    end    
+    
+  end
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 3
-  - 1
-  version: 0.0.3.1
+  - 3
+  version: 0.0.3.3
 platform: ruby
 authors: 
 - Didier Lafforgue
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 +02:00
+date: 2010-07-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -345,6 +345,7 @@ files:
 - app/models/extensions/asset/vignette.rb
 - app/models/extensions/page/parts.rb
 - app/models/extensions/page/render.rb
+- app/models/extensions/page/templatized.rb
 - app/models/extensions/page/tree.rb
 - app/models/layout.rb
 - app/models/liquid_template.rb
@@ -812,6 +813,7 @@ files:
 - public/images/admin/plugins/toggle_handle_right-bg.png
 - public/images/admin/plugins/toggle_shadow-bg.png
 - public/images/admin/rails.png
+- public/javascripts/admin/account.js
 - public/javascripts/admin/application.js
 - public/javascripts/admin/asset_collections.js
 - public/javascripts/admin/assets.js
@@ -859,6 +861,7 @@ files:
 - public/javascripts/admin/plugins/plupload/plupload.silverlight.xap
 - public/javascripts/admin/plugins/scrollTo.js
 - public/javascripts/admin/plugins/shortcut.js
+- public/javascripts/admin/plugins/subscribe.js
 - public/javascripts/admin/plugins/tiny_mce/langs/en.js
 - public/javascripts/admin/plugins/tiny_mce/license.txt
 - public/javascripts/admin/plugins/tiny_mce/plugins/advhr/css/advhr.css