promethee 1.6.10 → 1.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91830eaaee60dc9cdb4af383cbf4d178b8e5bdab
-  data.tar.gz: 215c5abb1339a1cfcb6f50ffd191c520f3721885
+  metadata.gz: 1ccb914975b52c26fdab25010930c298bde59c98
+  data.tar.gz: facb91d0c73e987d34392813ff2a6e38e166e001
 SHA512:
-  metadata.gz: e527de89a924b717fd053a5eb88ff8a8472d38442e780bc8b1ffb644a835daafa2cb9dc9d7aeb65eb3f46907969608b72d616ea95c945509024a410f54c40d67
-  data.tar.gz: b3f65abe05e00af06d25d2573578bfdf28bd2e26e30f57226a4e4bda111a0c0d87a08c43e68983ca2d324ff25fcda15e150b46c2f9f1a2482868901814a99675
+  metadata.gz: 8239f1b92dc3aab19341ec7c119201465c5c710453c570fe0921498a159fcb95e796b1ec2005eece167b8ccf7d72898e59474fe6cd255ccb99488872baf1e17b
+  data.tar.gz: 7d3c31e91b58d159bbda3d20f32cf1b80cf5ef953a6203198f93fd197e3eaef8880f9a3fac0ea48daa6558a11f7dafc52f11f683252b82bd4cae2f0f71599dc1

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

@@ -22,15 +22,25 @@ var promethee = angular
 <% end %>
 
 <script type="text/javascript">
-promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'presets', 'identifier', 'Upload', function($scope, summernoteConfig, presets, identifier, Upload) {
+promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'presets', '$filter', function($scope, summernoteConfig, presets, $filter) {
+  
+  $scope.generateIdentifier = function() {
+    // https://stackoverflow.com/questions/105034/create-guid-uuid-in-javascript
+    function s4() {
+      return Math.floor((1 + Math.random()) * 0x10000)
+        .toString(16)
+        .substring(1);
+    }
+    return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4();
+  }
+
   $scope.data = <%= promethee_data.to_json.html_safe %>;
 
-  // Data (TODO use Adder and probably page definition to init)
+  // Data (TODO use standard method createComponentFromDefinition)
   if (typeof $scope.data !== 'object' || $scope.data === null || $scope.data.type !== 'page') {
     $scope.data = {
-      id: '',
+      id: $scope.generateIdentifier(),
       type: 'page',
-      version: 1,
       attributes: {
         title: 'New page',
         description: '',
@@ -41,8 +51,6 @@ promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'pres
     };
   }
 
-  $scope.identifier = identifier;
-
   $scope.promethee = {
     data: $scope.data,
     definitions: [],
@@ -53,30 +61,29 @@ promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'pres
     fullscreen: true
   };
 
-  $scope.upload = function (file, component, store) {
-    if (file == undefined) {
-      return;
-    }
+  $scope.findDefinitionByType = function(type) {
+    return $filter('filter')($scope.promethee.definitions, {'data':{'type':type}})[0]; 
+  }
+  
+  $scope.addComponentByType = function(type, target, index = -1) {
+    var definition = $scope.findDefinitionByType(type);
+    $scope.addComponent(definition, target, index);
+  }
 
-    if (store === undefined) {
-      store = component.attributes;
+  $scope.addComponent = function(definition, target, index = -1) {
+    var component = $scope.createComponentFromDefinition(definition);
+    if (index === -1) {
+      target.push(component);
+    } else {
+      target.splice(index, 0, component);
     }
+  }
 
-    $scope.promethee.inspected = component;
-    Upload.upload({
-      url: '<%= promethee_active_storage_create_path %>',
-      data: { file: file },
-      headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }
-    }).then(function (resp) {
-      store.blob = resp.data;
-      $scope.upload_error = undefined;
-    }, function (resp) {
-      $scope.upload_error = "An error occured (error " + resp.status + ": " + resp.statusText + ")";
-    }, function (evt) {
-      var progressPercentage = parseInt(100.0 * evt.loaded / evt.total);
-      $scope.upload_progress = progressPercentage;
-    });
-  };
+  $scope.createComponentFromDefinition = function(definition) {
+    var component = angular.copy(definition.data);
+    component.id = $scope.generateIdentifier();
+    return component;
+  } 
 
   $scope.inspect = function(component, event) {
     if(event.target.closest('.promethee-edit__component') === event.currentTarget) {
@@ -162,6 +169,9 @@ promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'pres
 
   <div class="promethee-edit" ng-show="promethee.fullscreen">
     <input type="hidden" name="page[data]" id="page_data" value="{{promethee.data}}" />
+    <div class="upload__modal" ng-show="upload.running">
+
+    </div>
     <nav class="navbar navbar-default promethee-edit__navbar" ng-class="{'navbar-fixed-top': promethee.fullscreen }">
       <div class="container-fluid">
         <div class="navbar-header promethee-edit__icon">

data/app/views/promethee/components/aside/_edit.define.html.erb

@@ -2,8 +2,9 @@
   init = <<~JAVASCRIPT
     promethee.definitions.push({
       name: 'Aside',
-      icon: #{render('promethee/components/aside/icon').to_json.html_safe},
+      icon: #{ promethee_component_render_icon 'aside' },
       position: 30,
+      library: true,
       data: {
         type: 'aside',
         attributes: {
@@ -16,5 +17,4 @@
     })
   JAVASCRIPT
 %>
-
-<%= content_tag :div, nil, 'ng-init': init %>
+<div ng-init="<%= init %>"></div>

data/app/views/promethee/components/collection/_edit.define.html.erb

@@ -2,8 +2,9 @@
   init = <<~JAVASCRIPT
     promethee.definitions.push({
       name: 'Collection',
-      icon: #{render('promethee/components/collection/icon').to_json.html_safe},
+      icon: #{ promethee_component_render_icon 'collection' },
       position: 20,
+      library: true,
       data: {
         type: 'collection',
         attributes: {
@@ -14,5 +15,4 @@
     })
   JAVASCRIPT
 %>
-
-<%= content_tag :div, nil, 'ng-init': init %>
+<div ng-init="<%= init %>"></div>

data/app/views/promethee/components/collection/_edit.inspect.html.erb

@@ -30,7 +30,7 @@
 </script>
 
 <script>
-  promethee.controller('CollectionInspectorController', ['$scope', 'identifier', function($scope, identifier) {
+  promethee.controller('CollectionInspectorController', ['$scope', function($scope) {
     var availableComponents = ['image', 'video'];
 
     $scope.itemDefinitions = $scope.promethee.definitions.filter(function(definition) {
@@ -43,7 +43,7 @@
 
     $scope.addItem = function(definition) {
       var item = JSON.parse(JSON.stringify(definition.data));
-      item.id = identifier.generate();
+      item.id = $scope.generateIdentifier();
 
       $scope.promethee.inspected.children.push(item);
     }

data/app/views/promethee/components/column/_edit.define.html.erb

@@ -2,8 +2,9 @@
   init = <<~JAVASCRIPT
     promethee.definitions.push({
       name: 'Column',
-      icon: #{render('promethee/components/column/icon').to_json.html_safe},
-      position: -1,
+      icon: #{ promethee_component_render_icon 'column' },
+      position: 0,
+      library: false,
       data: {
         type: 'column',
         attributes: {
@@ -15,5 +16,4 @@
     })
   JAVASCRIPT
 %>
-
-<%= content_tag :div, nil, 'ng-init': init %>
+<div ng-init="<%= init %>"></div>

data/app/views/promethee/components/column/_edit.move.html.erb

@@ -7,7 +7,7 @@
                 col-md-offset-{{component.attributes.offset}}">
     <div class="promethee-edit__component__inner">
       <%= render 'promethee/edit/move.remove' %>
-        <div class="header">Column</div>
+        <div class="header">Column {{$index + 1}}</div>
         <ng-include src="'promethee/move/components'"></ng-include>
         <pre class="hidden">{{component.attributes.search = concatenateChildrenSearch(component)}}</pre>
         <div

data/app/views/promethee/components/cover/_edit.define.html.erb

@@ -2,12 +2,13 @@
   init = <<~JAVASCRIPT
     promethee.definitions.push({
       name: 'Cover',
-      icon: #{render('promethee/components/cover/icon').to_json.html_safe},
+      icon: #{ promethee_component_render_icon 'cover' },
       position: 10,
+      library: true,
       data: {
         type: 'cover',
         attributes: {
-          blob: {
+          image: {
             id: undefined,
             name: ''
           },
@@ -19,5 +20,4 @@
     })
   JAVASCRIPT
 %>
-
-<%= content_tag :div, nil, 'ng-init': init %>
+<div ng-init="<%= init %>"></div>

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

@@ -1,13 +1,5 @@
 <script type="text/ng-template" id="promethee/components/cover/edit/inspect">
-  <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>
+  <promethee-uploader ng-model="promethee.inspected.attributes.image" label="Image" limits="'.jpg,.jpeg,.png,.gif'"></promethee-uploader>
 
   <div class="form-group">
     <label class="label-control">Surtitle</label>

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

@@ -2,9 +2,7 @@
   <%= render 'promethee/edit/move.header', type: 'cover' %>
       <div  class=" promethee-edit__wrapper
                     promethee-edit__cover-content"
-            ngf-drop="upload($file, component)"
-            ngf-pattern="'.jpg,.jpeg,.png,.gif'"
-            style="background-image:url('{{ component.attributes.blob.id ? '/promethee/blob/' + component.attributes.blob.id : '' }}')">
+            style="background-image:url('{{ component.attributes.image.id ? '/promethee/blob/' + component.attributes.image.id : '' }}')">
         <hgroup>
           <h2 class="surtitle">{{component.attributes.surtitle}}</h2>
           <h1>{{component.attributes.title}}</h1>

data/app/views/promethee/components/cover/_localize.html.erb

@@ -4,7 +4,7 @@
 
     <div class="row">
       <div class="col-md-6">
-        <img ng-src="/promethee/blob/{{component.attributes.blob.id}}" class="img-responsive">
+        <img ng-src="/promethee/blob/{{component.attributes.image.id}}" class="img-responsive">
       </div>
     </div>
 

data/app/views/promethee/components/cover/_show.html.erb

@@ -1,7 +1,7 @@
 <%
-blob_data = component[:attributes][:blob]
-if blob_data && blob_data[:id]
-  blob = ActiveStorage::Blob.find blob_data[:id]
+image_data = component[:attributes][:image]
+if image_data && image_data[:id]
+  blob = ActiveStorage::Blob.find image_data[:id]
 end
 
 surtitle = component[:attributes][:surtitle].to_s

data/app/views/promethee/components/image/_edit.define.html.erb

@@ -2,12 +2,13 @@
   init = <<~JAVASCRIPT
     promethee.definitions.push({
       name: 'Image',
-      icon: #{render('promethee/components/image/icon').to_json.html_safe},
+      icon: #{ promethee_component_render_icon 'image' },
       position: 2,
+      library: true,
       data: {
         type: 'image',
         attributes: {
-          blob: {
+          image: {
             id: undefined,
             name: ''
           },
@@ -18,5 +19,4 @@
     })
   JAVASCRIPT
 %>
-
-<%= content_tag :div, nil, 'ng-init': init %>
+<div ng-init="<%= init %>"></div>

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

@@ -1,13 +1,6 @@
 <script type="text/ng-template" id="promethee/components/image/edit/inspect">
-  <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>
+
+  <promethee-uploader ng-model="promethee.inspected.attributes.image" label="Image" limits="'.jpg,.jpeg,.png,.gif'"></promethee-uploader>
 
   <div class="form-group">
     <label class="label-control">Caption</label>

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

@@ -1,17 +1,13 @@
 <script type="text/ng-template" id="promethee/components/image/edit/move">
   <%= 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'"
+      <figure ng-show="component.attributes.image.id">
+        <img  ng-src="/promethee/blob/{{component.attributes.image.id}}"
               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.image.id">
         <p  ng-hide="editing"
-            ngf-drop="upload($file, component)"
-            ngf-pattern="'.jpg,.jpeg,.png,.gif'"
-            class="text-center text-empty">Click or drop file to set the image</p>
+            class="text-center text-empty">Click to set the image</p>
       </div>
       <pre class="hidden">{{component.attributes.search = (component.attributes.caption + ' ' + component.attributes.alt)}}</pre>
     </div>

data/app/views/promethee/components/image/_localize.html.erb

@@ -4,7 +4,7 @@
 
     <div class="row">
       <div class="col-md-6">
-        <img ng-src="/promethee/blob/{{component.attributes.blob.id}}" class="img-responsive">
+        <img ng-src="/promethee/blob/{{component.attributes.image.id}}" class="img-responsive">
       </div>
     </div>
 

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

@@ -1,7 +1,7 @@
 <%
-blob_data = component[:attributes][:blob]
-if blob_data && blob_data[:id]
-  blob = ActiveStorage::Blob.find blob_data[:id]
+image_data = component[:attributes][:image]
+if image_data && image_data[:id]
+  blob = ActiveStorage::Blob.find image_data[:id]
 end
 
 alt = component[:attributes][:alt]

data/app/views/promethee/components/page/_edit.define.html.erb

@@ -0,0 +1,21 @@
+<%
+  init = <<~JAVASCRIPT
+    promethee.definitions.push({
+      name: 'Page',
+      icon: #{ promethee_component_render_icon 'page' },
+      position: 0,
+      library: false,
+      data: {
+        type: 'page',
+        attributes: {
+          title: 'New page',
+          description: '',
+          stylesheets: '',
+          javascripts: ''
+        },
+        children: []
+      }
+    })
+  JAVASCRIPT
+%>
+<div ng-init="<%= init %>"></div>

data/app/views/promethee/components/page/_icon.svg

@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" viewBox="0 0 100 100">
+</svg>

data/app/views/promethee/components/row/_edit.define.html.erb

@@ -2,17 +2,25 @@
   init = <<~JAVASCRIPT
     promethee.definitions.push({
       name: 'Row',
-      icon: #{render('promethee/components/row/icon').to_json.html_safe},
+      icon: #{ promethee_component_render_icon 'row' },
       position: -2,
+      library: true,
       data: {
         type: 'row',
         attributes: {
-          bgcolor: "transparent"
+          bgcolor: "transparent",
+          bgimage1: {
+            id: undefined,
+            name: ''
+          },
+          bgimage2: {
+            id: undefined,
+            name: ''
+          },
         },
         children: []
       }
     })
   JAVASCRIPT
 %>
-
-<%= content_tag :div, nil, 'ng-init': init %>
+<div ng-init="<%= init %>"></div>

data/app/views/promethee/components/row/_edit.inspect.html.erb

@@ -1,6 +1,9 @@
 <script type="text/ng-template" id="promethee/components/row/edit/inspect">
   <div class="form-group">
-    No basic option for row.
+    <div class="btn btn-default" ng-click="addComponentByType('column', promethee.inspected.children)">Add column</div>
+    <ul class="list-unstyled">
+      <li ng-repeat="column in promethee.inspected.children">Column {{$index + 1}}</li>
+    </ul>
   </div>
 
   <div class="panel panel-default" ng-init="advancedConfigurationOpen = false">
@@ -14,5 +17,8 @@
         <input ng-model="promethee.inspected.attributes.bgcolor" colorpicker="rgba" class="form-control" type="text" />
       </div>
 
+      <promethee-uploader ng-model="promethee.inspected.attributes.bgimage1" label="Background Image 1" limits="'.jpg,.jpeg,.png,.gif'"></promethee-uploader>
+      <promethee-uploader ng-model="promethee.inspected.attributes.bgimage2" label="Background Image 2"></promethee-uploader>
+
     </div>
 </script>

data/app/views/promethee/components/row/_edit.move.html.erb

@@ -1,7 +1,7 @@
 <script type="text/ng-template" id="promethee/components/row/edit/move">
   <%= render 'promethee/edit/move.header', type: 'row' %>
       <div class="header">Row</div>
-      <div class="row">
+      <div class="row" style="background-image:url('{{ component.attributes.blob.id ? '/promethee/blob/' + component.attributes.blob.id : '' }}')">
         <ng-include src="'promethee/move/components'"></ng-include>
         <pre class="hidden">{{component.attributes.search = concatenateChildrenSearch(component)}}</pre>
       </div>

data/app/views/promethee/components/slider/_edit.define.html.erb

@@ -2,8 +2,9 @@
   init = <<~JAVASCRIPT
     promethee.definitions.push({
       name: 'Slider',
-      icon: #{render('promethee/components/slider/icon').to_json.html_safe},
+      icon: #{ promethee_component_render_icon 'slider' },
       position: 15,
+      library: true,
       data: {
         type: 'slider',
         attributes: {
@@ -14,5 +15,4 @@
     })
   JAVASCRIPT
 %>
-
-<%= content_tag :div, nil, 'ng-init': init %>
+<div ng-init="<%= init %>"></div>

data/app/views/promethee/components/slider/_edit.inspect.html.erb

@@ -33,7 +33,7 @@
 </script>
 
 <script>
-  promethee.controller('SliderInspectorController', ['$scope', 'identifier', function($scope, identifier) {
+  promethee.controller('SliderInspectorController', ['$scope', function($scope) {
     var availableComponents = ['image', 'video'];
 
     $scope.itemDefinitions = $scope.promethee.definitions.filter(function(definition) {
@@ -46,7 +46,7 @@
 
     $scope.addItem = function(definition) {
       var item = JSON.parse(JSON.stringify(definition.data));
-      item.id = identifier.generate();
+      item.id = $scope.generateIdentifier();
 
       $scope.promethee.inspected.children.push(item);
     }

data/app/views/promethee/components/text/_edit.define.html.erb

@@ -2,8 +2,9 @@
   init = <<~JAVASCRIPT
     promethee.definitions.push({
       name: 'Text',
-      icon: #{render('promethee/components/text/icon').to_json.html_safe},
+      icon: #{ promethee_component_render_icon 'text' },
       position: 1,
+      library: true,
       data: {
         type: 'text',
         attributes: {
@@ -13,5 +14,4 @@
     })
   JAVASCRIPT
 %>
-
-<%= content_tag :div, nil, 'ng-init': init %>
+<div ng-init="<%= init %>"></div>

data/app/views/promethee/components/video/_edit.define.html.erb

@@ -2,8 +2,9 @@
   init = <<~JAVASCRIPT
     promethee.definitions.push({
       name: 'Video',
-      icon: #{render('promethee/components/video/icon').to_json.html_safe},
+      icon: #{ promethee_component_render_icon 'video' },
       position: 3,
+      library: true,
       data: {
         type: 'video',
         attributes: {
@@ -13,5 +14,4 @@
     })
   JAVASCRIPT
 %>
-
-<%= content_tag :div, nil, 'ng-init': init %>
+<div ng-init="<%= init %>"></div>

data/app/views/promethee/edit/_move.html.erb

@@ -57,7 +57,7 @@ promethee
       }
     }
   })
-  .directive('droppable', ['$compile', 'presets', 'identifier', function($compile, presets, identifier) {
+  .directive('droppable', ['$compile', 'presets', function($compile, presets) {
     return {
       restrict: 'A',
       link: function(scope, element, attrs) {
@@ -79,7 +79,7 @@ promethee
                 var component;
                 for(var i = 0; i < components.length; i++) {
                   component = components[i];
-                  component.id = identifier.generate();
+                  component.id = scope.generateIdentifier();
                   if(Array.isArray(component.children)) provideIdentifiers(component.children);
                 }
 
@@ -100,7 +100,7 @@ promethee
             if (draggedFromLibrary) {
               var definition = angular.element(ui.draggable).scope().definition;
               var component = angular.copy(definition.data);
-              component.id = identifier.generate();
+              component.id = scope.generateIdentifier();
             } else {
               var draggedFromIndex = parseInt(ui.draggable[0].getAttribute('data-list-index'));
               // console.log('dragged', draggedFromList, draggedFromIndex);
@@ -134,7 +134,7 @@ promethee
     <div class="promethee-edit__library-header">Library</div>
     <div class="promethee-edit__library-content">
       <div class="row">
-        <div  ng-repeat="definition in promethee.definitions | orderBy:'position'"
+        <div  ng-repeat="definition in promethee.definitions | filter:{library:true} | orderBy:'position'"
               class="col-md-12 col-lg-6">
           <div  addable
                 class="promethee-edit__library__item"
@@ -167,7 +167,6 @@ promethee
       {{promethee.inspected.type}}
     </div>
     <div class="promethee-edit__inspect-content">
-      <ng-include src="'promethee/components/page/edit/inspect'" ng-show="promethee.inspected.type == 'page'"></ng-include>
       <div ng-repeat="definition in promethee.definitions | orderBy:'position'">
         <ng-include src="'promethee/components/' + definition.data.type + '/edit/inspect'"
                     ng-show="promethee.inspected.type == definition.data.type"></ng-include>

data/app/views/promethee/templates/_uploader.html.erb

@@ -0,0 +1,51 @@
+<script type="text/ng-template" id="promethee_uploader">
+  <div class="form-group" ngf-drop="prometheeUploader.upload($file)" ngf-pattern="{{limits || ''}}">
+    <label class="label-control">{{label}}</label>
+    <p>{{ngModel.name}}</p>
+    <div class="button btn btn-default" ngf-select="prometheeUploader.upload($file, ngModel)" ngf-accept="{{limits || ''}}" class="drop-box">Select an image</div>
+    <div class="progress" ng-show="prometheeUploader.upload_progress != undefined && prometheeUploader.upload_progress != 0 && prometheeUploader.upload_progress != 100">
+      <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: {{prometheeUploader.upload_progress}}%"></div>
+    </div>
+    <div class="alert alert-danger" ng-show="upload_error">{{upload_error}}</div>
+  </div>
+</script>
+
+<script>
+  promethee.directive('prometheeUploader', ['Upload', function(Upload) {
+    return {
+      restrict: 'E',
+      scope: {
+        ngModel: '=',
+        label: '@',
+        limits: '@',
+      },
+      templateUrl: 'promethee_uploader',
+      controller: function($scope) {
+        var self = this;
+        this.upload_error = '';
+        this.upload_progress = 0;
+
+        this.upload = function (file) {
+          if (file == undefined) return;
+          Upload.upload({
+            url: '<%= promethee_active_storage_create_path %>',
+            data: { file: file },
+            headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }
+          }).then(function (resp) {
+            $scope.ngModel = resp.data;
+            self.upload_error = undefined;
+            self.upload_error = "une erreur grave !";
+          }, function (resp) {
+            self.upload_error = "An error occured (error " + resp.status + ": " + resp.statusText + ")";
+          }, function (evt) {
+            var progressPercentage = parseInt(100.0 * evt.loaded / evt.total);
+            self.upload_progress = progressPercentage;
+          });
+        };
+
+      },
+      controllerAs: 'prometheeUploader'
+    }
+  }]);
+
+</script>

data/lib/promethee/rails/helper.rb

@@ -18,6 +18,10 @@ module Promethee::Rails::Helper
     promethee_partials_for 'components/*/_edit.*.html.erb'
   end
 
+  def promethee_component_render_icon(icon)
+    render("promethee/components/#{icon}/icon.svg").to_json.html_safe
+  end
+
   def promethee_util_partials
     promethee_partials_for 'utils/_*.html.erb'
   end

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '1.6.10'
+    VERSION = '1.6.11'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 1.6.10
+  version: 1.6.11
 platform: ruby
 authors:
 - Julien Dargelos
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -214,8 +214,10 @@ files:
 - app/views/promethee/components/image/_icon.svg
 - app/views/promethee/components/image/_localize.html.erb
 - app/views/promethee/components/image/_show.html.erb
+- app/views/promethee/components/page/_edit.define.html.erb
 - app/views/promethee/components/page/_edit.inspect.html.erb
 - app/views/promethee/components/page/_edit.move.html.erb
+- app/views/promethee/components/page/_icon.svg
 - app/views/promethee/components/page/_localize.html.erb
 - app/views/promethee/components/page/_show.html.erb
 - app/views/promethee/components/row/_edit.define.html.erb
@@ -251,9 +253,9 @@ files:
 - app/views/promethee/preview.html.erb
 - app/views/promethee/show/_component.html.erb
 - app/views/promethee/show/_components.html.erb
+- app/views/promethee/templates/_uploader.html.erb
 - app/views/promethee/utils/_html-safe.html.erb
 - app/views/promethee/utils/_humanize.html.erb
-- app/views/promethee/utils/_identifier.html.erb
 - app/views/promethee/utils/_number-of-characters.html.erb
 - app/views/promethee/utils/_number-of-words.html.erb
 - app/views/promethee/utils/_summernote-config.html.erb
@@ -378,7 +380,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Bring fire to your page

data/app/views/promethee/utils/_identifier.html.erb

@@ -1,19 +0,0 @@
-<script>
-  // Why doesn't this method just live in the adder controller ?
-  // Because the row component also need a special access to it in order to create cols with an id. So we make it global to the application.
-  promethee.provider('identifier', function() {
-    this.$get = function() {
-      return {
-        generate: function() {
-          // https://stackoverflow.com/questions/105034/create-guid-uuid-in-javascript
-          function s4() {
-            return Math.floor((1 + Math.random()) * 0x10000)
-              .toString(16)
-              .substring(1);
-          }
-          return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4();
-        }
-      };
-    };
-  });
-</script>