ksk 0.2.4 → 0.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: beed8bea3d2c6da7419484a3e223d3086a1e01e5
4
- data.tar.gz: 15ab6fb83c72558702d4c25069bb9d553a1f8b47
3
+ metadata.gz: 29fbce166b148f3c43b1cf550ee920e7f02ee53f
4
+ data.tar.gz: 8e71177bf41ca7ff4294a912925c51fe2da27e9a
5
5
  SHA512:
6
- metadata.gz: b1d4638104813f304cffeac7f22ceb0d73dc6f9b2bd36d9136febe20fd43d3ca5af47b5ad1c050802a7f5bab1723ab1766f7c97eecece42190ada66fb3f661a7
7
- data.tar.gz: 6fef3149eb48d8d82b5b5b31cc0c55247d217133b4f60493bee20eff7796ecf52c1d80ddf9047512b3f29350c70dc207ae8192e4c5d2ac467e642ccc1b8770e8
6
+ metadata.gz: be634ecb99a57fc45e1f1c168b057c16d02c170205dae9b3345bd89bad8aa7d566c1bd0b7c02ccec0934ee06ebbe391a859272cf788f0d459528023df01183fb
7
+ data.tar.gz: dfc5bac4a737cca62550fc7842645f8a599c757c00816a10488c98e4d37a228d5e5bb71c65469a7d599177894978ee23d38a45306d5c4f9add4d9a6f976a3322
@@ -2,7 +2,7 @@
2
2
  = node f, field do
3
3
  - imgs = f.object.assets.only_images
4
4
  - if imgs.any?
5
- %h3= t('ksk.asset.list.headline.photos')
5
+ %h4= t('ksk.asset.list.headline.photos')
6
6
  %ol.assets_list{:'data-sort-url' => sort_bhf_entries_path('assets')}
7
7
  - imgs.each do |asset|
8
8
  %li{id: "#{asset.id}_images"}
@@ -10,7 +10,7 @@
10
10
 
11
11
  - files = f.object.assets.only_data_files
12
12
  - if files.any?
13
- %h3= t('ksk.asset.list.headline.files')
13
+ %h4= t('ksk.asset.list.headline.files')
14
14
  %ol.assets_list{:'data-sort-url' => sort_bhf_entries_path('assets')}
15
15
  - files.each do |asset|
16
16
  %li{id: "#{asset.id}_data_files"}
@@ -5,13 +5,13 @@
5
5
 
6
6
  .file_delete.float_right
7
7
  = a.check_box :_destroy
8
- = a.label :_destroy, t('bhf.helpers.file.delete')
9
-
8
+ = a.label :_destroy, t(asset.is_image? ? 'bhf.helpers.image.delete' : 'bhf.helpers.file.delete')
9
+
10
10
  - if asset.is_image?
11
11
  = image_tag(asset.file.url(:medium), class: 'uploaded_image float_left')
12
- = link_to t('ksk.asset.photo_preview.button.edit'), edit_bhf_entry_path('assets', asset.id), class: 'alt_button float_right'
12
+ = link_to t('ksk.asset.image_preview.button.edit'), edit_bhf_entry_path('assets', asset.id), class: 'alt_button float_right'
13
13
  - else
14
- = link_to asset.file_file_name, asset.file.url, class: 'uploaded_image float_right'
14
+ = link_to asset.file_file_name, asset.file.url, class: 'uploaded_file float_left'
15
15
  - if asset.has_preview?
16
16
  = link_to t('ksk.asset.file_preview.button.edit'), edit_bhf_entry_path('previews', asset.preview), class: 'alt_button float_right'
17
17
  - else
@@ -6,9 +6,9 @@ de:
6
6
  asset:
7
7
  list:
8
8
  headline:
9
- photos: 'Pictures:'
10
- files: 'Files:'
11
- photo_preview:
9
+ photos: 'Bilder'
10
+ files: 'Dateien'
11
+ image_preview:
12
12
  button:
13
13
  edit: Bild bearbeiten
14
14
  file_preview:
@@ -6,11 +6,11 @@ en:
6
6
  asset:
7
7
  list:
8
8
  headline:
9
- photos: 'Bilder:'
10
- files: 'Dateien:'
11
- photo_preview:
9
+ photos: 'Images'
10
+ files: 'Files'
11
+ image_preview:
12
12
  button:
13
- edit: Bild bearbeiten
13
+ edit: Edit image
14
14
  file_preview:
15
15
  button:
16
16
  edit: Edit preview
@@ -79,7 +79,8 @@ table.navigation_capiton
79
79
  margin-right: 30px
80
80
  .alt_button
81
81
  margin-right: 15px
82
- .uploaded_image
82
+ .uploaded_image,
83
+ .uploaded_file
83
84
  margin: 0 !important
84
85
  li
85
86
  position: relative
@@ -98,5 +99,16 @@ table.navigation_capiton
98
99
  min-width: 18px
99
100
  text-align: center
100
101
  border-radius: 20px
101
-
102
+ .assets
103
+ h4
104
+ font-size: 16px
105
+ color: #3e3e3e
106
+
107
+ .quick_edit_holder
108
+ .assets_list
109
+ li:before
110
+ left: -20px
111
+ .alt_button
112
+ margin-right: 0
113
+
102
114
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ksk
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.4
4
+ version: 0.2.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Anton Pawlik
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-12-06 00:00:00.000000000 Z
11
+ date: 2013-12-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bhf
@@ -47,8 +47,7 @@ extra_rdoc_files:
47
47
  files:
48
48
  - app/controllers/ksk/navigations_controller.rb
49
49
  - app/helpers/ksk/application_helper.rb
50
- - app/views/bhf/entries/form/column/_image.html.haml
51
- - app/views/bhf/entries/form/column/_s3_file.html.haml
50
+ - app/views/bhf/entries/form/column/_file.html.haml
52
51
  - app/views/bhf/entries/form/column/_select_file_assets.html.haml
53
52
  - app/views/bhf/entries/form/has_many/_assets.html.haml
54
53
  - app/views/bhf/entries/form/has_many/_upload.html.haml
@@ -1,11 +0,0 @@
1
- = node f, field do
2
- - if f.object.photo.file?
3
- - if false
4
- = image_tag f.object.photo.url, class: 'uploaded_image'
5
- - else
6
- = link_to file, file, class: 'uploaded_file'
7
- .file_delete
8
- = f.check_box :delete_photo
9
- = f.label :delete_photo, t('bhf.helpers.file.delete')
10
- - unless @quick_edit
11
- = f.file_field field.name