promethee 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39a3cfd4fb50431eb643b4447a88a11f086d9888
-  data.tar.gz: 7a436c59748cc1b9498b46b555338ce17bba7e99
+  metadata.gz: 3b4d5a99e5945b1212e0fd1f31620a9d218472ea
+  data.tar.gz: 79e6b13c3e2400f8c79699cc118089ec2af4ed2b
 SHA512:
-  metadata.gz: b16c459cc3f67c9d89d4ac6889f756035fa97ac57ccde75d22ef4aa6b020699cbf7f7c13143564ce5df4e6977fdeb61174990d53a6f09f287745034966c2e3a7
-  data.tar.gz: 6e578c6a4e58721e3e5ca5eeccb02c9838e5a1a36a1881eda22c8b7317542050eac9c9e92e617165259bf84a74214a7a232099dbae19f75ceb117b7dcb235b74
+  metadata.gz: bb4cbd835e2742a6272932b8c0da17cc05465db64ba48c46a1c73475a556b68c4b09bc3eca518d080d3510465418256078005763dcec5f16d9b0d0d11ce4d1fd
+  data.tar.gz: 5d1167f496414344cfd1e6be188e56faf8004f0facf382362031c32cb4ae53c44998fcd4e3cb979ffab06987655a043fdd9c040bf76b4e3654d129b04642a256

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

@@ -5,7 +5,10 @@
       icon: #{render('promethee/components/aside/icon').to_json.html_safe},
       data: {
         type: 'aside',
-        attributes: {},
+        attributes: {
+          visible_content: '',
+          collapsed_content: ''
+        },
         children: []
       }
     })

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

@@ -1,3 +1,11 @@
 <script type="text/ng-template" id="promethee/components/aside/edit/inspect">
-  No option for aside.
+  <div class="form-group">
+    <label class="label-control">Visible content</label>
+    <summernote config="summernoteConfig" ng-model="promethee.inspected.attributes.visible_content"></summernote>
+  </div>
+
+  <div class="form-group">
+    <label class="label-control">Collapsed content</label>
+    <summernote config="summernoteConfig" ng-model="promethee.inspected.attributes.collapsed_content"></summernote>
+  </div>
 </script>

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

@@ -1,14 +1,12 @@
 <script type="text/ng-template" id="promethee/components/aside/edit/move">
   <%= render 'promethee/edit/move.header', type: 'aside' %>
-      <ng-include src="'promethee/move/components'"></ng-include>
-      <div
-        class=" promethee-edit__move__droppable
-                promethee-edit__move__droppable--row"
-        droppable
-        data-index="{{$index+1}}"
-        data-type="{{type}}"
-        >
-      </div>
+      <aside ng-if="component.attributes.collapsed_content">
+        {{component.attributes.visible_content | htmlSafe}}
+        <div ng-hide="collapsed" ng-bind-html="component.attributes.collapsed_content | htmlSafe"></div>
+        <a data-toggle="collapse" href="#aside-collapse-{{component.id}}">{/a>
+      </aside>
+
+      <aside ng-if="!component.attributes.collapsed_content" ng-bind-html="component.attributes.visible_content"></aside>
     </div>
   </div>
 </script>

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

@@ -9,9 +9,16 @@ title = component[:attributes][:title].to_s
 subtitle = component[:attributes][:subtitle].to_s
 %>
 <div class="<%= promethee_class_for(component) %>" style="background-image: url(<%= url_for(blob.variant(resize: '1920')) if blob %>)">
-  <hgroup>
-    <% unless surtitle.blank? %><h2><%= surtitle %></h2><% end %>
-    <% unless title.blank? %><h1><%= title %></h1><% end %>
-    <% unless subtitle.blank? %><h2><%= subtitle %></h2><% end %>
-  </hgroup>
+  <% if surtitle.present? %>
+    <p><%= surtitle %></p>
+  <% end %>
+
+  <% if title.present? %>
+    <h1><%= title %></h1>
+  <% end %>
+
+  <% if subtitle.present? %>
+    <p><%= subtitle %></p>
+  <% end %>
+
 </div>

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '1.4.7'
+    VERSION = '1.4.8'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
 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.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Bring fire to your page