locomotive_cms 2.0.0.rc12 → 2.0.0

data/app/presenters/locomotive/site_presenter.rb

@@ -1,24 +1,39 @@
 module Locomotive
   class SitePresenter < BasePresenter
 
-    delegate :name, :locales, :subdomain, :domains, :robots_txt, :seo_title, :meta_keywords, :meta_description, :domains_without_subdomain, :to => :source
+    ## properties ##
+
+    property    :name
+    properties  :locales,   type: Array
+
+    with_options if: Proc.new { Locomotive.config.multi_sites_or_manage_domains? } do |presenter|
+      presenter.property  :subdomain
+      presenter.property  :domains,   type: Array, required: false
+    end
+
+    with_options only_getter: true do |presenter|
+      presenter.property :domains_without_subdomain, type: Array, if: Proc.new { Locomotive.config.multi_sites_or_manage_domains? }
+      presenter.property :domain_name
+      presenter.property :memberships, type: Array
+    end
+
+    properties  :seo_title, :meta_keywords, :meta_description, :robots_txt, required: false
+
+    ## other getters / setters ##
 
     def domain_name
       Locomotive.config.domain
     end
 
     def memberships
-      self.source.memberships.map { |membership| membership.as_json(self.options) }
+      self.__source.memberships.map { |membership| membership.as_json(self.__options) }
     end
 
-    def included_methods
-      super + %w(name locales domain_name subdomain domains robots_txt seo_title meta_keywords meta_description domains_without_subdomain memberships)
-    end
+    ## custom as_json ##
 
     def as_json_for_html_view
-      methods = included_methods.clone - %w(memberships)
-      self.as_json(methods)
+      self.as_json(self.getters - %w(memberships))
     end
 
   end
-end
+end

data/app/presenters/locomotive/snippet_presenter.rb

@@ -1,20 +1,22 @@
 module Locomotive
   class SnippetPresenter < BasePresenter
 
-    delegate :name, :slug, :template, :to => :source
+    ## properties ##
+
+    properties  :name, :slug, :template
+    property    :updated_at, only_getter: true
+
+    ## other getters / setters ##
 
     def updated_at
-      I18n.l(self.source.updated_at, :format => :short)
+      I18n.l(self.__source.updated_at, format: :short)
     end
 
-    def included_methods
-      super + %w(name slug template updated_at)
-    end
+    ## custom as_json ##
 
     def as_json_for_html_view
-      methods = included_methods.clone - %w(template)
-      self.as_json(methods)
+      self.as_json(self.getters - %w(template))
     end
 
   end
-end
+end

data/app/presenters/locomotive/theme_asset_presenter.rb

@@ -1,44 +1,61 @@
 module Locomotive
   class ThemeAssetPresenter < BasePresenter
 
-    delegate :content_type, :folder, :plain_text, :to => :source
+    ## properties ##
+
+    properties  :content_type,  :folder
+    property    :plain_text,    allow_nil: false
+
+    with_options only_setter: true do |presenter|
+      presenter.properties :plain_text_name, :plain_text_type, :performing_plain_text, :source
+    end
+
+    with_options only_getter: true do |presenter|
+      presenter.properties :local_path, :url, :size, :raw_size, :dimensions, :can_be_deleted
+    end
+
+    ## other getters / setters ##
 
     def local_path
-      self.source.local_path(true)
+      self.__source.local_path(true)
     end
 
     def url
-      self.source.source.url
+      self.__source.source.url
     end
 
     def size
-      number_to_human_size(self.source.size)
+      number_to_human_size(self.__source.size)
+    end
+
+    def raw_size
+      self.__source.size
     end
 
     def dimensions
-      self.source.image? ? "#{self.source.width}px x #{self.source.height}px" : nil
+      self.__source.image? ? "#{self.__source.width}px x #{self.__source.height}px" : nil
     end
 
     def updated_at
-      I18n.l(self.source.updated_at, :format => :short)
+      I18n.l(self.__source.updated_at, format: :short)
     end
 
     def can_be_deleted
-      self.ability.try(:can?, :destroy, self.source)
+      self.__ability.try(:can?, :destroy, self.__source)
     end
 
-    def included_methods
-      default_list = %w(content_type folder local_path url size dimensions can_be_deleted updated_at)
-      default_list += %w(plain_text) if plain_text?
-      super + default_list
+    def plain_text
+      plain_text? ? self.__source.plain_text : nil
     end
 
-    private
+    ## methods ##
+
+    protected
 
     def plain_text?
-      # FIXME: self.options contains all the options passed by the responder
-      self.options[:template] == 'update' && self.source.errors.empty? && self.source.stylesheet_or_javascript?
+      # FIXME: self.__options contains all the options passed by the responder
+      self.__options[:template] == 'update' && self.__source.errors.empty? && self.__source.stylesheet_or_javascript?
     end
 
   end
-end
+end

data/app/presenters/locomotive/translation_presenter.rb

@@ -0,0 +1,9 @@
+module Locomotive
+  class TranslationPresenter < BasePresenter
+
+    ## properties ##
+
+    properties :key, :values
+
+  end
+end

data/app/uploaders/locomotive/editable_file_uploader.rb

@@ -3,6 +3,10 @@
 module Locomotive
   class EditableFileUploader < ::CarrierWave::Uploader::Base
 
+  	include ::CarrierWave::MimeTypes
+
+    process :set_content_type
+
     def store_dir
       self.build_store_dir('sites', model.page.site_id, 'pages', model.page.id, 'files')
     end

data/app/views/locomotive/content_assets/_asset.html.haml

@@ -2,4 +2,4 @@
   %h4= link_to truncate(asset.name, :length => 17), edit_admin_asset_path(asset)
   = vignette_tag(asset)
   .actions
-    = link_to image_tag('admin/list/icons/cross.png'), '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
+    = link_to_icon :trash, '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }, :title => t('locomotive.buttons.delete')

data/app/views/locomotive/content_assets/_picker.html.haml

@@ -30,4 +30,4 @@
   {{/if}}
 
   .actions
-    = link_to 'x', '#', :class => 'remove', :'data-confirm' => t('locomotive.messages.confirm')
+    = link_to_icon :trash, '#', :class => 'remove', :'data-confirm' => t('locomotive.messages.confirm')

data/app/views/locomotive/content_entries/_form.html.haml

@@ -3,8 +3,8 @@
 
 - content_for :backbone_view_data do
   :plain
-    content_entry: #{j @content_entry.to_json.html_safe},
-    content_type: #{j @content_type.to_json.html_safe}
+    content_entry: #{j to_json(@content_entry)},
+    content_type: #{j to_json(@content_type)}
 
 = f.inputs :name => :attributes do
   - @content_type.ordered_entries_custom_fields.each_with_index do |field, index|

data/app/views/locomotive/content_entries/_list.html.haml

@@ -5,7 +5,6 @@
     - entries.each do |entry|
       %li.item{ :id => "entry-#{entry._id}" }
         %span.handle
-          = image_tag 'locomotive/form/icons/drag.png'
 
         %strong= link_to entry_label(content_type, entry), edit_content_entry_url(content_type.slug, entry)
 
@@ -16,4 +15,4 @@
             != t('locomotive.content_entries.index.updated_at')
           = l entry.updated_at, :format => :short rescue 'n/a'
 
-          = link_to 'x', content_entry_url(content_type.slug, entry), :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }, :method => :delete
+          = link_to_icon :trash, content_entry_url(content_type.slug, entry), :title => t('locomotive.buttons.delete'), :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }, :method => :delete

data/app/views/locomotive/content_entries/edit.html.haml

@@ -8,9 +8,9 @@
 
 - content_for :buttons do
   - if can?(:manage, Locomotive::ContentType)
-    = local_action_button t('locomotive.content_entries.index.edit'), edit_content_type_url(@content_type), :class => 'edit'
+    = local_action_button t('locomotive.content_entries.index.edit'), edit_content_type_url(@content_type), :icon => 'icon-pencil'
 
-  = local_action_button t('locomotive.content_entries.index.new'), new_content_entry_url(@content_type.slug), :class => 'new'
+  = local_action_button t('locomotive.content_entries.index.new'), new_content_entry_url(@content_type.slug), :icon => 'icon-plus'
 
 %p= @content_type.description
 
@@ -18,4 +18,7 @@
 
   = render 'form', :f => form
 
-  = render 'locomotive/shared/form_actions', :back_url => content_entries_url(@content_type.slug), :button_label => :update
+  = render 'locomotive/shared/form_actions', :back_url => content_entries_url(@content_type.slug), :button_label => :update
+
+- content_for :foot do
+  = render_has_many_forms

data/app/views/locomotive/content_entries/index.html.haml

@@ -5,9 +5,9 @@
 
 - content_for :buttons do
   - if can?(:manage, Locomotive::ContentType)
-    = local_action_button :edit, edit_content_type_url(@content_type), :class => 'edit'
+    = local_action_button :edit, edit_content_type_url(@content_type), :icon => 'icon-pencil'
 
-  = local_action_button :new, new_content_entry_url(@content_type.slug), :class => 'new'
+  = local_action_button :new, new_content_entry_url(@content_type.slug), :icon => 'icon-plus'
 
 - if @content_type.description.present?
   %p= @content_type.description

data/app/views/locomotive/content_entries/new.html.haml

@@ -8,7 +8,7 @@
 
 - if can?(:manage, Locomotive::ContentType)
   - content_for :buttons do
-    = local_action_button t('locomotive.content_entries.index.edit'), edit_content_type_url(@content_type), :class => 'edit'
+    = local_action_button t('locomotive.content_entries.index.edit'), edit_content_type_url(@content_type), :icon => 'icon-pencil'
 
 %p= @content_type.description
 
@@ -16,4 +16,7 @@
 
   = render 'form', :f => form
 
-  = render 'locomotive/shared/form_actions', :back_url => content_entries_url(@content_type.slug), :button_label => :create
+  = render 'locomotive/shared/form_actions', :back_url => content_entries_url(@content_type.slug), :button_label => :create
+
+- content_for :foot do
+  = render_has_many_forms

data/app/views/locomotive/content_types/edit.html.haml

@@ -7,8 +7,8 @@
   = render 'locomotive/shared/actions/contents'
 
 - content_for :buttons do
-  = local_action_button :show_entries, content_entries_url(@content_type.slug_was), :class => 'show'
-  = local_action_button :new_entry, new_content_entry_url(@content_type.slug_was), :class => 'new'
+  = local_action_button :show_entries, content_entries_url(@content_type.slug_was), :icon => 'icon-eye-open'
+  = local_action_button :new_entry, new_content_entry_url(@content_type.slug_was), :icon => 'icon-plus'
 
 %p!= t('.help')
 

data/app/views/locomotive/current_site/edit.html.haml

@@ -8,7 +8,7 @@
 
 - content_for :buttons do
   - if can?(:create, Locomotive::Account)
-    = local_action_button t('.new_membership'), new_membership_url, :class => 'new'
+    = local_action_button t('.new_membership'), new_membership_url, :icon => 'icon-plus'
 
 %p!= t('.help')
 

data/app/views/locomotive/custom_fields/_form.html.haml

@@ -21,7 +21,7 @@
   = f.semantic_fields_for :contents_custom_field, CustomFields::Field.new do |g|
 
     .handle.col
-      = image_tag 'locomotive/form/icons/drag.png'
+      %i.icon-reorder
 
     .label-input.col
       = g.text_field :label, :class => 'label'
@@ -51,9 +51,9 @@
 
       = g.input :ui_enabled, :as => :'Locomotive::Toggle', :wrapper_html => { :class => 'extra ui-enabled' }, :input_html => { :class => 'ui_enabled' }
 
-    %span.actions
-      = link_to 'toggle', '#', :class => 'toggle'
-      = link_to 'x', '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
+    .actions
+      = link_to_icon :caret_down, '#', :class => 'toggle'
+      = link_to_icon :trash, '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
 
     .clear
 

data/app/views/locomotive/custom_fields/_select_templates.html.haml

@@ -12,5 +12,5 @@
     %span.name {{name}}
 
     %span.actions
-      = link_to 'drag', '#', :class => 'drag'
-      = link_to 'x', '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
+      = link_to_icon :move, '#', :class => 'drag'
+      = link_to_icon :trash, '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }

data/app/views/locomotive/custom_fields/types/_has_many.html.haml

@@ -6,7 +6,7 @@
   = f.input     name.to_sym,
     :label      => field.label,
     :hint       => field.hint,
-    :as         => :'Locomotive::Empty',
+    :as         => :'locomotive/empty',
     :wrapper_html => { :id => "content_entry_#{name}_input", :class => 'empty relationship input' }
 
   - content_for :head do
@@ -25,46 +25,18 @@
     %script{ :type => 'text/html', :id => "#{name}_entry" }
       %li
         .handle.col
-          = image_tag 'locomotive/form/icons/drag.png'
+          %i.icon-reorder
 
         .label.col
           {{label}}
 
         %span.actions
-          = link_to 'e', '#', :class => 'edit'
-          = link_to 'x', '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
+          = link_to_icon :pencil, '#', :class => 'edit'
+          = link_to_icon :trash, '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
 
 
   - content_for :backbone_view_data do
     :plain
-      , #{name}_new_entry: #{new_target_content_entry.to_json}
-
-  - content_for :foot do
-
-    %div{ :id => "#{name}-template-entry", :style => 'display: none' }
-
-      %h2
-        %span.new-section= t('locomotive.content_entries.new.title', :type => name.capitalize).html_safe
-        %span.edit-section= t('locomotive.content_entries.edit.title', :type => name.capitalize).html_safe
-
-      = semantic_form_for new_target_content_entry, :as => :content_entry, :url => content_entries_url(target_content_type.slug), :html => { :multipart => true, :data => { :sending_form_message => t('locomotive.messages.sending_form') } } do |form|
-
-        = form.inputs :name => :attributes do
-          - target_content_type.ordered_entries_custom_fields.each_with_index do |_field, index|
-
-            - next if _field.name == field.inverse_of || %w(has_many many_to_many).include?(_field.type)
-
-            = render "locomotive/custom_fields/types/#{_field.type}",
-              :f            => form,
-              :name         => _field.name.to_sym,
-              :field        => _field,
-              :highlighted  => _field._id == target_content_type.label_field_id
-
-
-      .dialog-actions
-        = link_to t('locomotive.buttons.close'), '#', :id => 'close-link'
-
-        .button-wrapper
-          %span.new-section= submit_tag t('locomotive.shared.form_actions.create'), :'data-disable-with' => t('locomotive.shared.form_actions.disable_with')
-          %span.edit-section= submit_tag t('locomotive.shared.form_actions.update'), :'data-disable-with' => t('locomotive.shared.form_actions.disable_with')
+      , #{name}_new_entry: #{to_json(new_target_content_entry)}
 
+  - push_has_many_form field

data/app/views/locomotive/custom_fields/types/_has_many_form.html.haml

@@ -0,0 +1,31 @@
+- name          = field.name.to_s
+- content_type  = Locomotive::ContentType.class_name_to_content_type(field.class_name, current_site)
+- content_entry = content_type.entries.build
+
+
+%div{ id: "#{name}-template-entry", style: 'display: none' }
+
+  %h2
+    %span.new-section= t('locomotive.content_entries.new.title', type: name.capitalize).html_safe
+    %span.edit-section= t('locomotive.content_entries.edit.title', type: name.capitalize).html_safe
+
+  = semantic_form_for content_entry, as: :content_entry, namespace: name.to_s, url: content_entries_url(content_type.slug), html: { multipart: true, data: { sending_form_message: t('locomotive.messages.sending_form') } } do |form|
+
+    = form.inputs name: :attributes do
+      - content_type.ordered_entries_custom_fields.each_with_index do |_field, index|
+
+        - next if _field.name == field.inverse_of || %w(has_many many_to_many).include?(_field.type)
+
+        = render "locomotive/custom_fields/types/#{_field.type}",
+          f:            form,
+          name:         _field.name.to_sym,
+          field:        _field,
+          highlighted:  _field._id == content_type.label_field_id
+
+  .dialog-actions
+    = link_to t('locomotive.buttons.close'), '#', id: 'close-link'
+
+    .button-wrapper
+      %span.new-section= submit_tag t('locomotive.shared.form_actions.create'), :'data-disable-with' => t('locomotive.shared.form_actions.disable_with')
+      %span.edit-section= submit_tag t('locomotive.shared.form_actions.update'), :'data-disable-with' => t('locomotive.shared.form_actions.disable_with')
+

data/app/views/locomotive/custom_fields/types/_many_to_many.html.haml

@@ -27,14 +27,13 @@
     %script{ :type => 'text/html', :id => "#{name}_entry" }
       %li
         .handle.col
-          = image_tag 'locomotive/form/icons/drag.png'
+          %i.icon-reorder
 
         .label.col
           {{label}}
 
         %span.actions
-          = link_to 'x', '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
-
+          = link_to_icon :trash, '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
 
   - content_for :backbone_view_data do
     :plain

data/app/views/locomotive/layouts/not_logged_in.html.haml

@@ -11,7 +11,7 @@
 
   %body{ :class => controller.controller_name }
     #wrapper
-      #light.container
+      #light
         #panel.container
           %h1!= title