activeadmin-selleo-cms 0.0.43 → 0.0.44

data/app/assets/stylesheets/active_admin/cms.css.scss

@@ -1,4 +1,5 @@
 @import 'jquery-ui.css.scss';
+@import 'active_admin/jquery.Jcrop.css';
 
 div.translation > input {
     -webkit-appearance: none;

data/app/assets/stylesheets/active_admin/jquery.Jcrop.css

@@ -0,0 +1,165 @@
+/* jquery.Jcrop.css v0.9.12 - MIT License */
+/*
+  The outer-most container in a typical Jcrop instance
+  If you are having difficulty with formatting related to styles
+  on a parent element, place any fixes here or in a like selector
+
+  You can also style this element if you want to add a border, etc
+  A better method for styling can be seen below with .jcrop-light
+  (Add a class to the holder and style elements for that extended class)
+*/
+.jcrop-holder {
+  direction: ltr;
+  text-align: left;
+}
+/* Selection Border */
+.jcrop-vline,
+.jcrop-hline {
+  background: #ffffff url("Jcrop.gif");
+  font-size: 0;
+  position: absolute;
+}
+.jcrop-vline {
+  height: 100%;
+  width: 1px !important;
+}
+.jcrop-vline.right {
+  right: 0;
+}
+.jcrop-hline {
+  height: 1px !important;
+  width: 100%;
+}
+.jcrop-hline.bottom {
+  bottom: 0;
+}
+/* Invisible click targets */
+.jcrop-tracker {
+  height: 100%;
+  width: 100%;
+  /* "turn off" link highlight */
+  -webkit-tap-highlight-color: transparent;
+  /* disable callout, image save panel */
+  -webkit-touch-callout: none;
+  /* disable cut copy paste */
+  -webkit-user-select: none;
+}
+/* Selection Handles */
+.jcrop-handle {
+  background-color: #333333;
+  border: 1px #eeeeee solid;
+  width: 7px;
+  height: 7px;
+  font-size: 1px;
+}
+.jcrop-handle.ord-n {
+  left: 50%;
+  margin-left: -4px;
+  margin-top: -4px;
+  top: 0;
+}
+.jcrop-handle.ord-s {
+  bottom: 0;
+  left: 50%;
+  margin-bottom: -4px;
+  margin-left: -4px;
+}
+.jcrop-handle.ord-e {
+  margin-right: -4px;
+  margin-top: -4px;
+  right: 0;
+  top: 50%;
+}
+.jcrop-handle.ord-w {
+  left: 0;
+  margin-left: -4px;
+  margin-top: -4px;
+  top: 50%;
+}
+.jcrop-handle.ord-nw {
+  left: 0;
+  margin-left: -4px;
+  margin-top: -4px;
+  top: 0;
+}
+.jcrop-handle.ord-ne {
+  margin-right: -4px;
+  margin-top: -4px;
+  right: 0;
+  top: 0;
+}
+.jcrop-handle.ord-se {
+  bottom: 0;
+  margin-bottom: -4px;
+  margin-right: -4px;
+  right: 0;
+}
+.jcrop-handle.ord-sw {
+  bottom: 0;
+  left: 0;
+  margin-bottom: -4px;
+  margin-left: -4px;
+}
+/* Dragbars */
+.jcrop-dragbar.ord-n,
+.jcrop-dragbar.ord-s {
+  height: 7px;
+  width: 100%;
+}
+.jcrop-dragbar.ord-e,
+.jcrop-dragbar.ord-w {
+  height: 100%;
+  width: 7px;
+}
+.jcrop-dragbar.ord-n {
+  margin-top: -4px;
+}
+.jcrop-dragbar.ord-s {
+  bottom: 0;
+  margin-bottom: -4px;
+}
+.jcrop-dragbar.ord-e {
+  margin-right: -4px;
+  right: 0;
+}
+.jcrop-dragbar.ord-w {
+  margin-left: -4px;
+}
+/* The "jcrop-light" class/extension */
+.jcrop-light .jcrop-vline,
+.jcrop-light .jcrop-hline {
+  background: #ffffff;
+  filter: alpha(opacity=70) !important;
+  opacity: .70!important;
+}
+.jcrop-light .jcrop-handle {
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  background-color: #000000;
+  border-color: #ffffff;
+  border-radius: 3px;
+}
+/* The "jcrop-dark" class/extension */
+.jcrop-dark .jcrop-vline,
+.jcrop-dark .jcrop-hline {
+  background: #000000;
+  filter: alpha(opacity=70) !important;
+  opacity: 0.7 !important;
+}
+.jcrop-dark .jcrop-handle {
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  background-color: #ffffff;
+  border-color: #000000;
+  border-radius: 3px;
+}
+/* Simple macro to turn off the antlines */
+.solid-line .jcrop-vline,
+.solid-line .jcrop-hline {
+  background: #ffffff;
+}
+/* Fix for twitter bootstrap et al. */
+.jcrop-holder img,
+img.jcrop-preview {
+  max-width: none;
+}

data/app/models/activeadmin_selleo_cms/asset.rb

@@ -1,7 +1,7 @@
 module ActiveadminSelleoCms
   class Asset < ActiveRecord::Base
     attr_protected :id
-    attr_accessor :cover_width, :cover_height, :cover_resize_method
+    attr_accessor :cover_width, :cover_height, :cover_resize_method, :crop_x, :crop_y, :crop_w, :crop_h
 
     acts_as_list :scope => [:assetable_type, :assetable_id]
 

data/app/models/activeadmin_selleo_cms/image.rb

@@ -6,15 +6,29 @@ module ActiveadminSelleoCms
                       :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
+                      :default_style => :normal,
+                      :processors => [:cropper]
 
     validates_attachment_size :data, :less_than => 1.megabytes
     validates_attachment_presence :data
 
     attr_protected :id
 
+    after_update :reprocess_image, :if => :cropping?
+
+    def cropping?
+      !crop_x.blank? && !crop_y.blank? && !crop_w.blank? && !crop_h.blank?
+    end
+
     def image_sizes
-      { :normal => "#{image_width || 640}x#{image_height || 480}#{resize_method || "#"}" }
+      { :normal => "#{image_width || 640}x#{image_height || 480}#{resize_method || ">"}" }
+    end
+
+    private
+
+    def reprocess_image
+      data.assign(data)
+      data.save
     end
 
   end

data/app/models/activeadmin_selleo_cms/layout.rb

@@ -48,7 +48,7 @@ module ActiveadminSelleoCms
         @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 : "#"
+        @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 : ">"

data/app/views/admin/images/_crop_form.html.haml

@@ -0,0 +1,16 @@
+= semantic_form_for [:admin, resource], remote: true, html: { multipart: true } do |form|
+
+  = form.inputs id: 'image_fields' do
+    = form.input :assetable_type, as: :hidden, input_html: { value: resource.assetable_type }
+    = form.input :assetable_id, as: :hidden, input_html: { value: resource.assetable_id }
+    = form.input :image_width, as: :hidden, input_html: { value: resource.assetable.activeadmin_selleo_cms_section.width }
+    = form.input :image_height, as: :hidden, input_html: { value: resource.assetable.activeadmin_selleo_cms_section.height }
+    = form.input :resize_method, as: :hidden, input_html: { value: resource.assetable.activeadmin_selleo_cms_section.resize_method }
+    = form.input :crop_x, as: :hidden
+    = form.input :crop_y, as: :hidden
+    = form.input :crop_w, as: :hidden
+    = form.input :crop_h, as: :hidden
+    %div.jcrop
+      = image_tag resource.data.url(:original)
+  = form.actions :submit
+

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

@@ -11,3 +11,4 @@
     = form.input :data, label: "Image", hint: (resource.data.exists? ? image_tag(resource.data.url, style: "max-width:520px") : "No image")
     = form.input :caption
   = form.actions :submit
+  = link_to_function "Crop image", "cropImage(#{resource.id}, #{resource.assetable.activeadmin_selleo_cms_section.width}, #{resource.assetable.activeadmin_selleo_cms_section.height})" unless resource.data.blank?

data/app/views/admin/images/crop.js.erb

@@ -0,0 +1 @@
+<%= render partial: 'crop_form' %>

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

@@ -1,4 +1,5 @@
-= semantic_form_for [:admin, @page], url: (@page.new_record? ? admin_pages_path : admin_page_path(@page.id)), html: { multipart: true } do |form|
+- @inline = defined?(inline)
+= semantic_form_for [:admin, @page], url: (@page.new_record? ? admin_pages_path : admin_page_path(@page.id)), remote: @inline, html: { multipart: true } do |form|
 
   %input{name: "_change_layout", type: "hidden"}
   - @page.new_record? ? @page.initialize_missing_translations : @page.create_missing_translations
@@ -8,8 +9,9 @@
   -#= @page.errors.full_messages
 
   = form.inputs general_options(@page), id: 'id-general-options' 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}" }
+    - unless @inline
+      = 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 :show_in_menu, as: :boolean
     = form.input :is_published, as: :boolean
     = form.input :published_at, as: :datetimepicker
@@ -88,11 +90,14 @@
         });
 
         $('#file-manager').dialog({
-            width: 1200,
+            width: 'auto',
             height: 'auto',
             title: 'File manager',
             modal: true,
-            autoOpen: false
+            autoOpen: false,
+            resize: function( event, ui ) {
+              $(this).dialog("option", "position", ['center', 'center'] );
+            }
           });
     });
 

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

@@ -8,51 +8,51 @@
     = 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.sort_by{|sf| sf.object.name}.each do |section_form|
-      %section{:name => section_form.object.name, :id => "id-#{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)
-
-            %fieldset.inputs
-              %legend
-                %span= "#{section.name.titleize} section"
-
-              %ol
-                - if section.text?
-                  = section_form_translated.input :body, as: section.type, label: "Content", label: false, input_html: { ckeditor: { toolbar: section.toolbar } }
-
-                = section_form_translated.input :locale, :as => :hidden, :label => false
-
-                - unless @page.new_record?
-                  - if section.attachments?
-                    %li.input
-                      %ol{ :style => "padding-left: 275px;" }
-                        %li= button_to_function t("active_admin.cms.manage_attachments"), "fileManager('#{edit_admin_section_translation_path(section_form_translated.object.id)}')", style: "padding: 5px;"
-
-                  - if section.image?
-                    %li.input
-                      %label Image
-                      %ol{ :style => "padding-left: 275px;" }
-                        %li= button_to_function t("active_admin.cms.file_manager.edit_image"), "fileManager('#{section_form_translated.object.image ? edit_admin_image_path(section_form_translated.object.image.id) : new_admin_image_path(image: { assetable_type: section_form_translated.object.class.name, assetable_id: section_form_translated.object.id })}')", style: "padding: 5px;"
-
-                  - if section.images?
-                    %li.input
-                      %label Attachments
-                      %ol{ :style => "padding-left: 275px;" }
-                        %li= button_to_function t("active_admin.cms.manage_images"), "fileManager('#{edit_admin_section_translation_path(section_form_translated.object.id)}')", style: "padding: 5px;"
-
-                  - if section.attachment?
-                    %li.input
-                      %label Attachment
-                      %ol{ :style => "padding-left: 275px;" }
-                        %li= button_to_function t("active_admin.cms.file_manager.edit_attachment"), "fileManager('#{section_form_translated.object.attachment ? edit_admin_attachment_path(section_form_translated.object.attachment.id): new_admin_attachment_path(image: { assetable_type: section_form_translated.object.class.name, assetable_id: section_form_translated.object.id }) }')", style: "padding: 5px;"
-
-                  - if section.related?
-                    %li.input
-                      %ol{ :style => "padding-left: 275px;" }
-                        %li= button_to_function t("active_admin.cms.manage_related"), "fileManager('#{edit_admin_section_translation_path(section_form_translated.object.id)}')", style: "padding: 5px;"
-
-          - else
-            = ""
+    - unless @inline
+      - @section_forms.sort_by{|sf| sf.object.name}.each do |section_form|
+        %section{:name => section_form.object.name, :id => "id-#{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)
+
+              %fieldset.inputs
+                %legend
+                  %span= "#{section.name.titleize} section"
+
+                %ol
+                  - if section.text?
+                    = section_form_translated.input :body, as: section.type, label: "Content", label: false, input_html: { ckeditor: { toolbar: section.toolbar } }
+
+                  = section_form_translated.input :locale, :as => :hidden, :label => false
+
+                  - unless @page.new_record?
+                    - if section.attachments?
+                      %li.input
+                        %ol{ :style => "padding-left: 275px;" }
+                          %li= button_to_function t("active_admin.cms.manage_attachments"), "fileManager('#{edit_admin_section_translation_path(section_form_translated.object.id)}')", style: "padding: 5px;"
+
+                    - if section.image?
+                      %li.input
+                        %label Image
+                        %ol{ :style => "padding-left: 275px;" }
+                          %li= button_to_function t("active_admin.cms.file_manager.edit_image"), "fileManager('#{section_form_translated.object.image ? edit_admin_image_path(section_form_translated.object.image.id) : new_admin_image_path(image: { assetable_type: section_form_translated.object.class.name, assetable_id: section_form_translated.object.id })}')", style: "padding: 5px;"
+
+                    - if section.images?
+                      %li.input
+                        %label Attachments
+                        %ol{ :style => "padding-left: 275px;" }
+                          %li= button_to_function t("active_admin.cms.manage_images"), "fileManager('#{edit_admin_section_translation_path(section_form_translated.object.id)}')", style: "padding: 5px;"
+
+                    - if section.attachment?
+                      %li.input
+                        %label Attachment
+                        %ol{ :style => "padding-left: 275px;" }
+                          %li= button_to_function t("active_admin.cms.file_manager.edit_attachment"), "fileManager('#{section_form_translated.object.attachment ? edit_admin_attachment_path(section_form_translated.object.attachment.id): new_admin_attachment_path(image: { assetable_type: section_form_translated.object.class.name, assetable_id: section_form_translated.object.id }) }')", style: "padding: 5px;"
+
+                    - if section.related?
+                      %li.input
+                        %ol{ :style => "padding-left: 275px;" }
+                          %li= button_to_function t("active_admin.cms.manage_related"), "fileManager('#{edit_admin_section_translation_path(section_form_translated.object.id)}')", style: "padding: 5px;"
+
+            - else
+              = ""

data/app/views/admin/pages/edit.js.erb

@@ -0,0 +1 @@
+<%= render partial: 'form', locals: { inline: true } %>

data/config/initializers/cropper.rb

@@ -0,0 +1,29 @@
+module Paperclip
+  class Cropper < Thumbnail
+    def initialize(file, options = {}, attachment = nil)
+      super
+      @current_geometry.width  = target.crop_w
+      @current_geometry.height = target.crop_h
+    end
+
+    def target
+      @attachment.instance
+    end
+
+    def transformation_command
+      if @attachment.instance.cropping?
+        crop_command = [
+            "-crop",
+            "#{target.crop_w}x" \
+            "#{target.crop_h}+" \
+            "#{target.crop_x}+" \
+            "#{target.crop_y}",
+            "+repage"
+        ]
+        crop_command + super
+      else
+        super
+      end
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module ActiveadminSelleoCms
-  VERSION = "0.0.43"
+  VERSION = "0.0.44"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-selleo-cms
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.44
   prerelease: 
 platform: ruby
 authors:
@@ -403,17 +403,22 @@ files:
 - app/helpers/pages_helper.rb
 - app/assets/stylesheets/active_admin/jquery-ui.css.scss
 - app/assets/stylesheets/active_admin/cms.css.scss
+- app/assets/stylesheets/active_admin/jquery.Jcrop.css
+- app/assets/images/activeadmin-selleo-cms/Jcrop.gif
 - app/assets/javascripts/active_admin.js
 - app/assets/javascripts/ckeditor/config.js
 - app/assets/javascripts/ckeditor/plugins/inlinesave/icons/save.png
 - app/assets/javascripts/ckeditor/plugins/inlinesave/plugin.js
+- app/assets/javascripts/activeadmin-selleo-cms/jquery.Jcrop.js
 - app/assets/javascripts/activeadmin-selleo-cms/jquery-ui-timepicker-addon.js
 - app/assets/javascripts/activeadmin-selleo-cms/application.js
 - app/assets/javascripts/activeadmin-selleo-cms/jquery.mjs.nestedSortable.js
 - app/assets/javascripts/activeadmin-selleo-cms/custom.js
+- app/assets/javascripts/activeadmin-selleo-cms/inline-editing.js
 - app/views/admin/sections/_form.html.haml
 - app/views/admin/sections/update.js.erb
 - app/views/admin/pages/_js.html.haml
+- app/views/admin/pages/edit.js.erb
 - app/views/admin/pages/reorder.html.haml
 - app/views/admin/pages/_form.html.haml
 - app/views/admin/pages/update_positions.js.erb
@@ -422,10 +427,13 @@ files:
 - app/views/admin/images/_form.html.haml
 - app/views/admin/images/new.html.erb
 - app/views/admin/images/_image.html.haml
+- app/views/admin/images/_crop_form.html.haml
 - app/views/admin/images/create.js.erb
 - app/views/admin/images/edit.html.erb
+- app/views/admin/images/crop.js.erb
 - app/views/admin/images/update.js.erb
 - app/views/admin/assets/destroy.js.erb
+- app/views/admin/assets/edit.js.erb
 - app/views/admin/translations/update.js.haml
 - app/views/admin/related_items/destroy.js.erb
 - app/views/admin/related_items/_form.html.haml
@@ -467,6 +475,7 @@ files:
 - config/locales/cms.en.yml
 - config/initializers/ckeditor.rb
 - config/initializers/active_admin.rb
+- config/initializers/cropper.rb
 - config/initializers/formtastic.rb
 - config/initializers/i18n.rb
 - config/initializers/acts_as_list.rb