smartkiosk-server 0.12.1 → 0.13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (78) hide show
  1. data/.ruby-version +1 -1
  2. data/Gemfile +9 -6
  3. data/Gemfile.lock +36 -9
  4. data/app/assets/images/sort-asc.png +0 -0
  5. data/app/assets/images/sort-desc.png +0 -0
  6. data/app/assets/javascripts/application.js +1 -1
  7. data/app/assets/javascripts/monitoring.js.coffee +25 -0
  8. data/app/assets/javascripts/monitoring/helpers/application.js.coffee +12 -0
  9. data/app/assets/javascripts/monitoring/layouts/application.js.coffee +2 -0
  10. data/app/assets/javascripts/monitoring/pages/application.js.coffee +1 -0
  11. data/app/assets/javascripts/monitoring/pages/welcome/index.js.coffee +229 -0
  12. data/app/assets/javascripts/monitoring/resources/.gitkeep +0 -0
  13. data/app/assets/javascripts/monitoring/routes.js.coffee +8 -0
  14. data/app/assets/javascripts/monitoring/templates/layouts/.gitkeep +0 -0
  15. data/app/assets/javascripts/monitoring/templates/layouts/application.jst.hamlc +1 -0
  16. data/app/assets/javascripts/monitoring/templates/pages/welcome/_row.jst.hamlc +28 -0
  17. data/app/assets/javascripts/monitoring/templates/pages/welcome/_tbody.jst.hamlc +3 -0
  18. data/app/assets/javascripts/monitoring/templates/pages/welcome/index.jst.hamlc +37 -0
  19. data/app/assets/javascripts/monitoring/templates/widgets/.gitkeep +0 -0
  20. data/app/assets/javascripts/monitoring/widgets/.gitkeep +0 -0
  21. data/app/assets/javascripts/monitoring_preloader.js.coffee.erb +17 -0
  22. data/app/assets/stylesheets/active_admin.css.scss +4 -4
  23. data/app/assets/stylesheets/{fonts.css.scss → active_admin/fonts.css.scss} +0 -0
  24. data/app/assets/stylesheets/active_admin/provider_groups.css.scss +12 -0
  25. data/app/assets/stylesheets/{provider_receipt_templates.css.scss → active_admin/provider_receipt_templates.css.scss} +0 -0
  26. data/app/assets/stylesheets/{terminals.css.scss → active_admin/terminals.css.scss} +0 -0
  27. data/app/assets/stylesheets/monitoring.css.scss +4 -0
  28. data/app/assets/stylesheets/monitoring/bootstrap.css +9 -0
  29. data/app/assets/stylesheets/monitoring/theme.css.scss +35 -0
  30. data/app/controllers/monitoring_controller.rb +31 -0
  31. data/app/controllers/payments_controller.rb +1 -1
  32. data/app/controllers/terminal_builds_controller.rb +2 -0
  33. data/app/controllers/welcome_controller.rb +5 -2
  34. data/app/models/ability.rb +6 -4
  35. data/app/models/agent.rb +6 -0
  36. data/app/models/collection.rb +2 -2
  37. data/app/models/payment.rb +3 -3
  38. data/app/models/provider_gateway.rb +1 -1
  39. data/app/models/report_result.rb +1 -1
  40. data/app/models/report_template.rb +3 -3
  41. data/app/models/role.rb +51 -10
  42. data/app/models/terminal.rb +25 -1
  43. data/app/models/terminal_build.rb +1 -1
  44. data/app/models/terminal_order.rb +1 -1
  45. data/app/models/terminal_ping.rb +3 -0
  46. data/app/models/terminal_profile.rb +6 -0
  47. data/app/models/user_role.rb +1 -1
  48. data/app/views/monitoring/index.html.erb +28 -0
  49. data/config.ru +7 -0
  50. data/config/deploy.rb +1 -1
  51. data/config/environments/development.rb +2 -0
  52. data/config/environments/production.rb +1 -1
  53. data/config/initializers/monitoring.rb +3 -0
  54. data/config/initializers/redis.rb +1 -1
  55. data/config/locales/activerecord.ru.yml +14 -0
  56. data/config/locales/smartkiosk.ru.yml +38 -0
  57. data/config/routes.rb +1 -1
  58. data/db/migrate/20130419125334_add_ping_to_terminals.rb +22 -0
  59. data/db/schema.rb +25 -7
  60. data/lib/blueprints.rb +2 -0
  61. data/lib/monitorer.rb +41 -0
  62. data/lib/seeder.rb +1 -1
  63. data/lib/smartkiosk/server/version.rb +1 -1
  64. data/vendor/assets/javascripts/chosen.jquery.js +1 -1
  65. data/vendor/assets/javascripts/cookie.jquery.js +95 -0
  66. data/vendor/assets/javascripts/copypaste.js +148 -0
  67. data/vendor/assets/javascripts/event-drag.jquery.js +402 -0
  68. data/vendor/assets/javascripts/sheetclip.js +87 -0
  69. data/vendor/assets/javascripts/slick.cellrangedecorator.js +64 -0
  70. data/vendor/assets/javascripts/slick.cellrangeselector.js +111 -0
  71. data/vendor/assets/javascripts/slick.cellselectionmodel.js +152 -0
  72. data/vendor/assets/javascripts/slick.core.js +458 -0
  73. data/vendor/assets/javascripts/slick.grid.js +3287 -0
  74. data/vendor/assets/stylesheets/slick.grid.css +167 -0
  75. metadata +42 -9
  76. data/app/assets/stylesheets/provider_groups.css.scss +0 -12
  77. data/app/views/layouts/application.html.erb +0 -1
  78. data/app/views/welcome/index.html.erb +0 -25
@@ -0,0 +1,167 @@
1
+ /*
2
+ IMPORTANT:
3
+ In order to preserve the uniform grid appearance, all cell styles need to have padding, margin and border sizes.
4
+ No built-in (selected, editable, highlight, flashing, invalid, loading, :focus) or user-specified CSS
5
+ classes should alter those!
6
+ */
7
+
8
+ .slick-header.ui-state-default, .slick-headerrow.ui-state-default {
9
+ width: 100%;
10
+ overflow: hidden;
11
+ border-left: 0px;
12
+ }
13
+
14
+ .slick-header-columns, .slick-headerrow-columns {
15
+ position: relative;
16
+ white-space: nowrap;
17
+ cursor: default;
18
+ overflow: hidden;
19
+ border-bottom: 2px solid black;
20
+ font-weight: bold;
21
+ background-color: #EEE;
22
+ }
23
+
24
+ .slick-header-column.ui-state-default {
25
+ position: relative;
26
+ display: inline-block;
27
+ overflow: hidden;
28
+ -o-text-overflow: ellipsis;
29
+ text-overflow: ellipsis;
30
+ height: 16px;
31
+ line-height: 16px;
32
+ margin: 0;
33
+ padding: 4px;
34
+ padding-top: 8px;
35
+ padding-bottom: 8px;
36
+ border-right: 1px solid silver;
37
+ border-left: 0px;
38
+ border-top: 0px;
39
+ border-bottom: 0px;
40
+ float: left;
41
+ }
42
+
43
+ .slick-headerrow-column.ui-state-default {
44
+ padding: 4px;
45
+ }
46
+
47
+ .slick-header-column-sorted {
48
+ font-style: italic;
49
+ }
50
+
51
+ .slick-sort-indicator {
52
+ display: inline-block;
53
+ }
54
+
55
+ .slick-sort-indicator-desc {
56
+ background: url(/assets/sort-desc.png);
57
+ width: 8px;
58
+ height: 5px;
59
+ margin-right: 2px;
60
+ }
61
+
62
+ .slick-sort-indicator-asc {
63
+ background: url(/assets/sort-asc.png);
64
+ width: 8px;
65
+ height: 5px;
66
+ margin-right: 2px;
67
+ }
68
+
69
+ .slick-resizable-handle {
70
+ position: absolute;
71
+ font-size: 0.1px;
72
+ display: block;
73
+ cursor: col-resize;
74
+ width: 4px;
75
+ right: 0px;
76
+ top: 0;
77
+ height: 100%;
78
+ }
79
+
80
+ .slick-sortable-placeholder {
81
+ background: silver;
82
+ }
83
+
84
+ .grid-canvas {
85
+ position: relative;
86
+ outline: 0;
87
+ }
88
+
89
+ .slick-row.ui-widget-content, .slick-row.ui-state-active {
90
+ position: absolute;
91
+ border: 0px;
92
+ width: 100%;
93
+ }
94
+
95
+ .slick-cell, .slick-headerrow-column {
96
+ position: absolute;
97
+ border: 1px solid transparent;
98
+ border-right: 1px dotted silver;
99
+ border-bottom-color: silver;
100
+ overflow: hidden;
101
+ -o-text-overflow: ellipsis;
102
+ text-overflow: ellipsis;
103
+ vertical-align: middle;
104
+ z-index: 1;
105
+ padding: 1px 2px 2px 1px;
106
+ margin: 0;
107
+ white-space: nowrap;
108
+ cursor: default;
109
+ }
110
+
111
+ .slick-cell.selected {
112
+ background-color: #FFF9C9;
113
+ }
114
+
115
+ .slick-group {
116
+ }
117
+
118
+ .slick-group-toggle {
119
+ display: inline-block;
120
+ }
121
+
122
+ .slick-cell.highlighted {
123
+ background: lightskyblue;
124
+ background: rgba(0, 0, 255, 0.2);
125
+ -webkit-transition: all 0.5s;
126
+ -moz-transition: all 0.5s;
127
+ -o-transition: all 0.5s;
128
+ transition: all 0.5s;
129
+ }
130
+
131
+ .slick-cell.flashing {
132
+ border: 1px solid red !important;
133
+ }
134
+
135
+ .slick-cell.editable {
136
+ z-index: 11;
137
+ overflow: visible;
138
+ background: white;
139
+ border-color: black;
140
+ border-style: solid;
141
+ }
142
+
143
+ .slick-cell:focus {
144
+ outline: none;
145
+ }
146
+
147
+ .slick-reorder-proxy {
148
+ display: inline-block;
149
+ background: blue;
150
+ opacity: 0.15;
151
+ filter: alpha(opacity = 15);
152
+ cursor: move;
153
+ }
154
+
155
+ .slick-reorder-guide {
156
+ display: inline-block;
157
+ height: 2px;
158
+ background: blue;
159
+ opacity: 0.7;
160
+ filter: alpha(opacity = 70);
161
+ }
162
+
163
+ .slick-selection {
164
+ z-index: 10;
165
+ position: absolute;
166
+ border: 2px dashed black;
167
+ }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: smartkiosk-server
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.12.1
4
+ version: '0.13'
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-04-10 00:00:00.000000000 Z
13
+ date: 2013-04-23 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
@@ -97,25 +97,46 @@ files:
97
97
  - app/assets/fonts/PT_Sans-Web-Regular.ttf
98
98
  - app/assets/fonts/PT_Sans-Web-Regular.woff
99
99
  - app/assets/images/chosen-sprite.png
100
+ - app/assets/images/sort-asc.png
101
+ - app/assets/images/sort-desc.png
100
102
  - app/assets/javascripts/active_admin.js.coffee
101
103
  - app/assets/javascripts/active_admin/chosen.js.erb.coffee
102
104
  - app/assets/javascripts/active_admin/pages/application.js.coffee
103
105
  - app/assets/javascripts/active_admin/qtip.js.coffee
104
106
  - app/assets/javascripts/active_admin/sortable_forms.js.coffee
105
107
  - app/assets/javascripts/application.js
108
+ - app/assets/javascripts/monitoring.js.coffee
109
+ - app/assets/javascripts/monitoring/helpers/application.js.coffee
110
+ - app/assets/javascripts/monitoring/layouts/application.js.coffee
111
+ - app/assets/javascripts/monitoring/pages/application.js.coffee
112
+ - app/assets/javascripts/monitoring/pages/welcome/index.js.coffee
113
+ - app/assets/javascripts/monitoring/resources/.gitkeep
114
+ - app/assets/javascripts/monitoring/routes.js.coffee
115
+ - app/assets/javascripts/monitoring/templates/layouts/.gitkeep
116
+ - app/assets/javascripts/monitoring/templates/layouts/application.jst.hamlc
117
+ - app/assets/javascripts/monitoring/templates/pages/welcome/_row.jst.hamlc
118
+ - app/assets/javascripts/monitoring/templates/pages/welcome/_tbody.jst.hamlc
119
+ - app/assets/javascripts/monitoring/templates/pages/welcome/index.jst.hamlc
120
+ - app/assets/javascripts/monitoring/templates/widgets/.gitkeep
121
+ - app/assets/javascripts/monitoring/widgets/.gitkeep
122
+ - app/assets/javascripts/monitoring_preloader.js.coffee.erb
106
123
  - app/assets/javascripts/report_templates.js.coffee
107
124
  - app/assets/javascripts/terminals.js.coffee
108
125
  - app/assets/stylesheets/active_admin.css.scss
109
126
  - app/assets/stylesheets/active_admin/PIE.css.scss
110
127
  - app/assets/stylesheets/active_admin/filter_numeric_range.css.scss
128
+ - app/assets/stylesheets/active_admin/fonts.css.scss
129
+ - app/assets/stylesheets/active_admin/provider_groups.css.scss
130
+ - app/assets/stylesheets/active_admin/provider_receipt_templates.css.scss
111
131
  - app/assets/stylesheets/active_admin/selectable_check_boxes.css.scss
112
132
  - app/assets/stylesheets/active_admin/sortable_forms.css.scss
113
- - app/assets/stylesheets/fonts.css.scss
114
- - app/assets/stylesheets/provider_groups.css.scss
115
- - app/assets/stylesheets/provider_receipt_templates.css.scss
116
- - app/assets/stylesheets/terminals.css.scss
133
+ - app/assets/stylesheets/active_admin/terminals.css.scss
134
+ - app/assets/stylesheets/monitoring.css.scss
135
+ - app/assets/stylesheets/monitoring/bootstrap.css
136
+ - app/assets/stylesheets/monitoring/theme.css.scss
117
137
  - app/controllers/application_controller.rb
118
138
  - app/controllers/collections_controller.rb
139
+ - app/controllers/monitoring_controller.rb
119
140
  - app/controllers/payments_controller.rb
120
141
  - app/controllers/session_records_controller.rb
121
142
  - app/controllers/system_receipt_templates_controller.rb
@@ -178,8 +199,7 @@ files:
178
199
  - app/views/admin/terminals/pings.html.arb
179
200
  - app/views/admin/terminals/session_records.html.arb
180
201
  - app/views/admin/terminals/upgrade_build.html.arb
181
- - app/views/layouts/application.html.erb
182
- - app/views/welcome/index.html.erb
202
+ - app/views/monitoring/index.html.erb
183
203
  - app/workers/gem_stash_update_worker.rb
184
204
  - app/workers/pay_worker.rb
185
205
  - app/workers/report_worker.rb
@@ -202,6 +222,7 @@ files:
202
222
  - config/initializers/inflections.rb
203
223
  - config/initializers/mime_types.rb
204
224
  - config/initializers/money.rb
225
+ - config/initializers/monitoring.rb
205
226
  - config/initializers/redis.rb
206
227
  - config/initializers/secret_token.rb
207
228
  - config/initializers/session_store.rb
@@ -263,6 +284,7 @@ files:
263
284
  - db/migrate/20130325154559_add_externally_paid_to_payments.rb
264
285
  - db/migrate/20130410085714_add_groupping_to_provider_fields.rb
265
286
  - db/migrate/20130410142059_add_address_details_to_terminals.rb
287
+ - db/migrate/20130419125334_add_ping_to_terminals.rb
266
288
  - db/schema.rb
267
289
  - db/seeds.rb
268
290
  - db/seeds/receipt_templates/payment.txt
@@ -286,6 +308,7 @@ files:
286
308
  - lib/formtastic/inputs/selectable_check_boxes.rb
287
309
  - lib/gem_stasher.rb
288
310
  - lib/kaminari/array_extension_fix.rb
311
+ - lib/monitorer.rb
289
312
  - lib/paper_trail/version_fix.rb
290
313
  - lib/report_builder.rb
291
314
  - lib/seeder.rb
@@ -313,13 +336,23 @@ files:
313
336
  - spec/spec_helper.rb
314
337
  - vendor/assets/javascripts/.gitkeep
315
338
  - vendor/assets/javascripts/chosen.jquery.js
339
+ - vendor/assets/javascripts/cookie.jquery.js
340
+ - vendor/assets/javascripts/copypaste.js
316
341
  - vendor/assets/javascripts/datepicker-ru.jquery.js
342
+ - vendor/assets/javascripts/event-drag.jquery.js
317
343
  - vendor/assets/javascripts/nestedSortable.jquery.js
318
344
  - vendor/assets/javascripts/qtip.jquery.js
345
+ - vendor/assets/javascripts/sheetclip.js
346
+ - vendor/assets/javascripts/slick.cellrangedecorator.js
347
+ - vendor/assets/javascripts/slick.cellrangeselector.js
348
+ - vendor/assets/javascripts/slick.cellselectionmodel.js
349
+ - vendor/assets/javascripts/slick.core.js
350
+ - vendor/assets/javascripts/slick.grid.js
319
351
  - vendor/assets/stylesheets/.gitkeep
320
352
  - vendor/assets/stylesheets/chosen.jquery.css
321
353
  - vendor/assets/stylesheets/modules/PIE.htc
322
354
  - vendor/assets/stylesheets/qtip.jquery.css.scss
355
+ - vendor/assets/stylesheets/slick.grid.css
323
356
  - vendor/plugins/.gitkeep
324
357
  homepage: https://github.com/smartkiosk/smartkiosk-server
325
358
  licenses: []
@@ -335,7 +368,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
335
368
  version: '0'
336
369
  segments:
337
370
  - 0
338
- hash: -4360942284115096697
371
+ hash: 1857187141892860625
339
372
  required_rubygems_version: !ruby/object:Gem::Requirement
340
373
  none: false
341
374
  requirements:
@@ -1,12 +0,0 @@
1
- // fieldset.provider_groups {
2
- // img {
3
- // padding-right: 5px;
4
- // }
5
-
6
- // li.file {
7
- // display: block !important;
8
- // label { display: none }
9
- // float: right;
10
- // padding: 5px;
11
- // }
12
- // }
@@ -1 +0,0 @@
1
- <%= yield %>
@@ -1,25 +0,0 @@
1
- <!DOCTYPE html>
2
- <html>
3
- <head>
4
- <title>Access rejected (403)</title>
5
- <style type="text/css">
6
- body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
7
- div.dialog {
8
- width: 25em;
9
- padding: 0 4em;
10
- margin: 4em auto 0 auto;
11
- border: 1px solid #ccc;
12
- border-right-color: #999;
13
- border-bottom-color: #999;
14
- }
15
- h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
16
- </style>
17
- </head>
18
-
19
- <body>
20
- <div class="dialog">
21
- <h1>You are not supposed to be here.</h1>
22
- <p>You might be unauthorized or just mistyped the url.</p>
23
- </div>
24
- </body>
25
- </html>