RubyGems - promethee - Versions diffs - 1.4.4 → 1.4.5 - Mend

promethee 1.4.4 → 1.4.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.

Files changed (10) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d859537c49d6b96169a72299a527f6a8224c3d05
-  data.tar.gz: 25095a47ef0d8a8071e0e9113f11f98f0fc36921
+  metadata.gz: bcf6669cacfb03d3549aa918457aed0b1199fb26
+  data.tar.gz: cf7d853ef7b6e40e719a97e50275697abb9cedc7
 SHA512:
-  metadata.gz: 82230b08d5029415b741508c456d1022b319ff81ff859a316aa55a6c75daec9a305cdfb77e4c67f4179d3e67db28bd1aba83bf9634c8cbc1cec237677482d94d
-  data.tar.gz: db3775c7a998509a0c77470af1cd323e9548020e60a46d4289859f76359a979dca37d69b7906d7f4aacd4819a001da90efcf490b0626c4cb082a4c1bd47b3979
+  metadata.gz: 66a77489c558ac4a3378e209c8a7c0f4de124a9315c7833b9c016adb99bbe6f04d8e543fafb10fb88541c761ac48b954c0aaa2559f0fda96d1e13381f08fe4be
+  data.tar.gz: 49751db2ba3399a7eae46a8f91caa925f77c2d629e4c0ccbd4279481b31ba54d5c9535bfa32d69c9b9c2cf3a4f82c2f7cf2bcbb2d6c8c098b9594504efc2e4d4

data/app/views/promethee/_edit.html.erb CHANGED

@@ -53,13 +53,17 @@ promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'pres
     fullscreen: true
   };
-  $scope.upload = function (file) {
+  $scope.upload = function (file, component) {
+    if (file == undefined) {
+      return;
+    }
+    $scope.promethee.inspected = component;
     Upload.upload({
       url: '/promethee/blob',
       data: { file: file },
       headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }
     }).then(function (resp) {
-      $scope.promethee.inspected.attributes.blob = resp.data;
+      component.attributes.blob = resp.data;
       $scope.upload_error = undefined;
     }, function (resp) {
       $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 @@
       data: {
         type: 'cover',
         attributes: {
-          src: 'https://picsum.photos/1920/1080/?random',
-          body: ''
+          blob: {
+            id: undefined,
+            name: ''
+          },
+          surtitle: '',
+          title: '',
+          subtitle: ''
         }
       }
     })

data/app/views/promethee/components/cover/_edit.inspect.html.erb CHANGED

@@ -1,7 +1,12 @@
 <script type="text/ng-template" id="promethee/components/cover/edit/inspect">
-  <div class="form-group">
-    <label class="label-control">Image Url</label>
-    <input ng-model="promethee.inspected.attributes.src" class="form-control" type="text"/>
+  <div class="form-group" ngf-drop="upload($file, promethee.inspected)" ngf-pattern="'.jpg,.jpeg,.png,.gif'">
+    <label class="label-control">Image</label>
+    <p>{{promethee.inspected.attributes.blob.name}}</p>
+    <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>
+    <div class="progress" ng-show="upload_progress != undefined && upload_progress != 0 && upload_progress != 100">
+      <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: {{upload_progress}}%"></div>
+    </div>
+    <div class="alert alert-danger" ng-show="upload_error">{{upload_error}}</div>
   </div>
   <div class="form-group">

data/app/views/promethee/components/cover/_edit.move.html.erb CHANGED

@@ -1,13 +1,15 @@
 <script type="text/ng-template" id="promethee/components/cover/edit/move">
   <%= render 'promethee/edit/move.header', type: 'cover' %>
-      <div  class=" promethee-edit__wrapper
+      <div  class=" promethee-edit__wrapper
                     promethee-edit__cover-content"
-            style="background-image: url('{{component.attributes.src}}')">
+            ngf-drop="upload($file, component)"
+            ngf-pattern="'.jpg,.jpeg,.png,.gif'"
+            style="background-image:url('{{'/promethee/blob/' + component.attributes.blob.id}}')">
         <hgroup>
           <h2 class="surtitle">{{component.attributes.surtitle}}</h2>
           <h1>{{component.attributes.title}}</h1>
           <h2 class="subtitle">{{component.attributes.subtitle}}</h2>
-        </hgroup>
+        </hgroup>
       </div>
     </div>
   </div>

data/app/views/promethee/components/image/_edit.inspect.html.erb CHANGED

@@ -1,8 +1,8 @@
 <script type="text/ng-template" id="promethee/components/image/edit/inspect">
-  <div class="form-group" ngf-drop="upload($file)" >
+  <div class="form-group" ngf-drop="upload($file, promethee.inspected)" ngf-pattern="'.jpg,.jpeg,.png,.gif'">
     <label class="label-control">Image</label>
     <p>{{promethee.inspected.attributes.blob.name}}</p>
-    <div class="button btn btn-default" ngf-select="upload($file)" class="drop-box">Select or drop an image</div>
+    <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>
     <div class="progress" ng-show="upload_progress != undefined && upload_progress != 0 && upload_progress != 100">
       <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: {{upload_progress}}%"></div>
     </div>

data/app/views/promethee/components/image/_edit.move.html.erb CHANGED

@@ -2,12 +2,16 @@
   <%= render 'promethee/edit/move.header', type: 'image' %>
       <figure ng-show="component.attributes.blob.id">
         <img  ng-src="/promethee/blob/{{component.attributes.blob.id}}"
+              ngf-drop="upload($file, component)"
+              ngf-pattern="'.jpg,.jpeg,.png,.gif'"
               class="img-responsive">
         <figcaption ng-show="component.attributes.caption">{{component.attributes.caption}}</figcaption>
       </figure>
-      <div  ng-hide="component.attributes.blob_id">
+      <div  ng-hide="component.attributes.blob.id">
         <p  ng-hide="editing"
-            class="text-center">Click to set the image</p>
+            ngf-drop="upload($file, component)"
+            ngf-pattern="'.jpg,.jpeg,.png,.gif'"
+            class="text-center">Click or drop file to set the image</p>
       </div>
     </div>
   </div>

data/app/views/promethee/components/image/_show.html.erb CHANGED

@@ -6,7 +6,9 @@ caption = component[:attributes][:caption].to_s
 %>
 <figure class="<%= promethee_class_for component %>">
   <%= image_tag url_for(blob.variant(resize: '1920')), class: 'img-responsive', alt: alt if blob %>
-  <% if caption.present? %>
-    <figcaption><%= caption %></figcaption>
+  <% unless caption.blank? %>
+    <figcaption>
+      <%= caption %>
+    </figcaption>
   <% end %>
 </figure>

data/lib/promethee/rails/version.rb CHANGED

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '1.4.4'
+    VERSION = '1.4.5'
   end
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Julien Dargelos
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key:
 specification_version: 4
 summary: Bring fire to your page