promethee 1.2.1 → 1.2.2

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: 8a3f738767613ef1e4bf21969c35fb8c43166dfe
4
- data.tar.gz: 1749396ff01a0343609d40cad3a7761f5032e378
3
+ metadata.gz: 837722cd93470c7d892212e0095fcf9306410778
4
+ data.tar.gz: 0aab2bd6e43bb0d21728ba624f4b6e2d03173713
5
5
  SHA512:
6
- metadata.gz: 52cb76ef5ba1d2671378cacf833b3a1f13fb14abfd486d446a22757c911d64804e0abcd6bb5c000260677e24ede886bdb74c18b799b3d9502acfc68f0a8ccd8e
7
- data.tar.gz: 330ba22bd2757d269b547863fc3416df3bc9d334623c34daa5a2f593b4f5a0562dadfdf911a5be297de90ff121df65468dea73c5d965bf204bb2722698c7d97d
6
+ metadata.gz: f16550b08f9412db6a241907ade48f78cfe7c48f447e6caa4cd9c65ed718f6f84788a823993f77c5ca50221c9256e279e314ff26422070f8eaec985c78caf94a
7
+ data.tar.gz: d7661c8cc03048409b6f2af5c02b8518c5f328371456257b08dcdbf34ec0b63feb3a33ada7e9a2f343c3482954c6ad52c56f27233aa37666b9c9dd1cfba1f232
data/README.md CHANGED
@@ -248,7 +248,16 @@ This would do quite the same thing:
248
248
  <input type="submit">
249
249
  </form>
250
250
  ```
251
+ ### SQLite (or other not native json storage)
251
252
 
253
+ Prométhée takes a ruby hash.
254
+ With Postgresql, there's a native jsonb storage, which results in a ruby hash.
255
+ If you use SQLite, you'll store json as string, and will need to convert it to a hash.
256
+ The code example below does this properly, with keys as symbols and not as strings.
257
+
258
+ ```erb
259
+ JSON.parse(data, symbolize_names: true)
260
+ ```
252
261
 
253
262
  ### Roadmap
254
263
  - ~~Gem setup~~
@@ -69,6 +69,7 @@ promethee.controller('PrometheeController', ['$scope', 'definitions', '$http', f
69
69
  data: $scope.data,
70
70
  inspected: null,
71
71
  mode: 'write',
72
+ //mode: 'move',
72
73
  preview: 'desktop',
73
74
  fullscreen: false
74
75
  };
@@ -150,6 +151,7 @@ promethee
150
151
  revertDuration: 0,
151
152
  scroll: true,
152
153
  refreshPositions: true,
154
+ cursor: 'move',
153
155
  start: function() {
154
156
  var $elementDragged = $(element[0]);
155
157
  var type = $elementDragged.data('type');
@@ -1,39 +1,56 @@
1
1
  .promethee-edit__move
2
- width: 432px
2
+ width: 720px
3
3
  margin: 0 auto
4
4
  padding-bottom: 200px
5
5
  *
6
6
  font-size: 100%
7
7
  line-height: 100%
8
8
  margin: 0
9
+ &__columns
10
+ user-select: none
11
+ height: 100%
12
+ position: absolute
13
+ width: 730px
14
+ z-index: 0
15
+ opacity: 0.03
16
+ .col
17
+ height: 100%
18
+ .color
19
+ height: 100%
20
+ background: black
21
+ &__page
22
+ z-index: 1
9
23
  .header
10
- padding: 5px 0
11
- font-size: 9px
24
+ background: #253742
25
+ padding: 5px 5px
26
+ font-size: 8px
27
+ color: white
12
28
  text-transform: uppercase
13
- border-bottom: 1px solid #ccc
29
+ margin-bottom: 5px
14
30
  &__component
15
31
  user-select: none
16
-
17
32
  .row
18
33
  margin-left: -5px
19
34
  margin-right: -5px
20
35
  .col
21
36
  padding-left: 5px
22
37
  padding-right: 5px
23
-
24
38
  &__droppable
25
39
  visibility: hidden
40
+ opacity: .2
26
41
  margin: 10px 0
27
42
  position: relative
28
- background: #253742
43
+ background: white
29
44
  width: 100%
30
45
  height: 10px
31
- transition: width .2s, height .2s
46
+ border: 1px dashed #253742
47
+ transition: width .2s, height .2s, opacity .2s
32
48
  &.ui-droppable-active
33
49
  visibility: visible
34
50
  height: 10px
35
51
  &.ui-droppable-hover
36
- height: 20px
52
+ opacity: 1
53
+ height: 100px
37
54
  &--row
38
55
  position: absolute
39
56
  display: none
@@ -43,16 +60,18 @@
43
60
  width: 10px
44
61
  height: 100%
45
62
  &.ui-droppable-hover
63
+ opacity: 1
46
64
  width: 20px
47
65
  height: 100%
48
66
  &--first
49
67
  display: block
50
68
  left: -10px
51
- top: 9px
69
+ top: 10px
70
+ bottom: 20px
52
71
  &--inside-column
53
72
  display: block
54
- right: -10px
55
- top: -11px
73
+ right: -5px
74
+ top: -10px
56
75
 
57
76
  // All this is done to mask droppable that would put the draggable at the same position
58
77
  // &--hidden
@@ -1,5 +1,12 @@
1
1
  <div class="promethee-edit__move" ng-show="promethee.mode == 'move'">
2
- <ng-include src="'promethee/move/components'"></ng-include>
2
+ <div class="promethee-edit__move__columns row">
3
+ <% 12.times do %>
4
+ <div class="col col-md-1"><div class="color"></div></div>
5
+ <% end %>
6
+ </div>
7
+ <div class="promethee-edit__move__page">
8
+ <ng-include src="'promethee/move/components'"></ng-include>
9
+ </div>
3
10
  </div>
4
11
 
5
12
  <script type="text/ng-template" id="promethee/move/component">
@@ -1,5 +1,5 @@
1
1
  module Promethee
2
2
  module Rails
3
- VERSION = '1.2.1'
3
+ VERSION = '1.2.2'
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.1
4
+ version: 1.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Julien Dargelos
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2018-01-17 00:00:00.000000000 Z
14
+ date: 2018-01-18 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rails