activeadmin-selleo-cms 0.0.20 → 0.0.21

data/app/admin/activeadmin_selleo_cms/asset.rb

@@ -1,7 +1,6 @@
 ActiveAdmin.register ActiveadminSelleoCms::Asset, { as: 'Asset' } do
   config.batch_actions = false
-
-  #belongs_to :page
+  menu false
 
   controller do
     respond_to :html, :js

data/app/admin/activeadmin_selleo_cms/related_item.rb

@@ -0,0 +1,9 @@
+ActiveAdmin.register ActiveadminSelleoCms::RelatedItem, { as: 'RelatedItem' } do
+  config.batch_actions = false
+  menu false
+
+  controller do
+    respond_to :html, :js
+  end
+
+  end

data/app/assets/javascripts/activeadmin-selleo-cms/custom.js

@@ -20,13 +20,20 @@ function delete_asset(page_id, asset_id) {
     $.ajax({
         url: '/admin/assets/' + asset_id + '.js',
         type: 'DELETE'
-    }).success(function(){
-        $('[data-attachment-id="' + asset_id + '"]').remove();
     }).error(function(){
         alert('Could not delete attachment');
     });
 }
 
+function delete_related(page_id, related_item_id) {
+    $.ajax({
+        url: '/admin/related_items/' + related_item_id + '.js',
+        type: 'DELETE'
+    }).error(function(){
+        alert('Could not delete related item');
+    });
+}
+
 function update_positions(pagesArray) {
     $('.update-positions-button').attr('disabled', true).attr('value', 'Saving...')
     $.ajax({

data/app/helpers/pages_helper.rb

@@ -19,19 +19,13 @@ module PagesHelper
     return "#" unless page
     _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(locale, page)
-    end
+    _url = page.url
     I18n.locale = _locale
     return _url
   end
 
   def link_to_page(page, link_name=nil)
-    link_to (link_name || page.title), url_to_page(page)
+    link_to (link_name || page.title), page.url
   end
 
   def s(name)

data/app/models/activeadmin_selleo_cms/asset.rb

@@ -1,17 +1,25 @@
 module ActiveadminSelleoCms
   class Asset < ActiveRecord::Base
     attr_protected :id
+    attr_accessor :cover_width, :cover_height, :cover_resize_method
 
     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"
+                      :path => ":rails_root/public/system/cms/covers/:id/:style_:basename.:extension",
+                      :styles => Proc.new{ |attachment| attachment.instance.image_sizes },
+                      :default_style => :normal
 
     validates_attachment_size :cover, :less_than => 10.megabytes
 
     def url(format=nil)
       data.url(format)
     end
+
+    def image_sizes
+      { :normal => "#{cover_width || 120}x#{cover_height || 90}#{cover_resize_method || ">"}" }
+    end
+
   end
 end

data/app/models/activeadmin_selleo_cms/image.rb

@@ -1,6 +1,6 @@
 module ActiveadminSelleoCms
   class Image < ActiveadminSelleoCms::Asset
-    attr_accessor :image_width, :image_height, :resize_method
+    attr_accessor :image_width, :image_height, :resize_method, :cover_width, :cover_height
 
     has_attached_file :data,
                       :url  => "/system/cms/images/:id/:style_:basename.:extension",

data/app/models/activeadmin_selleo_cms/layout.rb

@@ -37,37 +37,45 @@ module ActiveadminSelleoCms
     end
 
     class Section
-      attr_accessor :name, :type, :toolbar, :width, :height, :resize_method
+      attr_accessor :name, :type, :toolbar, :width, :height, :resize_method, :cover_width, :cover_height, :cover_resize_method
 
       def initialize(node)
         @name = node.attributes["name"].content
         @type = node.attributes["data-type"] ? node.attributes["data-type"].content : 'ckeditor'
-        @attachments = (['files'].include?(@type) or node.attributes["data-attachments"]) ? true : false
-        @attachment = (['file'].include?(@type) or node.attributes["data-attachment"]) ? true : false
+        @attachments =  node.attributes["data-attachments"] ? node.attributes["data-attachments"].content.eql?("true") : false
+        @attachment =  node.attributes["data-attachment"] ? node.attributes["data-attachment"].content.eql?("true") : false
+        @related =  node.attributes["data-related"] ? node.attributes["data-related"].content.eql?("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 : "#"
+        @cover_width = node.attributes["data-cover-width"] ? node.attributes["data-cover-width"].content : 140
+        @cover_height = node.attributes["data-cover-height"] ? node.attributes["data-cover-height"].content : 199
+        @cover_resize_method = node.attributes["data-cover-resize-method"] ? node.attributes["data-cover-resize-method"].content : ">"
       end
 
       def text?
-        ['ckeditor', 'text'].include? @type
+        ['ckeditor', 'text', 'string'].include? @type.downcase
       end
 
       def image?
-        ['image'].include? @type
+        ['image'].include? @type.downcase
       end
 
       def images?
-        ['images'].include? @type
+        ['images'].include? @type.downcase
       end
 
       def attachments?
-        @attachments == true
+        ['files'].include?(@type.downcase) or @attachments
       end
 
       def attachment?
-        @attachment == true
+        ['file'].include?(@type.downcase) or @attachment
+      end
+
+      def related?
+        ['related'].include?(@type.downcase) or @related
       end
 
     end

data/app/models/activeadmin_selleo_cms/page.rb

@@ -10,19 +10,14 @@ module ActiveadminSelleoCms
 
     attr_protected :id
 
-    has_many :sections, as: :sectionable
-    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
+    has_many :sections, as: :sectionable, dependent: :destroy
+    has_many :searches, as: :searchable, dependent: :destroy
+    has_many :related_items, as: :related
 
-    accepts_nested_attributes_for :translations, :sections, :children, :attachments
+    accepts_nested_attributes_for :translations, :sections, :children
 
     validates_format_of :link_url, with: /^http/i, allow_blank: false, if: ->(page) { page.is_link_url }
     validates_presence_of :layout_name
-    # ZUO
-    #validates_associated :translations, :sections
 
     scope :show_in_menu, where(show_in_menu: true)
     scope :published, where(is_published: true)
@@ -39,8 +34,8 @@ module ActiveadminSelleoCms
     end
 
     before_save do
-      if is_published_changed?
-        self.published_at = is_published ? Time.now : nil
+      if is_published_changed? and is_published and published_at.blank?
+        self.published_at = Time.now
       end
     end
 
@@ -79,6 +74,10 @@ module ActiveadminSelleoCms
       title
     end
 
+    def to_label
+      "#{'- ' * depth} #{title}"
+    end
+
     def section_names
       @section_names ||= layout.section_names
     end
@@ -124,6 +123,10 @@ module ActiveadminSelleoCms
       end
     end
 
+    #def method_missing(sym, *args)
+    #  sections.with_name(sym).first
+    #end
+
     class Translation
       attr_protected :id
 

data/app/models/activeadmin_selleo_cms/related_item.rb

@@ -0,0 +1,20 @@
+module ActiveadminSelleoCms
+  class RelatedItem < ActiveRecord::Base
+    attr_protected :id
+
+    belongs_to :relatable, polymorphic: true
+    belongs_to :page
+
+    validates_presence_of :page_id, if: ->(ri){ ri.related_url.blank? }
+    validates :related_url, presence: true, format: { with: /^http/i }, if: ->(ri){ ri.page_id.blank? }
+
+    def target_title
+      title.present? ? title : (page.present? ? page.title : related_url)
+    end
+
+    def target_url
+      related_url.present? ? related_url : page.url
+    end
+
+  end
+end

data/app/models/activeadmin_selleo_cms/section.rb

@@ -55,15 +55,17 @@ module ActiveadminSelleoCms
     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
+      has_many :attachments, as: :assetable, dependent: :destroy
+      has_many :images, as: :assetable, dependent: :destroy
+      has_one :attachment, as: :assetable, dependent: :destroy
+      has_one :image, as: :assetable, dependent: :destroy
+      has_many :related_items, as: :relatable, dependent: :destroy
 
-      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 :attachments, reject_if: lambda{ |a| a[:data].blank? }
+      accepts_nested_attributes_for :attachment, reject_if: lambda{ |a| a[: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? }
+      accepts_nested_attributes_for :related_items, reject_if: lambda{ |ri| ri[:related_url].blank? and ri[:page_id].blank? }
     end
   end
 end

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

@@ -11,6 +11,7 @@
     = 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? }
+    = form.input :published_at, as: :datetimepicker
     = form.input :redirect_to_first_sub_page, as: :boolean
     = form.input :is_link_url, as: :boolean, input_html: { checked: @page.link_url.present? }
     = form.input :link_url, hint: "Enter remote URL including the http part at the beginning"

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

@@ -24,6 +24,7 @@
                 = 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" )
+                = image_form.input :caption
 
             - elsif section.images?
               = section_form_translated.inputs section.name.titleize, for: [:images, ActiveadminSelleoCms::Image.new] do |image_form|
@@ -31,6 +32,7 @@
                 = 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 }
+                = image_form.input :caption
                 - unless section_form_translated.object.new_record?
                   - section_form_translated.object.images.each do |image|
                     %li{"data-asset-id" => image.id}
@@ -41,24 +43,50 @@
             - 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_width, as: :hidden, value: section.cover_width
+                = attachment_form.input :cover_height, as: :hidden, value: section.cover_height
+                = attachment_form.input :cover_resize_method, as: :hidden, value: section.cover_resize_method
                 = 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|
+              = section_form_translated.inputs "#{section.name.titleize} attachments", for: [:attachments, section_form_translated.object.attachments.detect{|a| a.new_record?} || ActiveadminSelleoCms::Attachment.new] do |attachment_form|
                 = attachment_form.input :data, label: "File to upload"
+                = attachment_form.input :cover_image_width, as: :hidden, value: section.cover_width
+                = attachment_form.input :cover_image_height, as: :hidden, value: section.cover_height
+                = attachment_form.input :cover_resize_method, as: :hidden, value: section.cover_resize_method
                 = 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})"
+                    - unless attachment.new_record?
+                      %li{"data-asset-id" => attachment.id}
+                        %label File
+                        .attachment
+                          .cover-image= image_tag(attachment.cover.url) if attachment.cover.exists?
+                          .file-name= attachment.data_file_name
+                          .caption= attachment.caption
+                          .delete-link= link_to_function "Delete", "delete_asset(#{@page.id}, #{attachment.id})"
+
+            - if section.related?
+              = section_form_translated.inputs "#{section.name.titleize}", for: [:related_items, section_form_translated.object.related_items.detect{|ri| ri.new_record?} || ActiveadminSelleoCms::RelatedItem.new] do |related_form|
+                = related_form.input :title
+                = related_form.input :related_url
+                %li or
+                = related_form.input :page, collection: ActiveadminSelleoCms::Page.published.reorder("lft"), label: 'Related page'
+                - if section_form_translated.object.related_items.any? and !section_form_translated.object.new_record?
+                  %li Related links
+                  - section_form_translated.object.related_items.each do |related_item|
+                    - unless related_item.new_record?
+                      %li{"data-related-item-id" => related_item.id}
+                        %label Link
+                        .related
+                          .related-item= link_to related_item.target_title, related_item.target_url, target: '_blank'
+                          .delete-link= link_to_function "Delete", "delete_related(#{@page.id}, #{related_item.id})"
+
           - else
             = ""
 

data/app/views/admin/related_items/destroy.js.erb

@@ -0,0 +1 @@
+$('li[data-related-item-id="<%= @related_item.id %>"]').remove();

data/db/migrate/20130211151210_create_activeadmin_selleo_cms_related_items.rb

@@ -0,0 +1,16 @@
+class CreateActiveadminSelleoCmsRelatedItems < ActiveRecord::Migration
+  def change
+    create_table :activeadmin_selleo_cms_related_items do |t|
+      t.integer :relatable_id
+      t.string  :relatable_type
+
+      t.belongs_to :page
+
+      t.string  :related_url
+
+      t.string  :title
+
+      t.timestamps
+    end
+  end
+end

data/lib/activeadmin-selleo-cms/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminSelleoCms
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-selleo-cms
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -361,11 +361,13 @@ files:
 - app/admin/translation.rb
 - app/admin/activeadmin_selleo_cms/section.rb
 - app/admin/activeadmin_selleo_cms/locale.rb
+- app/admin/activeadmin_selleo_cms/related_item.rb
 - app/admin/activeadmin_selleo_cms/page.rb
 - app/admin/activeadmin_selleo_cms/asset.rb
 - app/admin/active_admin/views_helper.rb
 - app/views/layouts/activeadmin_selleo_cms/application.html.erb
 - app/views/admin/sections/_form.html.haml
+- app/views/admin/related_items/destroy.js.erb
 - app/views/admin/pages/reorder.html.haml
 - app/views/admin/pages/_form.html.haml
 - app/views/admin/pages/_translated_fields.html.haml
@@ -380,6 +382,7 @@ files:
 - app/models/activeadmin_selleo_cms/section.rb
 - app/models/activeadmin_selleo_cms/image.rb
 - app/models/activeadmin_selleo_cms/locale.rb
+- app/models/activeadmin_selleo_cms/related_item.rb
 - app/models/activeadmin_selleo_cms/attachment.rb
 - app/models/activeadmin_selleo_cms/layout.rb
 - app/models/activeadmin_selleo_cms/search.rb
@@ -414,6 +417,7 @@ files:
 - db/migrate/20121204112326_create_ckeditor_assets.rb
 - db/migrate/20130207213528_change_activeadmin_selleo_cms_assets.rb
 - db/migrate/20121221164723_create_activeadmin_selleo_cms_searches.rb
+- db/migrate/20130211151210_create_activeadmin_selleo_cms_related_items.rb
 - db/migrate/20130102113712_create_activeadmin_selleo_cms_assets.rb
 - db/migrate/20130108153415_add_redirect_to_first_sub_page.rb
 - db/migrate/20130109132745_add_fields_to_page.rb