locomotivecms 3.0.0.pre.alpha.3 → 3.0.0.pre.beta.1

data/app/assets/stylesheets/locomotive/globals/_variables.scss

@@ -50,6 +50,7 @@ $form_input_hovered_background_color:     #f7f8d1;
 $form_input_padding:                      15px;
 $form_input_radius:                       4px;
 $form_input_label_color:                  #555;
+$form_input_label_untranslated_color:     #f89406;
 $form_input_label_size:                   11px;
 $form_input_control_border_size:          4px;
 $form_input_control_border_color:         #d7d7d7;
@@ -99,6 +100,7 @@ $asset_border_radius:                       4px;
 $asset_width:                               240px;
 $asset_height:                              240px;
 $asset_title_color:                         #333;
+$asset_size_color:                          #aaa;
 $asset_thumbnail_background:                #d7d7d7;
 $asset_thumbnail_border_radius:             4px;
 $asset_thumbnail_img_border:                2px solid #acacac;

data/app/assets/stylesheets/locomotive/not_logged_in.scss

@@ -1,3 +1,6 @@
+@import "font-awesome-sprockets";
+@import "font-awesome";
+
 @import "./globals/bootstrap";
 @import "bootstrap";
 
@@ -6,6 +9,7 @@
 
 @import "layouts/not_logged_in";
 
+@import "components/misc/notify";
 @import "components/not_logged_in/sign_in_and_up";
 @import "components/not_logged_in/passwords";
 

data/app/controllers/locomotive/accounts_controller.rb

@@ -12,7 +12,7 @@ module Locomotive
     def create
       authorize Membership
       @account = Account.create(account_params)
-      current_site.memberships.create(account: @account) if @account.errors.empty?
+      service.create(@account) if @account.errors.empty?
       respond_with @account, location: edit_current_site_path(current_site)
     end
 
@@ -22,5 +22,10 @@ module Locomotive
       params.require(:account).permit(:email, :name, :locale, :password, :password_confirmation)
     end
 
+    def service
+      policy = MembershipPolicy.new(pundit_user, @membership || Membership)
+      @service ||= Locomotive::MembershipService.new(current_site, policy)
+    end
+
   end
 end

data/app/controllers/locomotive/base_controller.rb

@@ -14,7 +14,7 @@ module Locomotive
 
     before_filter :require_ssl
 
-    helper  Locomotive::BaseHelper
+    helper Locomotive::BaseHelper, Locomotive::ErrorsHelper
 
     self.responder = Locomotive::ActionController::Responder # custom responder
 

data/app/controllers/locomotive/concerns/exception_controller.rb

@@ -16,7 +16,8 @@ module Locomotive
         status = (case exception
         when ::Mongoid::Errors::DocumentNotFound  then 404
         else
-          raise exception # 500
+          raise exception unless request.xhr?
+          500
         end)
 
         if request.xhr?

data/app/controllers/locomotive/concerns/site_dispatcher_controller.rb

@@ -29,7 +29,8 @@ module Locomotive
       def render_no_site_error
         respond_to do |format|
           format.html do
-            render template: '/locomotive/errors/no_site', layout: false, status: :not_found
+            @title = t(:title, scope: 'locomotive.errors.no_site')
+            render template: '/locomotive/errors/no_site', layout: 'locomotive/layouts/error', status: :not_found
           end
           format.json do
             render json: { error: 'No site found' }, status: :not_found

data/app/controllers/locomotive/content_assets_controller.rb

@@ -35,7 +35,7 @@ module Locomotive
 
     def destroy
       authorize @content_asset
-      @content_asset.destroy
+      service.destroy(@content_asset)
       respond_with(@content_asset) do |format|
         format.html do
           if request.xhr?
@@ -67,7 +67,7 @@ module Locomotive
     end
 
     def service
-      @service ||= Locomotive::ContentAssetService.new(current_site)
+      @service ||= Locomotive::ContentAssetService.new(current_site, current_locomotive_account)
     end
 
     def content_asset_params

data/app/controllers/locomotive/content_entries_controller.rb

@@ -69,12 +69,12 @@ module Locomotive
     def sort
       authorize ContentEntry, :update?
       service.sort(params[:entries])
-      respond_with @content_type
+      respond_with @content_type, location: content_entries_path(current_site, @content_type.slug)
     end
 
     def destroy
       authorize @content_entry
-      @content_entry.destroy
+      service.destroy(@content_entry)
       respond_with @content_entry, location: content_entries_path(current_site, @content_type.slug)
     end
 

data/app/controllers/locomotive/current_site_controller.rb

@@ -18,7 +18,7 @@ module Locomotive
 
     def update
       authorize @site
-      @site.update_attributes(site_params)
+      service.update(@site, site_params)
       respond_with @site, location: -> { edit_current_site_path(current_site) }
     end
 
@@ -54,6 +54,10 @@ module Locomotive
       params.require(:site).permit(*policy(@site || Site).permitted_attributes)
     end
 
+    def service
+      @service ||= Locomotive::SiteService.new(current_locomotive_account)
+    end
+
     def ensure_domains_list
       params[:site][:domains] = [] unless params[:site][:domains]
     end

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

@@ -38,7 +38,7 @@ module Locomotive
       end
 
       def options_params
-        params.require(:select_options).map { |p| p.permit(:_id, :name, :_destroyed) }
+        params.require(:select_options).map { |p| p.permit(:_id, :name, :_destroy) }
       end
 
       def option_name_param

data/app/controllers/locomotive/dashboard_controller.rb

@@ -4,6 +4,8 @@ module Locomotive
     account_required & within_site
 
     def show
+      @activities = current_site.activities.order_by(:created_at.desc).page(params[:page]).per(Locomotive.config.ui[:per_page])
+      respond_with @activities, layout: !request.xhr?
     end
 
   end

data/app/controllers/locomotive/developers_documentation_controller.rb

@@ -0,0 +1,11 @@
+module Locomotive
+  class DevelopersDocumentationController < BaseController
+
+    account_required & within_site
+
+    def show
+      authorize(current_site, :show_developers_documentation?)
+    end
+
+  end
+end

data/app/controllers/locomotive/editable_elements_controller.rb

@@ -41,19 +41,12 @@ module Locomotive
     end
 
     def page_params
-      params.require(:page).permit(editable_elements_attributes: [:id, :page_id, :source, :remove_source, :remote_source_url, :content])
-    end
-
-    def parsing_service
-      @parsing_service ||= Locomotive::PageParsingService.new(current_site, current_content_locale)
-    end
-
-    def persisting_service
-      @persisting_service ||= Locomotive::EditableElementService.new(current_site, current_locomotive_account)
+      params.require(:page).permit(editable_elements_attributes: [:id, :_id, :page_id, :source, :remove_source, :remote_source_url, :content])
     end
 
     def render_index
-      @editable_elements_by_block = @editable_elements.group_by { |(_, e)| e.block }
+      @editable_elements_by_block = parsing_service.group_and_sort_editable_elements(@editable_elements)
+      @blocks = parsing_service.blocks_from_grouped_editable_elements(@editable_elements_by_block)
 
       @content_entry = @page.content_type.entries.find(params[:content_entry_id]) if params[:content_entry_id]
 
@@ -64,6 +57,14 @@ module Locomotive
       end
     end
 
+    def parsing_service
+      @parsing_service ||= Locomotive::PageParsingService.new(current_site, current_content_locale)
+    end
+
+    def persisting_service
+      @persisting_service ||= Locomotive::EditableElementService.new(current_site, current_locomotive_account)
+    end
+
     def store_location_if_content_entry
       store_location if @content_entry
     end

data/app/controllers/locomotive/errors_controller.rb

@@ -0,0 +1,15 @@
+module Locomotive
+  class ErrorsController < ApplicationController
+
+    layout '/locomotive/layouts/error'
+
+    def error_404
+      render '404', status: :not_found
+    end
+
+    def error_500
+      render '500', status: :internal_server_error
+    end
+
+  end
+end

data/app/controllers/locomotive/pages_controller.rb

@@ -36,13 +36,13 @@ module Locomotive
 
     def destroy
       authorize @page
-      @page.destroy
+      service.destroy(@page)
       respond_with @page, location: editable_elements_path(current_site, current_site.pages.root.first)
     end
 
     def sort
       authorize @page, :update?
-      @page.sort_children!(params.require(:children))
+      service.sort(@page, params.require(:children))
       respond_with @page, location: edit_page_path(current_site, @page)
     end
 
@@ -57,7 +57,7 @@ module Locomotive
     end
 
     def service
-      @service ||= Locomotive::PageService.new(current_site)
+      @service ||= Locomotive::PageService.new(current_site, current_locomotive_account)
     end
 
   end

data/app/controllers/locomotive/public_submission_accounts_controller.rb

@@ -0,0 +1,42 @@
+module Locomotive
+  class PublicSubmissionAccountsController < BaseController
+
+    account_required & within_site
+
+    before_filter :load_content_type
+
+    def edit
+      authorize @content_type
+      respond_with @content_type
+    end
+
+    def update
+      authorize @content_type
+      service.update(@content_type, content_type_params)
+      respond_with @content_type, location: content_entries_path(current_site, @content_type.slug)
+    end
+
+    def new_account
+      if params[:public_submission_account].present?
+        render partial: 'account', locals: { public_submission_account: params[:public_submission_account] }
+      else
+        head :unprocessable_entity
+      end
+    end
+
+    private
+
+    def load_content_type
+      @content_type ||= current_site.content_types.where(slug: params[:slug]).first
+    end
+
+    def service
+      @service ||= Locomotive::ContentTypeService.new(current_site)
+    end
+
+    def content_type_params
+      params.require(:content_type).permit(public_submission_accounts: [])
+    end
+
+  end
+end

data/app/controllers/locomotive/translations_controller.rb

@@ -3,26 +3,14 @@ module Locomotive
 
     account_required & within_site
 
-    before_filter :load_translation, only: [:edit, :update, :destroy]
+    before_filter :load_translation, only: [:edit, :update]
 
     def index
       authorize ThemeAsset
-      @translations = current_site.translations.ordered.page(params[:page]).per(Locomotive.config.ui[:per_page])
+      @translations = service.all(params.slice(:page, :per_page, :q, :filter_by))
       respond_with @translations
     end
 
-    def new
-      authorize ThemeAsset
-      @translation = current_site.translations.build
-      respond_with @translation
-    end
-
-    def create
-      authorize ThemeAsset
-      @translation = current_site.translations.create(translation_params)
-      respond_with @translation, location: translations_path(current_site)
-    end
-
     def edit
       authorize @translation
       respond_with @translation
@@ -30,14 +18,8 @@ module Locomotive
 
     def update
       authorize @translation
-      @translation.update_attributes(translation_params)
-      respond_with @translation, location: translations_path(current_site)
-    end
-
-    def destroy
-      authorize @translation
-      @translation.destroy
-      respond_with @translation, location: translations_path(current_site)
+      service.update(@translation, translation_params[:values])
+      respond_with @translation, location: translations_path(current_site, params[:_location])
     end
 
     private
@@ -47,7 +29,11 @@ module Locomotive
     end
 
     def translation_params
-      params.require(:translation).permit(:key, :values)
+      params.require(:translation).permit(values: current_site.locales)
+    end
+
+    def service
+      @service ||= Locomotive::TranslationService.new(current_site, current_locomotive_account)
     end
 
   end

data/app/helpers/locomotive/base_helper.rb

@@ -59,22 +59,6 @@ module Locomotive
       content_tag :i, '', class: ['fa', name].join(' ')
     end
 
-    # Like link_to but instead of passing a label, we
-    # pass the name of an Font Awesome icon.
-    # If the name is a Symbol, we append "icon-" to the
-    # dasherized version of the name.
-    #
-    # @param [ String / Symbol ] name The class name or a symbol
-    # @param [ Array ] *args
-    #
-    # @return [ String ] The HTML <a> tag
-    #
-    def link_to_icon(name, *args, &block)
-      name = name.is_a?(Symbol) ? "icon-#{name.to_s.dasherize}" : name
-      icon = content_tag(:i, '', class: name)
-      link_to(icon, *args, &block).html_safe
-    end
-
     # Execute the code only once during the request time. It avoids duplicated
     # dom elements in the rendered rails page.
     #
@@ -89,13 +73,10 @@ module Locomotive
       end
     end
 
-    # def locale_picker_link
-    #   if current_site.locales.size > 1 && localized?
-    #     content_tag :div, render('locomotive/shared/locale_picker_link'), class: 'action'
-    #   else
-    #     nil
-    #   end
-    # end
+    def locale_picker_link
+      return '' if current_site.locales.size == 1
+      render 'locomotive/shared/locale_picker_link'
+    end
 
     def flash_message
       if not flash.empty?
@@ -218,5 +199,26 @@ module Locomotive
       end
     end
 
+    # Display the name of the account (+ avatar) who created or updated the document
+    # (content_entry, translation, ...etc) as well as the date when it occured.
+    #
+    # @param [ Object ] document The model
+    #
+    # @return [ String ] The html output
+    #
+    def document_stamp(document)
+      distance  = distance_of_time_in_words_to_now(document.updated_at)
+      update    = document.updated_at && document.updated_at != document.created_at
+
+      if account = (document.updated_by || document.created_by)
+        profile = account_avatar_and_name(account, '40x40#')
+        key     = update ? :updated_by : :created_by
+        t(key, scope: 'locomotive.shared.list', distance: distance, who: profile)
+      else
+        key = update ? :updated_at : :created_at
+        t(key, scope: 'locomotive.shared.list', distance: distance)
+      end
+    end
+
   end
 end

data/app/helpers/locomotive/content_assets_helper.rb

@@ -22,6 +22,14 @@ module Locomotive
       value.blank? ? '?' : value
     end
 
+    def human_asset_size(asset)
+      if asset.image?
+        "#{asset.width} X #{asset.height} px"
+      else
+        number_to_human_size(asset.size)
+      end
+    end
+
   end
 
   class ImageResizeForm

data/app/helpers/locomotive/content_entries_helper.rb

@@ -1,23 +1,13 @@
 module Locomotive
   module ContentEntriesHelper
 
-    # Display the name of the account (+ avatar) who created or updated the content entry
-    # as well as the date when it happened.
-    #
-    # @param [ Object ] entry The content entry instance
-    #
-    # @return [ String ] The html output
-    #
-    def content_entry_stamp(entry)
-      distance = time_ago_in_words(entry.updated_at)
+    # Tell if the tab specified by the name argument should
+    # be displayed or not. It is based on the display_settings
+    # property of the content type.
+    def display_content_entry_tab?(content_type, name)
+      return true if content_type.display_settings.blank?
 
-      if account = entry.updated_by || entry.created_by
-        profile = account_avatar_and_name(account, '40x40#')
-        key     = entry.updated_by ? :updated_by : :created_by
-        t(key, scope: 'locomotive.content_entries.index', distance: distance, who: profile)
-      else
-        t('locomotive.content_entries.index.updated_at', distance: distance)
-      end
+      content_type.display_settings[name.to_s] != false
     end
 
     # Display the label related to a field of a content entry.
@@ -34,9 +24,9 @@ module Locomotive
       if field.localized?
         translated_css = entry.translated_field?(field) ? '' : 'untranslated'
 
-        icon  = content_tag(:i, '', class: 'icon-flag')
-        tag   = content_tag(:span, icon, class: "localized-icon #{translated_css}")
-        "#{tag}#{field.label}"
+        icon = content_tag(:i, '', class: "fa fa-globe #{translated_css}")
+
+        "#{icon} #{field.label}".html_safe
       else
         field.label
       end
@@ -67,5 +57,9 @@ module Locomotive
       end
     end
 
+    def can_edit_public_submission_accounts?(content_type)
+      policy(content_type).update? && content_type.public_submission_enabled?
+    end
+
   end
 end