rbbt-rest 1.8.51 → 1.8.52

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 65d315a1aede3fcdac01d916d54cfdabf5dfc132
4
- data.tar.gz: f25e1fe1e2d9be5460a4821067c9e6a389582183
3
+ metadata.gz: e414c27e3ed3a44c1a059d25e2f050391a81a8c6
4
+ data.tar.gz: 46ac7dc29040a1e1c88d262793cdf756d839870e
5
5
  SHA512:
6
- metadata.gz: 309ba34ab698e6402651aa00a45fa48156e401bf6051b5c720621dd0989b02cc73284de9fc81b769c2c665cb87464458f27fc86ee8a6978db0257f26c0191367
7
- data.tar.gz: 9a6e03686f8d0f6d3d3353cfa3dc8d6e37c69cc87e0f2aac5c6e37044c03790520150ed17576e91ea4e1e8c6a3c899db4fb5319c3ba6c42d4b88cd315ed24c4c
6
+ metadata.gz: 56807a6bff2ef23869cc5493cb3bec8af634705093c1e4af15f8163ae67b3242fce46343f2e7ce3083cfc86ddeb3bd74e6cd1e320fae431d317a7d5e0bdd9a30
7
+ data.tar.gz: cf46f5eec18acdc2fafbc10e1eae383a793ea22c47f60ca1abd7b92179d633cd63072ec35807954c9b10ca55edce1093be14d3320eb5bf4342c7d8e7113682db
@@ -264,11 +264,17 @@ module Sinatra
264
264
  entities.each do |entity|
265
265
  _matches_h = kb.neighbours(database, entity)
266
266
  _matches_h.each do |key, _matches|
267
- target_type = _matches.target_entity_type
268
-
269
- _matches = acc[target_type].concat _matches if acc[target_type] and acc[target_type].any?
270
-
271
- acc.merge!({ target_type => _matches }) if _matches and _matches.any?
267
+ if _matches and _matches.any?
268
+ target_type = _matches.target_entity_type
269
+
270
+ if acc[target_type].nil?
271
+ acc[target_type] = _matches
272
+ else
273
+ acc[target_type].concat _matches
274
+ end
275
+ else
276
+ acc
277
+ end
272
278
  end
273
279
  end
274
280
  acc
@@ -82,6 +82,8 @@ table, table.responsive
82
82
  clear: both
83
83
  span.title
84
84
  border: none !important
85
+ > a
86
+ padding: 0.5em
85
87
 
86
88
  table
87
89
  .caption, .title
@@ -126,6 +128,20 @@ option[disabled]
126
128
  display: inline-block
127
129
  text-align: center
128
130
 
131
+ .plus_sign
132
+ white-space: nowrap
133
+ &:before
134
+ content: "\002B"
135
+ display: inline-block
136
+ text-align: center
137
+
138
+ .minus_sign
139
+ white-space: nowrap
140
+ &:before
141
+ content: "\002D"
142
+ display: inline-block
143
+ text-align: center
144
+
129
145
  a.entity.highlight
130
146
  @extend .bulleted
131
147
  font-weight: bold
@@ -149,27 +165,46 @@ a.entity[data-aes-color]:not([data-aes-color=none])
149
165
  &:before
150
166
  color: green
151
167
 
152
- span.bullet
153
- @extend .bulleted
168
+ .small_fav_button
154
169
  @extend .pointer
155
170
  &:hover
156
- border: 1px solid rgba(0,0,0,0.12)
171
+ background: rgba(0,0,0,0.12)
172
+ &:hover
173
+ background: rgba(0,0,0,0.12)
174
+ display: inline-block
157
175
  width: 2em
158
176
  height: 2.5em
159
177
  line-height: 2.5em
160
178
  text-align: center
161
- position: absolute
162
- left: 0
179
+
180
+ .fav_control_button
181
+ @extend .small_fav_button
182
+ //position: absolute
183
+ //left: 0
184
+ float: left
185
+ &+a
186
+ padding-left: 0em
187
+ width: calc(100% - 2em) !important
188
+ overflow: hidden
189
+ text-overflow: ellipsis
190
+
191
+ span.open_fav_controls
192
+ @extend .fav_control_button
193
+ @extend .plus_sign
194
+
195
+ span.minus
196
+ @extend .small_fav_button
197
+ @extend .minus_sign
198
+
199
+ span.bullet
200
+ @extend .small_fav_button
201
+ @extend .bulleted
163
202
  &.red
164
203
  color: red
165
204
  &.green
166
205
  color: green
167
- &+a
168
- color: red
169
- font-style:italic
170
- margin-left: 2em !important
171
- padding-left: 0em
172
- width: calc(100% - 2em) !important
206
+ &.purple
207
+ color: purple
173
208
 
174
209
  //.dropdown.item .dropdown.item > .menu
175
210
  overflow-y: auto
@@ -227,3 +262,11 @@ ul.tasks
227
262
  .hide_overflow
228
263
  overflow: hidden
229
264
  text-overflow: ellipsis
265
+
266
+ .float.right
267
+ display: inline-block
268
+ float: right
269
+
270
+ .float.left
271
+ display: inline-block
272
+ float: left
@@ -105,6 +105,20 @@ fav_module.draw_favourite_menu = function(){
105
105
  })))
106
106
  }
107
107
 
108
+ fav_module.list_controls = m.prop()
109
+ fav_module.toggle_list_controls = function(list){
110
+ if (fav_module.list_controls() == list)
111
+ fav_module.list_controls(undefined)
112
+ else
113
+ fav_module.list_controls(list)
114
+
115
+ fav_module.update()
116
+ }
117
+
118
+ fav_module.remove_list = function(type, list){
119
+ rbbt.post({url: '/remove_favourite_entity_list/' + type + '/' + clean_element(list)}).then(fav_module.update)
120
+ }
121
+
108
122
  fav_module.draw_favourite_list_menu = function(){
109
123
  var favourites = fav_module.lists.types()
110
124
  var types = Object.keys(favourites)
@@ -122,7 +136,18 @@ fav_module.draw_favourite_list_menu = function(){
122
136
  return rbbt.mview.dropdown(type, lists.map(function(list, index){
123
137
  url = _type[list].url()
124
138
  var link = m('a.item', {href: url, style: 'display: inline-block'}, _type[list].name)
125
- return [m('span.bullet.green.highlight', {onclick: function(){_type[list].highlight('green'); return false}},''),link,m('br')]
139
+ if (fav_module.list_controls() == list){
140
+ var highlight_g = m('span.bullet.green.highlight', {onclick: function(){_type[list].highlight('green'); return false}},'')
141
+ var highlight_r = m('span.bullet.red.highlight', {onclick: function(){_type[list].highlight('red'); return false}},'')
142
+ var highlight_p = m('span.bullet.purple.highlight', {onclick: function(){_type[list].highlight('purple'); return false}},'')
143
+ var remove = m('span.minus.remove', {onclick: function(){fav_module.remove_list(type,list); return false}},'')
144
+ link = [link, m('div.controls', [highlight_g, highlight_p, highlight_r, remove])]
145
+ }
146
+ return [
147
+ m('span.open_fav_controls', {onclick: function(){fav_module.toggle_list_controls(list); return false}},''),
148
+ link,
149
+ m('br')
150
+ ]
126
151
  }))
127
152
  })
128
153
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rbbt-rest
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.8.51
4
+ version: 1.8.52
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-02-07 00:00:00.000000000 Z
11
+ date: 2017-02-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake