locomotivecms 4.0.0.alpha2 → 4.0.0.alpha3

data/app/assets/stylesheets/locomotive/old/_list.scss

@@ -3,6 +3,33 @@
     color: $paragraph_color;
   }
 
+  .list-groups {
+    margin-bottom: 10px;
+
+    .nav-tabs {
+      padding-left: 15px;
+      padding-right: 15px;
+    }
+  }
+
+  .list-header {
+
+    .col {
+      display: flex;
+      flex-direction: column;
+      padding-bottom: 1rem;
+
+      &:first-child {
+        align-items: flex-start;
+      }
+
+      &:last-child {
+        align-items: flex-end;
+        padding-top: 4px;
+      }
+    }
+  }
+
   .big-list {
     .item {
       position: relative;
@@ -74,6 +101,7 @@
       .actions {
         position: relative;
         margin-left: auto;
+        font-size: 0; /* remove empty space */
 
         i {
           font-size: 16px;

data/app/assets/stylesheets/locomotive/old/_main.scss

@@ -11,14 +11,31 @@
       color: $main_title_color;
     }
 
+    .text {
+      margin: 0.8rem 0 0 0;
+      color: rgba($main_title_color, 0.7);
+    }
+
     .actions {
       text-align: right;
-      p {
-        margin: 0;
-      }
 
-      a {
+      & > a, & > div {
         margin-left: 5px;
+        display: inline-block;
+      }
+
+      .btn > i {
+        margin-right: 0.5rem;
+      }
+
+      .btn.dropdown-toggle {
+        border-left: 1px solid $btn-primary-border;
+      }
+
+      .dropdown-menu {
+        i {
+          margin-right: 1rem;
+        }
       }
     }
   }

data/app/assets/stylesheets/locomotive/old/_search_bars.scss

@@ -1,13 +1,9 @@
 .search-bar {
-  text-align: right;
-
   form {
     display: inline-block;
 
     .form-group {
-      position: relative;
-      top: -6px;
-      padding: 4px 6px;
+      padding: 0.5rem 0.9rem;
       margin-bottom: 0;
       border: 1px solid #dadada;
 
@@ -24,6 +20,7 @@
       .icon {
         display: inline-block;
         color: $nav-tabs-link-color;
+        margin-right: 0.8rem;
       }
     }
   }

data/app/assets/stylesheets/locomotive/old/_translations.scss

@@ -1,8 +1,8 @@
 #translations-list {
 
   .item {
-    &:first-child {
-      border-top: none;
+    & > .status {
+      margin-right: 1.5rem;
     }
 
     &.zero-done .completion i { color: $brand-danger; }

data/app/controllers/locomotive/content_entries_controller.rb

@@ -72,10 +72,10 @@ module Locomotive
       respond_with @content_type, location: content_entries_path(current_site, @content_type.slug)
     end
 
-    def destroy
-      authorize @content_entry
-      service.destroy(@content_entry)
-      respond_with @content_entry, location: content_entries_path(current_site, @content_type.slug)
+    def bulk_destroy
+      authorize ContentEntry, :destroy?
+      service.bulk_destroy(params[:ids].split(','))
+      respond_with @content_type, location: content_entries_path(current_site, @content_type.slug, page: params[:page], q: params[:q])
     end
 
     private
@@ -89,7 +89,7 @@ module Locomotive
     end
 
     def service
-      @service ||= Locomotive::ContentEntryService.new(load_content_type, current_locomotive_account)
+      @service ||= Locomotive::ContentEntryService.new(load_content_type, current_locomotive_account, current_content_locale)
     end
 
     def list_params

data/app/controllers/locomotive/current_site_controller.rb

@@ -20,6 +20,7 @@ module Locomotive
     def update
       authorize @site
       service.update(@site, site_params)
+      logger.debug @site.errors.inspect
       respond_with @site, location: -> { edit_current_site_path(current_site) }
     end
 
@@ -63,7 +64,13 @@ module Locomotive
     end
 
     def site_params
-      params.require(:site).permit(*policy(@site || Site).permitted_attributes)
+      params.require(:site).permit(*policy(@site || Site).permitted_attributes).tap do |_params|
+        if params[:site][:url_redirections_expert_mode] == '1'
+          _params[:url_redirections] = params[:site][:url_redirections_plain_text]
+          .split("\n")
+          .map { |line| line.split(/\s+/) }
+        end
+      end
     end
 
     def service

data/app/controllers/locomotive/custom_fields/select_options_controller.rb

@@ -38,7 +38,7 @@ module Locomotive
       end
 
       def service
-        @service ||= Locomotive::CustomFieldService.new(@custom_field)
+        @service ||= Locomotive::CustomFieldService.new(@custom_field, current_content_locale)
       end
 
       def options_params

data/app/controllers/locomotive/editable_elements_controller.rb

@@ -65,7 +65,7 @@ module Locomotive
     end
 
     def persisting_service
-      @persisting_service ||= Locomotive::EditableElementService.new(current_site, current_locomotive_account)
+      @persisting_service ||= Locomotive::EditableElementService.new(current_site, current_locomotive_account, current_content_locale)
     end
 
     def store_location_if_content_entry

data/app/controllers/locomotive/page_content_controller.rb

@@ -12,7 +12,7 @@ module Locomotive
 
     respond_to :json, only: [:edit, :update]
 
-    helper Locomotive::ContentEntriesHelper
+    helper Locomotive::ContentEntriesHelper, Locomotive::PagesHelper
 
     def edit
       authorize @page
@@ -56,7 +56,7 @@ module Locomotive
     end
 
     def persisting_service
-      @persisting_service ||= Locomotive::EditorService.new(current_site, current_locomotive_account, @page)
+      @persisting_service ||= Locomotive::EditorService.new(current_site, current_locomotive_account, @page, current_content_locale)
     end
 
     def editable_elements_layout

data/app/controllers/locomotive/pages_controller.rb

@@ -58,7 +58,7 @@ module Locomotive
     end
 
     def service
-      @service ||= Locomotive::PageService.new(current_site, current_locomotive_account)
+      @service ||= Locomotive::PageService.new(current_site, current_locomotive_account, current_content_locale)
     end
 
     def edit_content_path(page)

data/app/controllers/locomotive/search_for_resources_controller.rb

@@ -6,7 +6,7 @@ module Locomotive
     respond_to :json, only: [:index]
 
     def index
-      resources = service.find_resources(params[:q])
+      resources = service.find_resources(params[:type], params[:q], params[:scope])
       respond_with resources
     end
 

data/app/controllers/locomotive/translations_controller.rb

@@ -24,6 +24,12 @@ module Locomotive
       respond_with @translation, location: translations_path(current_site, translation_nav_params)
     end
 
+    def bulk_destroy
+      authorize Translation, :destroy?
+      service.bulk_destroy(params[:ids].split(','))
+      respond_with current_site, location: translations_path(current_site, translation_nav_params)
+    end
+
     protected
 
     def load_translation
@@ -35,7 +41,7 @@ module Locomotive
     end
 
     def translation_nav_params
-      params[:_location].permit(:filter_by, :q)
+      params.permit(:filter_by, :q, :page, :per_page)
     end
 
     def service

data/app/helpers/locomotive/base_helper.rb

@@ -29,10 +29,11 @@ module Locomotive
       end
     end
 
-    def help(text)
-      if text.present?
-        content_tag :p, text, class: 'text'
+    def help(text = nil)
+      if text.nil?
+        @content_for_help
       else
+        @content_for_help = content_tag(:p, text, class: 'text')
         ''
       end
     end
@@ -295,10 +296,10 @@ module Locomotive
       )
     end
 
-    def decorated_steam_page(page)
+    def decorated_steam_page(page, locale = nil)
       Locomotive::Steam::Decorators::PageDecorator.new(
         page.to_steam,
-        current_content_locale,
+        locale || current_content_locale,
         current_site.default_locale
       )
     end

data/app/helpers/locomotive/dashboard_helper.rb

@@ -5,7 +5,8 @@ module Locomotive
       if current_site.domains.blank?
         preview_url(current_site)
       else
-        URI.join('http://' + current_site.domains.first).tap do |uri|
+        protocol = current_site.redirect_to_https? ? 'https' : 'http'
+        URI.join("#{protocol}://" + current_site.domains.first).tap do |uri|
           uri.port = request.port if request.port != 80 && request.port != 443
         end.to_s
       end
@@ -17,6 +18,7 @@ module Locomotive
       case activity.domain
       when 'site'             then 'fa-cog'
       when 'page'             then 'fa-file-alt'
+      when 'page_content'     then 'fa-file-alt'
       when 'editable_element' then 'fa-file-alt'
       when 'content_entry'    then activity.action == 'created_public' ? 'fa-comment' : 'fa-archive'
       when 'content_asset'    then 'fa-image'
@@ -27,13 +29,15 @@ module Locomotive
 
     def render_activity_sentence(activity)
       params = activity.parameters
+      locale = activity.locale
 
       options = case activity.key
       when /\Apage\./                       then activity_page_options(params)
-      when /\Acontent_entry\./              then activity_content_entry_options(params)
+      when /\Acontent_entry\./              then activity_content_entry_options(params, locale)
+      when 'page_content.updated'           then activity_page_content_options(params, locale)
       when 'editable_element.updated_bulk'  then activity_bulk_editable_elements_options(params)
       when 'content_asset.created_bulk'     then { count: activity_emphasize(params[:assets].size) }
-      when 'content_asset.destroyed'        then { name:  activity_emphasize(params[:name]) }
+      when 'content_asset.destroyed'        then { name: activity_emphasize(params[:name]) }
       when 'membership.created'             then { name: activity_emphasize(params[:name]) }
       when 'site_metafields.updated'        then { label: current_site_metafields_ui[:label].downcase }
       end
@@ -67,19 +71,27 @@ module Locomotive
       end
     end
 
+    def activity_page_content_options(params, locale)
+      path = edit_page_content_path(current_site, params[:_id], content_locale: locale)
+      { page: link_to(truncate(params[:title]), path).html_safe }
+    end
+
     def activity_bulk_editable_elements_options(params)
       pages = params[:pages].map do |page|
-        link_to truncate(page[:title]),  editable_elements_path(current_site, page[:_id])
+        link_to truncate(page[:title]), editable_elements_path(current_site, page[:_id])
       end.join(', ').html_safe
 
       { pages: pages }
     end
 
-    def activity_content_entry_options(params)
+    def activity_content_entry_options(params, locale)
       entry = if params[:_id]
-        link_to(params[:label], edit_content_entry_path(current_site, params[:content_type_slug], params[:_id]))
+        path = edit_content_entry_path(current_site, params[:content_type_slug], params[:_id], content_locale: locale)
+        link_to(params[:label], path)
       elsif params[:label]
         activity_emphasize(params[:label])
+      elsif params[:labels]
+        activity_emphasize(params[:labels].join(', '))
       else
         nil
       end

data/app/helpers/locomotive/page_content_helper.rb

@@ -3,6 +3,29 @@ require 'digest'
 module Locomotive
   module PageContentHelper
 
+    def content_types_with_templates(site)
+      site.content_types.order_by(title: 1).map do |content_type|
+        pages = site.pages
+          .only(:_id, :site_id, :title, :target_klass_name, :sections_dropzone_content, :sections_content)
+          .where(target_klass_name: content_type.entries_class_name)
+          .map do |page|
+            {
+              id:       page._id,
+              title:    page.title,
+              sections: page.all_sections_content
+            }
+          end
+
+        next if pages.empty?
+
+        {
+          name:   content_type.name,
+          slug:   content_type.slug,
+          pages:  pages
+        }
+      end.compact
+    end
+
     def sections_content(model, sections, definitions)
       source  = model.respond_to?(:title) ? :page : :site
       content = model.sections_content || {}
@@ -16,14 +39,14 @@ module Locomotive
         if content[key].blank?
           definition = definitions.find { |definition| definition['type'] == type } || {}
 
-          content[key] = definition['default'] || { 'settings' => {}, 'blocks' => [], 'type' => type }
+          content[key] = definition['default'] || { 'settings' => {}, 'blocks' => [] }
         else
-          content[key]['type'] = type
           content[key]['settings'] ||= {}
           content[key]['blocks']   ||= []
         end
 
-        content[key]['id'] = attributes[:id] # FIXME: attributes[:id] => section domId
+        content[key]['id']    = attributes[:id] # FIXME: attributes[:id] => section domId
+        content[key]['type']  = type # make sure there is always the type attribute
 
         # reset block id
         content[key]['blocks'] = (content[key]['blocks'] || []).each_with_index.map do |block, index|
@@ -36,7 +59,7 @@ module Locomotive
     end
 
     def sections_dropzone_content(page)
-      (page.sections_dropzone_content || {}).each_with_index.map do |section, index|
+      (page.sections_dropzone_content || []).each_with_index.map do |section, index|
         section['id'] = "dropzone-#{index}"
 
         # FIXME: sections content deployed with Wagon might have no blocks (nil)
@@ -57,7 +80,7 @@ module Locomotive
           ids[attributes[:uuid]] = attributes
         end
 
-        (page.sections_dropzone_content || {}).each_with_index do |section, index|
+        (page.sections_dropzone_content || []).each_with_index do |section, index|
           id    = "dropzone-#{index}"
           uuid  = Digest::MD5.hexdigest(id)
 

data/app/helpers/locomotive/pages_helper.rb

@@ -25,6 +25,10 @@ module Locomotive
       list
     end
 
+    def display_slug?(page)
+      !page.index? && !page.not_found? && (!page.templatized? || page.templatized_from_parent?)
+    end
+
     def display_page_layouts?
       ((@page.persisted? && @page.allow_layout? && @page.use_layout?) || !@page.persisted?) &&
       !current_site.pages.layouts.empty?

data/app/helpers/locomotive/shared/pages_helper.rb

@@ -10,9 +10,9 @@ module Locomotive
         truncate(path, length: 50)
       end
 
-      def preview_page_path(page, locale: nil, mounted_on: false)
+      def preview_page_path(page, locale: nil, mounted_on: false, prefix_default_locale: nil)
         locale = locale || current_content_locale.to_s
-        _page  = decorated_steam_page(page)
+        _page  = decorated_steam_page(page, locale)
 
         if page.content_entry
           _page.content_entry = decorated_steam_content_entry(page.content_entry)
@@ -20,12 +20,16 @@ module Locomotive
 
         steam_url_builder.mounted_on = mounted_on ? preview_path(current_site) : nil
 
-        steam_url_builder.url_for(_page, locale)
+        steam_url_builder.url_for(_page, locale, prefix_default_locale)
       end
 
       def localized_preview_page_paths(page, mounted_on: false)
         current_site.locales.inject({}) do |memo, locale|
-          memo[locale] = preview_page_path(page, locale: locale, mounted_on: mounted_on)
+          memo[locale] = preview_page_path(page,
+            locale:     locale,
+            mounted_on: mounted_on,
+            prefix_default_locale: true
+          )
           memo
         end
       end

data/app/models/locomotive/activity.rb

@@ -6,6 +6,7 @@ module Locomotive
     ## fields ##
     field :key
     field :parameters,  type: Hash
+    field :locale
 
     ## associations ##
     belongs_to :site,       class_name: 'Locomotive::Site', validate: false, autosave: false