locomotive_cms 0.0.1.4 → 0.0.2

data/public/javascripts/admin/page_parts.js

@@ -23,7 +23,7 @@ $(document).ready(function() {
 		$(parts).each(function() {
 			// console.log("iterating..." + this.slug);
 			var control = $('#control-part-' + this.slug);
-			
+						
 			// adding missing part
 			if (control.size() == 0) {
 				// console.log('adding part');
@@ -42,10 +42,15 @@ $(document).ready(function() {
 				var wrapper = $('#parts-' + index);
 				
 				// updating part
-				control.html('<span>' + this.name + '</span>').addClass('enabled').show();
-				wrapper.find('input.disabled').val('false');
-				wrapper.show();
-			}			
+				wrapper.find('input.disabled').val(this.disabled == true ? 'true' : 'false');
+				if (this.disabled == false) {
+					control.html('<span>' + this.name + '</span>').addClass('enabled').show();
+					wrapper.show();
+				} else {
+					control.hide();
+					wrapper.hide();
+				}
+			}
 	 	});
 	
 		// removing or hiding parts

data/public/javascripts/admin/pages.js

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

data/public/javascripts/admin/snippets.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/theme_assets.js

@@ -71,6 +71,8 @@ var setupUploader = function() {
 			
 			asset.removeClass('new-asset');
 			
+			$('.asset-picker p.no-items').hide();
+			
 			$('.asset-picker ul').scrollTo($('li.asset:last'), 400);
 		}
 	});

data/public/javascripts/admin/utils.js

@@ -0,0 +1,9 @@
+function makeSlug(val, sep) { // code largely inspired by http://www.thewebsitetailor.com/jquery-slug-plugin/
+	if (typeof sep == 'undefined') sep = '_';
+	var alphaNumRegexp = new RegExp('[^a-zA-Z0-9\\' + sep + ']', 'g');	
+	var avoidDuplicateRegexp = new RegExp('[\\' + sep + ']{2,}', 'g');
+	val = val.replace(/\s/g, sep);
+	val = val.replace(alphaNumRegexp, '');
+	val = val.replace(avoidDuplicateRegexp, sep);
+	return val.toLowerCase();
+}

data/public/javascripts/all.js

@@ -687,6 +687,17 @@ jQuery(function ($) {
 
 
 
+function makeSlug(val, sep) { // code largely inspired by http://www.thewebsitetailor.com/jquery-slug-plugin/
+	if (typeof sep == 'undefined') sep = '_';
+	var alphaNumRegexp = new RegExp('[^a-zA-Z0-9\\' + sep + ']', 'g');	
+	var avoidDuplicateRegexp = new RegExp('[\\' + sep + ']{2,}', 'g');
+	val = val.replace(/\s/g, sep);
+	val = val.replace(alphaNumRegexp, '');
+	val = val.replace(avoidDuplicateRegexp, sep);
+	return val.toLowerCase();
+}
+
+
 /**
  *
  * Copyright (c) 2009 Tony Dewan (http://www.tonydewan.com/)
@@ -1059,15 +1070,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/stylesheets/admin/application.css

@@ -149,7 +149,7 @@ ul.assets li.asset div.image div.inside {
 
 ul.assets li.asset div.actions {
 	position: absolute;
-	top: 8px;
+	top: 4px;
 	right: 12px;
 }
 
@@ -234,7 +234,7 @@ div#uploadAssetsInputQueue { display: none; }
 
 #pages-list li .more {
 	position: absolute;
-	top: 3px;
+	top: 6px;
 	right: 20px;
 	font-size: 0.7em;
 	color: #8b8d9a;

data/public/stylesheets/admin/box.css

@@ -1,8 +1,10 @@
 /* custom styles for fancybox */
 
-div.asset-picker { width: 470px; position: relative; }
-div.asset-picker .actions { position: absolute; right: 4px; top: 0px; }
-div.asset-picker h2 {
+/* ___ common ___ */
+
+.box-wrapper { display: none; }
+
+#fancybox-inner h2 {
 	border-bottom:1px dotted #BBBBBD;
 	color:#1E1F26;
 	font-size:1.1em;
@@ -10,5 +12,79 @@ div.asset-picker h2 {
 	padding-bottom:10px;
 }
 
+#fancybox-inner form.formtastic legend span {
+	background-image: url("/images/admin/form/header-popup.png");
+	width: 453px;
+}
+
+#fancybox-inner form.formtastic ol {
+	background-image: url("/images/admin/form/footer-popup.png");
+}
+
+#fancybox-inner form.formtastic .editable-list ol {
+	width: 433px;
+}
+
+#fancybox-inner form.formtastic .editable-list li {
+	width: 413px;
+}
+
+#fancybox-inner form.formtastic .editable-list li {
+	background-image: url("/images/admin/form/item-popup.png");
+}
+
+#fancybox-inner form.formtastic .editable-list li.template { 
+	background-image: url("/images/admin/form/big_item-popup.png");
+}
+
+#fancybox-inner p { color:#8B8D9A; font-size:0.8em; }
+
+/* ___ asset picker ___ */
+
+div.asset-picker { width: 470px; position: relative; }
+div.asset-picker .actions { position: absolute; right: 4px; top: 0px; }
+
+div.asset-picker p.no-items { background-image: url("/images/admin/list/none-small.png"); }
+
 div.asset-picker ul { overflow: auto; height: 471px; }
-div.asset-picker ul li.new-asset { display: none; }
+div.asset-picker ul li.new-asset { display: none; }
+
+/* ___ custom fields ___ */
+
+#edit-custom-field {
+	width: 473px;
+}
+
+#edit-custom-field-category {
+	width: 493px;
+}
+
+#edit-custom-field-category .inner {
+	padding: 10px 10px 61px 10px;
+}
+
+/* ___ form action ___ */
+
+#fancybox-inner .popup-actions {
+	position: absolute;
+	left: 0px;
+	bottom: 0px;
+	height: 61px;
+	width: 100%;
+	background: #8b8d9a;
+}
+
+#fancybox-inner .popup-actions p {
+	padding: 15px;
+	margin: 0px;
+	text-align: right;
+}
+
+/*#fancybox-inner .actions a {
+	color: #fff;
+	text-decoration: none;
+	font-size: 0.8em;
+	position: relative;
+	top: 4px;
+}*/
+

data/public/stylesheets/admin/formtastic_changes.css

@@ -224,10 +224,11 @@ form.formtastic fieldset ol li.item em {
 
 form.formtastic fieldset ol li.item span.actions {
 	position: absolute;
-	top: 7px;
+	top: 5px;
 	right: 10px;
-	width: 16px;
+	width: 50px;
 	height: 16px;
+	text-align:right;
 }
 
 /* ___ editable-list (content type fields and validations) ___ */
@@ -338,6 +339,10 @@ form.formtastic fieldset.editable-list ol li.template span.actions {
 	top: 10px;
 }
 
+form.formtastic fieldset.editable-list ol li.template span.actions a.edit {
+	display: none;
+}
+
 form.formtastic fieldset.editable-list ol li.template span.actions a.remove {
 	display: none;
 }

data/public/stylesheets/all.css

@@ -896,8 +896,9 @@ form.formtastic fieldset ol li.item span.actions {
 	position: absolute;
 	top: 7px;
 	right: 10px;
-	width: 16px;
+	width: 50px;
 	height: 16px;
+	text-align:right;
 }
 
 /* ___ editable-list (content type fields and validations) ___ */
@@ -1008,6 +1009,10 @@ form.formtastic fieldset.editable-list ol li.template span.actions {
 	top: 10px;
 }
 
+form.formtastic fieldset.editable-list ol li.template span.actions a.edit {
+	display: none;
+}
+
 form.formtastic fieldset.editable-list ol li.template span.actions a.remove {
 	display: none;
 }

data/spec/lib/locomotive/render_spec.rb

@@ -61,7 +61,7 @@ describe 'Locomotive rendering system' do
       
       before(:each) do
         @page.published = false
-        @controller.current_account = nil
+        @controller.current_admin = nil
       end
     
       it 'should return the 404 page if the page has not been published yet' do
@@ -72,7 +72,7 @@ describe 'Locomotive rendering system' do
       end
       
       it 'should not return the 404 page if the page has not been published yet and admin is logged in' do
-        @controller.current_account = true
+        @controller.current_admin = true
         @controller.request.fullpath = '/contact'
         @controller.current_site.pages.expects(:where).with({ :fullpath => 'contact' }).returns([@page])
         @controller.send(:locomotive_page).should == @page

data/spec/models/asset_collections_spec.rb

@@ -20,7 +20,7 @@ describe AssetCollection do
     context 'unit' do
       
       before(:each) do
-        @field = CustomFields::CustomField.new(:kind => 'String')
+        @field = CustomFields::Field.new(:kind => 'String')
       end
       
       it 'should tell if it is a String' do
@@ -66,8 +66,8 @@ describe AssetCollection do
       end    
       
       it 'should have an unique alias' do
-        @collection.asset_custom_fields.first._alias.should == "description"
-        @collection.asset_custom_fields.last._alias.should == "active"
+        @collection.asset_custom_fields.first.safe_alias.should == "description"
+        @collection.asset_custom_fields.last.safe_alias.should == "active"
       end  
             
     end
@@ -164,7 +164,7 @@ describe AssetCollection do
       end
       
     end
-    
+        
   end
   
   def build_asset(collection)

data/spec/spec_helper.rb

@@ -12,6 +12,6 @@ Rspec.configure do |config|
   config.mock_with :mocha
   
   config.before(:each) do
-    Mongoid.master.collections.each(&:drop)
+    Mongoid.master.collections.select { |c| c.name != 'system.indexes' }.each(&:drop)
   end
 end

data/spec/support/locomotive.rb

@@ -7,7 +7,7 @@ module Locomotive
    
     include Locomotive::Render
    
-    attr_accessor :output, :current_site, :current_account
+    attr_accessor :output, :current_site, :current_admin
    
     def render(options = {})
       self.output = options[:text]

data/vendor/plugins/custom_fields/Gemfile

@@ -0,0 +1,11 @@
+source "http://gemcutter.org"
+
+gem "bson_ext", ">= 1.0.1"
+gem "mongo_ext"
+gem "mongoid", ">= 2.0.0.beta6"
+gem "activesupport", ">= 3.0.0.beta4"
+
+group :test do
+  gem 'rspec', '>= 2.0.0.beta.10'
+  gem 'mocha', :git => 'git://github.com/floehopper/mocha.git'	
+end

data/vendor/plugins/custom_fields/README

@@ -1,4 +1,4 @@
-CustomField
+CustomFields
 ===========
 
 Introduction goes here.
@@ -10,4 +10,4 @@ Example
 Example goes here.
 
 
-Copyright (c) 2010 [name of plugin creator], released under the MIT license
+Copyright (c) 2010 [Didier Lafforgue], released under the MIT license

data/vendor/plugins/custom_fields/Rakefile

@@ -1,23 +1,29 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
+require "rubygems"
+require "rake"
+require "rake/rdoctask"
+require "rspec"
+require "rspec/core/rake_task"
 
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the custom_field plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the custom_field plugin.'
+desc 'Generate documentation for the custom_fields plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'CustomField'
+  rdoc.title    = 'CustomFields'
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
+end
+
+Rspec::Core::RakeTask.new('spec:unit') do |spec|
+  spec.pattern = "spec/unit/**/*_spec.rb"
+  # spec.pattern = "spec/unit/custom_fields_for_spec.rb"
+  # spec.pattern = "spec/unit/types/category_spec.rb"
+end
+
+Rspec::Core::RakeTask.new('spec:integration') do |spec|
+  spec.pattern = "spec/integration/**/*_spec.rb"
+  # spec.pattern = "spec/integration/types/category_spec.rb"
+end
+
+task :spec => ['spec:unit', 'spec:integration']
+
+task :default => :spec

data/vendor/plugins/custom_fields/lib/custom_fields/custom_fields_for.rb

@@ -30,7 +30,7 @@ module CustomFields
         class_eval <<-EOV
           field :#{singular_name}_custom_fields_counter, :type => Integer, :default => 0
           
-          embeds_many :#{singular_name}_custom_fields, :class_name => "::CustomFields::CustomField"
+          embeds_many :#{singular_name}_custom_fields, :class_name => "::CustomFields::Field"
           
           validates_associated :#{singular_name}_custom_fields
           
@@ -39,6 +39,7 @@ module CustomFields
           def ordered_#{singular_name}_custom_fields
             self.#{singular_name}_custom_fields.sort { |a, b| (a.position || 0) <=> (b.position || 0) }
           end
+          
         EOV
       end
       

data/vendor/plugins/custom_fields/lib/custom_fields/extensions/mongoid/associations/embeds_many.rb

@@ -2,23 +2,30 @@
 module Mongoid #:nodoc:
   module Associations #:nodoc:
     class EmbedsMany < Proxy
-      def build_with_custom_field_settings(attrs = {}, type = nil)
-        document = build_without_custom_field_settings(attrs, type)
-        
-        if @association_name.ends_with?('_custom_fields')
-          document.class_eval <<-EOV
-            self.associations = {} # prevent associations to be nil
-            embedded_in :#{@parent.class.to_s.underscore}, :inverse_of => :#{@association_name}
-          EOV
+      
+      def initialize_with_custom_fields(parent, options, target_array = nil)
+        if custom_fields?(parent, options.name)
+          options = options.clone # 2 parent instances should not share the exact same option instance
           
-          document.send(:set_unique_name!)
-          document.send(:set_alias)
+          custom_fields = parent.send(:"ordered_#{custom_fields_association_name(options.name)}")
+        
+          klass = options.klass.to_klass_with_custom_fields(custom_fields)
+          klass._parent = parent
+          klass.association_name = options.name
+        
+          options.instance_eval <<-EOF
+            def klass=(klass); @klass = klass; end
+            def klass; @klass || class_name.constantize; end
+          EOF
+        
+          options.klass = klass
         end
-        document
+        
+        initialize_without_custom_fields(parent, options, target_array)
       end
       
-      alias_method_chain :build, :custom_field_settings
+      alias_method_chain :initialize, :custom_fields
+      
     end
-    
   end
 end

data/vendor/plugins/custom_fields/lib/custom_fields/extensions/mongoid/associations/has_many_related.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Associations #:nodoc:
+    # Represents an relational one-to-many association with an object in a
+    # separate collection or database.
+    class HasManyRelated < Proxy
+      
+      def initialize_with_custom_fields(parent, options, target_array = nil)
+        if custom_fields?(parent, options.name)
+          options = options.clone # 2 parent instances should not share the exact same option instance
+          
+          custom_fields = parent.send(:"ordered_#{custom_fields_association_name(options.name)}")
+          
+          klass = options.klass.to_klass_with_custom_fields(custom_fields)
+          klass._parent = parent
+          klass.association_name = options.name
+          
+          options.instance_eval <<-EOF
+            def klass=(klass); @klass = klass; end
+            def klass; @klass || class_name.constantize; end
+          EOF
+          
+          options.klass = klass
+        end
+        
+        initialize_without_custom_fields(parent, options, target_array)
+      end
+      
+      alias_method_chain :initialize, :custom_fields
+      
+    end
+  end
+end

data/vendor/plugins/custom_fields/lib/custom_fields/extensions/mongoid/associations/proxy.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+  module Associations #:nodoc
+    class Proxy #:nodoc
+      
+      def custom_fields_association_name(association_name)
+        "#{association_name.to_s.singularize}_custom_fields".to_sym
+      end
+      
+      def custom_fields?(object, association_name)
+        object.respond_to?(custom_fields_association_name(association_name))
+      end
+      
+      def klass
+        @klass
+      end
+      
+    end
+  end
+end

data/vendor/plugins/custom_fields/lib/custom_fields/extensions/mongoid/document.rb

@@ -2,34 +2,27 @@
 module Mongoid #:nodoc:
   module Document
     module InstanceMethods
+      
       def parentize_with_custom_fields(object, association_name)
+        if association_name.to_s.ends_with?('_custom_fields')
+          self.singleton_class.associations = {}
+          self.singleton_class.embedded_in object.class.to_s.underscore.to_sym, :inverse_of => association_name
+        end
+            
         parentize_without_custom_fields(object, association_name)
         
-        if self.custom_fields?(object, association_name)          
-          # puts "[parentize_with_custom_fields] association_name = #{association_name} / #{self.custom_fields_association_name(association_name)}"          
-          object.send(self.custom_fields_association_name(association_name)).each do |field|
-            field.apply(self, association_name)
-          end
-          
-          self.instance_eval <<-EOV
-            def custom_fields
-              fields = self._parent.send(:#{self.custom_fields_association_name(association_name)})
-              fields.sort { |a, b| (a.position || 0) <=> (b.position || 0) }
-            end
-          EOV
+        if self.embedded? && self.instance_variable_get(:"@association_name").nil?
+          self.instance_variable_set(:"@association_name", association_name) # weird bug with proxy class
+        end
+        
+        if association_name.to_s.ends_with?('_custom_fields')
+          self.send(:set_unique_name!)
+          self.send(:set_alias)
         end
       end
       
       alias_method_chain :parentize, :custom_fields
       
-      def custom_fields_association_name(association_name)
-        "#{association_name.to_s.singularize}_custom_fields".to_sym
-      end
-      
-      def custom_fields?(object, association_name)
-        object.respond_to?(custom_fields_association_name(association_name)) &&
-        object.associations[association_name]
-      end      
-    end    
+    end
   end
 end

data/vendor/plugins/custom_fields/lib/custom_fields/{custom_field.rb → field.rb}

@@ -1,14 +1,19 @@
 module CustomFields
 
-  class CustomField
-    include Mongoid::Document
-    include Mongoid::Timestamps
+  class Field
+    include ::Mongoid::Document
+    include ::Mongoid::Timestamps
+    
+    # types ##
+    include Types::Default
+    include Types::Category
   
     ## fields ##
-    field :label, :type => String
-    field :_alias, :type => String # need it for instance in: > asset.description (description being a custom field)
-    field :_name, :type => String
-    field :kind, :type => String
+    field :label
+    field :_alias # need it for instance in: > asset.description (description being a custom field)
+    field :_name
+    field :kind
+    field :hint
     field :position, :type => Integer, :default => 0
       
     ## validations ##
@@ -17,7 +22,7 @@ module CustomFields
       
     ## methods ##
     
-    %w{String Text Email Boolean Date File}.each do |kind|
+    %w{String Text Category}.each do |kind|
       define_method "#{kind.downcase}?" do
         self.kind == kind
       end
@@ -25,27 +30,25 @@ module CustomFields
   
     def field_type
       case self.kind
-        when 'String', 'Text', 'Email' then String
+        when 'String', 'Text', 'Category' then String
         else
           self.kind.constantize
       end
     end
-  
-    def apply(object, association_name)
+    
+    def apply(klass)
       return unless self.valid?
       
-      # trick mongoid
-      object.class_eval { def meta; (class << self; self; end); end }
-      object.meta.fields = object.fields.clone 
-      object.meta.send(:define_method, :fields) { self.meta.fields }
+      klass.field self._name, :type => self.field_type
       
-      object.meta.field self._name, :type => self.field_type
-      object.class_eval <<-EOF
-        alias :#{self.safe_alias} :#{self._name}
-        alias :#{self.safe_alias}= :#{self._name}=
-      EOF
+      case self.kind
+      when 'Category'
+        apply_category_type(klass)
+      else
+        apply_default_type(klass)
+      end
     end
-  
+    
     def safe_alias
       self.set_alias
       self._alias 
@@ -66,8 +69,7 @@ module CustomFields
     
     def set_alias
       return if self.label.blank? && self._alias.blank?
-      self._alias ||= self.label.clone
-      self._alias.slugify!(:downcase => true, :underscore => true)
+      self._alias = (self._alias.blank? ? self.label : self._alias).parameterize('_').downcase
     end
   
     def increment_counter!