locomotive_cms 2.0.0.rc2 → 2.0.0.rc4

data/README.textile

@@ -24,8 +24,8 @@ h2. Gems
 
 Here is a short list of main gems / technologies used in the application.
 
-* Rails 3.2
-* Mongoid 2.4.3 (with MongoDB 2.0)
+* Rails 3.2.3
+* Mongoid 2.4.6 (with MongoDB 2.0)
 * Liquid
 * Devise
 * Carrierwave
@@ -44,7 +44,7 @@ We work on the procedure to upgrade from a previous version of the engine (below
 
 h2. Community
 
-* Get help or discuss locomotive CMS at the "LocomotiveCMS Discussion Forums":http://locomotive.vanillaforums.com/
+* Get help or discuss locomotive CMS at the "LocomotiveCMS Google group":https://groups.google.com/forum/?fromgroups#!forum/locomotivecms or the "LocomotiveCMS Discussion Forums":http://locomotive.vanillaforums.com/ (deprecated)
 * Join us on IRC "#locomotivecms at irc.freenode.net!":http://webchat.freenode.net/
 * "Follow us on twitter":http://twitter.com/locomotiveapp
 
@@ -60,7 +60,7 @@ Locomotive CMS is an open source project, we encourage contributions. If you hav
 * Make the tests pass
 * "Create a GitHub pull request":http://help.github.com/send-pull-requests
 
-For new features (especially large ones) it is best to create a topic on the "discussion forums":http://locomotive.vanillaforums.com/ first to make sure it fits into the goals of the project.
+For new features (especially large ones) it is best to create a topic on the "Google group":https://groups.google.com/forum/?fromgroups#!forum/locomotivecms first to make sure it fits into the goals of the project.
 
 h2. Team
 

data/app/assets/javascripts/locomotive/models/page.js.coffee

@@ -16,7 +16,7 @@ class Locomotive.Models.Page extends Backbone.Model
 
   toJSON: ->
     _.tap super, (hash) =>
-      _.each ['content_type_id_text', 'edit_url', 'parent_id_text'], (key) => delete hash[key]
+      _.each ['content_type_id_text', 'edit_url', 'parent_id_text', 'response_type_text'], (key) => delete hash[key]
 
       delete hash['editable_elements']
       hash.editable_elements = @get('editable_elements').toJSONForSave() if @get('editable_elements')? && @get('editable_elements').length > 0

data/app/assets/javascripts/locomotive/models/site.js.coffee

@@ -24,7 +24,7 @@ class Locomotive.Models.Site extends Backbone.Model
       delete hash.memberships
       hash.memberships_attributes = @get('memberships').toJSONForSave() if @get('memberships')? && @get('memberships').length > 0
       delete hash.domains
-      hash.domains = _.map(@get('domains'), (domain) -> domain.get('name')) if @get('domains')? && @get('domains').length > 0
+      hash.domains = _.map(@get('domains'), (domain) -> domain.get('name'))
 
 class Locomotive.Models.CurrentSite extends Locomotive.Models.Site
 

data/app/assets/javascripts/locomotive/views/content_entries/_form_view.js.coffee

@@ -48,6 +48,11 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
   enable_richtexteditor: ->
     _.each @$('li.input.rte textarea.html'), (textarea) =>
       settings = _.extend {}, @tinyMCE_settings(),
+        oninit: ((editor) =>
+          $.cmd 'S', (() =>
+            $(textarea).val(editor.getBody().innerHTML).trigger('change')
+            @$('form').trigger('submit')
+          ), [], ignoreCase: true, document: editor.dom.doc),
         onchange_callback: (editor) =>
           $(textarea).val(editor.getBody().innerHTML).trigger('change')
 
@@ -68,18 +73,20 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
         new_entry = new Locomotive.Models.ContentEntry(@options["#{name}_new_entry"])
         view      = new Locomotive.Views.Shared.Fields.HasManyView model: @model, name: name, new_entry: new_entry, inverse_of: inverse_of
 
-        @_has_many_field_views.push(view)
+        if view.ui_enabled()
+          @_has_many_field_views.push(view)
 
-        @$("##{@model.paramRoot}_#{name}_input label").after(view.render().el)
+          @$("##{@model.paramRoot}_#{name}_input label").after(view.render().el)
 
   enable_many_to_many_fields: ->
     _.each @model.get('many_to_many_custom_fields'), (field) =>
       name = field[0]
       view = new Locomotive.Views.Shared.Fields.ManyToManyView model: @model, name: name, all_entries: @options["all_#{name}_entries"]
 
-      @_many_to_many_field_views.push(view)
+      if view.ui_enabled()
+        @_many_to_many_field_views.push(view)
 
-      @$("##{@model.paramRoot}_#{name}_input label").after(view.render().el)
+        @$("##{@model.paramRoot}_#{name}_input label").after(view.render().el)
 
   slugify_label_field: ->
     @$('li.input.highlighted > input[type=text]').slugify(target: @$('#content_entry__slug'))

data/app/assets/javascripts/locomotive/views/editable_elements/control_view.js.coffee

@@ -0,0 +1,24 @@
+Locomotive.Views.EditableElements ||= {}
+
+class Locomotive.Views.EditableElements.ControlView extends Backbone.View
+
+  tagName: 'li'
+
+  className: 'control input'
+
+  render: ->
+    $(@el).html(ich.editable_control_input(@model.toJSON()))
+
+    @bind_model()
+
+    return @
+
+  after_render: ->
+    # do nothing
+
+  refresh: ->
+    @bind_model()
+
+  bind_model: ->
+    Backbone.ModelBinding.bind @, { select: 'class' }
+

data/app/assets/javascripts/locomotive/views/editable_elements/edit_all_view.js.coffee

@@ -32,6 +32,9 @@ class Locomotive.Views.EditableElements.EditAllView extends Backbone.View
       view.model = @collection.get(view.model.get('id'))
       view.refresh()
 
+  unbind_model: ->
+    _.each @_editable_elements_views, (view) => Backbone.ModelBinding.unbind(view)
+
   render_elements: ->
     index = 0
 
@@ -45,6 +48,7 @@ class Locomotive.Views.EditableElements.EditAllView extends Backbone.View
           when 'EditableShortText' then Locomotive.Views.EditableElements.ShortTextView
           when 'EditableLongText' then Locomotive.Views.EditableElements.LongTextView
           when 'EditableFile' then Locomotive.Views.EditableElements.FileView
+          when 'EditableControl' then Locomotive.Views.EditableElements.ControlView
 
         view = new view_class(model: element)
         @$("#block-#{block.index} > fieldset > ol").append(view.render().el)

data/app/assets/javascripts/locomotive/views/editable_elements/short_text_view.js.coffee

@@ -13,6 +13,11 @@ class Locomotive.Views.EditableElements.ShortTextView extends Backbone.View
 
   after_render: ->
     settings = _.extend {}, @tinymce_settings(),
+      oninit: ((editor) =>
+        $.cmd 'S', (() =>
+          @model.set(content: editor.getBody().innerHTML)
+          $(@el).parents('form').trigger('submit')
+        ), [], ignoreCase: true, document: editor.dom.doc),
       onchange_callback: (editor) =>
         @model.set(content: editor.getBody().innerHTML)
 

data/app/assets/javascripts/locomotive/views/pages/_form_view.js.coffee

@@ -37,6 +37,9 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
     # the url gets modified by different ways so reflect the changes in the UI
     @listen_for_url_changes()
 
+    # enable response type
+    @enable_response_type_select()
+
     # enable check boxes
     @enable_templatized_checkbox()
 
@@ -90,6 +93,7 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
 
   # Just re-connect the model and the views (+ redraw the file fields)
   refresh_editable_elements: ->
+    @editable_elements_view.unbind_model()
     @editable_elements_view.collection = @model.get('editable_elements')
     @editable_elements_view.refresh()
 
@@ -108,6 +112,19 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
       data:       { parent_id:  @$('#page_parent_id').val(), slug: @$('#page_slug').val() }
       success:    (data) =>
         @$('#page_slug_input .inline-hints').html(data.url).effect('highlight')
+        if data.templatized_parent
+          @$('li#page_slug_input').show()
+          @$('li#page_templatized_input, li#page_target_klass_name_input').hide()
+        else
+          @$('li#page_templatized_input, li#page_target_klass_name_input').show()
+
+  enable_response_type_select: ->
+    @$('li#page_response_type_input').change (event) =>
+      if $(event.target).val() == 'text/html'
+        @$('li#page_redirect_input, li#page_redirect_url_input').show()
+      else
+        @model.set redirect: false
+        @$('li#page_redirect_input, li#page_redirect_url_input').hide()
 
   enable_templatized_checkbox: ->
     @_enable_checkbox 'templatized',
@@ -117,6 +134,8 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
       off_callback: =>
         @$('li#page_target_klass_name_input').hide()
 
+    @$('li#page_templatized_input').hide() if @model.get('templatized_from_parent') == true
+
   enable_redirect_checkbox: ->
     @_enable_checkbox 'redirect',
       features:     ['templatized', 'cache_strategy']

data/app/assets/javascripts/locomotive/views/shared/fields/has_many_view.js.coffee

@@ -34,6 +34,9 @@ class Locomotive.Views.Shared.Fields.HasManyView extends Backbone.View
 
     return @
 
+  ui_enabled: ->
+    @template()?
+
   insert_entries: ->
     if @collection.length > 0
       @collection.each (entry) => @insert_entry(entry)

data/app/assets/javascripts/locomotive/views/shared/fields/many_to_many_view.js.coffee

@@ -39,6 +39,9 @@ class Locomotive.Views.Shared.Fields.ManyToManyView extends Backbone.View
 
     return @
 
+  ui_enabled: ->
+    @template()?
+
   insert_entries: ->
     if @collection.length > 0
       @collection.each (entry) => @insert_entry(entry)

data/app/assets/javascripts/locomotive/views/shared/form_view.js.coffee

@@ -13,6 +13,9 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
     # make inputs foldable (if specified)
     @make_inputs_foldable()
 
+    # allow users to save with CTRL+S or CMD+s
+    @enable_save_with_keys_combination()
+
     return @
 
   save: (event) ->
@@ -68,6 +71,9 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
       else
         content.slideUp 100, -> parent.addClass('folded')
 
+  enable_save_with_keys_combination: ->
+    $.cmd 'S', (() => @$('form').trigger('submit')), [], ignoreCase: true
+
   after_inputs_fold: ->
     # overide this method if necessary
 

data/app/assets/stylesheets/locomotive/backoffice/application.css.scss

@@ -80,6 +80,7 @@ ul.list {
 
     span.untranslated {
       @include label;
+      background-color: #F89406;
       top: -1px;
       left: 5px;
     }
@@ -219,6 +220,13 @@ ul.list {
       &.hidden a { font-style: italic; font-weight: normal; }
 
       span.untranslated {
+        @include label;
+        background-color: #F89406;
+        top: 3px;
+        left: 5px;
+      }
+
+      span.response-type {
         @include label;
         top: 3px;
         left: 5px;

data/app/assets/stylesheets/locomotive/inline_editor/layout.css.scss

@@ -11,6 +11,7 @@ body {
     width: 100%;
     height: 100%;
     display: block;
+    min-height: 100%;
   }
 }
 

data/app/controllers/locomotive/pages_controller.rb

@@ -53,9 +53,10 @@ module Locomotive
     end
 
     def get_path
-      page = current_site.pages.build(:parent => current_site.pages.find(params[:parent_id]), :slug => params[:slug].permalink)
-      page.send(:build_fullpath)
-      render :json => { :url => public_page_url(page), :slug => page.slug }
+      page = current_site.pages.build(:parent => current_site.pages.find(params[:parent_id]), :slug => params[:slug].permalink).tap do |p|
+        p.valid?; p.send(:build_fullpath)
+      end
+      render :json => { :url => public_page_url(page), :slug => page.slug, :templatized_parent => page.templatized_from_parent? }
     end
 
   end

data/app/helpers/locomotive/pages_helper.rb

@@ -50,5 +50,18 @@ module Locomotive
       ]
     end
 
+    def options_for_page_response_type
+      [
+        ['HTML', 'text/html'],
+        ['RSS', 'application/rss+xml'],
+        ['XML', 'text/xml'],
+        ['JSON', 'application/json']
+      ]
+    end
+
+    def page_response_type_to_string(page)
+      options_for_page_response_type.detect { |t| t.last == page.response_type }.try(:first) || '—'
+    end
+
   end
 end

data/app/models/locomotive/editable_control.rb

@@ -0,0 +1,56 @@
+module Locomotive
+  class EditableControl < EditableElement
+
+    ## fields ##
+    field :content
+    field :options, :type => Array,   :default => []
+
+    ## methods ##
+
+    def options=(value)
+      if value.respond_to?(:split)
+        value = value.split(/\s*\,\s*/).map do |option|
+          first, last = *option.split(/\s*=\s*/)
+          last ||= first
+          { 'value' => first, 'text' => last }
+        end
+      end
+
+      super(value)
+    end
+
+    def default_content?
+      false
+    end
+
+    def copy_attributes_from(el)
+      super(el)
+
+      %w(content options).each do |meth|
+        self.attributes[meth] = el.attributes[meth]
+      end
+    end
+
+    def as_json(options = {})
+      Locomotive::EditableControlPresenter.new(self).as_json
+    end
+
+    protected
+
+    def propagate_content
+      if self.content_changed?
+        operations  = {
+          '$set' => {
+            'editable_elements.$.content' => self.content,
+            'editable_elements.$.options' => self.options,
+          }
+        }
+
+        self.page.collection.update self._selector, operations, :multi => true
+      end
+      true
+    end
+
+  end
+end
+

data/app/models/locomotive/editable_element.rb

@@ -1,29 +1,101 @@
 module Locomotive
   class EditableElement
 
-      include ::Mongoid::Document
+    include ::Mongoid::Document
 
-      ## fields ##
-      field :slug
-      field :block
-      field :default_content,   :localize => true
-      field :default_attribute
-      field :hint
-      field :priority,          :type => Integer, :default => 0
-      field :disabled,          :type => Boolean, :default => false
-      field :assignable,        :type => Boolean, :default => true
-      field :from_parent,       :type => Boolean, :default => false
+    ## fields ##
+    field :slug
+    field :block
+    field :hint
+    field :priority,          :type => Integer, :default => 0
+    field :fixed,             :type => Boolean, :default => false
+    field :disabled,          :type => Boolean, :default => false, :localize => true
+    field :from_parent,       :type => Boolean, :default => false
+    field :locales,           :type => Array,   :default => []
 
-      ## associations ##
-      embedded_in :page, :class_name => 'Locomotive::Page', :inverse_of => :editable_elements
+    ## associations ##
+    embedded_in :page, :class_name => 'Locomotive::Page', :inverse_of => :editable_elements
 
-      ## validations ##
-      validates_presence_of :slug
+    ## validations ##
+    validates_presence_of :slug
 
-      ## scopes ##
-      scope :by_priority, :order_by => [[:priority, :desc]]
+    ## callbacks ##
+    after_save :propagate_content, :if => :fixed?
 
-      ## methods ##
+    ## scopes ##
+    scope :by_priority, :order_by => [[:priority, :desc]]
+
+    ## methods ##
+
+    def disabled?
+      !!self.disabled # the original method does not work quite well with the localization
+    end
+
+    # Determines if the current element can be edited in the back-office
+    #
+    def editable?
+      !self.disabled? && self.locales.include?(::Mongoid::Fields::I18n.locale.to_s) && (!self.fixed? || !self.from_parent?)
+    end
+
+    def _run_rearrange_callbacks
+      # callback from page/tree. not needed in the editable elements
+    end
+
+    def default_content?
+      # needs to be overridden for each kind of elements
+      true
+    end
+
+    # Copy attributes extracted from the corresponding Liquid tag
+    # Each editable element overrides this method.
+    #
+    # @param [ Hash ] attributes The up-to-date attributes
+    #
+    def copy_attributes(attributes)
+      self.attributes = attributes
+    end
+
+    # Copy attributes from an existing editable element coming
+    # from the parent page. Each editable element may or not
+    # override this method. The source element is a new record.
+    #
+    # @param [ EditableElement] el The source element
+    #
+    def copy_attributes_from(el)
+      self.attributes   = el.attributes.reject { |attr| !%w(slug block hint priority fixed disabled locales from_parent).include?(attr) }
+      self.from_parent  = true
+    end
+
+    # Make sure the current locale is added to the list
+    # of locales for the current element so that we know
+    # in which languages the element was translated.
+    #
+    def add_current_locale
+      locale = ::Mongoid::Fields::I18n.locale.to_s
+      self.locales << locale unless self.locales.include?(locale)
+    end
+
+    protected
+
+    def _selector
+      locale = ::Mongoid::Fields::I18n.locale
+      {
+        'site_id'                         => self.page.site_id,
+        "template_dependencies.#{locale}" => { '$in' => [self.page._id] },
+        'editable_elements.fixed'         => true,
+        'editable_elements.block'         => self.block,
+        'editable_elements.slug'          => self.slug
+      }
+    end
+
+    # Update the value (or content) of the elements matching the same block/slug
+    # as the current element in all the pages inheriting from the current page.
+    # This method is called only if the element has the "fixed" property set to true.
+    # It also needs to be overridden for each kind of elements (file, short text, ...etc)
+    #
+    def propagate_content
+      true
+    end
 
   end
 end