locomotive_cms 2.2.2 → 2.2.3

data/app/cells/locomotive/global_actions_cell.rb

@@ -12,7 +12,7 @@ module Locomotive
     protected
 
     def build_list
-      add :welcome, url: edit_my_account_url, i18n_options: {
+      add :welcome, url: edit_my_account_path, i18n_options: {
         key:    'locomotive.shared.header.welcome',
         arg:    :name,
         value:  @current_locomotive_account.name
@@ -25,7 +25,7 @@ module Locomotive
       end
 
       add :help, url: 'http://doc.locomotivecms.com', class: 'tutorial', id: 'help', target: '_blank'
-      add :logout, url: destroy_locomotive_session_url, data: { confirm: t('locomotive.messages.confirm') }, method: :delete
+      add :logout, url: destroy_locomotive_session_path, data: { confirm: t('locomotive.messages.confirm') }, method: :delete
     end
 
     def localize_label(label, options = {})

data/app/cells/locomotive/main_menu_cell.rb

@@ -4,8 +4,8 @@ module Locomotive
     protected
 
     def build_list
-      add :contents,  url: pages_url,             icon: 'icon-folder-open'
-      add :settings,  url: edit_current_site_url, icon: 'icon-cog'
+      add :contents,  url: pages_path,             icon: 'icon-folder-open'
+      add :settings,  url: edit_current_site_path, icon: 'icon-cog'
     end
 
   end

data/app/cells/locomotive/settings_menu_cell.rb

@@ -4,10 +4,10 @@ module Locomotive
     protected
 
     def build_list
-      add :site,          url: edit_current_site_url
-      add :theme_assets,  url: theme_assets_url
-      add :translations,  url: translations_url
-      add :account,       url: edit_my_account_url
+      add :site,          url: edit_current_site_path
+      add :theme_assets,  url: theme_assets_path
+      add :translations,  url: translations_path
+      add :account,       url: edit_my_account_path
     end
 
   end

data/app/controllers/locomotive/accounts_controller.rb

@@ -11,7 +11,7 @@ module Locomotive
     def create
       @account = Account.create(params[:account])
       current_site.memberships.create(account: @account) if @account.errors.empty?
-      respond_with @account, location: edit_current_site_url
+      respond_with @account, location: edit_current_site_path
     end
 
   end

data/app/controllers/locomotive/api/tokens_controller.rb

@@ -2,7 +2,7 @@ module Locomotive
   module Api
     class TokensController < Locomotive::Api::BaseController
 
-      skip_before_filter :require_account, :require_site, :set_locale, :set_current_thread_variables
+      skip_before_filter :require_account, :require_site, :set_current_thread_variables
 
       def create
         begin

data/app/controllers/locomotive/base_controller.rb

@@ -41,7 +41,7 @@ module Locomotive
       else
         flash[:alert] = exception.message
 
-        redirect_to pages_url
+        redirect_to pages_path
       end
     end
 

data/app/controllers/locomotive/content_entries_controller.rb

@@ -49,7 +49,7 @@ module Locomotive
 
     def create
       @content_entry = @content_type.entries.create(params[:content_entry])
-      respond_with @content_entry, location: edit_content_entry_url(@content_type.slug, @content_entry._id)
+      respond_with @content_entry, location: edit_content_entry_path(@content_type.slug, @content_entry._id)
     end
 
     def edit
@@ -60,7 +60,7 @@ module Locomotive
     def update
       @content_entry = @content_type.entries.find(params[:id])
       @content_entry.update_attributes(params[:content_entry])
-      respond_with @content_entry, location: edit_content_entry_url(@content_type.slug, @content_entry._id)
+      respond_with @content_entry, location: edit_content_entry_path(@content_type.slug, @content_entry._id)
     end
 
     def sort
@@ -71,7 +71,7 @@ module Locomotive
     def destroy
       @content_entry = @content_type.entries.find(params[:id])
       @content_entry.destroy
-      respond_with @content_entry, location: content_entries_url(@content_type.slug)
+      respond_with @content_entry, location: content_entries_path(@content_type.slug)
     end
 
     protected

data/app/controllers/locomotive/content_types_controller.rb

@@ -16,7 +16,7 @@ module Locomotive
 
     def create
       @content_type = current_site.content_types.create(params[:content_type])
-      respond_with @content_type, location: edit_content_type_url(@content_type._id)
+      respond_with @content_type, location: edit_content_type_path(@content_type._id)
     end
 
     def edit
@@ -27,13 +27,13 @@ module Locomotive
     def update
       @content_type = current_site.content_types.find(params[:id])
       @content_type.update_attributes(params[:content_type])
-      respond_with @content_type, location: edit_content_type_url(@content_type._id)
+      respond_with @content_type, location: edit_content_type_path(@content_type._id)
     end
 
     def destroy
       @content_type = current_site.content_types.find(params[:id])
       @content_type.destroy
-      respond_with @content_type, location: pages_url
+      respond_with @content_type, location: pages_path
     end
 
   end

data/app/controllers/locomotive/current_site_controller.rb

@@ -25,7 +25,7 @@ module Locomotive
     def update
       @site = current_site
       @site.update_attributes(params[:site])
-      respond_with @site, location: edit_current_site_url(new_host_if_subdomain_changed)
+      respond_with @site, location: edit_current_site_path(new_host_if_subdomain_changed)
     end
 
     protected

data/app/controllers/locomotive/memberships_controller.rb

@@ -9,20 +9,20 @@ module Locomotive
 
       case @membership.process!
       when :create_account
-        redirect_to new_account_url(email: @membership.email)
+        redirect_to new_account_path(email: @membership.email)
       when :save_it
-        respond_with @membership, location: edit_current_site_url
+        respond_with @membership, location: edit_current_site_path
       when :error
         respond_with @membership, flash: true
       when :already_created
-        respond_with @membership, alert: t('flash.locomotive.memberships.create.already_created'), location: edit_current_site_url
+        respond_with @membership, alert: t('flash.locomotive.memberships.create.already_created'), location: edit_current_site_path
       end
     end
 
     def destroy
       @membership = current_site.memberships.find(params[:id])
       @membership.destroy
-      respond_with @membership, location: edit_current_site_url
+      respond_with @membership, location: edit_current_site_path
     end
 
   end

data/app/controllers/locomotive/my_account_controller.rb

@@ -17,13 +17,13 @@ module Locomotive
     def update
       @account = current_locomotive_account
       @account.update_attributes(params[:account])
-      respond_with @account, location: edit_my_account_url
+      respond_with @account, location: edit_my_account_path
     end
 
     def regenerate_api_key
       @account = current_locomotive_account
       @account.regenerate_api_key!
-      respond_with({ api_key: @account.api_key }, location: edit_my_account_url)
+      respond_with({ api_key: @account.api_key }, location: edit_my_account_path)
     end
 
   end

data/app/controllers/locomotive/pages_controller.rb

@@ -26,7 +26,7 @@ module Locomotive
 
     def create
       @page = current_site.pages.create(params[:page])
-      respond_with @page, location: edit_page_url(@page._id)
+      respond_with @page, location: edit_page_path(@page._id)
     end
 
     def edit
@@ -37,7 +37,7 @@ module Locomotive
     def update
       @page = current_site.pages.find(params[:id])
       @page.update_attributes(params[:page])
-      respond_with @page, location: edit_page_url(@page._id)
+      respond_with @page, location: edit_page_path(@page._id)
     end
 
     def destroy

data/app/controllers/locomotive/sessions_controller.rb

@@ -14,7 +14,7 @@ module Locomotive
     protected
 
     def after_sign_in_path_for(resource)
-      pages_url
+      pages_path
     end
 
     def after_sign_out_path_for(resource)

data/app/controllers/locomotive/sites_controller.rb

@@ -14,7 +14,7 @@ module Locomotive
       @site = Site.new(params[:site])
       @site.memberships.build account: self.current_locomotive_account, role: 'admin'
       @site.save
-      respond_with @site, location: edit_my_account_url
+      respond_with @site, location: edit_my_account_path
     end
 
     def destroy
@@ -26,7 +26,7 @@ module Locomotive
         @site.errors.add(:base, 'Can not destroy the site you are logging in now')
       end
 
-      respond_with @site, location: edit_my_account_url
+      respond_with @site, location: edit_my_account_path
     end
 
   end

data/app/controllers/locomotive/snippets_controller.rb

@@ -21,7 +21,7 @@ module Locomotive
 
     def create
       @snippet = current_site.snippets.create(params[:snippet])
-      respond_with @snippet, location: edit_snippet_url(@snippet._id)
+      respond_with @snippet, location: edit_snippet_path(@snippet._id)
     end
 
     def edit
@@ -32,13 +32,13 @@ module Locomotive
     def update
       @snippet = current_site.snippets.find(params[:id])
       @snippet.update_attributes(params[:snippet])
-      respond_with @snippet, location: edit_snippet_url(@snippet._id)
+      respond_with @snippet, location: edit_snippet_path(@snippet._id)
     end
 
     def destroy
       @snippet = current_site.snippets.find(params[:id])
       @snippet.destroy
-      respond_with @snippet, location: theme_assets_url
+      respond_with @snippet, location: theme_assets_path
     end
 
   end

data/app/controllers/locomotive/theme_assets_controller.rb

@@ -26,7 +26,7 @@ module Locomotive
 
     def create
       @theme_asset = current_site.theme_assets.create(params[:theme_asset])
-      respond_with @theme_asset, location: edit_theme_asset_url(@theme_asset._id)
+      respond_with @theme_asset, location: edit_theme_asset_path(@theme_asset._id)
     end
 
     def edit
@@ -38,7 +38,7 @@ module Locomotive
     def update
       @theme_asset = current_site.theme_assets.find(params[:id])
       @theme_asset.update_attributes(params[:theme_asset])
-      respond_with @theme_asset, location: edit_theme_asset_url(@theme_asset._id)
+      respond_with @theme_asset, location: edit_theme_asset_path(@theme_asset._id)
     end
 
     def destroy

data/app/helpers/locomotive/installation_helper.rb

@@ -2,7 +2,7 @@ module Locomotive
   module InstallationHelper
 
     def next_installation_step_link(step = 1, label = nil)
-      link_to(content_tag(:span, label || t('admin.installation.common.next')), installation_step_url(step), class: 'button')
+      link_to(content_tag(:span, label || t('admin.installation.common.next')), installation_step_path(step), class: 'button')
     end
 
   end

data/app/models/locomotive/content_type.rb

@@ -91,7 +91,7 @@ module Locomotive
       _entries = self.entries.order_by([_order_by_definition]).where(options)
 
       # pagination or full list
-      page ? _entries.page(page).per(per_page) : _entries
+      !self.order_manually? && page ? _entries.page(page).per(per_page) : _entries
     end
 
     def groupable?

data/app/models/locomotive/editable_file.rb

@@ -56,6 +56,9 @@ module Locomotive
 
       locale = ::Mongoid::Fields::I18n.locale.to_s
 
+      # make sure the default_source_url is safely defined
+      self.attributes['default_source_url'] ||= { locale => nil }
+
       if self.attributes['default_source_url'][locale].nil?
         self.default_source_url = el.default_source_url
       end

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

@@ -5,7 +5,7 @@
 
 %p!= t('.help')
 
-= semantic_form_for @account, url: accounts_url do |f|
+= semantic_form_for @account, url: accounts_path do |f|
 
   = f.inputs name: :information do
     = f.input :name
@@ -15,7 +15,7 @@
   - if f.object.respond_to?(:password)
     = f.inputs name: :credentials do
       = f.input :email
-      = f.input :password, input_html: { autocomplete: "off" }
-      = f.input :password_confirmation, input_html: { autocomplete: "off" }
+      = f.input :password, input_html: { autocomplete: 'off' }
+      = f.input :password_confirmation, input_html: { autocomplete: 'off' }
 
-  = render 'locomotive/shared/form_actions', back_url: edit_current_site_url, button_label: :create
+  = render 'locomotive/shared/form_actions', back_url: edit_current_site_path, button_label: :create

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

@@ -11,9 +11,9 @@
     = link_to t('locomotive.buttons.close'), '#', id: 'close-link'
 
     .button-wrapper.upload
-      = form_tag content_assets_url(:json), class: 'quick-upload' do
+      = form_tag content_assets_path(:json), class: 'quick-upload' do
         = file_field_tag 'content_asset[source]', multiple: 'multiple'
-        = link_to t('locomotive.content_assets.image_picker.upload'), content_assets_url(:json), class: 'new', id: 'upload-link'
+        = link_to t('locomotive.content_assets.image_picker.upload'), content_assets_path(:json), class: 'new', id: 'upload-link'
 
 %script{ type: 'text/html', id: 'content_asset' }
 

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

@@ -1,12 +1,12 @@
 - if entries.empty?
-  %p.no-items!= t('.no_items', url: new_content_entry_url(content_type.slug))
+  %p.no-items!= t('.no_items', url: new_content_entry_path(content_type.slug))
 - else
-  %ul{ id: 'entries-list', class: "#{'list' unless content_type.groupable?} #{'sortable' if content_type.order_manually?}", :'data-url' => sort_content_entries_url(content_type.slug, :json) }
+  %ul{ id: 'entries-list', class: "#{'list' unless content_type.groupable?} #{'sortable' if content_type.order_manually?}", :'data-url' => sort_content_entries_path(content_type.slug, :json) }
     - entries.each do |entry|
       %li.item{ id: "entry-#{entry._id}" }
         %span.handle
 
-        %strong= link_to entry_label(content_type, entry), edit_content_entry_url(content_type.slug, entry)
+        %strong= link_to entry_label(content_type, entry), edit_content_entry_path(content_type.slug, entry)
 
         - unless entry.translated?
           %span.untranslated= t('locomotive.shared.list.untranslated')
@@ -15,7 +15,7 @@
             != t('locomotive.content_entries.index.updated_at')
           = l entry.updated_at, format: :short rescue 'n/a'
 
-          = 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
+          = link_to_icon :trash, content_entry_path(content_type.slug, entry), title: t('locomotive.buttons.delete'), class: 'remove', data: { confirm: t('locomotive.messages.confirm') }, method: :delete
 
   - if entries.respond_to?(:current_page)
     = paginate entries, namespace: 'locomotive'

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

@@ -8,17 +8,17 @@
 
 - content_for :buttons do
   - if can?(:manage, Locomotive::ContentType)
-    = 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.edit'), edit_content_type_path(@content_type), icon: 'icon-pencil'
 
-  = local_action_button t('locomotive.content_entries.index.new'), new_content_entry_url(@content_type.slug), icon: 'icon-plus'
+  = local_action_button t('locomotive.content_entries.index.new'), new_content_entry_path(@content_type.slug), icon: 'icon-plus'
 
 %p= @content_type.description
 
-= semantic_form_for @content_entry, as: :content_entry, url: content_entry_url(@content_type.slug, @content_entry), html: { multipart: true } do |form|
+= semantic_form_for @content_entry, as: :content_entry, url: content_entry_path(@content_type.slug, @content_entry), html: { multipart: true } do |form|
 
   = 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_path(@content_type.slug), button_label: :update
 
 - content_for :foot do
   = render_has_many_forms

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

@@ -5,11 +5,11 @@
 
 - content_for :buttons do
   - if can?(:manage, Locomotive::ContentType)
-    = local_action_button :edit, edit_content_type_url(@content_type), icon: 'icon-pencil'
+    = local_action_button :edit, edit_content_type_path(@content_type), icon: 'icon-pencil'
 
-  = local_action_button :export, export_content_entries_url(@content_type.slug, :csv), icon: 'icon-download'
+  = local_action_button :export, export_content_entries_path(@content_type.slug, :csv), icon: 'icon-download'
 
-  = local_action_button :new, new_content_entry_url(@content_type.slug), icon: 'icon-plus'
+  = local_action_button :new, new_content_entry_path(@content_type.slug), icon: 'icon-plus'
 
 - if @content_type.description.present?
   %p= @content_type.description
@@ -31,4 +31,4 @@
 - if can?(:manage, Locomotive::ContentType)
   #local-actions-bottom-bar
     %p.tleft
-      = link_to t('.destroy'), content_type_url(@content_type), data: { confirm: t('locomotive.messages.confirm') }, method: :delete, class: 'button remove'
+      = link_to t('.destroy'), content_type_path(@content_type), data: { confirm: t('locomotive.messages.confirm') }, method: :delete, class: 'button remove'

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

@@ -8,15 +8,15 @@
 
 - if can?(:manage, Locomotive::ContentType)
   - content_for :buttons do
-    = 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.edit'), edit_content_type_path(@content_type), icon: 'icon-pencil'
 
 %p= @content_type.description
 
-= semantic_form_for @content_entry, as: :content_entry, url: content_entries_url(@content_type.slug), html: { multipart: true } do |form|
+= semantic_form_for @content_entry, as: :content_entry, url: content_entries_path(@content_type.slug), html: { multipart: true } do |form|
 
   = 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_path(@content_type.slug), button_label: :create
 
 - content_for :foot do
   = render_has_many_forms

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_path(@content_type.slug_was), icon: 'icon-eye-open'
+  = local_action_button :new_entry, new_content_entry_path(@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_path(@content_type) do |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_path(@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_path do |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_path, button_label: :create

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

@@ -8,11 +8,11 @@
 
 - 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_path, icon: 'icon-plus'
 
 %p!= t('.help')
 
-= semantic_form_for @site, url: current_site_url do |form|
+= semantic_form_for @site, url: current_site_path do |form|
 
   = render 'form', f: form
 

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

@@ -3,4 +3,4 @@
   hint:           field.hint,
   as:             :string,
   wrapper_html:   { class: 'select2' },
-  input_html:     { data: { value: f.object.send(field.name.to_sym).try(:_label), url: content_entries_url(field.class_name_to_content_type.slug, :json), per_page: Locomotive.config.ui[:per_page] } }
+  input_html:     { data: { value: f.object.send(field.name.to_sym).try(:_label), url: content_entries_path(field.class_name_to_content_type.slug, :json), per_page: Locomotive.config.ui[:per_page] } }

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

@@ -9,7 +9,7 @@
     %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|
+  = semantic_form_for content_entry, as: :content_entry, namespace: name.to_s, url: content_entries_path(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|

data/app/views/locomotive/errors/404.html.haml

@@ -4,4 +4,4 @@
   %p.notice= t('.notice')
 
   %p.link.tright
-    = link_to preserve(t('.link')), pages_url
+    = link_to preserve(t('.link')), pages_path

data/app/views/locomotive/errors/500.html.haml

@@ -4,4 +4,4 @@
   %p.notice= t('.notice')
 
   %p.link.tright
-    = link_to preserve(t('.link')), pages_url
+    = link_to preserve(t('.link')), pages_path

data/app/views/locomotive/installation/step_1.html.haml

@@ -4,7 +4,7 @@
 - title t('.title')
 
 - if @step_done.blank?
-  = semantic_form_for(@account, url: installation_step_url(1)) do |f|
+  = semantic_form_for(@account, url: installation_step_path(1)) do |f|
     .inner
       = f.inputs do
         = f.input :name, label: t('.name'), required: false

data/app/views/locomotive/installation/step_2.html.haml

@@ -3,7 +3,7 @@
 
 - title t('.title')
 
-= semantic_form_for(@site, url: installation_step_url(2), html: { multipart: true }) do |f|
+= semantic_form_for(@site, url: installation_step_path(2), html: { multipart: true }) do |f|
   .inner
 
     %p.explanations

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

@@ -5,10 +5,10 @@
 
 %p!= t('.help')
 
-= semantic_form_for @membership, url: memberships_url do |f|
+= semantic_form_for @membership, url: memberships_path do |f|
 
   = f.inputs name: :membership_email, class: 'inputs email' do
 
     = f.input :email, label: false, wrapper_html: { class: 'no-label' }
 
-  = render 'locomotive/shared/form_actions', back_url: edit_current_site_url, button_label: :create
+  = render 'locomotive/shared/form_actions', back_url: edit_current_site_path, button_label: :create

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

@@ -9,11 +9,11 @@
 
 - if multi_sites?
   - content_for :buttons do
-    = local_action_button t('.new_site'), new_site_url, icon: 'icon-plus' if can?(:create, Locomotive::Site)
+    = local_action_button t('.new_site'), new_site_path, icon: 'icon-plus' if can?(:create, Locomotive::Site)
 
 %p= t('.help')
 
-= semantic_form_for @account, url: my_account_url do |f|
+= semantic_form_for @account, url: my_account_path do |f|
 
   = f.inputs name: :information do
     = f.input :name
@@ -23,7 +23,7 @@
     = f.input :email
     = f.input :password, input_html: { autocomplete: 'off' }
     = f.input :password_confirmation, input_html: { autocomplete: 'off' }
-    = f.input :api_key, as: '::Locomotive::ApiKey', url: regenerate_api_key_my_account_url
+    = f.input :api_key, as: '::Locomotive::ApiKey', url: regenerate_api_key_my_account_path
 
   - if multi_sites?
     = f.inputs name: :sites, class: "sites inputs foldable" do

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

@@ -14,7 +14,7 @@
   - if not @page.index? and not @page.not_found?
     = f.input :parent_id, as: :select, collection: parent_pages_options, include_blank: false
 
-  = f.input :slug, required: false, hint: @page.slug.blank? ? t('.empty_slug') : public_page_url(@page, locale: current_content_locale), input_html: { :'data-url' => get_path_pages_url, disabled: @page.index? || @page.not_found? }, wrapper_html: { style: "#{'display: none' if @page.templatized? && !@page.templatized_from_parent?};", class: 'em-inline-hints' }
+  = f.input :slug, required: false, hint: @page.slug.blank? ? t('.empty_slug') : public_page_url(@page, locale: current_content_locale), input_html: { :'data-url' => get_path_pages_path, disabled: @page.index? || @page.not_found? }, wrapper_html: { style: "#{'display: none' if @page.templatized? && !@page.templatized_from_parent?};", class: 'em-inline-hints' }
 
 = f.inputs name: :seo, class: "inputs foldable #{'folded' if inputs_folded?(@page)}" do
 

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

@@ -11,8 +11,8 @@
 
 %p!= t('.help')
 
-= semantic_form_for @page, url: page_url(@page), html: { multipart: true } do |form|
+= semantic_form_for @page, url: page_path(@page), html: { multipart: true } do |form|
 
   = render 'form', f: form
 
-  = render 'locomotive/shared/form_actions', back_url: pages_url, button_label: :update
+  = render 'locomotive/shared/form_actions', back_url: pages_path, button_label: :update

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_path, 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_path)
 - else
   %ul#pages-list
     = render @pages

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

@@ -8,8 +8,8 @@
 
 %p!= t('.help')
 
-= semantic_form_for @page, url: pages_url do |form|
+= semantic_form_for @page, url: pages_path do |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_path, 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_path, html: { method: :put }) do |f|
 
   = f.hidden_field :reset_password_token
 

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

@@ -1,5 +1,5 @@
 %h1
-  = link_to current_site.name, locomotive.pages_url
+  = link_to current_site.name, locomotive.pages_path
 
 = render_cell 'locomotive/global_actions', :show, current_locomotive_account: current_locomotive_account, current_site_url: current_site_public_url
 

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

@@ -3,8 +3,8 @@
     - 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, protocol: request.ssl? ? 'https' : 'http')
 
   - if can?(:manage, Locomotive::Site)
     %p.action
-      = link_to t('locomotive.sites_picker.new'), locomotive.new_site_url
+      = link_to t('locomotive.sites_picker.new'), locomotive.new_site_path

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_path, class: 'button' do
       %i.icon-plus
       = t('locomotive.content_types.index.new')
 

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

@@ -1,9 +1,9 @@
-= submenu_entry 'pages', pages_url do
+= submenu_entry 'pages', pages_path do
   .wrapper
     - if can? :manage, @page
       .header
         %p
-          = link_to new_page_url do
+          = link_to new_page_path do
             %i.icon-plus
             = t('locomotive.pages.index.new')
     .inner
@@ -12,7 +12,7 @@
         - 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_path(page)
             %span= time_ago_in_words(page.updated_at)
 
 - each_content_type do |menu_item|
@@ -24,20 +24,20 @@
           %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_path(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_path(content_type.slug), i18n: false, css: "#{'on' if is_content_type_selected(content_type)}" do
       .wrapper
         .header
           %p
-            = link_to new_content_entry_url(content_type.slug) do
+            = link_to new_content_entry_path(content_type.slug) do
               %i.icon-plus
               = t('locomotive.content_entries.index.new')
 
           - if can? :manage, content_type
             %p.edit
-              = link_to edit_content_type_url(content_type) do
+              = link_to edit_content_type_path(content_type) do
                 %i.icon-pencil
                 = t('locomotive.content_types.index.edit')
 
@@ -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_path(content_type.slug, entry)
                 %span= time_ago_in_words(entry.updated_at)

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_path do |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_path, button_label: :create

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_path, icon: 'icon-plus'
 
 %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_path(@snippet), html: { class: 'save-with-shortcut' } do |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_path, 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_path do |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_path, button_label: :create

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

@@ -10,9 +10,9 @@
     = link_to t('locomotive.buttons.close'), '#', id: 'close-link'
 
     .button-wrapper.upload
-      = form_tag theme_assets_url(:json), class: 'quick-upload' do
+      = form_tag theme_assets_path(:json), class: 'quick-upload' do
         = file_field_tag 'theme_asset[source]', multiple: 'multiple'
-        = link_to t('locomotive.theme_assets.image_picker.upload'), theme_assets_url(:json), class: 'new', id: 'upload-link'
+        = link_to t('locomotive.theme_assets.image_picker.upload'), theme_assets_path(:json), class: 'new', id: 'upload-link'
 
 %script{ type: 'text/html', id: 'theme_asset' }
 

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

@@ -5,7 +5,7 @@
 
 - if can?(:manage, Locomotive::ThemeAsset)
   - content_for :buttons do
-    = local_action_button t('locomotive.theme_assets.index.new'), new_theme_asset_url, icon: 'icon-plus'
+    = local_action_button t('locomotive.theme_assets.index.new'), new_theme_asset_path, icon: 'icon-plus'
 
 %p.help
   - if %w(image javascript stylesheet).include?(@theme_asset.content_type.to_s)
@@ -14,8 +14,8 @@
   != t('.help', url: @theme_asset.source.url)
 
 
-= semantic_form_for @theme_asset, url: theme_asset_url(@theme_asset), html: { multipart: true, class: 'save-with-shortcut' } do |form|
+= semantic_form_for @theme_asset, url: theme_asset_path(@theme_asset), html: { multipart: true, class: 'save-with-shortcut' } do |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_path, button_label: :update

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

@@ -3,17 +3,17 @@
 - content_for :head do
   = render 'asset'
 
-  = render 'list', name: 'images', title: t('.images'), empty_message: t('.no_items', url: new_theme_asset_url)
-  = render 'list', name: 'media', title: t('.media'), empty_message: t('.no_items', url: new_theme_asset_url)
-  = render 'list', name: 'others', title: t('.others'), empty_message: t('.no_items', url: new_theme_asset_url)
+  = render 'list', name: 'images', title: t('.images'), empty_message: t('.no_items', url: new_theme_asset_path)
+  = render 'list', name: 'media', title: t('.media'), empty_message: t('.no_items', url: new_theme_asset_path)
+  = render 'list', name: 'others', title: t('.others'), empty_message: t('.no_items', url: new_theme_asset_path)
 
   - if can?(:manage, Locomotive::Snippet)
     = render '/locomotive/snippets/snippet'
-    = render 'list', name: 'snippets', title: t('.snippets'), empty_message: t('locomotive.snippets.index.no_items', url: new_snippet_url)
+    = render 'list', name: 'snippets', title: t('.snippets'), empty_message: t('locomotive.snippets.index.no_items', url: new_snippet_path)
 
   - if can?(:manage, Locomotive::ThemeAsset)
-    = render 'list', name: 'js_and_css', title: t('.css_and_js'), empty_message: t('.no_items', url: new_theme_asset_url)
-    = render 'list', name: 'fonts', title: t('.fonts'), empty_message: t('.no_items', url: new_theme_asset_url)
+    = render 'list', name: 'js_and_css', title: t('.css_and_js'), empty_message: t('.no_items', url: new_theme_asset_path)
+    = render 'list', name: 'fonts', title: t('.fonts'), empty_message: t('.no_items', url: new_theme_asset_path)
 
 - content_for :backbone_view_data do
   :plain
@@ -29,12 +29,12 @@
 
 - content_for :buttons do
   - if can?(:manage, Locomotive::ThemeAsset)
-    = form_tag theme_assets_url(:json), id: 'theme-assets-quick-upload', class: 'quick-upload', :'data-sending-form-message' => t('locomotive.messages.sending_form')  do
+    = form_tag theme_assets_path(:json), id: 'theme-assets-quick-upload', class: 'quick-upload', :'data-sending-form-message' => t('locomotive.messages.sending_form')  do
       = file_field_tag 'theme_asset[source]', multiple: 'multiple'
       = local_action_button :quick_upload, '#', icon: :upload, class: 'new'
 
-  = local_action_button t('locomotive.snippets.index.new'), new_snippet_url, icon: 'icon-plus' if can?(:manage, Locomotive::Snippet)
-  = local_action_button :new, new_theme_asset_url, icon: :plus if can?(:manage, Locomotive::ThemeAsset)
+  = local_action_button t('locomotive.snippets.index.new'), new_snippet_path, icon: 'icon-plus' if can?(:manage, Locomotive::Snippet)
+  = local_action_button :new, new_theme_asset_path, icon: :plus if can?(:manage, Locomotive::ThemeAsset)
 
 %p!= t('.help')
 

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

@@ -5,8 +5,8 @@
 
 %p!= t('.help')
 
-= semantic_form_for @theme_asset, url: theme_assets_url, html: { multipart: true } do |form|
+= semantic_form_for @theme_asset, url: theme_assets_path, html: { multipart: true } do |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_path, button_label: :create

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

@@ -4,7 +4,7 @@
   = render_cell 'locomotive/settings_menu', :show
 
 - content_for :buttons do
-  = local_action_button t('locomotive.translations.index.new'), new_translation_url, icon: 'icon-plus'
+  = local_action_button t('locomotive.translations.index.new'), new_translation_path, icon: 'icon-plus'
 
 %p!= t('.help', key: @translation.key)
 
@@ -12,4 +12,4 @@
 
   = render 'form', f: form
 
-  = render 'locomotive/shared/form_actions', back_url: translations_url, button_label: :update
+  = render 'locomotive/shared/form_actions', back_url: translations_path, button_label: :update

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

@@ -25,6 +25,6 @@
           %span!= t('.updated_at')
           = l translation.updated_at, format: :short
 
-          = link_to_icon :trash, translation_url(translation), title: t('.remove', key: translation.key, default: ''), class: 'remove', data: { confirm: t('locomotive.messages.confirm') }, method: :delete
+          = link_to_icon :trash, translation_path(translation), title: t('.remove', key: translation.key, default: ''), class: 'remove', data: { confirm: t('locomotive.messages.confirm') }, method: :delete
 
     = paginate @translations, namespace: 'locomotive'

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

@@ -9,4 +9,4 @@
 
   = render 'form', f: form
 
-  = render 'locomotive/shared/form_actions', back_url: translations_url, button_label: :create
+  = render 'locomotive/shared/form_actions', back_url: translations_path, button_label: :create

data/features/backoffice/contents.feature

@@ -21,15 +21,22 @@ Background:
     | Other project #2  | Lorem ipsum...          | Design          |
     | Other project #3  | Lorem ipsum...          | Design          |
 
-Scenario:
+Scenario: Listing content entries
   When I go to the list of "Projects"
   Then I should see "My sexy project"
   And I should see "Other project #2"
   And I should see "Other project #3"
 
-Scenario:
+Scenario: Listing content entries without pagination
   When I change the number of items to display per page to 4
   And I go to the list of "Projects"
+  Then I should see "Other project #2"
+  And I should see "Other project #3"
+
+Scenario: Listing content entries with pagination
+  When I change the number of items to display per page to 4
+  And the custom model named "Projects" is ordered by "name"
+  And I go to the list of "Projects"
   Then I should not see "Other project #2"
   And I should not see "Other project #3"
 

data/features/public/contact_form.feature

@@ -48,7 +48,7 @@ Feature: Contact form
     When I view the rendered page at "/contact"
     Then the rendered output should look like:
       """
-      <form action="http://test.example.com/entry_submissions/messages" method="post">
+      <form action="/entry_submissions/messages" method="post">
       """
 
   Scenario: Prevents users to post messages if the public submission option is disabled

data/features/step_definitions/content_types_steps.rb

@@ -64,13 +64,18 @@ Given %r{^I have entries for "([^"]*)" with$} do |name, entries|
   content_type.save.should be_true
 end
 
+When(/^the custom model named "(.*?)" is ordered by "(.*?)"$/) do |name, order_by|
+  content_type = Locomotive::ContentType.where(name: name).first
+  content_type.update_attribute :order_by, order_by
+end
+
 #the "client" "Alpha, Inc" has "Fun project" as one of its "projects"
 Given(/^the "(.*?)" "(.*?)" has "(.*?)" as one of its "(.*?)"$/) do |source, source_label, target_label, target|
   source_model = Locomotive::ContentType.where(name: source.classify.pluralize).first
   source_entry = source_model.entries.where(source_model.label_field_name => source_label).first
   target_model = Locomotive::ContentType.where(name: target.classify.pluralize).first
   target_entry = target_model.entries.where(target_model.label_field_name => target_label).first
-  
+
   source_entry.send("#{target}").send("<<", target_entry)
 end
 

data/lib/locomotive/action_controller/locale_helpers.rb

@@ -33,6 +33,9 @@ module Locomotive
       end
 
       def back_to_default_site_locale
+        # we do force the content locale to the site default locale
+        params.delete(:content_locale)
+
         session[:content_locale] = ::Mongoid::Fields::I18n.locale = current_site.default_locale
       end
 

data/lib/locomotive/action_controller/url_helpers.rb

@@ -9,7 +9,8 @@ module Locomotive
       end
 
       def current_site_public_url
-        request.protocol + request.host_with_port
+        # by convention, a public site is displayed in http not https.
+        'http://' + request.host_with_port
       end
 
       def switch_to_site_url(site, options = {})

data/lib/locomotive/liquid/drops/content_types.rb

@@ -18,7 +18,7 @@ module Locomotive
         end
 
         def public_submission_url
-          @context.registers[:controller].main_app.locomotive_entry_submissions_url(@content_type.slug)
+          @context.registers[:controller].main_app.locomotive_entry_submissions_path(@content_type.slug)
         end
 
         def api

data/lib/locomotive/liquid/filters/date.rb

@@ -2,7 +2,7 @@ module Locomotive
   module Liquid
     module Filters
       module Date
-        
+
         def distance_of_time_in_words(input, from_time = Time.now)
           # make sure we deals with instances of Time
           input     = to_time(input)
@@ -31,7 +31,7 @@ module Locomotive
           return input.to_s unless input.respond_to?(:strftime)
 
           input = input.in_time_zone(@context.registers[:site].timezone) if input.respond_to?(:in_time_zone)
-          
+
           I18n.l input, format: format, locale: locale
         end
 

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.2.2'
+  VERSION = '2.2.3'
 end

data/spec/lib/locomotive/liquid/tags/link_to_spec.rb

@@ -43,6 +43,15 @@ describe Locomotive::Liquid::Tags::LinkTo do
 
     end
 
+    context 'with a custom label' do
+
+      let(:assigns)   { { 'page' => page } }
+      let(:template)  { "{% link_to page %}Here{% endlink_to %}" }
+
+      it { should == %{<a href="/hello-world">Here</a>} }
+
+    end
+
   end
 
   describe 'templatized page' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -434,7 +434,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -442,7 +442,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -1416,7 +1416,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3728677471282995061
+      hash: 359297222815154012
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -1425,7 +1425,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3728677471282995061
+      hash: 359297222815154012
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23