locomotive_cms 2.0.3 → 2.1.0

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

@@ -1,39 +1,39 @@
 - content_for :head do
-  = render 'locomotive/custom_fields/form', :f => f
+  = render 'locomotive/custom_fields/form', f: f
 
 - content_for :backbone_view_data do
   :plain
-    content_type: #{j @content_type.persisted? ? @content_type.to_json.html_safe : 'null'},
-    inverse_of_list: #{j options_for_content_type_inverse_of.to_json.html_safe}
+    content_type: #{escape_json @content_type.persisted? ? @content_type.to_json.html_safe : 'null'},
+    inverse_of_list: #{escape_json options_for_content_type_inverse_of.to_json.html_safe}
 
-= f.inputs :name => :information do
+= f.inputs name: :information do
 
-  = f.input :name, :wrapper_html => { :class => 'highlighted' }
+  = f.input :name, wrapper_html: { class: 'highlighted' }
 
   = f.input :slug
 
   = f.input :description
 
-= f.inputs :name => :custom_fields, :class => "inputs foldable" do
+= f.inputs name: :custom_fields, class: "inputs foldable" do
 
-  = f.input :entries_custom_fields, :as => :'Locomotive::Empty', :label => false, :wrapper_html => { :id => 'custom_fields_input' }
+  = f.input :entries_custom_fields, as: :'Locomotive::Empty', label: false, wrapper_html: { id: 'custom_fields_input' }
 
 - if @content_type.persisted?
 
-  = f.inputs :name => :presentation, :class => "inputs foldable #{'folded' if inputs_folded?(@content_type)}" do
+  = f.inputs name: :presentation, class: "inputs foldable #{'folded' if inputs_folded?(@content_type)}" do
 
-    = f.input :label_field_id, :as => :select, :collection => options_for_label_field(@content_type), :include_blank => false
+    = f.input :label_field_id, as: :select, collection: options_for_label_field(@content_type), include_blank: false
 
-    = f.input :group_by_field_id, :as => :select, :collection => options_for_group_by_field(@content_type)
+    = f.input :group_by_field_id, as: :select, collection: options_for_group_by_field(@content_type)
 
-    = f.input :raw_item_template, :as => :'Locomotive::SmallCode'
+    = f.input :raw_item_template, as: :'Locomotive::SmallCode'
 
-  = f.inputs :name => :options, :class => "inputs foldable #{'folded' if inputs_folded?(@content_type)}" do
+  = f.inputs name: :options, class: "inputs foldable #{'folded' if inputs_folded?(@content_type)}" do
 
-    = f.input :order_by, :as => :select, :collection => options_for_order_by(@content_type), :include_blank => false
+    = f.input :order_by, as: :select, collection: options_for_order_by(@content_type), include_blank: false
 
-    = f.input :order_direction, :as => :select, :collection => options_for_order_direction, :include_blank => false, :wrapper_html => { :style => "#{'display: none' if @content_type.order_manually?}" }
+    = f.input :order_direction, as: :select, collection: options_for_order_direction, include_blank: false, wrapper_html: { style: "#{'display: none' if @content_type.order_manually?}" }
 
-    = f.input :public_submission_enabled, :as => :'Locomotive::Toggle'
+    = f.input :public_submission_enabled, as: :'Locomotive::Toggle'
 
-    = f.input :public_submission_accounts, :as => :select, :collection => options_for_account, :include_blank => false, :multiple => true, :wrapper_html => { :class => 'multiple', :style => (@content_type.public_submission_enabled? ? '' : 'display: none') }
+    = f.input :public_submission_accounts, as: :select, collection: options_for_account, include_blank: false, multiple: true, wrapper_html: { class: 'multiple', style: (@content_type.public_submission_enabled? ? '' : 'display: none') }

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

@@ -7,13 +7,13 @@
   = render 'locomotive/shared/actions/contents'
 
 - content_for :buttons do
-  = 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'
+  = 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')
 
-= semantic_form_for @content_type, :url => content_type_url(@content_type) do |f|
+= semantic_form_for @content_type, url: content_type_url(@content_type) do |f|
 
-  = render 'form', :f => f
+  = render 'form', f: f
 
-  = render 'locomotive/shared/form_actions', :back_url => content_entries_url(@content_type.slug_was), :button_label => :update
+  = render 'locomotive/shared/form_actions', back_url: content_entries_url(@content_type.slug_was), button_label: :update

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

@@ -8,8 +8,8 @@
 
 %p!= t('.help')
 
-= semantic_form_for @content_type, :url => content_types_url do |f|
+= semantic_form_for @content_type, url: content_types_url do |f|
 
-  = render 'form', :f => f
+  = render 'form', f: f
 
-  = render 'locomotive/shared/form_actions', :back_url => pages_url, :button_label => :create
+  = render 'locomotive/shared/form_actions', back_url: pages_url, button_label: :create

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

@@ -4,33 +4,33 @@
 
 - content_for :backbone_view_data do
   :plain
-    site:   #{j @site.to_json(:current_account => current_locomotive_account, :current_site => current_site).html_safe},
+    site:   #{escape_json @site.to_json(current_account: current_locomotive_account, current_site: current_site).html_safe},
     errors: #{@site.errors.to_json}
 
-= f.inputs :name => :information  do
-  = f.input :name, :wrapper_html => { :style => 'display: none' }
-  = f.input :locales, :as => '::Locomotive::Locales', :collection => ordered_current_site_locales, :input_html => { :class => 'locales' }
+= f.inputs name: :information  do
+  = f.input :name, wrapper_html: { style: 'display: none' }
+  = f.input :locales, as: '::Locomotive::Locales', collection: ordered_current_site_locales, input_html: { class: 'locales' }
 
 - if can?(:point, Locomotive::Site)
   - if manage_subdomain_or_domains?
-    = f.inputs :name => :access_points do
-      = f.input :subdomain, :as => :'Locomotive::Subdomain', :domain => application_domain, :input_html => { :readonly => !manage_subdomain? }
+    = f.inputs name: :access_points do
+      = f.input :subdomain, as: :'Locomotive::Subdomain', domain: application_domain, input_html: { readonly: !manage_subdomain? }
 
       - if manage_domains?
-        = f.input :domains, :as => :'Locomotive::Empty'
+        = f.input :domains, as: :'Locomotive::Empty'
 
 
-= f.inputs :name => :seo, :class => "inputs foldable #{'folded' if inputs_folded?(@site)}" do
+= f.inputs name: :seo, class: "inputs foldable #{'folded' if inputs_folded?(@site)}" do
   = f.input :seo_title
   = f.input :meta_keywords
   = f.input :meta_description
 
 - if can?(:index, Locomotive::Membership)
 
-  = f.inputs :name => :memberships do
-    = f.input :memberships, :as => :'Locomotive::Empty', :label => false, :wrapper_html => { :id => 'site_memberships_input' }
+  = f.inputs name: :memberships do
+    = f.input :memberships, as: :'Locomotive::Empty', label: false, wrapper_html: { id: 'site_memberships_input' }
 
 - if can?(:manage, current_site)
 
-  = f.inputs :name => :robots_txt, :class => "inputs foldable #{'folded' if inputs_folded?(@site)}" do
-    = f.input :robots_txt, :as => :'Locomotive::Code', :picker => false, :wrapper_html => { :class => 'small no-label' }
+  = f.inputs name: :robots_txt, class: "inputs foldable #{'folded' if inputs_folded?(@site)}" do
+    = f.input :robots_txt, as: :'Locomotive::Code', picker: false, wrapper_html: { class: 'small no-label' }

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

@@ -1,4 +1,4 @@
-- title link_to(@site.name.blank? ? @site.name_was : @site.name, '#', :rel => 'site_name', :title => t('.ask_for_name'), :class => 'editable')
+- title link_to(@site.name.blank? ? @site.name_was : @site.name, '#', rel: 'site_name', title: t('.ask_for_name'), class: 'editable')
 
 - content_for :submenu do
   = render_cell 'locomotive/settings_menu', :show
@@ -8,12 +8,12 @@
 
 - content_for :buttons do
   - if can?(:create, Locomotive::Account)
-    = local_action_button t('.new_membership'), new_membership_url, :icon => 'icon-plus'
+    = local_action_button t('.new_membership'), new_membership_url, icon: 'icon-plus'
 
 %p!= t('.help')
 
-= semantic_form_for @site, :url => current_site_url do |form|
+= semantic_form_for @site, url: current_site_url do |form|
 
-  = render 'form', :f => form
+  = render 'form', f: form
 
-  = render 'locomotive/shared/form_actions', :button_label => :update
+  = render 'locomotive/shared/form_actions', button_label: :update

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

@@ -1,6 +1,6 @@
-%script{ :type => 'text/html', :id => 'custom_fields_list' }
+%script{ type: 'text/html', id: 'custom_fields_list' }
 
-  %p.empty{ :style => 'display: none' }!= t('.empty')
+  %p.empty{ style: 'display: none' }!= t('.empty')
 
   %ul
 
@@ -8,15 +8,15 @@
 
   .new-entry
 
-    = text_field_tag 'label', '', :id => '', :placeholder => t('.default_label')
+    = text_field_tag 'label', '', id: '', placeholder: t('.default_label')
 
     = select_tag 'type', options_for_select(options_for_custom_field_type)
 
     %span.actions
-      = link_to t('locomotive.buttons.new_item'), '#', :class => 'add'
+      = link_to t('locomotive.buttons.new_item'), '#', class: 'add'
 
 
-%script{ :type => 'text/html', :id => 'custom_field_entry' }
+%script{ type: 'text/html', id: 'custom_field_entry' }
 
   = f.semantic_fields_for :contents_custom_field, CustomFields::Field.new do |g|
 
@@ -24,36 +24,40 @@
       %i.icon-reorder
 
     .label-input.col
-      = g.text_field :label, :class => 'label'
+      = g.text_field :label, class: 'label'
 
     .type-input.col
-      = g.select :type, options_for_custom_field_type, {}, { :class => 'type' }
+      = g.select :type, options_for_custom_field_type, {}, { class: 'type' }
 
     .required-input.col
       %span= t('.required')
-      = g.check_box :required, :class => 'required'
+      = g.check_box :required, class: 'required'
 
-    %ol.nested{ :style => 'display: none' }
+    %ol.nested{ style: 'display: none' }
 
-      = g.input :name, :input_html => { :class => 'name' }
+      = g.input :name, input_html: { class: 'name' }
 
-      = g.input :hint, :input_html => { :class => 'hint' }
+      = g.input :hint, input_html: { class: 'hint' }
 
-      = g.input :localized, :as => :'Locomotive::Toggle', :wrapper_html => { :class => 'localized' }, :input_html => { :class => 'localized' }
+      = g.input :localized, as: :'Locomotive::Toggle', wrapper_html: { class: 'localized' }, input_html: { class: 'localized' }
 
-      = g.input :select_options, :as => :'Locomotive::Empty', :wrapper_html => { :class => 'extra select-options', :style => 'display: none' }
+      = g.input :unique, as: :'Locomotive::Toggle', wrapper_html: {class: 'unique'}, input_html: { class: 'unique'}
 
-      = g.input :text_formatting, :as => :select, :collection => options_for_text_formatting, :include_blank => false, :wrapper_html => { :class => 'extra text-formatting' }, :input_html => { :class => 'text_formatting' }
+      = g.input :select_options, as: :'Locomotive::Empty', wrapper_html: { class: 'extra select-options', style: 'display: none' }
 
-      = g.input :class_name, :as => :select, :collection => options_for_content_type, :include_blank => false, :wrapper_html => { :class => 'extra class-name', :style => 'display: none' }, :input_html => { :class => 'class_name' }
+      = g.input :text_formatting, as: :select, collection: options_for_text_formatting, include_blank: false, wrapper_html: { class: 'extra text-formatting' }, input_html: { class: 'text_formatting' }
 
-      = g.input :inverse_of, :as => :select, :collection => [], :wrapper_html => { :class => 'extra inverse-of', :style => 'display: none' }, :input_html => { :class => 'inverse_of' }
+      = g.input :class_name, as: :select, collection: options_for_content_type, include_blank: false, wrapper_html: { class: 'extra class-name', style: 'display: none' }, input_html: { class: 'class_name' }
 
-      = g.input :ui_enabled, :as => :'Locomotive::Toggle', :wrapper_html => { :class => 'extra ui-enabled' }, :input_html => { :class => 'ui_enabled' }
+      = g.input :inverse_of, as: :select, collection: [], wrapper_html: { class: 'extra inverse-of', style: 'display: none' }, input_html: { class: 'inverse_of' }
+
+      = g.input :ui_enabled, as: :'Locomotive::Toggle', wrapper_html: { class: 'extra ui-enabled' }, input_html: { class: 'ui_enabled' }
+
+      = render_cell 'locomotive/partials', :display, :custom_fields_form, g: g
 
     .actions
-      = link_to_icon :caret_down, '#', :class => 'toggle'
-      = link_to_icon :trash, '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
+      = 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

@@ -1,16 +1,16 @@
-%script{ :type => 'text/html', :id => 'select_options_list' }
+%script{ type: 'text/html', id: 'select_options_list' }
 
   %ul{ :'data-prompt' => t('locomotive.custom_fields.form.select_options.ask_name') }
 
   %span.actions
-    = link_to t('locomotive.buttons.new_item'), '#', :class => 'add'
+    = link_to t('locomotive.buttons.new_item'), '#', class: 'add'
 
 
-%script{ :type => 'text/html', :id => 'select_option_entry' }
+%script{ type: 'text/html', id: 'select_option_entry' }
 
   %li.entry
     %span.name {{name}}
 
     %span.actions
-      = link_to_icon :move, '#', :class => 'drag'
-      = link_to_icon :trash, '#', :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/_belongs_to.html.haml

@@ -1,5 +1,5 @@
 = f.input :"#{name}_id",
-  :label      => field.label,
-  :hint       => field.hint,
-  :as         => :select,
-  :collection => options_for_belongs_to_custom_field(field.class_name)
+  label:      field.label,
+  hint:       field.hint,
+  as:         :select,
+  collection: options_for_belongs_to_custom_field(field.class_name)

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

@@ -1,4 +1,4 @@
 = f.input name,
-  :label  => field.label,
-  :hint   => field.hint,
-  :as     => :'Locomotive::Toggle'
+  label:  field.label,
+  hint:   field.hint,
+  as:     :'Locomotive::Toggle'

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

@@ -1,5 +1,5 @@
 = f.input :"formatted_#{name}",
-  :label        => field.label,
-  :hint         => field.hint,
-  :wrapper_html => { :class => 'date' },
-  :input_html   => { :maxlength => 10 }
+  label:        field.label,
+  hint:         field.hint,
+  wrapper_html: { class: 'date' },
+  input_html:   { maxlength: 10 }

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

@@ -0,0 +1,4 @@
+= f.input name,
+  label:        field.label,
+  hint:         field.hint,
+  wrapper_html: { class: "#{'highlighted' if highlighted}" }

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

@@ -1,4 +1,4 @@
 = f.input name,
-  :label  => field.label,
-  :hint   => field.hint,
-  :as     => :'Locomotive::File'
+  label:  field.label,
+  hint:   field.hint,
+  as:     :'Locomotive::File'

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

@@ -0,0 +1,6 @@
+= f.input name,
+  label:        field.label,
+  hint:         field.hint,
+  as:           :number,
+  step:         0.1,
+  wrapper_html: { class: "#{'highlighted' if highlighted}" }

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

@@ -4,25 +4,25 @@
   - new_target_content_entry  = target_content_type.entries.build(field.inverse_of => f.object)
 
   = f.input     name.to_sym,
-    :label      => field.label,
-    :hint       => field.hint,
-    :as         => :'locomotive/empty',
-    :wrapper_html => { :id => "content_entry_#{name}_input", :class => 'empty relationship input' }
+    label:      field.label,
+    hint:       field.hint,
+    as:         :'locomotive/empty',
+    wrapper_html: { id: "content_entry_#{name}_input", class: 'empty relationship input' }
 
   - content_for :head do
 
-    %script{ :type => 'text/html', :id => "#{name}_list" }
+    %script{ type: 'text/html', id: "#{name}_list" }
 
-      %p.empty{ :style => 'display: none' }!= t('.empty')
+      %p.empty{ style: 'display: none' }!= t('.empty')
 
       %ul
 
       %hr
 
       %p.actions
-        = link_to t('.new_entry'), '#', :class => 'add'
+        = link_to t('.new_entry'), '#', class: 'add'
 
-    %script{ :type => 'text/html', :id => "#{name}_entry" }
+    %script{ type: 'text/html', id: "#{name}_entry" }
       %li
         .handle.col
           %i.icon-reorder
@@ -31,8 +31,8 @@
           {{label}}
 
         %span.actions
-          = link_to_icon :pencil, '#', :class => 'edit'
-          = link_to_icon :trash, '#', :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

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

@@ -0,0 +1,5 @@
+= f.input name,
+  label:        field.label,
+  hint:         field.hint,
+  as:           :number,
+  wrapper_html: { class: "#{'highlighted' if highlighted}" }

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

@@ -2,16 +2,16 @@
   - target_content_type = Locomotive::ContentType.class_name_to_content_type(field.class_name, current_site)
 
   = f.input       name.to_sym,
-    :label        => field.label,
-    :hint         => field.hint,
-    :as           => :'Locomotive::Empty',
-    :wrapper_html => { :id => "content_entry_#{name}_input", :class => 'empty relationship input' }
+    label:        field.label,
+    hint:         field.hint,
+    as:           :'Locomotive::Empty',
+    wrapper_html: { id: "content_entry_#{name}_input", class: 'empty relationship input' }
 
   - content_for :head do
 
-    %script{ :type => 'text/html', :id => "#{name}_list" }
+    %script{ type: 'text/html', id: "#{name}_list" }
 
-      %p.empty{ :style => 'display: none' }!= t('.empty')
+      %p.empty{ style: 'display: none' }!= t('.empty')
 
       %ul
 
@@ -22,9 +22,9 @@
         = select_tag 'entry', []
 
         %span.actions
-          = link_to t('locomotive.buttons.new_item'), '#', :class => 'add'
+          = link_to t('locomotive.buttons.new_item'), '#', class: 'add'
 
-    %script{ :type => 'text/html', :id => "#{name}_entry" }
+    %script{ type: 'text/html', id: "#{name}_entry" }
       %li
         .handle.col
           %i.icon-reorder
@@ -33,8 +33,8 @@
           {{label}}
 
         %span.actions
-          = link_to_icon :trash, '#', :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
-      , all_#{name}_entries: #{j target_content_type.list_or_group_entries.to_json(:depth => 1).html_safe}
+      , all_#{name}_entries: #{escape_json target_content_type.list_or_group_entries.to_json(depth: 1).html_safe}

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

@@ -1,8 +1,8 @@
 = f.input :"#{name}_id",
-  :label      => field.label,
-  :hint       => field.hint,
-  :as         => :select,
-  :collection => field.ordered_select_options.map { |option| [option.name, option.id] }
+  label:      field.label,
+  hint:       field.hint,
+  as:         :select,
+  collection: field.ordered_select_options.map { |option| [option.name, option.id] }
 
 - content_for :head do
 
@@ -11,8 +11,8 @@
     / Handlebar templates for managing the select options
     = render 'locomotive/custom_fields/select_templates'
 
-    %script{ :type => 'text/html', :id => 'edit_select_options_button' }
-      = link_to t('locomotive.content_entries.form.edit_select_options'), '#', :class => 'edit-options-button'
+    %script{ type: 'text/html', id: 'edit_select_options_button' }
+      = link_to t('locomotive.content_entries.form.edit_select_options'), '#', class: 'edit-options-button'
 
 
 - content_for :foot do
@@ -20,15 +20,15 @@
   - required_once :select_options_popup do
 
     / Handlebar template for the popup
-    %div{ :id => 'edit-select-option-entries', :style => 'display: none' }
+    %div{ id: 'edit-select-option-entries', style: 'display: none' }
 
       %h2
         = t('.manage_select_options_entries')
 
-      .placeholder{ :data => { :sending_form_message => t('locomotive.messages.sending_form') } }
+      .placeholder{ data: { sending_form_message: t('locomotive.messages.sending_form') } }
 
       .dialog-actions
-        = link_to t('locomotive.buttons.close'), '#', :id => 'close-link'
+        = link_to t('locomotive.buttons.close'), '#', id: 'close-link'
 
         .button-wrapper
-          = submit_tag t('locomotive.shared.form_actions.update'), { :data => { :disable_with => t('locomotive.shared.form_actions.disable_with') } }
+          = submit_tag t('locomotive.shared.form_actions.update'), { data: { disable_with: t('locomotive.shared.form_actions.disable_with') } }