activeadmin-selleo-cms 0.0.18 → 0.0.20

data/app/assets/javascripts/ckeditor/config.js

@@ -160,7 +160,6 @@ CKEDITOR.editorConfig = function( config )
 
     config.toolbar_Lite =
         [
-            ['FontSize'],
             ['Cut', 'Copy', 'Paste'],
             ['Bold', 'Italic', 'Underline', 'StrikeThrough'],
             ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyFull'],
@@ -168,4 +167,16 @@ CKEDITOR.editorConfig = function( config )
             ['BulletedList', 'HorizontalRule']
         ];
 
+    config.toolbar_Minimal =
+        [
+            ['Cut', 'Copy', 'Paste'],
+            ['Bold', 'Italic', 'Underline', 'StrikeThrough'],
+            ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyFull']
+        ];
+
+    config.toolbar_Header =
+        [
+            ['Bold'],
+        ];
+
 };

data/app/assets/stylesheets/activeadmin-selleo-cms/custom.css

@@ -56,4 +56,8 @@ div.translation > input {
 
 table#translations td.key {
     padding-top: 16px;
-}
+}
+
+.sortable { list-style-type: none; margin: 0; padding: 0; width: 60%; }
+.sortable li { margin: 0 3px 3px 3px; padding: 0.4em; padding-left: 1.5em; font-size: 1.4em; height: 18px; }
+.sortable li span { position: absolute; margin-left: -1.3em; }

data/app/assets/stylesheets/activeadmin-selleo-cms/jquery-ui-timepicker-addon.css

@@ -0,0 +1,10 @@
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
+.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+
+.ui-timepicker-rtl{ direction: rtl; }
+.ui-timepicker-rtl dl { text-align: right; }
+.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; }

data/app/controllers/pages_controller.rb

@@ -4,19 +4,24 @@ class PagesController < CmsController
   private
 
   def find_page
-    page_scope = ActiveadminSelleoCms::Page
     root = ActiveadminSelleoCms::Page.root
 
     raise "Create at least one page" unless root
 
-    if parent = ActiveadminSelleoCms::Page.find_by_slug(params[:page_id])
-      page_scope = page_scope.where(parent_id: parent.id)
+    page_id = nil
+
+    5.downto(1).each do |l|
+      if params["slug#{l}"] and page = ActiveadminSelleoCms::Page.where(parent_id: page_id).find_by_slug(params["slug#{l}"])
+        page_id = page.id
+      end
     end
 
-    @page = page_scope.find_by_slug(params[:id])
+    @page = ActiveadminSelleoCms::Page.find_by_id(page_id)
 
     if !@page or (!@page.is_published? and @page != root)
       redirect_to page_path(I18n.locale, root)
+    elsif @page.redirect_to_first_sub_page
+      redirect_to page_path(I18n.locale, @page.children.first || root)
     end
   end
 

data/app/controllers/searches_controller.rb

@@ -1,6 +1,6 @@
 class SearchesController < CmsController
   def show
-    @results = ActiveadminSelleoCms::Search.current_locale.search_by_content(params[:id]).map(&:searchable).uniq
+    @results = ActiveadminSelleoCms::Search.current_locale.search_by_content(params[:id])
     render action: :show, layout: 'search'
   end
 end

data/app/helpers/pages_helper.rb

@@ -1,7 +1,7 @@
 module PagesHelper
   def link_to_locale(link_name, locale, page=nil)
     if page
-      link_to link_name, page_path(locale.code, page.translated_attribute(:slug, locale.code))
+      link_to link_name, url_to_page(page, locale.to_s)
     elsif request.fullpath.match(/^\/\w{2}\/.*/)
       link_to link_name, request.fullpath.gsub(/^\/(\w{2})\//, "/#{locale.code}/")
     else
@@ -11,19 +11,23 @@ module PagesHelper
 
   def link_to_search_result(result)
     if result.is_a? ActiveadminSelleoCms::Page
-      link_to result, result.url
+      "#{link_to result.breadcrumb, result.url} #{link_to "(e)", edit_admin_page_path(result.id), target: '_blank' if current_user}".html_safe
     end
   end
 
-  def url_to_page(page)
+  def url_to_page(page, locale=I18n.locale)
     return "#" unless page
-    if page.is_link_url
+    _locale = I18n.locale
+    I18n.locale = locale
+    _url = if page.is_link_url
       page.link_url
     elsif page.redirect_to_first_sub_page
       page.children.published.any? ? url_to_page(page.children.published.first) : "#"
     else
-      page_path(I18n.locale, page)
+      page_path(locale, page)
     end
+    I18n.locale = _locale
+    return _url
   end
 
   def link_to_page(page, link_name=nil)

data/app/models/activeadmin_selleo_cms/asset.rb

@@ -1,9 +1,15 @@
 module ActiveadminSelleoCms
   class Asset < ActiveRecord::Base
-    attr_accessible :data
+    attr_protected :id
 
     belongs_to :assetable, polymorphic: true
 
+    has_attached_file :cover,
+                      :url  => "/system/cms/covers/:id/:style_:basename.:extension",
+                      :path => ":rails_root/public/system/cms/covers/:id/:style_:basename.:extension"
+
+    validates_attachment_size :cover, :less_than => 10.megabytes
+
     def url(format=nil)
       data.url(format)
     end

data/app/models/activeadmin_selleo_cms/attachment.rb

@@ -6,5 +6,7 @@ module ActiveadminSelleoCms
 
     validates_attachment_size :data, :less_than => 10.megabytes
     validates_attachment_presence :data
+
+    attr_protected :id
   end
 end

data/app/models/activeadmin_selleo_cms/image.rb

@@ -0,0 +1,21 @@
+module ActiveadminSelleoCms
+  class Image < ActiveadminSelleoCms::Asset
+    attr_accessor :image_width, :image_height, :resize_method
+
+    has_attached_file :data,
+                      :url  => "/system/cms/images/:id/:style_:basename.:extension",
+                      :path => ":rails_root/public/system/cms/images/:id/:style_:basename.:extension",
+                      :styles => Proc.new{ |attachment| attachment.instance.image_sizes },
+                      :default_style => :normal
+
+    validates_attachment_size :data, :less_than => 1.megabytes
+    validates_attachment_presence :data
+
+    attr_protected :id
+
+    def image_sizes
+      { :normal => "#{image_width || 640}x#{image_height || 480}#{resize_method || "#"}" }
+    end
+
+  end
+end

data/app/models/activeadmin_selleo_cms/layout.rb

@@ -37,13 +37,37 @@ module ActiveadminSelleoCms
     end
 
     class Section
-      attr_accessor :name, :type, :toolbar, :attachments
+      attr_accessor :name, :type, :toolbar, :width, :height, :resize_method
 
       def initialize(node)
         @name = node.attributes["name"].content
-        @attachments = node.attributes["attachments"] ? true : false
         @type = node.attributes["data-type"] ? node.attributes["data-type"].content : 'ckeditor'
-        @toolbar = node.attributes["data-toolbar"] ? node.attributes["data-toolbar"].content : 'Easy'
+        @attachments = (['files'].include?(@type) or node.attributes["data-attachments"]) ? true : false
+        @attachment = (['file'].include?(@type) or node.attributes["data-attachment"]) ? true : false
+        @toolbar = node.attributes["data-toolbar"] ? node.attributes["data-toolbar"].content : 'Minimal'
+        @width = node.attributes["data-width"] ? node.attributes["data-width"].content : 640
+        @height = node.attributes["data-height"] ? node.attributes["data-height"].content : 480
+        @resize_method = node.attributes["data-resize-method"] ? node.attributes["data-resize-method"].content : "#"
+      end
+
+      def text?
+        ['ckeditor', 'text'].include? @type
+      end
+
+      def image?
+        ['image'].include? @type
+      end
+
+      def images?
+        ['images'].include? @type
+      end
+
+      def attachments?
+        @attachments == true
+      end
+
+      def attachment?
+        @attachment == true
       end
 
     end

data/app/models/activeadmin_selleo_cms/page.rb

@@ -11,15 +11,13 @@ module ActiveadminSelleoCms
     attr_protected :id
 
     has_many :sections, as: :sectionable
-    has_one :icon, as: :assetable
-    has_one :header_image, as: :assetable
     has_many :attachments, as: :assetable
     has_many :assets, as: :assetable
     has_many :searches, as: :searchable
     # ZUO
     #has_many :translations, class_name: 'ActiveadminSelleoCms::Page::Translation', foreign_key: :activeadmin_selleo_cms_page_id, dependent: :destroy, before_add: :set_nest
 
-    accepts_nested_attributes_for :translations, :sections, :children, :icon, :header_image, :attachments
+    accepts_nested_attributes_for :translations, :sections, :children, :attachments
 
     validates_format_of :link_url, with: /^http/i, allow_blank: false, if: ->(page) { page.is_link_url }
     validates_presence_of :layout_name
@@ -32,8 +30,8 @@ module ActiveadminSelleoCms
     scope :latest, ->(n) { published.reorder("published_at DESC").limit(n) }
     scope :most_read, ->(n) { published.reorder("views DESC").limit(n) }
     scope :with_layout, ->(layout_name) { where(layout_name: layout_name) }
-    scope :with_setting_value, ->(key, value) { where("activeadmin_selleo_cms_pages.settings ~ '#{key}: #{value}'") }
-    scope :with_setting, ->(key) { where("activeadmin_selleo_cms_pages.settings ~ '#{key}: '") }
+    scope :with_setting_value, ->(key, value) { where("activeadmin_selleo_cms_pages.settings ~ '#{key}:\\s?\\W?#{value}\\W?\\s*$'") }
+    scope :with_setting, ->(key) { where("activeadmin_selleo_cms_pages.settings ~ '#{key}:\\s?'") }
 
     before_validation do
       self.slug = self.title.parameterize if title and slug.blank?
@@ -50,28 +48,25 @@ module ActiveadminSelleoCms
       self.layout_name = Layout.all.first if new_record? and layout_name.blank?
     end
 
-    def set_nest(translation)
-      translation.activeadmin_selleo_cms_page ||= self
+    after_initialize do
+      _settings = read_attribute(:settings) || {}
+      _settings.keys.each do |key|
+            eval "
+        def #{key}
+          (self.settings || {})[:#{key}]
+        end
+        def #{key}=(val)
+          self.settings ||= {}
+          val = true if val == '1'
+          val = false if val == '0'
+          self.settings[:#{key}] = val
+        end
+        "
+      end
     end
 
-    def method_missing(method, *args, &block)
-      _method = (method.to_s[/(.*)\=$/,1] || method).to_sym
-      unless (self.settings || {})[_method].nil?
-        eval "
-          def #{_method}
-            (self.settings || {})[:#{_method}]
-          end
-          def #{_method}=(val)
-            self.settings ||= {}
-            val = true if val == '1'
-            val = false if val == '0'
-            self.settings[:#{_method}] = val
-          end
-          "
-        send(method, *args)
-      else
-        super
-      end
+    def set_nest(translation)
+      translation.activeadmin_selleo_cms_page ||= self
     end
 
     def initialize_missing_sections
@@ -96,14 +91,6 @@ module ActiveadminSelleoCms
       parent ? "#{parent.to_param}/#{slug}" : slug
     end
 
-    def icon_url
-      icon ? icon.url : 'http://placehold.it/120x90'
-    end
-
-    def header_image_url
-      header_image ? header_image.url : 'http://placehold.it/770x385'
-    end
-
     def roots
       Page.published.roots
     end
@@ -124,6 +111,19 @@ module ActiveadminSelleoCms
       _url
     end
 
+    def self.update_positions(page_ids)
+      begin
+        ActiveRecord::Base.transaction do
+          page_ids.each_cons(2) do |pair|
+            Page.find(pair.last).move_to_right_of(Page.find(pair.first))
+          end
+        end
+        return true
+      rescue
+        return false
+      end
+    end
+
     class Translation
       attr_protected :id
 

data/app/models/activeadmin_selleo_cms/search.rb

@@ -6,5 +6,6 @@ module ActiveadminSelleoCms
     belongs_to :searchable, polymorphic: true
 
     scope :current_locale, -> { where(locale: I18n.locale) }
+    scope :published, -> { where(is_published: true) }
   end
 end

data/app/models/activeadmin_selleo_cms/section.rb

@@ -8,6 +8,8 @@ module ActiveadminSelleoCms
 
     belongs_to :sectionable, polymorphic: true
 
+    delegate :layout, to: :sectionable
+
     accepts_nested_attributes_for :translations
 
     validates_presence_of :name
@@ -26,12 +28,42 @@ module ActiveadminSelleoCms
       end
     end
 
+    def image
+      if current_translation = translations.with_locales(I18n.fallbacks[I18n.locale]).detect{|t| t.image}
+        current_translation.image
+      else
+        nil
+      end
+    end
+
+    def attachment
+      if current_translation = translations.with_locales(I18n.fallbacks[I18n.locale]).detect{|t| t.attachment}
+        current_translation.attachment
+      else
+        nil
+      end
+    end
+
+    def images
+      if current_translation = translations.with_locales(I18n.fallbacks[I18n.locale]).detect{|t| t.images.any? }
+        current_translation.images
+      else
+        []
+      end
+    end
+
     class Translation
       attr_protected :id
 
       has_many :attachments, as: :assetable
+      has_many :images, as: :assetable
+      has_one :attachment, as: :assetable
+      has_one :image, as: :assetable
 
-      accepts_nested_attributes_for :attachments
+      accepts_nested_attributes_for :attachments, reject_if: lambda{ |i| i[:data].blank? }
+      accepts_nested_attributes_for :attachment, reject_if: lambda{ |i| i[:data].blank? }
+      accepts_nested_attributes_for :image, reject_if: lambda{ |i| i[:data].blank? }
+      accepts_nested_attributes_for :images, reject_if: lambda{ |i| i[:data].blank? }
     end
   end
 end

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

@@ -5,8 +5,9 @@
   - current_locale = ActiveadminSelleoCms::Locale.find_by_code(I18n.locale)
   - @page.initialize_missing_sections
   - @section_forms = []
+  -#= @page.errors.full_messages
 
-  = form.inputs "General options" do
+  = form.inputs general_options(@page) do
     = form.input :layout_name, collection: ActiveadminSelleoCms::Layout.all.sort, include_blank: false, hint: "The form will reload on change"
     = form.input :parent_id, as: :select, collection: nested_set_options(ActiveadminSelleoCms::Page, @page) {|i| "#{'-' * i.level} #{i.title}" }
     = form.input :is_published, as: :boolean, input_html: { checked: @page.published_at.present? }
@@ -41,13 +42,6 @@
       - else
         = ""
 
-  - unless @page.new_record?
-    = form.inputs "Page icon", for: [:icon, form.object.icon || ActiveadminSelleoCms::Icon.new] do |icon_form|
-      = icon_form.input :data, label: "Icon", hint: (form.object.icon ? icon_form.template.image_tag(form.object.icon_url) : "No icon uploaded yet" )
-
-    = form.inputs "Header image", for: [:header_image, form.object.header_image || ActiveadminSelleoCms::HeaderImage.new] do |header_image_form|
-      = header_image_form.input :data, label: "Header image", hint: (form.object.header_image ? header_image_form.template.image_tag(form.object.header_image_url) : "No header image uploaded yet" )
-
   = form.actions do
     = form.action :submit
     %li.cancel

data/app/views/admin/pages/_translated_fields.html.haml

@@ -8,20 +8,57 @@
     = form.input :meta_keywords, input_html: { class: 'link-url-hide' }
     = form.input :meta_description, input_html: { rows: 3, class: 'link-url-hide' }
     = form.input :locale, :as => :hidden, :label => false
+    -#- unless @page.new_record?
     - @section_forms.each do |section_form|
-      = section_form.semantic_fields_for :translations do |section_form_translated|
-        - if section_form_translated.object.locale.to_sym == locale.code
-          - section = @page.layout.find_section(section_form.object.name)
-          = section_form_translated.input :body, as: section.type, label: "#{section_form.object.name.titleize} part", input_html: { toolbar: section.toolbar }
-          = section_form_translated.input :locale, :as => :hidden, :label => false
-          - if !@page.new_record? and section.attachments
-            = section_form_translated.inputs "Attachments", for: [:attachments, ActiveadminSelleoCms::Attachment.new] do |attachment_form|
-              = attachment_form.input :data, label: "Attachment", input_html: { multiple: false }
-              - section_form_translated.object.attachments.each do |attachment|
-                %li{"data-asset-id" => attachment.id}
-                  %label File
-                  = attachment.data_file_name
-                  = link_to_function "Delete", "delete_asset(#{@page.id}, #{attachment.id})"
-        - else
-          = ""
+      %section{:name => section_form.object.name}
+        = section_form.semantic_fields_for :translations do |section_form_translated|
+          - if section_form_translated.object.locale.to_sym == locale.code
+            - section = @page.layout.find_section(section_form.object.name)
+
+            - if section.text?
+              = section_form_translated.input :body, as: section.type, label: section.name.titleize, input_html: { toolbar: section.toolbar }
+
+            - elsif section.image?
+              = section_form_translated.inputs section.name.titleize, for: [:image, section_form_translated.object.image || ActiveadminSelleoCms::Image.new] do |image_form|
+                = image_form.input :image_width, as: :hidden, value: section.width
+                = image_form.input :image_height, as: :hidden, value: section.height
+                = image_form.input :resize_method, as: :hidden, value: section.resize_method
+                = image_form.input :data, label: "File to upload", input_html: { multiple: false }, hint: (section_form_translated.object.image ? section_form_translated.template.image_tag(section_form_translated.object.image.url) : "No icon uploaded yet" )
+
+            - elsif section.images?
+              = section_form_translated.inputs section.name.titleize, for: [:images, ActiveadminSelleoCms::Image.new] do |image_form|
+                = image_form.input :image_width, as: :hidden, value: section.width
+                = image_form.input :image_height, as: :hidden, value: section.height
+                = image_form.input :resize_method, as: :hidden, value: section.resize_method
+                = image_form.input :data, label: "File to upload", input_html: { multiple: false }
+                - unless section_form_translated.object.new_record?
+                  - section_form_translated.object.images.each do |image|
+                    %li{"data-asset-id" => image.id}
+                      %label Image
+                      = image.data_file_name
+                      = link_to_function "Delete", "delete_asset(#{@page.id}, #{image.id})"
+
+            - elsif section.attachment?
+              = section_form_translated.inputs section.name.titleize, for: [:attachment, section_form_translated.object.image || ActiveadminSelleoCms::Attachment.new] do |attachment_form|
+                = attachment_form.input :data, label: "File to upload", input_html: { multiple: false }, hint: (section_form_translated.object.image ? link_to(section_form_translated.object.image.url) : "No file uploaded yet" )
+                = attachment_form.input :cover, label: "Cover image"
+                = attachment_form.input :caption
+
+            = section_form_translated.input :locale, :as => :hidden, :label => false
+            - if section.attachments?
+              = section_form_translated.inputs "#{section.name.titleize} attachments", for: [:attachments, ActiveadminSelleoCms::Attachment.new] do |attachment_form|
+                = attachment_form.input :data, label: "File to upload"
+                = attachment_form.input :cover, label: "Cover image"
+                = attachment_form.input :caption
+                - if section_form_translated.object.attachments.any? and !section_form_translated.object.new_record?
+                  %li Existing files
+                  - section_form_translated.object.attachments.each do |attachment|
+                    %li{"data-asset-id" => attachment.id}
+                      %label File
+                      = attachment.data_file_name
+                      = image_tag(attachment.cover.url) if attachment.cover.exists?
+                      = attachment.caption
+                      = link_to_function "Delete", "delete_asset(#{@page.id}, #{attachment.id})"
+          - else
+            = ""