ksk 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc9ac631cf12c22eae6531bdcc55539617074b03
-  data.tar.gz: 1160f1ce2e4bbaba25c7cff140a35d34b72b7845
+  metadata.gz: beed8bea3d2c6da7419484a3e223d3086a1e01e5
+  data.tar.gz: 15ab6fb83c72558702d4c25069bb9d553a1f8b47
 SHA512:
-  metadata.gz: 6c03e3a452b72fef1d213cd2a402e4b0b9073ec03b4efc3681f36df20c0a6bda4cad52af393d01120b85c61e119484c3ecb733f7399a7d22b9a2a4d84d00a529
-  data.tar.gz: 790fe64dbd2a1b436cd4e3d98437d05a434bb0327cd6144e0f9d7e7df3d5eea47e5e8872e561b1131e0b6860800255da9a34e54ba5307dc98141f603d7356b59
+  metadata.gz: b1d4638104813f304cffeac7f22ceb0d73dc6f9b2bd36d9136febe20fd43d3ca5af47b5ad1c050802a7f5bab1723ab1766f7c97eecece42190ada66fb3f661a7
+  data.tar.gz: 6fef3149eb48d8d82b5b5b31cc0c55247d217133b4f60493bee20eff7796ecf52c1d80ddf9047512b3f29350c70dc207ae8192e4c5d2ac467e642ccc1b8770e8

data/app/helpers/ksk/application_helper.rb

@@ -52,10 +52,15 @@ module Ksk
 
     def place_data_files(text, data_files)
       place_content(text, data_files, 'file') do |asset, option|
-        link_to asset.file.url, class: asset.has_preview? ? :uploaded_file_preview : :uploaded_file do
+        link_to asset.file.url, title: asset.file.original_filename, class: asset.has_preview? ? :uploaded_file_preview : :uploaded_file do
           if asset.has_preview?
-            image_tag( asset.preview_file.url(:banner) )+
-            '<span>Hier klicken um die Datei herunter zu laden</span>'.html_safe
+            if asset.has_preview_image?
+              t_capition = !asset.preview.name.blank? ? asset.preview.name : t('ksk.asset.file_preview.button.download')
+              image_tag( asset.preview_file.url(:banner) )+
+              "<span>#{t_capition}</span>".html_safe
+            else
+              asset.preview.name
+            end
           else
             asset.file_file_name
           end

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

@@ -1,17 +1,22 @@
 - if f.object.assets.any?
   = node f, field do
-    %h3 Bilder:
-    %ol.assets_list{:'data-sort-url' => sort_bhf_entries_path('assets')}
-      - f.object.assets.only_images.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: true}
+    - imgs = f.object.assets.only_images
+    - if imgs.any?
+      %h3= 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"}
+            = render partial: 'bhf/entries/form/has_many/upload', locals: {field: field, f: f, asset: asset, allow_position: !@quick_edit}
     
-    %h3 Dateien:
-    %ol.assets_list{:'data-sort-url' => sort_bhf_entries_path('assets')}
-      - f.object.assets.only_data_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: true}
+    - files = f.object.assets.only_data_files
+    - if files.any?
+      %h3= 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"}
+            = render partial: 'bhf/entries/form/has_many/upload', locals: {field: field, f: f, asset: asset, allow_position: !@quick_edit}
 
+  .clear
 - unless @quick_edit
   = node f, field do
     .array_holder

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

@@ -1,20 +1,20 @@
-= f.fields_for field.name, asset do |a|
-  - if asset.file.file?
+- if asset.file.file?
+  = f.fields_for field.name, asset do |a|
     - if allow_position
-      .position_handle.float_left 
-    - if asset.is_image?
-      = image_tag asset.file.url(:medium), class: 'uploaded_image float_left'
-    - else
-      = link_to asset.file_file_name, asset.file.url, class: 'uploaded_image float_left'
-      - if asset.has_preview?
-        = link_to edit_bhf_entry_path('previews', asset.preview), class: 'float_left' do
-          = image_tag asset.preview_file.url(:thumb), class: 'uploaded_image'
-      - else
-        = link_to 'Vorschaubild hochladen', new_bhf_entry_path('previews', asset_id: asset.id), class: 'float_left'
+      .handle.icon.float_left 
 
     .file_delete.float_right
       = a.check_box :_destroy
       = a.label :_destroy, t('bhf.helpers.file.delete')
       
-    - if allow_position
-      %hr
+    - 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'
+    - else
+      = link_to asset.file_file_name, asset.file.url, class: 'uploaded_image float_right'
+      - 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
+        = link_to t('ksk.asset.file_preview.button.create'), new_bhf_entry_path('previews', asset_id: asset.id), class: 'alt_button float_right'
+
+    .clear

data/app/views/bhf/pages/_navi.html.haml

@@ -2,8 +2,8 @@
   def p_recursive_navi(navis, current_level = 0, max_level = 99, ul = 'ul', first_wrap = '')
     a = "\n <#{ul}#{first_wrap}>\n"
     navis.each do |navi|
-      x = link_to 'edit', edit_bhf_entry_path('navigation', navi)
-      y = link_to 'delete', bhf_entry_path('navigation', navi), :method => :delete, :confirm => t('bhf.helpers.promts.confirm')
+      x = link_to 'edit', edit_bhf_entry_path('navigation', navi), class: 'edit icon'
+      y = link_to 'delete', bhf_entry_path('navigation', navi), :method => :delete, :confirm => t('bhf.helpers.promts.confirm'), class: 'delete icon'
       a += " <li id='navigation_#{navi.id}'><div><span class='title'>#{navi.title}</span> <span class='links'>#{x} #{y}</span></div>"
       if current_level <= max_level and navi.children.any?
         a += p_recursive_navi(navi.children, current_level+1, max_level, ul)
@@ -14,10 +14,19 @@
   end
   
 
-#content.navi.js_tree_holder{data: {:'update-url' => sort_ksk_navigations_path}}
-  = p_recursive_navi(Navigation.top_level, 0, 99, 'ol', ' class="multi_grid js_tree_list"').html_safe  
-  
+%table.navigation_capiton.data_table{id: "#{platform.name}_platform", class: (platform.custom_columns? ? :custom_columns : :default_columns)}
+  %caption
+    %h4= platform.title
+    %p.info= t('ksk.navigation_sort.info')
+    - unless platform.hide_create
+      %p.create= link_to new_t(platform), new_bhf_entry_path(platform.name), class: :alt_button
+    - unless platform.custom_partial
+      = render partial: 'search', locals: {platform: platform} if platform.search?
+
+.content_box
+  .navi.js_tree_holder{data: {:'update-url' => sort_ksk_navigations_path}}
+    = p_recursive_navi(Navigation.top_level, 0, 99, 'ol', ' class="multi_grid js_tree_list"').html_safe  
+
   .template_data.hide{data: {:'update-path' => ksk_navigations_path, :'prompt-question' => I18n.t('ksk.navigation_sort.prompt_question')}}
-    = link_to 'edit', edit_bhf_entry_path('navigation', 'NAVIID')
-    = link_to 'delete', bhf_entry_path('navigation', 'NAVIID'), method: :delete, data: {confirm: t('bhf.helpers.promts.confirm')}
-  
+    = link_to 'edit', edit_bhf_entry_path('navigation', 'NAVIID'), class: 'edit icon'
+    = link_to 'delete', bhf_entry_path('navigation', 'NAVIID'), method: :delete, data: {confirm: t('bhf.helpers.promts.confirm')}, class: 'delete icon'

data/config/locales/de.yml

@@ -1,4 +1,18 @@
 de:  
   ksk:
     navigation_sort:
-      prompt_question: Name eintragen
+      prompt_question: Name eintragen
+      info: können neu angelegt und verschoben werden
+    asset:
+      list:
+        headline:
+          photos: 'Pictures:'
+          files: 'Files:'
+      photo_preview:
+        button:
+          edit: Bild bearbeiten
+      file_preview:
+        button:
+          edit: Vorschau einstellen
+          create: Vorschau erstellen
+          download: Hier klicken um die Datei herunter zu laden

data/config/locales/en.yml

@@ -1,4 +1,18 @@
-de:  
+en:  
   ksk:
     navigation_sort:
-      prompt_question: Enter the name
+      prompt_question: Enter the name
+      info: can be created and moved
+    asset:
+      list:
+        headline:
+          photos: 'Bilder:'
+          files: 'Dateien:'
+      photo_preview:
+        button:
+          edit: Bild bearbeiten
+      file_preview:
+        button:
+          edit: Edit preview
+          create: Add preview
+          download: Click here to download the file

data/lib/actives/asset.rb

@@ -38,7 +38,11 @@ module Ksk
     end
 
     def has_preview?
-      preview && preview.assets.any?
+      preview && (preview.assets.any? || !preview.name.blank?)
+    end
+
+    def has_preview_image?
+      preview.assets.any? and preview.assets.first.file
     end
 
     def preview_file

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

@@ -17,9 +17,10 @@ var kskInit = function(){
 				}).post(queryParams);
 			}
 		});
-		elem.getParent('.platform').getElements('.create a').addEvent('click', function(e){
+		var platform = elem.getParent('.platform');
+		platform.getElements('.create a').addEvent('click', function(e){
 			e.preventDefault();
-			var tmpl = elem.getElement('.template_data');
+			var tmpl = platform.getElement('.template_data');
 			var name = prompt(tmpl.get('data-prompt-question'), '');
 			if ( ! name) { return; }
 
@@ -29,13 +30,13 @@ var kskInit = function(){
 				title: name
 			};
 			new Request({
-				url: elem.getElement('.template_data').get('data-update-path'),
+				url: platform.getElement('.template_data').get('data-update-path'),
 				onSuccess: function(responseText){
 					new Element('li', {
 					  'id': naviName+'_'+responseText,
 					  'html': '<div> <span class="title">'+name+'</span> <span class="links">'+tmpl.get('html')+'</span></div>'.replace(/NAVIID/g, responseText)
 					})
-					.inject(elem.getElement('.js_tree_list li'), 'before');
+					.inject(platform.getElement('.js_tree_list li'), 'before');
 					naviA.reInit();
 				}
 			}).post(queryParams);

data/vendor/assets/javascripts/ksk/classes/NaviAdmin.js

@@ -22,7 +22,7 @@ var NaviAdmin = new Class({
 	options: {/*
 		onItemDropped: $empty(item, parent, itemId, parentId),*/
 		elemTree: null,
-		dragSpan: new Element('span', {'class': 'drag'}),
+		dragSpan: new Element('span', {'class': 'icon handle drag'}),
 		pos_helper: new Element('li', {'class': 'pos_helper'})
 	},
 	

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

@@ -1,60 +1,52 @@
+$w1: #fff
+$w2: #F1F1F1
+$k1: #000
+$b1: #38A5E9
+$b2: #0F8FDD
+$g1: #7F7F7F
+$g2: #ccc
+$g3: #424242
+
+table.navigation_capiton
+  margin-bottom: 20px
 .navi
   /* STYLING */
   .multi_grid
-    border: 1px solid #CDD0D3
-    border-bottom: 0
-    border: 1px solid #CDD0D3
-
+    ol
+      padding-top: 10px
     li
       margin: 0
       display: block
-      padding: 5px 0 5px 10px
-      border-bottom: 1px solid #CDD0D3
-  
-
-
-    li div
-      border-bottom: 1px solid #CDD0D3
-      padding-bottom: 5px
-      clear: both
-      overflow: hidden
-  
-    li .title
-      float: left
-  
-    li .links
-      float: right
-  
-    li
-      padding-left: 30px
+      padding: 0 0 10px 10px
+      border-bottom: 1px solid #E0E0E0
       border-bottom: 0
-  
+      li
+        padding-left: 30px
+      div
+        border-bottom: 1px solid #E0E0E0
+        padding-bottom: 10px
+        clear: both
+        overflow: hidden
+      .links
+        float: right
     .moved
       background-color: rgba(255, 255, 255, 0.6)
       padding-right: 20px
       min-width: 400px
+    .title
+      float: left
+    .handle
+      padding-right: 20px
+      float: left
   
-    .drag
-      background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAOCAYAAADwikbvAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QTgxODI2NTlBNUY5MTFERkJEQTY5NjM0QTI0OTkzQ0MiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QTgxODI2NUFBNUY5MTFERkJEQTY5NjM0QTI0OTkzQ0MiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpBODE4MjY1N0E1RjkxMURGQkRBNjk2MzRBMjQ5OTNDQyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpBODE4MjY1OEE1RjkxMURGQkRBNjk2MzRBMjQ5OTNDQyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PlrgasEAAAA7SURBVHjaYvz//z8DuYCJgQKAUzOLSOV/ZJpUmy3RaJI0H0ej6WQzMBYGyGaYjUguGC6hzThgaRsgwABmFBehNiE89QAAAABJRU5ErkJggg==) no-repeat 0px 2px
-
   /* ESSENTIAL */
-  .drag
-    display: block
-    float: left
-    height: 20px
-    width: 18px
-    cursor: move
-    background: gray
-
   .multi_grid,
   .multi_grid ol
     list-style: none
-
   .multi_grid 
     li div
       clear: both
       overflow: hidden
-
     .pos_helper
       padding: 0
       margin: 0
@@ -62,33 +54,49 @@
       transition-duration: 0.3s
       -moz-transition-duration: 0.3s
       -webkit-transition-duration: 0.3s
-
     &.drag_active .pos_helper
       height: 6px
-
     .pos_helper.hover
       height: 20px
-
     .hover
-      background-color: rgba(255, 0, 0, 0.1)
+      background-color: rgba($b1, 0.3)
       transition-duration: 0.3s
       -moz-transition-duration: 0.3s
       -webkit-transition-duration: 0.3s
+      li
+        border-color: $b2
 
   .moved
     z-index: 3000
 
 
-.float_left
-  float: left
-  margin-right: 100px !important
-.float_right
-  float: right
-
-.position_handle
-  background: image-url('bhf/pictos.png') no-repeat -94px 0
-  cursor: move
-  display: block
-  text-indent: -9999px
-  height: 30px
-  width: 30px
+.assets_list
+  clear: both
+  list-style: none
+  counter-reset: asset-counter
+  .handle
+    margin-top: 5px
+    margin-right: 30px
+  .alt_button
+    margin-right: 15px
+  .uploaded_image
+    margin: 0 !important
+  li
+    position: relative
+    padding: 10px 0
+    border-bottom: 1px solid #e0e0e0
+    &:before
+      content: counter(asset-counter)
+      counter-increment: asset-counter
+      position: absolute
+      background: #999
+      color: #fff
+      left: -26px
+      font-size: 12px
+      top: 15px
+      display: block
+      min-width: 18px
+      text-align: center
+      border-radius: 20px
+      
+  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ksk
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bhf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.13
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement