locomotive_cms 0.0.1.4 → 0.0.2

data/config/initializers/mongoid.rb

@@ -15,21 +15,10 @@ module Mongoid #:nodoc:
           end
         end
       
-        # Rails.logger.debug "conditions = #{conditions.inspect} / #{options[:scope].inspect}"
-        
         return if document.class.where(conditions).empty?
       
-        # if document.new_record? || key_changed?(document)
-          document.errors.add(attribute, :taken, :default => options[:message], :value => value)
-        # end
+        document.errors.add(attribute, :taken, :default => options[:message], :value => value)
       end
-
-      # protected
-      # def key_changed?(document)
-      #   (document.primary_key || {}).each do |key|
-      #     return true if document.send("#{key}_changed?")
-      #   end; false
-      # end
     end
   end
   
@@ -42,4 +31,14 @@ module Mongoid #:nodoc:
       end      
     end
   end
+  
+  # FIX BUG about accepts_nested_attributes_for  
+  module Document
+    module InstanceMethods
+      def remove(child)
+        name = child.association_name
+        @attributes.remove(name, child.raw_attributes)
+      end
+    end
+  end
 end

data/config/initializers/secret_token.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random, 
+# no regular words or you'll be exposed to dictionary attacks.
+Rails.application.config.secret_token = 'aa84844b97e90edda8e005a686d82c3bef1f8e20a1255301f1d0886fc592a45ef2393d64b0c3d3ea858b1f6406ad6f15305666264716a79fcfa17de93ad0d69d'

data/config/locales/admin_ui_en.yml

@@ -33,9 +33,16 @@ en:
         update: Update
         
     custom_fields:
+      edit:
+        title: Editing custom field
       kind:
         string: Simple Input
         text: Text
+        category: Select
+      edit_category:
+        title: Edit options
+        help: Manage the list of options for your select box.
+        collection_label: List of options
         
     sessions:
       new:
@@ -58,90 +65,174 @@ en:
     pages:
       index:
         title: Listing pages
+        help: "Pages are organized as a tree. You can order pages as well as folders"
         no_items: "There are no pages for now. Just click <a href=\"{{url}}\">here</a> to create the first one."
         new: new page
         lastest_items: Lastest pages
+      new:
+        title: New page
+        help: "Please fill in the below form to create your page. Be careful, by default, the page is not published."
       page:
         updated_at: updated at
       edit:
         show: show
+        help: "The page title can be updated by clicking it."
+        ask_for_title: "Please type the new page title"
       messages:
         successful_create: "Page was successfully created."
         successful_update: "Page was successfully updated."
+        successful_destroy: "Page was successfully deleted."
+        failed_create: "Page was not created."
+        failed_update: "Page was not updated."
         
     layouts:
       index:
         title: Listing layouts
+        help: "Layouts give the look of a page (1, 2 or many columns)."
         no_items: "There are no layouts for now. Just click <a href=\"{{url}}\">here</a> to create the first one."
         new: new layout
       new:
         title: New layout
+        help: "Fill in the form below to create your layout."
+      edit:
+        title: Editing layout
+        help: "Fill in the form below to update your layout."
+        new: new layout
+      layout:
+        updated_at: Updated at
+      messages:
+        successful_create: "Layout was successfully created."
+        successful_update: "Layout was successfully updated."
+        successful_destroy: "Layout was successfully deleted."
+        failed_create: "Layout was not created."
+        failed_update: "Layout was not updated."
 
     snippets:
       index:
         title: Listing snippets
+        help: "Snippets are portion of HTML code which can be found at different places within the site (such as a footer)."
         no_items: "There are no snippets for now. Just click <a href=\"{{url}}\">here</a> to create the first one."
         new: new snippet
       new:
         title: New snippet
+        help: "Fill in the form below to update your snippet."
       edit:
         title: Editing snippet
+        help: "Fill in the form below to update your snippet."
+      snippet:
+        updated_at: Updated at
+      messages:
+        successful_create: "Snippet was successfully created."
+        successful_update: "Snippet was successfully updated."
+        successful_destroy: "Snippet was successfully deleted."
+        failed_create: "Snippet was not created."
+        failed_update: "Snippet was not updated."
         
     sites:
       new:
         title: New site
+        help: "Fill in the form below to create your new site."
+      messages:
+        successful_create: "Site was successfully created."
+        failed_create: "Site was not created."
         
     current_sites:
       edit:
         new_membership: add account
+        help: "The site name can be updated by clicking it."
+        ask_for_name: "Please type the new site name"
+      messages:
+        successful_update: "My site was successfully updated."
+        failed_update: "My site was not updated."
         
     memberships:
       new:
         title: New membership
         help: "Please give the account email to add. If it does not exist, you will be redirected to the account creation form."
+      messages:
+        successful_create: "Membership was successfully created."
+        failed_create: "Membership was not created."
         
     accounts:
       new:
         title: New account
+      messages:
+        successful_create: "Account was successfully created."
+        failed_create: "Account was not created."
         
     my_accounts:
       edit:
+        help: "Your name can be updated by clicking it."
         new_site: new site
         en: English
         fr: French
+        ask_for_name: "Please type your new name"
+      messages:
+        successful_update: "My account was successfully updated."
+        failed_update: "My account was not updated."
         
     theme_assets:
       index:
         title: Listing theme files
+        help: "Theme assets represent files needed by layouts and snippets. If you need to manage an image gallery, go to the Assets section instead."
         new: new file
         css_and_js: Style and javascript
         images: Images
         no_items: "There are no files for now. Just click <a href=\"{{url}}\">here</a> to create the first one."
       new:
         title: New file
+        help: "You have the choice to either upload any file or to copy/paste a stylesheet or a javascript in plain text."
       edit:
         title: "Editing {{file}}"
         help: "You can use it by copying/pasting the following url: {{url}}"
       form:
+        picker_link: Insert a file into the code
         choose_file: Choose file
         choose_plain_text: Choose plain text
+      images:
+        title: Listing images
+      messages:
+        successful_create: "File was successfully created."
+        successful_update: "File was successfully updated."
+        successful_destroy: "File was successfully deleted."
+        failed_create: "File was not created."
+        failed_update: "File was not updated."
         
     asset_collections:
       index:
         title: Asset collections
+        help: "The collection name can be updated by clicking it. You can customize assets in a collection by adding new fields."
         new: new collection
         no_items: "There are no collections for now. Just click <a href=\"{{url}}\">here</a> to create the first one."
       new:
         title: New collection
+        help: "For now, just type a name. Other settings will come once the form is sent."
       edit:
-        help: "The collection name can be updated by clicking it. Uploading several files at once is possible, just click on the 'upload files' button at the right corner."
+        help: "The collection name can be updated by clicking it. You can customize assets in a collection by adding new fields."
         add_asset: add asset
         destroy: remove collection
         no_items: "There are no assets for now. Just click <a href=\"{{url}}\">here</a> to create the first one."
+        ask_for_name: "Please type the new name"
+      messages:
+        successful_create: "Collection was successfully created."
+        successful_update: "Collection was successfully updated."
+        successful_destroy: "Collection was successfully deleted."
+        failed_create: "Collection was not created."
+        failed_update: "Collection was not updated."
         
     assets:
       new:
         title: New asset
+        help: "Fill in the form below to create your asset."
+      edit:
+        title: Edit asset
+        help: "Fill in the form below to update your asset."
+      messages:
+        successful_create: "Asset was successfully created."
+        successful_update: "Asset was successfully updated."
+        successful_destroy: "Asset was successfully deleted."
+        failed_create: "Asset was not created."
+        failed_update: "Asset was not updated."
     
     content_types:
       index:
@@ -158,6 +249,12 @@ en:
         order_by:
           updated_at: 'By "updated at" date'
           position_in_list: Manually
+      messages:
+        successful_create: "Model was successfully created."
+        successful_update: "Model was successfully updated."
+        successful_destroy: "Model was successfully deleted."
+        failed_create: "Model was not created."
+        failed_update: "Model was not updated."
         
     contents:
       index:
@@ -168,12 +265,20 @@ en:
         new: new item
         no_items: "There are no items for now. Just click <a href=\"{{url}}\">here</a> to create the first one."
         lastest_items: "Lastest items"
+        updated_at: "Updated at"
       new:
         title: '{{type}} &mdash; new item' 
       edit:
-        title: '{{type}} &mdash; editing item' 
-        
-              
+        title: '{{type}} &mdash; editing item'
+      form:
+        edit_categories: Edit options
+      messages:
+        successful_create: "Content was successfully created."
+        successful_update: "Content was successfully updated."
+        successful_destroy: "Content was successfully deleted."
+        failed_create: "Content was not created."
+        failed_update: "Content was not updated."
+                      
   formtastic:
     titles:
       information: General information
@@ -196,6 +301,10 @@ en:
           source: File
         edit:
           source: Replace file
+      custom_fields:
+        field:
+          _alias: Alias
+          
     hints:
       page:
         keywords: "Meta keywords used within the head tag of the page. They are separeted by an empty space. Required for SEO." 

data/config/routes.rb

@@ -6,14 +6,8 @@ Rails.application.routes.draw do |map|
   end
   
   # admin authentication
-  Devise.register(:accounts, :controllers => { :sessions => 'admin/sessions', :passwords => 'admin/passwords' }) # bypass the devise_for :accounts  
-  scope '/admin' do
-    get 'login' => 'admin/sessions#new', :as => :new_account_session
-    post 'login' => 'admin/sessions#create', :as => :account_session
-    get 'logout' => 'admin/sessions#destroy', :as => :destroy_account_session    
-    resource :password, :only => [:new, :create, :edit, :update], :controller => 'admin/passwords'
-  end
-  
+  devise_for :admin, :class_name => 'Account', :controllers => { :sessions => 'admin/sessions', :passwords => 'admin/passwords' }
+    
   # admin interface for each website
   namespace 'admin' do
     root :to => 'pages#index'
@@ -49,6 +43,10 @@ Rails.application.routes.draw do |map|
     resources :contents, :path => "content_types/:slug/contents" do
       put :sort, :on => :collection
     end
+    
+    resources :api_contents, :path => "api/:slug/contents", :controller => 'api_contents', :only => [:create]
+    
+    resources :custom_fields, :path => "content_types/:slug/fields"
   end
   
   # magic urls

data/lib/locomotive/configuration.rb

@@ -8,7 +8,8 @@ module Locomotive
       # :forbidden_paths  => %w{layouts snippets stylesheets javascripts assets admin system api},
       :reserved_slugs   => %w{stylesheets javascripts assets admin images api pages},
       :locales          => %w{en fr},
-      :cookie_key       => '_locomotive_session'
+      :cookie_key       => '_locomotive_session',
+      :enable_logs      => false
     }
 
     cattr_accessor :settings

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

@@ -24,31 +24,20 @@ module Locomotive
     
         def first
           content = @content_type.ordered_contents(@context['with_scope']).first
-          build_content_drop(content) unless content.nil?
         end
     
         def last
           content = @content_type.ordered_contents(@context['with_scope']).last
-          build_content_drop(content) unless content.nil?
         end
     
         def each(&block)
           @collection ||= @content_type.ordered_contents(@context['with_scope'])
-          to_content_drops.each(&block)
-        end
-    
-        def to_content_drops
-          @collection.map { |c| build_content_drop(c) }
-        end
-        
-        def build_content_drop(content)
-          Locomotive::Liquid::Drops::Content.new(content)
         end
     
         def paginate(options = {})
           @collection ||= @content_type.ordered_contents(@context['with_scope']).paginate(options)
           {
-            :collection       => to_content_drops,
+            :collection       => @collection,
             :current_page     => @collection.current_page,
             :previous_page    => @collection.previous_page,
             :next_page        => @collection.next_page,
@@ -56,7 +45,16 @@ module Locomotive
             :total_pages      => @collection.total_pages,
             :per_page         => @collection.per_page
           }
-        end        
+        end
+        
+        def api
+          { 'create' => @context.registers[:controller].send('admin_api_contents_url', @content_type.slug) }
+        end
+        
+        def before_method(meth)
+          klass = @content_type.contents.klass # delegate to the proxy class
+          klass.send(meth)
+        end
       end
     end    
   end

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

@@ -8,7 +8,7 @@ module Locomotive
         end
   
         def before_method(meth)
-          asset = site.theme_assets.where(:content_type => 'javascript', :slug => meth.to_s).first
+          asset = @site.theme_assets.where(:content_type => 'javascript', :slug => meth.to_s).first
           !asset.nil? ? asset.source.url : nil
         end
   

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

@@ -24,7 +24,7 @@ module Locomotive
             @collection_name = $1
             @per_page = $2.to_i
           else
-            raise SyntaxError.new("Syntax Error in 'paginate' - Valid syntax: paginate [collection] by [number]")
+            raise ::Liquid::SyntaxError.new("Syntax Error in 'paginate' - Valid syntax: paginate [collection] by [number]")
           end
     
           super

data/lib/locomotive/render.rb

@@ -24,7 +24,7 @@ module Locomotive
         path = 'index' if path.blank?
         
         if page = current_site.pages.where(:fullpath => path).first
-          if not page.published? and current_account.nil?
+          if not page.published? and current_admin.nil?
             page = nil
           end
         end

data/lib/locomotive/routing/site_dispatcher.rb

@@ -19,6 +19,7 @@ module Locomotive
         protected
         
         def fetch_site
+          logger.info "[fetch site] host = #{request.host} / #{request.env['HTTP_HOST']}" if Locomotive.config.enable_logs
           @current_site ||= Site.match_domain(request.host).first
         end
       
@@ -31,7 +32,7 @@ module Locomotive
         end
         
         def validate_site_membership
-          return if current_site && current_site.accounts.include?(current_account)          
+          return if current_site && current_site.accounts.include?(current_admin)
           redirect_to application_root_url
         end
         

data/lib/locomotive.rb

@@ -3,6 +3,8 @@ require 'locomotive/configuration'
 require 'locomotive/liquid'
 require 'locomotive/mongoid'
 
+require 'mongo_session_store/mongoid'
+
 module Locomotive
   
   class << self
@@ -26,7 +28,7 @@ module Locomotive
     
     ActionMailer::Base.default_url_options[:host] = Locomotive.config.default_domain + (Rails.env.development? ? ':3000' : '')
 
-    Rails.application.config.session_store :cookie_store, {
+    Rails.application.config.session_store :mongoid_store, {
       :key => Locomotive.config.cookie_key,
       :domain => ".#{Locomotive.config.default_domain}"
     }

data/lib/misc_form_builder.rb

@@ -18,6 +18,7 @@ class MiscFormBuilder < Formtastic::SemanticFormBuilder
     
     html = options[:with_label] ? self.label(options[:label] || name) : ''
     html += template.capture(&block) || ''
+    html += inline_hints_for(name, options) || ''
     html += self.errors_on(name) || ''
 
     template.content_tag(:li, template.find_and_preserve(html), :class => "#{options[:css]} #{'error' unless @object.errors[name].empty?}")
@@ -32,4 +33,13 @@ class MiscFormBuilder < Formtastic::SemanticFormBuilder
     end
   end
   
+  def normalize_model_name(name)
+    if name =~ /(.+)\/(.+)/
+      [$1, $2]
+    else
+      super
+    end
+  end
+  
+  
 end

data/public/javascripts/admin/application.js

@@ -19,15 +19,16 @@ $.growl.settings.dockCss = {
 /* ___ codemirror ___ */
 
 var addCodeMirrorEditor = function(type, el, parser) {
+	if (type == 'liquid') type = 'xml';
 	var parserfile = "parse" + type + ".js";
-	if (parser != undefined) parserfile = parser;
-	// if (type == 'liquid') type = 'xml';
+	if (parser != undefined) parserfile = parser;	
 	
 	var editor = CodeMirror.fromTextArea(el.attr('id'), {
 		height: "400px",
 		parserfile: parserfile,
 		stylesheet: [
 			"/stylesheets/admin/plugins/codemirror/csscolors.css", 
+			"/stylesheets/admin/plugins/codemirror/xmlcolors.css", 
 			"/stylesheets/admin/plugins/codemirror/javascriptcolors.css", 
 			"/stylesheets/admin/plugins/codemirror/liquidcolors.css"],
 		path: "/javascripts/admin/plugins/codemirror/",

data/public/javascripts/admin/content_types.js

@@ -7,7 +7,7 @@ $(document).ready(function() {
 	
 		if (!slug.hasClass('filled')) {
 			setTimeout(function() {
-				slug.val(input.val().replace(/\s/g, '_').toLowerCase());
+				slug.val(makeSlug(input.val()));
 			}, 50);
 		}
 	});

data/public/javascripts/admin/contents.js

@@ -13,5 +13,15 @@ $(document).ready(function() {
 		items: 'li.content',
 		stop: function(event, ui) { updateContentsOrder(); }
 	});
-	
+		
+	$('button.edit-categories-link').click(function() {
+		var link = $(this);
+		$.fancybox({ 
+			titleShow: false,
+			href: link.attr('data-url'),
+			padding: 0,
+			onComplete: function() { SetupCustomFieldCategoryEditor(link.prev()); },
+			onCleanup: function() { console.log('closing...'); }
+		})
+	});
 });

data/public/javascripts/admin/custom_fields/category.js

@@ -0,0 +1,91 @@
+// edit category collection
+var SetupCustomFieldCategoryEditor = function(target) {
+	
+	var refreshPosition = function() {
+		jQuery.each($('#edit-custom-field-category .editable-list li.added input.position'), function(index) { 
+			$(this).val(index);
+		});
+	};
+	
+	$('#edit-custom-field-category .editable-list li.template button').click(function() {
+		var lastRow = $(this).parents('li.template');
+		
+		if (lastRow.find('input.name').val() == '') return ;
+		
+		var newRow = lastRow.clone(true).removeClass('template').addClass('added new').insertBefore(lastRow);
+	
+		var dateFragment = '[' + new Date().getTime() + ']';
+		newRow.find('input, select').each(function(index) {
+			$(this).attr('name', $(this).attr('name').replace('[-1]', dateFragment));
+		});
+	
+		// then reset the form
+		lastRow.find('input').val('');
+	
+		// warn the sortable widget about the new row
+		$("#edit-custom-field-category .editable-list ol").sortable('refresh');
+		refreshPosition();
+		
+		// resize popup
+		$.fancybox.resize();
+	});
+	
+	$('#edit-custom-field-category .editable-list li a.remove').click(function(e) {
+		if (confirm($(this).attr('data-confirm'))) {
+			var parent = $(this).parents('li');
+			if (parent.hasClass('new'))
+				parent.remove();
+			else {
+				var field = parent.find('input.position')
+				field.attr('name', field.attr('name').replace('[position]', '[_destroy]'));
+				parent.hide().removeClass('added');
+			}
+			refreshPosition();
+		}
+		e.preventDefault();
+		e.stopPropagation();
+	});
+	
+	$("#edit-custom-field-category .editable-list ol").sortable({ 
+		handle: 'span.handle', 
+		items: 'li:not(.template)', 
+		axis: 'y',
+		update: refreshPosition
+	});
+	
+	/* ___ submit ___ */
+	
+	var updateSelectOptions = function(list) {
+		console.log('updateSelectOptions [begin]');
+		var options = '';
+		var selectedValue = target.val();
+		for (var i = 0; i < list.length; i++) {
+			options += '<option value="' + list[i]._id + '" >' + list[i].name + '</option>';
+		}
+		target.html(options);
+		target.val(selectedValue);
+		console.log('updateSelectOptions [end]');
+	};
+	
+	$('#edit-custom-field-category .popup-actions button').click(function(e) {
+		var form = $('#edit-custom-field-category form');
+		
+		$.ajax({
+			type: 'PUT',
+			dataType: 'json',
+			data: form.serialize(),
+			url: form.attr('action'),
+			success: function(data) {
+				console.log("success");
+				if (data.error == null) {
+					list = data.category_items.sort(function(a, b) { return (a.position - b.position); });
+					updateSelectOptions(list);
+					$.fancybox.close();
+				} else
+					$.growl("error", data.error);
+			}
+		});
+		e.preventDefault();
+		e.stopPropagation();
+	});
+}

data/public/javascripts/admin/custom_fields.js

@@ -110,4 +110,31 @@ $(document).ready(function() {
 		axis: 'y',
 		update: refreshPosition
 	});
+	
+	// edit in depth custom field 
+	$('fieldset.fields li.item span.actions a.edit').click(function() {
+		var link = $(this);
+		$.fancybox({ 
+			titleShow: false,
+			content: $(link.attr('href')).parent().html(),
+			onComplete: function() {
+				$('#fancybox-wrap form').submit(function(e) {
+					$.fancybox.close();
+					e.preventDefault();
+					e.stopPropagation();
+				});
+				
+				var alias = link.parent().prevAll('.alias').val();
+				if (alias == '') alias = makeSlug(link.parent().prevAll('.label').val());
+				$('#fancybox-wrap #custom_fields_field__alias').val(alias);
+				
+				var hint = link.parent().prevAll('.hint').val();
+				$('#fancybox-wrap #custom_fields_field_hint').val(hint);
+			},
+			onCleanup: function() {
+				link.parent().prevAll('.alias').val($('#fancybox-wrap #custom_fields_field__alias').val());
+				link.parent().prevAll('.hint').val($('#fancybox-wrap #custom_fields_field_hint').val());
+			}
+		})
+	});
 });