locomotivecms 3.0.0.pre.alpha → 3.0.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13af7d4674ae2e9a78c3f0c28ba9b0c6eab430b5
-  data.tar.gz: cbc17a9c176e8a2df21dc8f7c7545eb3ae3e4192
+  metadata.gz: 10adf1633c36bc535a1fee5de2d222f04b412144
+  data.tar.gz: 941c8279d7f786e77f16a659745c9d3c74166172
 SHA512:
-  metadata.gz: 9c5c7319dda26005c0b70f6179cbd1ddd2402083feea05428c498c8c0255e9da5bb51a0b124cc032ff647cad11f465260ae721269b0c50a95c0f4e5b7da90ae2
-  data.tar.gz: 371622004666f61268c538b2eef46b89355c5fc08d945adc21900784533442c21c2bbc89ed1c41096aa0da0085ffd9a44544cf0d7a1a0b3ec31dcc3fad4babfd
+  metadata.gz: b1023a316c88d96e7eb64e5b77c88027e1071f9b536fdd59d8db139a85f86160c44b8245f70829bd1fa8a91241dcc9bf4b6d87d10d9ad17298a99b11277367e3
+  data.tar.gz: bfd4756b7844f6013e639960b21a4ce8461a32b2c9af5cb6332d8a40abdf93eb294435975523a5d78173c491a7b9d120948e21f58b74fec81261235e7d58ec4d

data/app/api/locomotive/api/entities/site_entity.rb

@@ -15,6 +15,10 @@ module Locomotive
           site.timezone_name
         end
 
+        expose :picture_url do |site, _|
+          site.picture.url
+        end
+
       end
 
     end

data/app/api/locomotive/api/forms/site_form.rb

@@ -4,7 +4,7 @@ module Locomotive
 
       class SiteForm < BaseForm
 
-        attrs :name, :handle, :robots_txt, :locales, :domains, :timezone
+        attrs :name, :handle, :robots_txt, :locales, :domains, :timezone, :picture
 
         attrs :seo_title, :meta_keywords, :meta_description, localized: true
 

data/app/api/locomotive/api/resources/site_resource.rb

@@ -64,6 +64,7 @@ module Locomotive
               optional :locales, type: Array
               optional :domains, type: Array
               optional :timezone
+              optional :picture
             end
           end
           post do
@@ -88,6 +89,7 @@ module Locomotive
               optional :locales, type: Array
               optional :domains, type: Array
               optional :timezone
+              optional :picture
             end
           end
           put ':id' do

data/app/assets/javascripts/locomotive/utils/notify.js.coffee

@@ -0,0 +1,13 @@
+Locomotive.notify = (message, type) ->
+  icon = if type == 'danger'
+    'exclamation-triangle'
+  else if type == 'success'
+    'check'
+  else
+    'exclamation-circle'
+
+  $.notify { message: message, icon: "fa fa-#{icon}" },
+    type: type
+    placement:
+      from:   'bottom'
+      align:  'right'

data/app/assets/javascripts/locomotive/views/application_view.js.coffee

@@ -32,7 +32,7 @@ class Locomotive.Views.ApplicationView extends Backbone.View
 
   render_flash_messages: (messages) ->
     _.each messages, (couple) ->
-      $.growl couple[1], { type: couple[0] }
+      Locomotive.notify couple[1], couple[0]
 
   automatic_max_height: ->
     $(window).on 'resize', => @set_max_height()

data/app/assets/javascripts/locomotive/views/content_assets/dropzone_view.js.coffee

@@ -38,7 +38,7 @@ class Locomotive.Views.ContentAssets.DropzoneView extends Backbone.View
     form_data = new FormData()
 
     _.each event.target.files || event.originalEvent.dataTransfer.files, (file, i) ->
-      form_data.append("content_assets[#{i}][source]", file)
+      form_data.append("content_assets[][source]", file)
 
     @upload_files(form_data)
 

data/app/assets/javascripts/locomotive/views/content_assets/edit_image_view.js.coffee

@@ -21,7 +21,8 @@ class Locomotive.Views.ContentAssets.EditImageView extends Backbone.View
     @create_resize_popover()
 
   create_cropper: ->
-    @$cropper = @$('.image-container > img')
+    @$cropper         = @$('.image-container > img')
+    @cropper_enabled  = false
 
     @set_cropper_height()
     @$cropper.cropper
@@ -84,6 +85,7 @@ class Locomotive.Views.ContentAssets.EditImageView extends Backbone.View
       .then (image) =>
         @width  = width
         @height = height
+        @cropper_enabled = true
         @$cropper.cropper('replace', image.src)
         @set_cropper_height()
         $btn.button('reset')
@@ -99,7 +101,7 @@ class Locomotive.Views.ContentAssets.EditImageView extends Backbone.View
     return unless @cropper_enabled
 
     $link     = $(event.target).closest('.apply-btn')
-    image_url = @$cropper.cropper('getDataURL')
+    image_url = @$cropper.cropper('getDataURL') || @$cropper.attr('src')
     blob      = window.dataURLtoBlob(image_url)
 
     form_data = new FormData()

data/app/assets/javascripts/locomotive/views/pages/_form_view.js.coffee

@@ -1,10 +1,20 @@
-# #= require ../shared/form_view
+#= require ../shared/form_view
 
-# Locomotive.Views.Pages ||= {}
+Locomotive.Views.Pages ||= {}
+
+class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
+
+  el: '#content'
+
+  initialize: ->
+    @attach_events_on_redirect_attribute()
+
+  attach_events_on_redirect_attribute: ->
+    @$('#page_redirect').on 'switchChange.bootstrapSwitch', (event, state) ->
+      $inputs = $('.locomotive_page_redirect_url, .locomotive_page_redirect_type')
+      $inputs.toggleClass('hide')
 
-# class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
 
-#   el: '#content'
 
 #   events:
 #     'change   #page_parent_id':       'change_page_url'

data/app/assets/javascripts/locomotive/views/pages/edit_view.js.coffee

@@ -2,7 +2,7 @@
 
 Locomotive.Views.Pages ||= {}
 
-class Locomotive.Views.Pages.EditView extends Locomotive.Views.Shared.FormView
+class Locomotive.Views.Pages.EditView extends Locomotive.Views.Pages.FormView
 
   el: '.main'
 

data/app/assets/javascripts/locomotive/views/pages/list_view.js.coffee

@@ -70,10 +70,8 @@ class Locomotive.Views.Pages.ListView extends Backbone.View
       error:      @.on_failed_sort
 
   on_successful_sort: (data, status, xhr) ->
-    $.growl decodeURIComponent($.parseJSON(xhr.getResponseHeader('X-Message'))),
-      type: 'success'
+    Locomotive.notify decodeURIComponent($.parseJSON(xhr.getResponseHeader('X-Message'))), 'success'
 
   on_failed_sort: (data, status, xhr) ->
-    $.growl decodeURIComponent($.parseJSON(xhr.getResponseHeader('X-Message'))),
-      type: 'error'
+    Locomotive.notify decodeURIComponent($.parseJSON(xhr.getResponseHeader('X-Message'))), 'error'
 

data/app/assets/stylesheets/locomotive/components/_misc.scss

@@ -1 +1,2 @@
-@import "misc/nav";
+@import "misc/nav";
+@import "misc/notify";

data/app/assets/stylesheets/locomotive/components/misc/_notify.scss

@@ -0,0 +1,27 @@
+[data-notify="container"] {
+  border: none;
+
+  [data-notify="icon"] {
+    font-size: 18px;
+    margin-right: 9px;
+    color: #fff;
+  }
+
+  [data-notify="message"] {
+    color: #fff;
+  }
+}
+
+[data-notify="container"].alert-success {
+  background-color: $brand-success;
+}
+
+[data-notify="container"].alert-danger {
+  background-color: $brand-danger;
+}
+
+[data-notify="container"].alert-info {
+  [data-notify="icon"],  [data-notify="message"] {
+    color: $state-info-text;
+  }
+}

data/app/assets/stylesheets/locomotive/components/sidebar/_pages_tree.scss

@@ -74,7 +74,7 @@ $pt_warning_color:      #F89406;
           &.folded .folded, &.unfolded .unfolded { display: inline; }
         }
 
-        &.new-content {
+        &.new-entry, &.list-entries, &.new-page {
           a {
             margin-left: 1px;
             color: $pt_new_link_color;

data/app/controllers/locomotive/pages_controller.rb

@@ -11,12 +11,6 @@ module Locomotive
 
     respond_to :json, only: [:sort]
 
-    def index
-      authorize Page
-      @pages = current_site.all_pages_in_once
-      respond_with(@pages)
-    end
-
     def new
       authorize Page
       @page = current_site.pages.build
@@ -25,7 +19,7 @@ module Locomotive
 
     def create
       authorize Page
-      @page = current_site.pages.create(page_params)
+      @page = service.create(page_params)
       respond_with @page, location: -> { edit_page_path(current_site, @page) }
     end
 
@@ -36,7 +30,7 @@ module Locomotive
 
     def update
       authorize @page
-      @page.update_attributes(page_params)
+      service.update(@page, page_params)
       respond_with @page, location: edit_page_path(current_site, @page)
     end
 
@@ -62,5 +56,9 @@ module Locomotive
       params.require(:page).permit(:title, :parent_id, :listed, :published)
     end
 
+    def service
+      @service ||= Locomotive::PageService.new(current_site)
+    end
+
   end
 end

data/app/helpers/locomotive/base_helper.rb

@@ -125,9 +125,8 @@ module Locomotive
 
     def flash_key_to_bootstrap_alert(key)
       case key.to_sym
-      when :notice  then :success
-      when :alert   then :info
-      when :error   then :warning
+      when :notice          then :success
+      when :alert, :error   then :danger
       else
         :info
       end

data/app/helpers/locomotive/custom_fields_helper.rb

@@ -50,8 +50,8 @@ module Locomotive
         name:   field.name,
         label:  label_for_custom_field(form.object, field),
         hint:   field.hint,
-        wrapper_html: {
-          class: "#{'highlighted' if highlighted}"
+        input_html: {
+          class: "#{'input-lg' if highlighted}"
         }
       }
     end

data/app/helpers/locomotive/pages_helper.rb

@@ -25,17 +25,17 @@ module Locomotive
       list
     end
 
-    # def display_page_layouts?
-    #   ((@page.persisted? && @page.allow_layout?) || !@page.persisted?) &&
-    #   !current_site.pages.layouts.empty?
-    # end
+    def display_page_layouts?
+      ((@page.persisted? && @page.allow_layout?) || !@page.persisted?) &&
+      !current_site.pages.layouts.empty?
+    end
 
-    # def options_for_page_layouts
-    #   layouts = current_site.pages.layouts.map do |_layout|
-    #     [_layout.title, _layout._id]
-    #   end
-    #   [[t('.no_layout'), nil]] + layouts
-    # end
+    def options_for_page_layouts
+      layouts = current_site.pages.layouts.map do |_layout|
+        [_layout.title, _layout._id]
+      end
+      [[t(:no_layout, scope: 'locomotive.pages.form'), nil]] + layouts
+    end
 
     # def options_for_page_response_type
     #   [
@@ -46,12 +46,13 @@ module Locomotive
     #   ]
     # end
 
-    # def options_for_page_redirect_type
-    #   [
-    #     [t('.redirect_type.permanent'), 301],
-    #     [t('.redirect_type.temporary'), 302]
-    #   ]
-    # end
+    def options_for_page_redirect_type
+      puts t('.redirect_type.permanent').inspect
+      [
+        [t('.redirect_type.permanent'), 301],
+        [t('.redirect_type.temporary'), 302]
+      ]
+    end
 
     # def page_response_type_to_string(page)
     #   options_for_page_response_type.detect { |t| t.last == page.response_type }.try(:first) || '—'

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

@@ -10,7 +10,7 @@ module Locomotive
       end
 
       def build_page_tree
-        @page_tree ||= Locomotive::PageService.new(current_site).build_tree
+        @page_tree ||= Locomotive::PageTreeService.new(current_site).build_tree
       end
 
       class Node < Struct.new(:page, :children, :controller)
@@ -20,7 +20,7 @@ module Locomotive
         def_delegators :page, :_id, :title, :index_or_not_found?, :published?, :templatized?, :translated?, :redirect?, :response_type
 
         def fold_state
-          controller.send(:cookies)["node-#{_id}"] != 'folded' ? 'unfolded' : 'folded'
+          controller.send(:cookies)["node-#{_id}"] != 'unfolded' ? 'folded' : 'unfolded'
         end
 
         def nodes

data/app/models/locomotive/concerns/page/layout.rb

@@ -23,6 +23,10 @@ module Locomotive
 
         end
 
+        def is_layout_or_related?
+          !(self.fullpath =~ /^layouts($|\/)/).nil?
+        end
+
         private
 
         def set_default_raw_template_if_layout

data/app/models/locomotive/page.rb

@@ -3,19 +3,18 @@ module Locomotive
 
     include Locomotive::Mongoid::Document
 
-    MINIMAL_ATTRIBUTES = %w(_id title slug fullpath position depth published templatized target_klass_name redirect listed response_type parent_id parent_ids site_id created_at updated_at raw_template)
+    MINIMAL_ATTRIBUTES = %w(_id title slug fullpath position depth published templatized target_klass_name redirect listed response_type parent_id parent_ids site_id created_at updated_at raw_template is_layout)
 
     ## concerns ##
     include Concerns::Page::Tree
     include Concerns::Page::EditableElements
     include Concerns::Page::Layout
-    # include Concerns::Page::Parse
-    # include Concerns::Page::Render
     include Concerns::Page::Templatized
     include Concerns::Page::Redirect
     include Concerns::Page::Listed
     include Concerns::Shared::Slug
     include Concerns::Shared::Seo
+    include Concerns::Shared::Userstamp
 
     ## fields ##
     field :title,               localize: true

data/app/models/locomotive/site.rb

@@ -43,10 +43,6 @@ module Locomotive
 
     ## methods ##
 
-    def all_pages_in_once
-      PageService.new(self).build_tree
-    end
-
     # Get all the pages in the right order: depth and position, both ASC.
     #
     # @param [ Hash ] conditions Extra conditions passed to the Mongoid criteria

data/app/services/locomotive/content_entry_service.rb

@@ -56,6 +56,7 @@ module Locomotive
     # @return [ Object ] An instance of the content entry.
     #
     def public_create(attributes)
+      raise 'TODO'
       content_type.entries.build.tap do |entry|
         entry.from_presenter(attributes)
         entry.save

data/app/services/locomotive/page_service.rb

@@ -1,63 +1,35 @@
 module Locomotive
 
-  class PageService < Struct.new(:site)
+  class PageService < Struct.new(:site, :account)
 
-    # Returns the tree of pages from the site with the most minimal amount of queries.
-    # This method should only be used for read-only purpose since
-    # the mongodb returns the minimal set of required attributes to build
-    # the tree.
+    # Create a page from the attributes passed in parameter.
+    # It sets the created_by column with the current account.
     #
-    # @return [ Array ] The first array of pages (index + page not found + pages with depth == 1)
+    # @param [ Hash ] attributes The attributes of new page.
     #
-    def build_tree
-      pages, page_not_found = pages_with_minimun_attributes, nil
-
-      [].tap do |tree|
-        while page = pages.shift
-          if page.not_found?
-            # move the "page not found" (404) at the end of the array
-            page_not_found = page
-          elsif page.index?
-            # make the index page without children
-            tree << [page, nil]
-          else
-            tree << _build_tree(page, pages)
-          end
-        end
-
-        tree << [page_not_found, nil]
+    # @return [ Object ] An instance of the page.
+    #
+    def create(attributes)
+      site.pages.build(attributes).tap do |page|
+        page.created_by = account if account
+        page.save
       end
     end
 
-    protected
-
-    #:nodoc:
-    def pages_with_minimun_attributes
-      site.pages.unscoped.
-        minimal_attributes.
-        order_by_depth_and_position.
-        to_a
-    end
-
-    #:nodoc:
-    def _build_tree(current_page, pages)
-      i, children = 0, []
-
-      while !pages.empty?
-        page = pages[i]
-
-        break if page.nil? # end of the array
-
-        if page.parent_id == current_page.id
-          page = pages.delete_at(i)
-
-          children << _build_tree(page, pages)
-        else
-          i += 1
-        end
+    # Update a page from the attributes passed in parameter.
+    # It sets the updated_by column with the current account.
+    #
+    # @param [ Object ] entry The page to update.
+    # @param [ Hash ] attributes The attributes of new page.
+    #
+    # @return [ Object ] The instance of the page.
+    #
+    def update(page, attributes)
+      page.tap do
+        page.attributes = attributes
+        page.updated_by = account
+        page.save
       end
-
-      [current_page, children]
     end
 
   end