promethee 1.2.7 → 1.2.8

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
2
  SHA1:
3
- metadata.gz: 960025acde1bf01f45d7fe3c3116ad62779f36cf
4
- data.tar.gz: 8c603f7509b53949ba15fff0ad1a649e718526ec
3
+ metadata.gz: c3212d87a9edd604ee01df1efc88ffab92b2152f
4
+ data.tar.gz: 16143b0646eee97b14d3884782564bcb7d7ec1f9
5
5
  SHA512:
6
- metadata.gz: 19726792f185919701c35a2ef93faf75b4a166f8cca19f0c91e55df6976ebdce555f4d3486b3c45b4e6db389dde8411d26661b7c6b2499c4edff4486535718ea
7
- data.tar.gz: '09ef7ab0bb016cf949f363049cd6ff2ba8d6fd663af1a5ed2c5a01dcc11deab44f48bec48d33a5056c3d02ec0732b3089fb617e1acab50777423735cd72bfbcb'
6
+ metadata.gz: 9bbd3f7fe6031b0296fdd1163ee007b6bfa066360e09658764d22b368bbd592008c0009d3adcff0691f9843dae18f8b696c52970f9d81af1a01dd1b66222a63c
7
+ data.tar.gz: 50fe8c5c1d88f342abaae4c130e4f5ef7e8ce1f77207fcd95fa7a97d4311973c6542891ee9d1e45842c0779bf9de4d9ec87afac7050d0b659443b7c4a5f3e5f3
@@ -11,7 +11,11 @@
11
11
  <ng-include src="'promethee/write/toolbar'"></ng-include>
12
12
  </div>
13
13
  <ng-include src="'promethee/write/components'"></ng-include>
14
- <ng-include src="'promethee/write/add_button'"></ng-include>
14
+ <span type="button"
15
+ class="btn btn-default btn-block"
16
+ ng-click="addComponentTo(component.children)">
17
+ Add component
18
+ </span>
15
19
  </div>
16
20
  </div>
17
21
  </script>
@@ -1,44 +1,31 @@
1
1
  <script type="text/ng-template" id="promethee/components/slider/edit/write">
2
2
  <div ng-controller="SliderController"
3
3
  ng-click="inspect(component, $event)"
4
- class=" row
5
- promethee-edit__component
4
+ class=" row
5
+ promethee-edit__component
6
6
  promethee-edit__component--slider">
7
7
  <div class="promethee-edit__component-selected" ng-class="{'promethee-edit__component-selected--visible': promethee.inspected === component}">
8
8
  <div class="promethee-edit__toolbar">
9
9
  Slider
10
10
  <ng-include src="'promethee/write/toolbar'"></ng-include>
11
- <div class="pull-right">
12
- <span ng-show="editing" ng-click="prev()" class="promethee-edit__button"><%= fa_icon 'chevron-left' %></span>
13
- <span ng-show="editing" ng-click="next()" class="promethee-edit__button"><%= fa_icon 'chevron-right' %></span>
14
- </div>
15
11
  </div>
16
- <div id="{{sliderId}}" class="carousel slide" data-ride="carousel" ng-init="components = component.children">
17
- <div class="carousel-inner" style="min-height: 100px">
18
- <div ng-repeat="component in components track by $index" class="item" ng-class="{active: $index === 0}">
19
- <ng-include src="'promethee/' + (editing ? 'write' : 'move') + '/component'"></ng-include>
12
+
13
+ <div class="row">
14
+ <div ng-init="components = component.children">
15
+ <div ng-repeat="component in components">
16
+ <div class="col-md-3">
17
+ <ng-include src="'promethee/write/component'"></ng-include>
18
+ </div>
20
19
  </div>
21
20
  </div>
22
- <a ng-hide="editing"
23
- ng-click="$event.preventDefault()"
24
- class="left carousel-control fontawesome-carousel-control"
25
- href="#{{sliderId}}"
26
- data-slide="prev">
27
- <%= fa_icon 'angle-left' %>
28
- </a>
29
- <a ng-hide="editing"
30
- ng-click="$event.preventDefault()"
31
- class="right carousel-control fontawesome-carousel-control"
32
- href="#{{sliderId}}"
33
- data-slide="next">
34
- <%= fa_icon 'angle-right' %>
35
- </a>
36
21
  </div>
22
+ <div class="clearfix"></div>
23
+
37
24
  <span type="button"
38
- class=" btn
39
- btn-default
25
+ class=" btn
26
+ btn-default
40
27
  btn-block"
41
- ng-click="addComponentTo(component.children);goToLastItem();">
28
+ ng-click="addComponentTo(component.children);">
42
29
  Add item
43
30
  </span>
44
31
  </div>
@@ -47,27 +34,6 @@
47
34
 
48
35
  <script>
49
36
  promethee.controller('SliderController', ['$scope', '$element', function($scope, $element) {
50
- $scope.sliderId = 'slider-' + Date.now() + '-' + Math.floor(Math.random()*1000000);
51
-
52
- $scope.$watch('editing', function(newVal) {
53
- if(newVal === true) $element.find('.carousel').carousel('pause');
54
- else $element.find('.carousel').carousel('play');
55
- });
56
-
57
- $scope.goToLastItem = function() {
58
- setTimeout(function() {
59
- $element.find('.carousel').carousel($scope.component.children.length - 1);
60
- }, 1000);
61
- };
62
-
63
- $scope.prev = function() {
64
- $element.find('.carousel').carousel('prev');
65
- };
66
-
67
- $scope.next = function() {
68
- $element.find('.carousel').carousel('next');
69
- };
70
37
 
71
- $element.find('.carousel').carousel();
72
38
  }]);
73
39
  </script>
@@ -1,5 +1,5 @@
1
1
  module Promethee
2
2
  module Rails
3
- VERSION = '1.2.7'
3
+ VERSION = '1.2.8'
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.2.7
4
+ version: 1.2.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Julien Dargelos