ksk 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b804e03da8cfde0ad5b09746538107c5e333d4f
-  data.tar.gz: 9c0787bb75383e9e48c172a6ec17535e6bf2ca88
+  metadata.gz: 3c4d598578b73bdcfb5dcbfdaef592c31c541af9
+  data.tar.gz: a69d61eb6855cf795d67afb31dd53436cd2079fb
 SHA512:
-  metadata.gz: f58b9c31d819b4beef4692476235c459831fdd1764c309a710f4c87a6490480dbb1a804d3659bb14315a84f37060a82daa165b7ec46d8d4cd7bec805bc7b8a60
-  data.tar.gz: 0e7d6232bbb39d8a120baa9a4e5cdd4d85fa8dee85e80c7d3e04c4f2d64dd542edc8563f25b7a748ab1f6bc123457a37c59b4fa50333c46b23566d91a8863fa1
+  metadata.gz: 8dd2524833aac95cafc845239bab5ea7f6f0f800f07de8246d4209177d0887be79a418b9d1d7bd1839142af3fd8b428d10fdabf0eee5cbe5cb4255e367f84427
+  data.tar.gz: 0d2ba23d5e1b59cf027caba237713cab29be1599b95455b44c0a86f39b3ef0223eaaac6f7d097ca5547bfdcbed5fd53f3b31f11968686e17746217d48745c92c

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.2

data/app/assets/javascripts/ksk/application.js

@@ -41,24 +41,7 @@ initHelper(function(scope){
 				}
 			}).post(queryParams);
 		});
-	});
-
-	scope.getElements('.assets_list').each(function(elem){
-		new Sortables(elem, {
-			handle: '.handle',
-			onStart: function(element, clone){
-				element.addClass('dragged');
-			},
-			onComplete: function(element){
-				element.removeClass('dragged');
-				new Request({
-					method: 'put',
-					url: this.element.getParent('ol').get('data-sort-url')
-				}).send({data: {order: this.serialize()}});
-			}
-		});
-	});
-	
+	});	
 	
 	cropImages = scope.getElements('.js_crop_image');
 	if (cropImages.length) {
@@ -67,7 +50,9 @@ initHelper(function(scope){
 			jQuery('.js_crop_image').each(function(){
 				var $cropImg = jQuery(this);
 				$cropImg.Jcrop({
-					onSelect: function(c){
+					boxWidth: 800,
+          boxHeight: 800,
+          onSelect: function(c){
 						$cropImg.parent().find('.js_cords_x').val(c.x);
 						$cropImg.parent().find('.js_cords_y').val(c.y);
 						$cropImg.parent().find('.js_cords_w').val(c.w);

data/app/models/concerns/ksk/asset.rb

@@ -14,11 +14,11 @@ module Ksk::Asset
 
     do_not_validate_attachment_file_type :file
 
-    scope :only_images, -> {where(file_content_type: Bhf::PAPERCLIP_IMAGE_TYPES)}
+    scope :only_images, -> {where(file_content_type: Bhf.configuration.paperclip_image_types)}
     scope :first_image, -> {only_images.limit(1)}
     scope :other_images, -> {only_images.offset(1)}
 
-    scope :only_data_files, -> {where('file_content_type not in (?)', Bhf::PAPERCLIP_IMAGE_TYPES)}
+    scope :only_data_files, -> {where('file_content_type not in (?)', Bhf.configuration.paperclip_image_types)}
     scope :first_data_files, -> {only_data_files.limit(1)}
 
     before_file_post_process :is_image?
@@ -66,7 +66,7 @@ module Ksk::Asset
   end
   
   def is_image?
-    Bhf::PAPERCLIP_IMAGE_TYPES.include?(file.content_type)
+    Bhf.configuration.paperclip_image_types.include?(file.content_type)
   end
 
   def has_preview?

data/app/views/bhf/{entries/form → form}/column/_crop_thumbs.html.haml

@@ -1,5 +1,4 @@
 - return if @quick_edit
-- style = :banner
 - f.object.file.styles.each_pair do |style, meta|
   .node{class: field.form_type}
     .label= f.label "crop_#{style}", f.object.class.human_attribute_name("crop_#{style}")

data/app/views/bhf/{entries/form → form}/has_many/_assets.html.haml

@@ -3,18 +3,18 @@
     - imgs = f.object.assets.only_images
     - if imgs.any?
       %h4= t('ksk.asset.list.headline.photos')
-      %ol.assets_list{:'data-sort-url' => sort_entries_path('assets')}
+      %ol.assets_list.js_sortable{data: {sort_url: sort_entries_path('assets')}}
         - imgs.each do |asset|
           %li{id: "#{asset.id}_images"}
-            = render partial: 'bhf/entries/form/has_many/upload', locals: {field: field, f: f, asset: asset, allow_position: !@quick_edit}
+            = render partial: 'bhf/form/has_many/upload', locals: {field: field, f: f, asset: asset, allow_position: !@quick_edit}
     
     - files = f.object.assets.only_data_files
     - if files.any?
       %h4= t('ksk.asset.list.headline.files')
-      %ol.assets_list{:'data-sort-url' => sort_entries_path('assets')}
+      %ol.assets_list.js_sortable{data: {sort_url: sort_entries_path('assets')}}
         - files.each do |asset|
           %li{id: "#{asset.id}_data_files"}
-            = render partial: 'bhf/entries/form/has_many/upload', locals: {field: field, f: f, asset: asset, allow_position: !@quick_edit}
+            = render partial: 'bhf/form/has_many/upload', locals: {field: field, f: f, asset: asset, allow_position: !@quick_edit}
 
   .clear
 - unless @quick_edit

data/app/views/bhf/{entries/form → form}/has_many/_upload.html.haml

@@ -7,9 +7,10 @@
       = a.check_box :_destroy
       = a.label :_destroy, t(asset.is_image? ? 'bhf.helpers.image.delete' : 'bhf.helpers.file.delete')
 
-    - return_to = {return_to: (edit_entry_path(@platform.name, f.object) unless @platform.return_to == false)}
+    - return_to = {return_to: edit_entry_path(@platform.name, f.object)}
     - if asset.is_image?
-      = image_tag(find_smallest_size_url_for_file(asset.file), class: 'uploaded_image float_left')
+      = link_to asset.file.url, target: :blank do
+        = image_tag(find_smallest_size_url_for_file(asset.file), class: 'uploaded_image float_left')
       = link_to t('ksk.asset.image_preview.button.edit'), edit_entry_path('assets', asset.id, return_to), class: 'alt_button float_right'
     - else
       = link_to asset.file_file_name, asset.file.url, class: 'uploaded_file float_left'

data/app/views/bhf/{entries/form → form}/has_one/_asset.html.haml

@@ -2,7 +2,7 @@
   = node f, field do
     = f.fields_for field.name, Asset.new do |a|
       - if ! f.object.send(field.name).nil?
-        = render partial: 'bhf/entries/form/has_many/upload', locals: {field: field, f: f, asset: f.object.send(field.name), allow_position: false}
+        = render partial: 'bhf/form/has_many/upload', locals: {field: field, f: f, asset: f.object.send(field.name), allow_position: false}
       %div
       = a.file_field :file
       %hr

data/ksk.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: ksk 0.3.0 ruby lib
+# stub: ksk 0.3.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ksk"
-  s.version = "0.3.0"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Anton Pawlik"]
-  s.date = "2014-06-11"
+  s.date = "2014-07-02"
   s.description = "Fast and friendly"
   s.email = "anton.pawlik@gmail.com"
   s.extra_rdoc_files = [
@@ -38,14 +38,14 @@ Gem::Specification.new do |s|
     "app/models/concerns/ksk/post.rb",
     "app/models/concerns/ksk/preview.rb",
     "app/models/concerns/ksk/static.rb",
-    "app/views/bhf/entries/form/column/_crop_thumbs.html.haml",
-    "app/views/bhf/entries/form/column/_file.html.haml",
-    "app/views/bhf/entries/form/column/_select_file_assets.html.haml",
-    "app/views/bhf/entries/form/has_many/_assets.html.haml",
-    "app/views/bhf/entries/form/has_many/_upload.html.haml",
-    "app/views/bhf/entries/form/has_one/_asset.html.haml",
-    "app/views/bhf/pages/_navi.html.haml",
-    "app/views/bhf/pages/macro/column/_extern_link.haml",
+    "app/views/bhf/form/column/_crop_thumbs.html.haml",
+    "app/views/bhf/form/column/_file.html.haml",
+    "app/views/bhf/form/column/_select_file_assets.html.haml",
+    "app/views/bhf/form/has_many/_assets.html.haml",
+    "app/views/bhf/form/has_many/_upload.html.haml",
+    "app/views/bhf/form/has_one/_asset.html.haml",
+    "app/views/bhf/platform/_navi.html.haml",
+    "app/views/bhf/table/column/_extern_link.haml",
     "config/locales/de.yml",
     "config/locales/en.yml",
     "config/routes.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ksk
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bhf
@@ -149,14 +149,14 @@ files:
 - app/models/concerns/ksk/post.rb
 - app/models/concerns/ksk/preview.rb
 - app/models/concerns/ksk/static.rb
-- app/views/bhf/entries/form/column/_crop_thumbs.html.haml
-- app/views/bhf/entries/form/column/_file.html.haml
-- app/views/bhf/entries/form/column/_select_file_assets.html.haml
-- app/views/bhf/entries/form/has_many/_assets.html.haml
-- app/views/bhf/entries/form/has_many/_upload.html.haml
-- app/views/bhf/entries/form/has_one/_asset.html.haml
-- app/views/bhf/pages/_navi.html.haml
-- app/views/bhf/pages/macro/column/_extern_link.haml
+- app/views/bhf/form/column/_crop_thumbs.html.haml
+- app/views/bhf/form/column/_file.html.haml
+- app/views/bhf/form/column/_select_file_assets.html.haml
+- app/views/bhf/form/has_many/_assets.html.haml
+- app/views/bhf/form/has_many/_upload.html.haml
+- app/views/bhf/form/has_one/_asset.html.haml
+- app/views/bhf/platform/_navi.html.haml
+- app/views/bhf/table/column/_extern_link.haml
 - config/locales/de.yml
 - config/locales/en.yml
 - config/routes.rb