ksk 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beed8bea3d2c6da7419484a3e223d3086a1e01e5
-  data.tar.gz: 15ab6fb83c72558702d4c25069bb9d553a1f8b47
+  metadata.gz: 29fbce166b148f3c43b1cf550ee920e7f02ee53f
+  data.tar.gz: 8e71177bf41ca7ff4294a912925c51fe2da27e9a
 SHA512:
-  metadata.gz: b1d4638104813f304cffeac7f22ceb0d73dc6f9b2bd36d9136febe20fd43d3ca5af47b5ad1c050802a7f5bab1723ab1766f7c97eecece42190ada66fb3f661a7
-  data.tar.gz: 6fef3149eb48d8d82b5b5b31cc0c55247d217133b4f60493bee20eff7796ecf52c1d80ddf9047512b3f29350c70dc207ae8192e4c5d2ac467e642ccc1b8770e8
+  metadata.gz: be634ecb99a57fc45e1f1c168b057c16d02c170205dae9b3345bd89bad8aa7d566c1bd0b7c02ccec0934ee06ebbe391a859272cf788f0d459528023df01183fb
+  data.tar.gz: dfc5bac4a737cca62550fc7842645f8a599c757c00816a10488c98e4d37a228d5e5bb71c65469a7d599177894978ee23d38a45306d5c4f9add4d9a6f976a3322

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

@@ -2,7 +2,7 @@
   = node f, field do
     - imgs = f.object.assets.only_images
     - if imgs.any?
-      %h3= t('ksk.asset.list.headline.photos')
+      %h4= t('ksk.asset.list.headline.photos')
       %ol.assets_list{:'data-sort-url' => sort_bhf_entries_path('assets')}
         - imgs.each do |asset|
           %li{id: "#{asset.id}_images"}
@@ -10,7 +10,7 @@
     
     - files = f.object.assets.only_data_files
     - if files.any?
-      %h3= t('ksk.asset.list.headline.files')
+      %h4= t('ksk.asset.list.headline.files')
       %ol.assets_list{:'data-sort-url' => sort_bhf_entries_path('assets')}
         - files.each do |asset|
           %li{id: "#{asset.id}_data_files"}

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

@@ -5,13 +5,13 @@
 
     .file_delete.float_right
       = a.check_box :_destroy
-      = a.label :_destroy, t('bhf.helpers.file.delete')
-      
+      = a.label :_destroy, t(asset.is_image? ? 'bhf.helpers.image.delete' : 'bhf.helpers.file.delete')
+
     - if asset.is_image?
       = image_tag(asset.file.url(:medium), class: 'uploaded_image float_left')
-      = link_to t('ksk.asset.photo_preview.button.edit'), edit_bhf_entry_path('assets', asset.id), class: 'alt_button float_right'
+      = link_to t('ksk.asset.image_preview.button.edit'), edit_bhf_entry_path('assets', asset.id), class: 'alt_button float_right'
     - else
-      = link_to asset.file_file_name, asset.file.url, class: 'uploaded_image float_right'
+      = link_to asset.file_file_name, asset.file.url, class: 'uploaded_file float_left'
       - if asset.has_preview?
         = link_to t('ksk.asset.file_preview.button.edit'), edit_bhf_entry_path('previews', asset.preview), class: 'alt_button float_right'
       - else

data/config/locales/de.yml

@@ -6,9 +6,9 @@ de:
     asset:
       list:
         headline:
-          photos: 'Pictures:'
-          files: 'Files:'
-      photo_preview:
+          photos: 'Bilder'
+          files: 'Dateien'
+      image_preview:
         button:
           edit: Bild bearbeiten
       file_preview:

data/config/locales/en.yml

@@ -6,11 +6,11 @@ en:
     asset:
       list:
         headline:
-          photos: 'Bilder:'
-          files: 'Dateien:'
-      photo_preview:
+          photos: 'Images'
+          files: 'Files'
+      image_preview:
         button:
-          edit: Bild bearbeiten
+          edit: Edit image
       file_preview:
         button:
           edit: Edit preview

data/vendor/assets/stylesheets/ksk/application.css.sass

@@ -79,7 +79,8 @@ table.navigation_capiton
     margin-right: 30px
   .alt_button
     margin-right: 15px
-  .uploaded_image
+  .uploaded_image,
+  .uploaded_file
     margin: 0 !important
   li
     position: relative
@@ -98,5 +99,16 @@ table.navigation_capiton
       min-width: 18px
       text-align: center
       border-radius: 20px
-      
+.assets
+  h4
+    font-size: 16px
+    color: #3e3e3e
+
+.quick_edit_holder
+  .assets_list
+    li:before
+      left: -20px
+    .alt_button
+      margin-right: 0
+  
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ksk
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bhf
@@ -47,8 +47,7 @@ extra_rdoc_files:
 files:
 - app/controllers/ksk/navigations_controller.rb
 - app/helpers/ksk/application_helper.rb
-- app/views/bhf/entries/form/column/_image.html.haml
-- app/views/bhf/entries/form/column/_s3_file.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

data/app/views/bhf/entries/form/column/_s3_file.html.haml

@@ -1,11 +0,0 @@
-= node f, field do
-  - if f.object.photo.file?
-    - if false
-      = image_tag f.object.photo.url, class: 'uploaded_image'
-    - else
-      = link_to file, file, class: 'uploaded_file'
-    .file_delete
-      = f.check_box :delete_photo
-      = f.label :delete_photo, t('bhf.helpers.file.delete')
-  - unless @quick_edit
-    = f.file_field field.name