promethee 1.6.47 → 1.6.48

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 19ad17c0ad101ebd8d0442c5da52541d532a7359
4
- data.tar.gz: 98d65334dd033520f55d247505c12895c95bdadf
2
+ SHA256:
3
+ metadata.gz: add5d8562fb0e23e09127e3666a5afc41aaaeba7ab8ee63530564fe017b96ddf
4
+ data.tar.gz: 9dd810222bdf30bde6c883365e236b4902a64520df8203afd80754f232aa021b
5
5
  SHA512:
6
- metadata.gz: d03f1ebbdbd001b313307dd0152f0bbb5fbdc21f0893784680bb788fe376675ab91cc978583ab07dbad6bb9c0d6b49d364bd3c9bbed2387476f5b22046132e7b
7
- data.tar.gz: a33309eb958fc652a0d9696c946afa0a6066d20907d285b260a8b7046f3af81d44af05e2461f004ad6438c3f2f0af97386238c21db7dcf0d28896492b1f44177
6
+ metadata.gz: ae61240e6351d66d2a7d43cc536c96c3510e22bcf06ef22f23eb58f13ed1ff0439573d6454f403fa130c93cac6badc6208584dd33c646f32be1b89f4ff32c8b2
7
+ data.tar.gz: 8b9b52d4aef606cf458162596651ac7b0d06462b1d1ab1d02efb7c7dc61d90b905699682e42bf757c19df5a99a6fafc7a03e0e7136f70f3c47b1f10e543b3923
@@ -3,7 +3,7 @@
3
3
  <div class="header">Collection Item</div>
4
4
  <div class="row">
5
5
  <div class="col-xs-12">
6
- <img ng-show="component.attributes.media_type == 'image'" ng-src="/promethee/blob/{{component.attributes.image.id}}" class="img-responsive">
6
+ <img ng-show="component.attributes.media_type == 'image'" ng-src="{{ component.attributes.image.id ? '/promethee/blob/' + component.attributes.image.id : '#' }}" class="img-responsive">
7
7
  <div ng-show="component.attributes.media_type == 'video'" ng-controller="CollectionItemVideoController">
8
8
  <div class="embed-responsive embed-responsive-16by9">
9
9
  <iframe ng-if="embed" frameborder="0" webkitallowfullscreen="" mozallowfullscreen="" allowfullscreen="allowfullscreen" ng-src="{{embed | urlSafe}}"></iframe>
@@ -4,7 +4,7 @@
4
4
  <div class="row">
5
5
  <div class="col-xs-3">
6
6
  <figure ng-show="component.attributes.image.id">
7
- <img ng-src="/promethee/blob/{{component.attributes.image.id}}" class="img-responsive">
7
+ <img ng-src="{{ component.attributes.image.id ? '/promethee/blob/' + component.attributes.image.id : '#' }}" class="img-responsive">
8
8
  </figure>
9
9
  </div>
10
10
  <div class="col-xs-9">
@@ -1,7 +1,7 @@
1
1
  <script type="text/ng-template" id="promethee/components/image/edit/move">
2
2
  <%= render 'promethee/edit/move.header', type: 'image' %>
3
3
  <figure ng-show="component.attributes.image.id">
4
- <img ng-src="/promethee/blob/{{component.attributes.image.id}}"
4
+ <img ng-src="{{ component.attributes.image.id ? '/promethee/blob/' + component.attributes.image.id : '#' }}"
5
5
  class="img-responsive">
6
6
  <figcaption ng-show="component.attributes.searchable_caption">
7
7
  {{component.attributes.searchable_caption}}
@@ -4,6 +4,8 @@ background_images = []
4
4
  background_positions = []
5
5
  background_sizes = []
6
6
 
7
+ has_background = !(background_color =~ /rgba\(\s*255\s*,\s*255\s*,\s*255\s*,\s*0\s*\)/)
8
+
7
9
  if component[:attributes] && component[:attributes].has_key?(:backgrounds) # retro-compatibility
8
10
  component[:attributes][:backgrounds].each do |item|
9
11
  image_data = item[:image]
@@ -20,6 +22,6 @@ if component[:attributes] && component[:attributes].has_key?(:backgrounds) # ret
20
22
  end
21
23
  %>
22
24
 
23
- <div class="row <%= promethee_class_for component %>" style="background-color: <%= background_color %>; <%= background_images.count > 0 ? "background-repeat: no-repeat; background-image: #{background_images.join(', ')}; background-position: #{background_positions.join(', ')}; background-size: #{background_sizes.join(', ')};" : '' %>">
25
+ <div class="row <%= promethee_class_for component %><%= ' promethee__component__row--background' if has_background %>" style="background-color: <%= background_color %>; <%= background_images.count > 0 ? "background-repeat: no-repeat; background-image: #{background_images.join(', ')}; background-position: #{background_positions.join(', ')}; background-size: #{background_sizes.join(', ')};" : '' %>">
24
26
  <%= render 'promethee/show/components', components: component[:children] %>
25
27
  </div>
@@ -3,7 +3,7 @@
3
3
  <div class="header">Slider Item</div>
4
4
  <div class="row">
5
5
  <div class="col-xs-12">
6
- <img ng-show="component.attributes.media_type == 'image'" ng-src="/promethee/blob/{{component.attributes.image.id}}" class="img-responsive">
6
+ <img ng-show="component.attributes.media_type == 'image'" ng-src="{{ component.attributes.image.id ? '/promethee/blob/' + component.attributes.image.id : '#' }}" class="img-responsive">
7
7
  <div ng-show="component.attributes.media_type == 'video'" ng-controller="SliderItemVideoController">
8
8
  <div class="embed-responsive embed-responsive-16by9">
9
9
  <iframe ng-if="embed" frameborder="0" webkitallowfullscreen="" mozallowfullscreen="" allowfullscreen="allowfullscreen" ng-src="{{embed | urlSafe}}"></iframe>
@@ -1,5 +1,5 @@
1
1
  module Promethee
2
2
  module Rails
3
- VERSION = '1.6.47'
3
+ VERSION = '1.6.48'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: promethee
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.47
4
+ version: 1.6.48
5
5
  platform: ruby
6
6
  authors:
7
7
  - Julien Dargelos
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2018-07-02 00:00:00.000000000 Z
16
+ date: 2018-07-06 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: rails
@@ -458,7 +458,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
458
458
  version: '0'
459
459
  requirements: []
460
460
  rubyforge_project:
461
- rubygems_version: 2.6.11
461
+ rubygems_version: 2.7.6
462
462
  signing_key:
463
463
  specification_version: 4
464
464
  summary: Bring fire to your page