promethee 1.4.4 → 1.4.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/app/views/promethee/_edit.html.erb +6 -2
  3. data/app/views/promethee/components/cover/_edit.define.html.erb +7 -2
  4. data/app/views/promethee/components/cover/_edit.inspect.html.erb +8 -3
  5. data/app/views/promethee/components/cover/_edit.move.html.erb +5 -3
  6. data/app/views/promethee/components/image/_edit.inspect.html.erb +2 -2
  7. data/app/views/promethee/components/image/_edit.move.html.erb +6 -2
  8. data/app/views/promethee/components/image/_show.html.erb +4 -2
  9. data/lib/promethee/rails/version.rb +1 -1
  10. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d859537c49d6b96169a72299a527f6a8224c3d05
4
- data.tar.gz: 25095a47ef0d8a8071e0e9113f11f98f0fc36921
3
+ metadata.gz: bcf6669cacfb03d3549aa918457aed0b1199fb26
4
+ data.tar.gz: cf7d853ef7b6e40e719a97e50275697abb9cedc7
5
5
  SHA512:
6
- metadata.gz: 82230b08d5029415b741508c456d1022b319ff81ff859a316aa55a6c75daec9a305cdfb77e4c67f4179d3e67db28bd1aba83bf9634c8cbc1cec237677482d94d
7
- data.tar.gz: db3775c7a998509a0c77470af1cd323e9548020e60a46d4289859f76359a979dca37d69b7906d7f4aacd4819a001da90efcf490b0626c4cb082a4c1bd47b3979
6
+ metadata.gz: 66a77489c558ac4a3378e209c8a7c0f4de124a9315c7833b9c016adb99bbe6f04d8e543fafb10fb88541c761ac48b954c0aaa2559f0fda96d1e13381f08fe4be
7
+ data.tar.gz: 49751db2ba3399a7eae46a8f91caa925f77c2d629e4c0ccbd4279481b31ba54d5c9535bfa32d69c9b9c2cf3a4f82c2f7cf2bcbb2d6c8c098b9594504efc2e4d4
data/app/views/promethee/_edit.html.erb CHANGED
@@ -53,13 +53,17 @@ promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'pres
53
53
  fullscreen: true
54
54
  };
55
55
 
56
- $scope.upload = function (file) {
56
+ $scope.upload = function (file, component) {
57
+ if (file == undefined) {
58
+ return;
59
+ }
60
+ $scope.promethee.inspected = component;
57
61
  Upload.upload({
58
62
  url: '/promethee/blob',
59
63
  data: { file: file },
60
64
  headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }
61
65
  }).then(function (resp) {
62
- $scope.promethee.inspected.attributes.blob = resp.data;
66
+ component.attributes.blob = resp.data;
63
67
  $scope.upload_error = undefined;
64
68
  }, function (resp) {
65
69
  $scope.upload_error = "An error occured (error " + resp.status + ": " + resp.statusText + ")";
data/app/views/promethee/components/cover/_edit.define.html.erb CHANGED
@@ -6,8 +6,13 @@
6
6
  data: {
7
7
  type: 'cover',
8
8
  attributes: {
9
- src: 'https://picsum.photos/1920/1080/?random',
10
- body: ''
9
+ blob: {
10
+ id: undefined,
11
+ name: ''
12
+ },
13
+ surtitle: '',
14
+ title: '',
15
+ subtitle: ''
11
16
  }
12
17
  }
13
18
  })
data/app/views/promethee/components/cover/_edit.inspect.html.erb CHANGED
@@ -1,7 +1,12 @@
1
1
  <script type="text/ng-template" id="promethee/components/cover/edit/inspect">
2
- <div class="form-group">
3
- <label class="label-control">Image Url</label>
4
- <input ng-model="promethee.inspected.attributes.src" class="form-control" type="text"/>
2
+ <div class="form-group" ngf-drop="upload($file, promethee.inspected)" ngf-pattern="'.jpg,.jpeg,.png,.gif'">
3
+ <label class="label-control">Image</label>
4
+ <p>{{promethee.inspected.attributes.blob.name}}</p>
5
+ <div class="button btn btn-default" ngf-select="upload($file, promethee.inspected)" ngf-accept="'.jpg,.jpeg,.png,.gif'" class="drop-box">Select an image</div>
6
+ <div class="progress" ng-show="upload_progress != undefined && upload_progress != 0 && upload_progress != 100">
7
+ <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: {{upload_progress}}%"></div>
8
+ </div>
9
+ <div class="alert alert-danger" ng-show="upload_error">{{upload_error}}</div>
5
10
  </div>
6
11
 
7
12
  <div class="form-group">
data/app/views/promethee/components/cover/_edit.move.html.erb CHANGED
@@ -1,13 +1,15 @@
1
1
  <script type="text/ng-template" id="promethee/components/cover/edit/move">
2
2
  <%= render 'promethee/edit/move.header', type: 'cover' %>
3
- <div class=" promethee-edit__wrapper
3
+ <div class=" promethee-edit__wrapper
4
4
  promethee-edit__cover-content"
5
- style="background-image: url('{{component.attributes.src}}')">
5
+ ngf-drop="upload($file, component)"
6
+ ngf-pattern="'.jpg,.jpeg,.png,.gif'"
7
+ style="background-image:url('{{'/promethee/blob/' + component.attributes.blob.id}}')">
6
8
  <hgroup>
7
9
  <h2 class="surtitle">{{component.attributes.surtitle}}</h2>
8
10
  <h1>{{component.attributes.title}}</h1>
9
11
  <h2 class="subtitle">{{component.attributes.subtitle}}</h2>
10
- </hgroup>
12
+ </hgroup>
11
13
  </div>
12
14
  </div>
13
15
  </div>
data/app/views/promethee/components/image/_edit.inspect.html.erb CHANGED
@@ -1,8 +1,8 @@
1
1
  <script type="text/ng-template" id="promethee/components/image/edit/inspect">
2
- <div class="form-group" ngf-drop="upload($file)" >
2
+ <div class="form-group" ngf-drop="upload($file, promethee.inspected)" ngf-pattern="'.jpg,.jpeg,.png,.gif'">
3
3
  <label class="label-control">Image</label>
4
4
  <p>{{promethee.inspected.attributes.blob.name}}</p>
5
- <div class="button btn btn-default" ngf-select="upload($file)" class="drop-box">Select or drop an image</div>
5
+ <div class="button btn btn-default" ngf-select="upload($file, promethee.inspected)" ngf-accept="'.jpg,.jpeg,.png,.gif'" class="drop-box">Select an image</div>
6
6
  <div class="progress" ng-show="upload_progress != undefined && upload_progress != 0 && upload_progress != 100">
7
7
  <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: {{upload_progress}}%"></div>
8
8
  </div>
data/app/views/promethee/components/image/_edit.move.html.erb CHANGED
@@ -2,12 +2,16 @@
2
2
  <%= render 'promethee/edit/move.header', type: 'image' %>
3
3
  <figure ng-show="component.attributes.blob.id">
4
4
  <img ng-src="/promethee/blob/{{component.attributes.blob.id}}"
5
+ ngf-drop="upload($file, component)"
6
+ ngf-pattern="'.jpg,.jpeg,.png,.gif'"
5
7
  class="img-responsive">
6
8
  <figcaption ng-show="component.attributes.caption">{{component.attributes.caption}}</figcaption>
7
9
  </figure>
8
- <div ng-hide="component.attributes.blob_id">
10
+ <div ng-hide="component.attributes.blob.id">
9
11
  <p ng-hide="editing"
10
- class="text-center">Click to set the image</p>
12
+ ngf-drop="upload($file, component)"
13
+ ngf-pattern="'.jpg,.jpeg,.png,.gif'"
14
+ class="text-center">Click or drop file to set the image</p>
11
15
  </div>
12
16
  </div>
13
17
  </div>
data/app/views/promethee/components/image/_show.html.erb CHANGED
@@ -6,7 +6,9 @@ caption = component[:attributes][:caption].to_s
6
6
  %>
7
7
  <figure class="<%= promethee_class_for component %>">
8
8
  <%= image_tag url_for(blob.variant(resize: '1920')), class: 'img-responsive', alt: alt if blob %>
9
- <% if caption.present? %>
10
- <figcaption><%= caption %></figcaption>
9
+ <% unless caption.blank? %>
10
+ <figcaption>
11
+ <%= caption %>
12
+ </figcaption>
11
13
  <% end %>
12
14
  </figure>
data/lib/promethee/rails/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Promethee
2
2
  module Rails
3
- VERSION = '1.4.4'
3
+ VERSION = '1.4.5'
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.4.4
4
+ version: 1.4.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Julien Dargelos
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
341
341
  version: '0'
342
342
  requirements: []
343
343
  rubyforge_project:
344
- rubygems_version: 2.6.12
344
+ rubygems_version: 2.6.11
345
345
  signing_key:
346
346
  specification_version: 4
347
347
  summary: Bring fire to your page