locomotive_cms 2.0.3 → 2.1.0

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

@@ -8,12 +8,12 @@
 
 - if can? :create, Locomotive::Page
   - content_for :buttons do
-    = local_action_button :new, new_page_url, :icon => 'icon-plus', :id => 'newpage'
+    = local_action_button :new, new_page_url, icon: 'icon-plus', id: 'newpage'
 
 %p!= t('.help')
 
 - if @pages.empty?
-  %p.no-items!= t('.no_items', :url => new_page_url)
+  %p.no-items!= t('.no_items', url: new_page_url)
 - else
   %ul#pages-list
     = render @pages

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

@@ -2,14 +2,14 @@
 
 - content_for :submenu do
   = render 'locomotive/shared/menu/contents'
-  
+
 - content_for :actions do
   = render 'locomotive/shared/actions/contents'
 
 %p!= t('.help')
 
-= semantic_form_for @page, :url => pages_url do |form|
+= semantic_form_for @page, url: pages_url do |form|
 
-  = render 'form', :f => form
+  = render 'form', f: form
 
-  = 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/passwords/edit.html.haml

@@ -1,6 +1,6 @@
 - title t('.title')
 
-= semantic_form_for(resource, :as => resource_name, :url => locomotive_account_password_url, :html => { :method => :put }) do |f|
+= semantic_form_for(resource, as: resource_name, url: locomotive_account_password_url, html: { method: :put }) do |f|
 
   = f.hidden_field :reset_password_token
 
@@ -8,8 +8,8 @@
     = flash_message
 
     = f.inputs do
-      = f.input :password, :label => t('.password'), :required => false
-      = f.input :password_confirmation, :label => t('.password_confirmation'), :required => false
+      = f.input :password, label: t('.password'), required: false
+      = f.input :password_confirmation, label: t('.password_confirmation'), required: false
 
     %p.link
       = link_to preserve(t('.link')), new_locomotive_account_session_path

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

@@ -1,6 +1,6 @@
 - title t('.title')
 
-= semantic_form_for(resource, :as => resource_name, :url => locomotive_account_password_path) do |f|
+= semantic_form_for(resource, as: resource_name, url: locomotive_account_password_path) do |f|
 
   = f.hidden_field :reset_password_token
 
@@ -8,7 +8,7 @@
     = flash_message
 
     = f.inputs do
-      = f.input :email, :label => t('.email'), :required => false
+      = f.input :email, label: t('.email'), required: false
 
     %p.link
       = link_to preserve(t('.link')), new_locomotive_account_session_path

data/app/views/locomotive/public/pages/show_toolbar.html.haml

@@ -1,6 +1,6 @@
 !!! XML
 !!!
-%html{ :xmlns => 'http://www.w3.org/1999/xhtml'  }
+%html{ xmlns: 'http://www.w3.org/1999/xhtml'  }
   %head
     %title Locomotive
 
@@ -8,23 +8,23 @@
 
     - key = Rails.application.config.session_options[:key]
 
-    %meta{ :name => 'key-param', :content => Rails.application.config.session_options[:key] }
-    %meta{ :name => 'key-token', :content => cookies[key] }
+    %meta{ name: 'key-param', content: Rails.application.config.session_options[:key] }
+    %meta{ name: 'key-token', content: cookies[key] }
 
-    %script{ :type => 'text/javascript' }
+    %script{ type: 'text/javascript' }
       :plain
         window.Locomotive = { mounted_on: '#{Locomotive.mounted_on}' };
 
-    = stylesheet_link_tag     'locomotive/inline_editor', :media => 'screen'
+    = stylesheet_link_tag     'locomotive/inline_editor', media: 'screen'
     = javascript_include_tag  'locomotive/inline_editor'
 
-    %script{ :type => 'text/javascript' }
+    %script{ type: 'text/javascript' }
       :plain
         window.locale         = '#{I18n.locale}';
         window.content_locale = '#{::Mongoid::Fields::I18n.locale}';
 
-        Locomotive.current_site     = new Locomotive.Models.Site(#{j current_site.to_json.html_safe});
-        Locomotive.current_account  = new Locomotive.Models.Account(#{j current_locomotive_account.to_json.html_safe});
+        Locomotive.current_site     = new Locomotive.Models.Site(#{escape_json current_site.to_json.html_safe});
+        Locomotive.current_account  = new Locomotive.Models.Account(#{escape_json current_locomotive_account.to_json.html_safe});
 
         $(document).ready(function() {
 
@@ -37,15 +37,15 @@
 
   %body
     #page
-      %iframe{ :src => request.fullpath.gsub('_admin', '_edit'), :scrolling => 'no', :frameborder => '0' }
+      %iframe{ src: request.fullpath.gsub('_admin', '_edit'), scrolling: 'no', frameborder: '0' }
 
     #toolbar
       .background
       .inner
-        %h1{ :class => 'loading', :'data-disabled-status' => t('.statuses.disabled'), :'data-loading-status' => t('.statuses.loading') }= t('.statuses.loading')
+        %h1{ class: 'loading', :'data-disabled-status' => t('.statuses.disabled'), :'data-loading-status' => t('.statuses.loading') }= t('.statuses.loading')
 
         .back.col
-          = link_to_icon :home, '#', :class => 'button back', :title => t('.buttons.back'), :alt => t('.buttons.back')
+          = link_to_icon :home, '#', class: 'button back', title: t('.buttons.back'), alt: t('.buttons.back')
 
         - if current_site.locales.size > 1
           .lang.col
@@ -56,9 +56,9 @@
           %label= t('.labels.editing_mode')
           = check_box_tag 'edit', '1', false
 
-        .element-actions.col{ :style => 'display: none' }
+        .element-actions.col{ style: 'display: none' }
           %label= t('.labels.save_changes')
-          = link_to t('.buttons.confirm'), '#', :class => 'button blue save'
-          = link_to t('.buttons.cancel'), '#', :class => 'button cancel'
+          = link_to t('.buttons.confirm'), '#', class: 'button blue save'
+          = link_to t('.buttons.cancel'), '#', class: 'button cancel'
 
-    = render_cell 'locomotive/content_locale_picker', :show, :site => current_site, :locale => current_content_locale
+    = render_cell 'locomotive/content_locale_picker', :show, site: current_site, locale: current_content_locale

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

@@ -1,14 +1,14 @@
 - title t('.title')
 
-= semantic_form_for(resource, :as => resource_name, :url => locomotive_account_session_path) do |f|
-  = f.hidden_field :remember_me, :value => 'true'
+= semantic_form_for(resource, as: resource_name, url: locomotive_account_session_path) do |f|
+  = f.hidden_field :remember_me, value: 'true'
 
   .inner
     = flash_message
 
     = f.inputs do
-      = f.input :email, :label => t('.email'), :required => false
-      = f.input :password, :label => t('.password'), :required => false
+      = f.input :email, label: t('.email'), required: false
+      = f.input :password, label: t('.password'), required: false
 
     %p.link
       = link_to t('.link'), new_locomotive_account_password_path

data/app/views/locomotive/shared/_footer.html.haml

@@ -1,2 +1,2 @@
 %p.tcenter
-  != t('.who_is_behind', :version => Locomotive::VERSION, :development => nocoffee_tag)
+  != t('.who_is_behind', version: Locomotive::VERSION, development: nocoffee_tag)

data/app/views/locomotive/shared/_head.html.haml

@@ -4,24 +4,24 @@
 
 - key = Rails.application.config.session_options[:key]
 
-%meta{ :name => 'key-param', :content => Rails.application.config.session_options[:key] }
-%meta{ :name => 'key-token', :content => cookies[key] }
+%meta{ name: 'key-param', content: Rails.application.config.session_options[:key] }
+%meta{ name: 'key-token', content: cookies[key] }
 
-%script{ :type => 'text/javascript' }
+%script{ type: 'text/javascript' }
   :plain
     window.Locomotive = { mounted_on: '#{Locomotive.mounted_on}' };
 
-= stylesheet_link_tag     'locomotive', :media => 'screen'
+= stylesheet_link_tag     'locomotive', media: 'screen'
 = javascript_include_tag  'locomotive'
 
-%script{ :type => 'text/javascript' }
+%script{ type: 'text/javascript' }
   :plain
     window.locale                 = '#{I18n.locale}';
     window.content_locale         = '#{::Mongoid::Fields::I18n.locale}';
     window.permalink_service_url  = '#{Locomotive.mounted_on}/_permalink.json';
 
-    Locomotive.current_site     = new Locomotive.Models.Site(#{j current_site.to_presenter.as_json_for_html_view.to_json.html_safe});
-    Locomotive.current_account  = new Locomotive.Models.Account(#{j current_locomotive_account.to_json.html_safe});
+    Locomotive.current_site     = new Locomotive.Models.Site(#{escape_json current_site.to_presenter.as_json_for_html_view.to_json.html_safe});
+    Locomotive.current_account  = new Locomotive.Models.Account(#{escape_json current_locomotive_account.to_json.html_safe});
 
     $(document).ready(function() {
 

data/app/views/locomotive/shared/_header.html.haml

@@ -1,10 +1,10 @@
 %h1
   = link_to current_site.name, locomotive.pages_url
 
-= render_cell 'locomotive/global_actions', :show, :current_locomotive_account => current_locomotive_account, :current_site_url => current_site_public_url
+= render_cell 'locomotive/global_actions', :show, current_locomotive_account: current_locomotive_account, current_site_url: current_site_public_url
 
 - if multi_sites? && current_locomotive_account.sites.size > 1
   = render 'locomotive/shared/site_picker'
 
 - if localized?
-  = render_cell 'locomotive/content_locale_picker', :show, :site => current_site, :locale => current_content_locale
+  = render_cell 'locomotive/content_locale_picker', :show, site: current_site, locale: current_content_locale

data/app/views/locomotive/shared/_locale_picker_link.html.haml

@@ -1,4 +1,4 @@
-= link_to '#', :id => 'content-locale-picker-link', :class => 'button' do
+= link_to '#', id: 'content-locale-picker-link', class: 'button' do
   = flag_tag current_content_locale
 
   %span.text= current_content_locale

data/app/views/locomotive/shared/_site_picker.html.haml

@@ -1,9 +1,9 @@
-#sites-picker{ :style => 'display: none' }
+#sites-picker{ style: 'display: none' }
   %ul
     - current_locomotive_account.sites.each do |site|
       - unless current_site._id == site._id
         %li
-          = link_to site.name, locomotive.pages_url(:host => site.full_subdomain, :port => request.port)
+          = link_to site.name, locomotive.pages_url(host: site.full_subdomain, port: request.port)
 
   - if can?(:manage, Locomotive::Site)
     %p.action

data/app/views/locomotive/shared/actions/_contents.html.haml

@@ -1,6 +1,6 @@
 - if can? :manage, Locomotive::ContentType
   .action
-    = link_to new_content_type_url, :class => 'button' do
+    = link_to new_content_type_url, class: 'button' do
       %i.icon-plus
       = t('locomotive.content_types.index.new')
 

data/app/views/locomotive/shared/menu/_contents.html.haml

@@ -12,22 +12,22 @@
         - current_site.pages.unscoped.latest_updated.minimal_attributes.each do |page|
           %li
             %i.icon-chevron-right
-            = link_to truncate(page.title, :length => 25), edit_page_url(page)
+            = link_to truncate(page.title, length: 25), edit_page_url(page)
             %span= time_ago_in_words(page.updated_at)
 
 - each_content_type do |menu_item|
   -if menu_item.is_a?(Array)
     - content_types = menu_item
-    = submenu_entry '...', '#', :i18n => false do
+    = submenu_entry '...', '#', i18n: false do
       .wrapper
         .inner
           %ul.big-links
             - content_types.each do |content_type|
               %li
-                = link_to truncate(content_type.name, :length => 20), content_entries_url(content_type.slug)
+                = link_to truncate(content_type.name, length: 20), content_entries_url(content_type.slug)
   - else
     - content_type = menu_item
-    = submenu_entry truncate(content_type.name, :length => 15), content_entries_url(content_type.slug), :i18n => false, :css => "#{'on' if is_content_type_selected(content_type)}" do
+    = submenu_entry truncate(content_type.name, length: 15), content_entries_url(content_type.slug), i18n: false, css: "#{'on' if is_content_type_selected(content_type)}" do
       .wrapper
         .header
           %p
@@ -47,5 +47,5 @@
             - content_type.entries.latest_updated.each do |entry|
               %li
                 %i.icon-chevron-right
-                = link_to truncate(entry._label(content_type), :length => 20), edit_content_entry_url(content_type.slug, entry)
+                = link_to truncate(entry._label(content_type), length: 20), edit_content_entry_url(content_type.slug, entry)
                 %span= time_ago_in_words(entry.updated_at)

data/app/views/locomotive/sites/_domains.html.haml

@@ -1,6 +1,6 @@
-%script{ :type => 'text/html', :id => 'domains_list' }
+%script{ type: 'text/html', id: 'domains_list' }
 
-  %p.empty{ :style => 'display: none' }!= t('.empty')
+  %p.empty{ style: 'display: none' }!= t('.empty')
 
   %ul
 
@@ -8,15 +8,15 @@
 
   .new-entry
     %em http://
-    = text_field_tag 'domain', '', :id => '', :placeholder => t('formtastic.hints.site.domain_name'), :class => 'path'
+    = text_field_tag 'domain', '', id: '', placeholder: t('formtastic.hints.site.domain_name'), class: 'path'
 
     %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 => 'domain_entry' }
+%script{ type: 'text/html', id: 'domain_entry' }
 
   %em http://
-  = text_field_tag 'site[domains][]', '{{name}}', :id => '', :class => 'path'
+  = text_field_tag 'site[domains][]', '{{name}}', id: '', class: 'path'
 
   %span.actions
-    = link_to_icon :trash, '#', :title => t('locomotive.buttons.delete'), :class => 'remove'
+    = link_to_icon :trash, '#', title: t('locomotive.buttons.delete'), class: 'remove'

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

@@ -3,10 +3,15 @@
 
 = f.inputs name: :information do
   = f.input :name, wrapper_html: { class: 'highlighted' }
+  = f.input :locales, as: :select,
+    collection:     options_for_select(options_for_site_locales, current_locomotive_account.locale),
+    input_html:     { name: 'site[locales][]' },
+    include_blank:  false
 
 - 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? }
 
     - if manage_domains?
-      = f.input :domains, as: :'Locomotive::Empty'
+      = f.input :domains, as: :'Locomotive::Empty'
+

data/app/views/locomotive/sites/_memberships.html.haml

@@ -1,4 +1,4 @@
-%script{ :type => 'text/html', :id => 'membership_entry' }
+%script{ type: 'text/html', id: 'membership_entry' }
 
   = hidden_field_tag 'site[memberships_attributes][{{index}}][id]', '{{id}}'
   = hidden_field_tag 'site[memberships_attributes][{{index}}][_destroy]'
@@ -13,11 +13,11 @@
     {{#if grant_admin}}
     = select_tag 'site[memberships_attributes][{{index}}][role]', options_for_membership_roles
     {{else}}
-    = select_tag 'site[memberships_attributes][{{index}}][role]', options_for_membership_roles(:skip_admin => true)
+    = select_tag 'site[memberships_attributes][{{index}}][role]', options_for_membership_roles(skip_admin: true)
     {{/if}}
 
   %span.actions
-    = link_to_icon :trash, '#', :title => t('locomotive.buttons.delete'), :class => 'remove'
+    = link_to_icon :trash, '#', title: t('locomotive.buttons.delete'), class: 'remove'
 
   {{else}}
   .role

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

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

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

@@ -3,11 +3,11 @@
 
 - content_for :backbone_view_data do
   :plain
-    snippet: #{j @snippet.persisted? ? to_json(@snippet) : 'null'}
+    snippet: #{escape_json @snippet.persisted? ? to_json(@snippet) : 'null'}
 
-= f.inputs :name => :information do
-  = f.input :name, :wrapper_html => { :class => 'highlighted' }
-  = f.input :slug, :required => false
+= f.inputs name: :information do
+  = f.input :name, wrapper_html: { class: 'highlighted' }
+  = f.input :slug, required: false
 
-= f.inputs :name => :code do
-  = f.input :template, :as => :'Locomotive::Code', :main_locale_template_url => snippet_main_template_path(@snippet)
+= f.inputs name: :code do
+  = f.input :template, as: :'Locomotive::Code', main_locale_template_url: snippet_main_template_path(@snippet)

data/app/views/locomotive/snippets/_snippet.html.haml

@@ -1,8 +1,8 @@
-%script{ :type => 'text/html', :id => 'snippet_item' }
+%script{ type: 'text/html', id: 'snippet_item' }
 
   %strong= link_to "{{name}}", edit_snippet_path('snippet_id').gsub(/\/snippet_id\//, '/{{id}}/')
   .more
     %span!= t('.updated_at')
     {{updated_at}}
 
-    = link_to_icon :trash, '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
+    = link_to_icon :trash, '#', class: 'remove', data: { confirm: t('locomotive.messages.confirm') }

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

@@ -7,12 +7,12 @@
   = locale_picker_link
 
 - content_for :buttons do
-  = local_action_button t('locomotive.snippets.index.new'), new_snippet_url, :icon => 'icon-plus'
+  = local_action_button t('locomotive.snippets.index.new'), new_snippet_url, icon: 'icon-plus'
 
-%p!= t('.help', :slug => @snippet.slug)
+%p!= t('.help', slug: @snippet.slug)
 
-= semantic_form_for @snippet, :url => snippet_url(@snippet), :html => { :class => 'save-with-shortcut' } do |form|
+= semantic_form_for @snippet, url: snippet_url(@snippet), html: { class: 'save-with-shortcut' } do |form|
 
-  = render 'form', :f => form
+  = render 'form', f: form
 
-  = render 'locomotive/shared/form_actions', :back_url => theme_assets_url, :button_label => :update
+  = render 'locomotive/shared/form_actions', back_url: theme_assets_url, button_label: :update

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

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

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

@@ -1,4 +1,4 @@
-%script{ :type => 'text/html', :id => 'editable_theme_asset_item' }
+%script{ type: 'text/html', id: 'editable_theme_asset_item' }
 
   %strong= link_to "{{local_path}}", edit_theme_asset_path('asset_id').gsub(/\/asset_id\//, '/{{id}}/')
   .more
@@ -7,5 +7,5 @@
     %span.date {{updated_at}}
 
     {{#if can_be_deleted}}
-    = link_to_icon :trash, '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
+    = link_to_icon :trash, '#', class: 'remove', data: { confirm: t('locomotive.messages.confirm') }
     {{/if}}

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

@@ -3,33 +3,33 @@
 
 - content_for :backbone_view_data do
   :plain
-    theme_asset: #{j @theme_asset.persisted? ? @theme_asset.to_json.html_safe : 'null'}
+    theme_asset: #{escape_json @theme_asset.persisted? ? @theme_asset.to_json.html_safe : 'null'}
 
 = f.hidden_field :performing_plain_text
 
-#file-selector{ :class => "selector #{'hidden' if display_plain_text?(@theme_asset)}" }
-  = f.inputs :name => :information do
+#file-selector{ class: "selector #{'hidden' if display_plain_text?(@theme_asset)}" }
+  = f.inputs name: :information do
     = f.input :source
 
   - if allow_plain_text_editing?(@theme_asset)
-    = link_to '#', :class => 'alt' do
+    = link_to '#', class: 'alt' do
       %i.icon-share
       = t('locomotive.theme_assets.form.choose_plain_text')
 
 - if allow_plain_text_editing?(@theme_asset)
-  #text-selector{ :class => "selector #{'hidden' unless display_plain_text?(@theme_asset)}", :style => "#{'display: none' unless display_plain_text?(@theme_asset)}" }
-    = f.inputs :name => :code, :class => 'inputs code' do
+  #text-selector{ class: "selector #{'hidden' unless display_plain_text?(@theme_asset)}", style: "#{'display: none' unless display_plain_text?(@theme_asset)}" }
+    = f.inputs name: :code, class: 'inputs code' do
 
       - if @theme_asset.new_record?
         = f.input :plain_text_name
 
-        = f.input :plain_text_type, :as => 'select', :collection => %w(stylesheet javascript), :include_blank => false
+        = f.input :plain_text_type, as: 'select', collection: %w(stylesheet javascript), include_blank: false
 
-      = f.input :plain_text, :as => :'Locomotive::Code', :type => plain_text_type(@theme_asset)
+      = f.input :plain_text, as: :'Locomotive::Code', type: plain_text_type(@theme_asset)
 
-    = link_to '#', :class => 'alt' do
+    = link_to '#', class: 'alt' do
       %i.icon-share
       = t('locomotive.theme_assets.form.choose_file')
 
-= f.inputs :name => :options, :class => "inputs foldable #{'folded' if inputs_folded?(@theme_asset)}" do
+= f.inputs name: :options, class: "inputs foldable #{'folded' if inputs_folded?(@theme_asset)}" do
   = f.input :folder