ish_manager 0.1.8.314 → 0.1.8.316

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.
Files changed (46) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/ish_manager/application.js +13 -39
  3. data/app/assets/stylesheets/ish_manager/application.scss +107 -155
  4. data/app/assets/stylesheets/ish_manager/galleries.scss +30 -18
  5. data/app/assets/stylesheets/ish_manager/maps.scss +45 -32
  6. data/app/assets/stylesheets/ish_manager/markers.scss +8 -0
  7. data/app/assets/stylesheets/ish_manager/pagination.scss +54 -0
  8. data/app/assets/stylesheets/ish_manager/photos.scss +39 -2
  9. data/app/assets/stylesheets/ish_manager/{tags.css → tags.scss} +0 -0
  10. data/app/assets/stylesheets/ish_manager/{bootstrap.css → trash/bootstrap.css} +0 -0
  11. data/app/assets/stylesheets/ish_manager/{materialize.css → trash/materialize.css} +0 -0
  12. data/app/assets/stylesheets/ish_manager/{reset.css → trash/reset.css} +0 -0
  13. data/app/controllers/ish_manager/leads_controller.rb +0 -1
  14. data/app/controllers/ish_manager/maps_controller.rb +0 -2
  15. data/app/controllers/ish_manager/markers_controller.rb +0 -2
  16. data/app/controllers/ish_manager/meetings_controller.rb +0 -2
  17. data/app/controllers/ish_manager/newsitems_controller.rb +4 -5
  18. data/app/helpers/ish_manager/application_helper.rb +12 -1
  19. data/app/views/ish_manager/application/_debug.haml +8 -6
  20. data/app/views/ish_manager/application/_main_footer.haml +7 -6
  21. data/app/views/ish_manager/application/_main_header.haml +1 -1
  22. data/app/views/ish_manager/application/_main_header_admin.haml +3 -7
  23. data/app/views/ish_manager/application/_main_header_guy.haml +1 -1
  24. data/app/views/ish_manager/application/_main_header_manager.haml +1 -1
  25. data/app/views/ish_manager/application/_search.haml +5 -10
  26. data/app/views/ish_manager/application/home.haml +8 -7
  27. data/app/views/ish_manager/galleries/_index.haml +19 -19
  28. data/app/views/ish_manager/galleries/_menu.haml +12 -14
  29. data/app/views/ish_manager/galleries/_menu_secondary.haml +12 -0
  30. data/app/views/ish_manager/galleries/_title.haml +12 -14
  31. data/app/views/ish_manager/galleries/{index_ajax.haml → index_ajax.haml-trash} +0 -0
  32. data/app/views/ish_manager/galleries/show.haml +24 -33
  33. data/app/views/ish_manager/markers/_index.haml +1 -1
  34. data/app/views/ish_manager/newsitems/_form.haml +3 -0
  35. data/app/views/ish_manager/photos/_index_thumbs.haml +7 -0
  36. data/app/views/ish_manager/photos/_meta_manager.haml +5 -5
  37. data/app/views/ish_manager/photos/_multinew.haml +4 -6
  38. data/app/views/ish_manager/videos/_index.haml +1 -1
  39. data/app/views/layouts/ish_manager/application.haml +53 -0
  40. data/app/views/layouts/ish_manager/{application2.haml → application.haml-trash} +0 -0
  41. metadata +12 -12
  42. data/app/assets/stylesheets/ish_manager/trash/bootstrap.min.css +0 -6
  43. data/app/assets/stylesheets/ish_manager/trash/bootstrap.min.css.map +0 -1
  44. data/app/views/ish_manager/galleries/_index_thumbs.haml +0 -1
  45. data/app/views/layouts/ish_manager/application.haml +0 -1
  46. data/app/views/layouts/ish_manager/application_no_material.haml +0 -53
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0e0a29a8f1154e898d9f840facfeccc05429dcbbfe917bc158118064f437070f
4
- data.tar.gz: f1edcac5a49a23dabbc91c9db5794dc1473142879ec4019c6c3757451f16a819
3
+ metadata.gz: 18b3141485361167090653528482f267142c3bab300104bbfadeb37be603c74b
4
+ data.tar.gz: 1fe3ab212b45dfdc7bc4be1370090e6dc884b9f8e4e4d59fd769f862279d51f1
5
5
  SHA512:
6
- metadata.gz: fd43313d6d453f5dea3f6aef518af6d543b1338fc24c29ab919b72b17791a1bcde4853e7467edf93def8a1ad0c18679c19aee3d1d1b7fadc36434a24ce268c4e
7
- data.tar.gz: 9d8f5ff3dc4fc1ecc82bc7b7ed5d2126c6c6622b54593617e0a811bb03e654732c4f8380bf40554497dc07b39dc2ab4ac45eb86ff40125184fcabf0e2e8d743e
6
+ metadata.gz: 40051254ade984fbacbb6ea63843d525ef6f6a9778259203488a6ea2b473b1ae17a6812ee2cff5903a95db72542fcfef6ef8bd45fd899c928dc0a2efa579f7b6
7
+ data.tar.gz: 68ec34c76a50135d8da176fec88fc975e9e94ef2b9535cc09a53f9b4f65ae3f3652607e7200d1a23152970fe5e23d20bf0917ed6d51dd531c02cbc7d01d4f88c
@@ -62,46 +62,24 @@ $(function () {
62
62
  }
63
63
 
64
64
 
65
- var mainHeaderContext = $(".manager--main-header")
66
- $(".manager--main-header #collapseHeader").click(function (_e) {
67
- if ($(this).hasClass('fa-compress')) {
68
- $(this).addClass('fa-expand')
69
- $(this).removeClass('fa-compress')
70
- localStorage.setItem('mainHeaderCollapsed', 'true')
71
- $('.content', $(this).parent()).css('display', 'none')
72
- } else {
73
- $(this).removeClass('fa-expand')
74
- $(this).addClass('fa-compress')
75
- localStorage.setItem('mainHeaderCollapsed', 'false')
76
- $('.content', $(this).parent()).css('display', 'block')
65
+ $(".collapse-expand").each(function(idx, obj) {
66
+ const thisId = $(this).attr('id')
67
+ const state = localStorage.getItem("collapse-expand#"+thisId)
68
+ if (state === 'collapsed') {
69
+ $(this).next().slideToggle();
77
70
  }
78
71
  })
79
- if (localStorage.getItem('mainHeaderCollapsed') === 'true') {
80
- $("#collapseHeader").addClass('fa-expand')
81
- $("#collapseHeader").removeClass('fa-compress')
82
- $(".content", mainHeaderContext).css("display", 'none')
83
- }
84
-
85
- var mainFooterContext = $(".manager--main-footer")
86
- $(".manager--main-footer #collapseFooter").click(function (_e) {
87
- const el = $(this).next()
88
- if ($(this).hasClass('fa-compress')) {
89
- $(this).addClass('fa-expand')
90
- $(this).removeClass('fa-compress')
91
- localStorage.setItem('mainFooterCollapsed', 'true')
92
- $(el, $(this).parent()).css('display', 'none')
72
+ $(".collapse-expand").click(function (_e) {
73
+ const thisId = $(this).attr('id')
74
+ const state = localStorage.getItem("collapse-expand#"+thisId)
75
+ if (state === 'collapsed') {
76
+ localStorage.removeItem("collapse-expand#"+thisId)
93
77
  } else {
94
- $(this).removeClass('fa-expand')
95
- $(this).addClass('fa-compress')
96
- localStorage.setItem('mainFooterCollapsed', 'false')
97
- $(el, $(this).parent()).css('display', 'block')
78
+ localStorage.setItem("collapse-expand#"+thisId, "collapsed")
98
79
  }
80
+ $(this).next().slideToggle();
99
81
  })
100
- if (localStorage.getItem('mainFooterCollapsed') === 'true') {
101
- $("#collapseFooter").addClass('fa-expand')
102
- $("#collapseFooter").removeClass('fa-compress')
103
- $(".content", mainFooterContext).css("display", 'none')
104
- }
82
+
105
83
 
106
84
  if ('function' === typeof $('body').DataTable) {
107
85
  $('#dataTable').DataTable({
@@ -112,10 +90,6 @@ $(function () {
112
90
  })
113
91
  }
114
92
 
115
- $(".addToggle").on('click', function () {
116
- $(this).next().toggle(500)
117
- })
118
-
119
93
  if ('function' === typeof $('body').datepicker) {
120
94
  $(".datepicker").datepicker({ dateFormat: 'yy-mm-dd' })
121
95
  }
@@ -1,44 +1,28 @@
1
1
  /*
2
- * This is a manifest file that'll be compiled into application.css, which will include all the files
3
- * listed below.
4
- *
5
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
6
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
7
- *
8
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
9
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
10
- * files in this directory. Styles in this file should be added after the last require_* statement.
11
- * It is generally better to create a new file per style scope.
12
- *
13
- * alphabetized : )
2
+ * Alphabetized : )
14
3
  *
4
+ *= require ish_manager/jquery-ui
15
5
  *= require_self
16
- *
17
- ** Utils
18
- ** Newsitems
19
- ** Reports
20
- *
21
6
  *= require ish_manager/galleries
22
- *= require ish_manager/jquery-ui
23
7
  *= require ish_manager/maps
8
+ *= require ish_manager/markers
24
9
  *= require ish_manager/leads
25
10
  *= require ish_manager/photos
26
11
  *= require ish_manager/tags
27
12
  *= require ish_manager/user_profiles
28
13
  *= require ish_manager/videos
29
- */
30
-
31
-
32
-
33
- /*
34
- * Utils
14
+ *= require ish_manager/pagination
35
15
  **/
36
16
 
17
+
37
18
  body {
38
19
  background: #dedede;
39
20
  font-size: 20px;
40
21
  }
41
-
22
+ hr {
23
+ background: red;
24
+ height: 1px !important;
25
+ }
42
26
  pre {
43
27
  background: #e0e0e0;
44
28
  padding: 1em;
@@ -52,39 +36,28 @@ ul:not(.browser-default).bullets, {
52
36
  }
53
37
  }
54
38
 
55
- .-index {
56
- .item {
57
- margin-bottom: 3em;
58
- }
59
-
60
- /* clear nth! */
61
- .row div:nth-child(2n+1) {
62
- clear:left
63
- }
64
-
65
- .row h3 {
66
- margin-bottom: 0;
67
- }
68
- }
69
-
70
-
71
-
72
39
 
73
40
  /* A */
74
41
 
75
- .addToggle::after {
42
+ .collapse-expand::after {
76
43
  content: " [<>]";
77
44
  }
78
- .addToggle {
79
- + * {
80
- display: none;
81
- }
82
- }
83
45
  .alert {
84
46
  border: 1px solid red;
85
47
  padding: .8em;
86
48
  }
87
49
 
50
+ .application--debug {
51
+ width: 100vwh;
52
+ overflow-x: auto;
53
+ }
54
+ .application-home {
55
+ .bordered-card {
56
+ max-width: 400px;
57
+ }
58
+ }
59
+
60
+
88
61
  /* B */
89
62
 
90
63
  .bg-white {
@@ -102,7 +75,7 @@ ul:not(.browser-default).bullets, {
102
75
  padding: 1em;
103
76
  }
104
77
 
105
- .bordered {
78
+ .bordered-card {
106
79
  border: 1px solid grey;
107
80
  padding: .5em;
108
81
  border-radius: 8px;
@@ -113,6 +86,10 @@ ul:not(.browser-default).bullets, {
113
86
 
114
87
  /* C */
115
88
 
89
+ .c {
90
+ clear: both;
91
+ }
92
+
116
93
  .Card {
117
94
  border: 1px solid gray;
118
95
  border-radius: 8px;
@@ -124,18 +101,20 @@ ul:not(.browser-default).bullets, {
124
101
  text-align: center;
125
102
  }
126
103
 
127
- .clearfix {
128
- clear: both;
129
- }
130
-
131
104
  .collapse-expand {
132
105
  cursor: pointer;
133
106
  }
134
- #collapseFooter {
135
- float: left;
136
- }
137
107
 
138
108
  /* D */
109
+
110
+ .descr,
111
+ .description {
112
+ border: 1px solid red;
113
+ padding: 1em;
114
+ font-size: 1.6em;
115
+ }
116
+
117
+
139
118
  /* E */
140
119
  .error_explanation {
141
120
  border: 1px solid red;
@@ -144,48 +123,29 @@ ul:not(.browser-default).bullets, {
144
123
 
145
124
  /* F */
146
125
 
147
- .--form {
148
- margin-bottom: 2em;
149
- }
150
-
151
- .flat-row {
152
- display: flex;
153
- flex-direction: row;
154
- justify-content: flex-start;
155
- align-content: flex-start;
156
-
157
- height: 2.4em;
158
- line-height: 3em;
159
-
160
- width: 100%;
161
- margin: 1em 0 0 0;
162
- padding: 0;
163
-
164
- > * {
165
- padding-right: 1em;
166
- }
167
- }
168
-
169
-
170
126
  .flex-row {
171
127
  display: flex;
172
- flex-wrap: wrap; /* @TODO: why does it wrap? in ish_manager/show , I'd prefer it didn't. */
128
+ flex-wrap: wrap;
129
+ > div {
130
+ margin-right: 10px;
131
+ }
132
+ > div:last-child {
133
+ margin-right: 0;
134
+ }
173
135
  }
174
136
 
175
137
  .float-left {
176
138
  float: left;
177
139
  padding-right: 1em;
178
140
  }
141
+
179
142
  .float-right {
180
143
  float: right;
181
144
  }
182
- hr {
183
- background: red;
184
- height: 1px !important;
185
- }
145
+
186
146
 
187
147
  /* I */
188
- img .img-400 {
148
+ img.img-400 {
189
149
  width: 400px;
190
150
  }
191
151
 
@@ -195,13 +155,20 @@ img .img-400 {
195
155
  }
196
156
  ul.inline li {
197
157
  display: inline;
158
+ padding-right: 1em;
198
159
  }
160
+
199
161
  .inline-search {
200
- width: 20px;
201
- bordeR: 1px solid white;
162
+ border: 1px solid white;
202
163
  display: inline-block;
164
+ width: 20px;
165
+
166
+ input[type='text'] {
167
+ width: 20px;
168
+ }
203
169
  }
204
170
 
171
+
205
172
  /* L */
206
173
  textarea.large {
207
174
  height: 400px;
@@ -214,7 +181,7 @@ textarea.large {
214
181
  /* M */
215
182
 
216
183
 
217
- .manager--main-header {
184
+ .main-header {
218
185
  background: url('/assets/bg/weather.png');
219
186
 
220
187
  a {
@@ -226,50 +193,63 @@ textarea.large {
226
193
  margin-top: 0;
227
194
  }
228
195
 
196
+
197
+
229
198
  ul {
199
+ margin: 0;
200
+ padding: 0;
201
+ display: flex;
202
+ flex-wrap: wrap;
203
+
230
204
  li {
231
- display: inline;
232
- padding: 1em;
205
+ margin: 0 0 10px 0;
206
+ display: inline-block;
207
+ min-width: 200px;
208
+
209
+ > div { /* for example .galleries--menu */
210
+ display: inline-block;
211
+ }
233
212
  }
234
213
  }
235
-
214
+ }
215
+ @media only screen and (max-width: 400px) {
216
+ .main-header ul li {
217
+ min-width: 45vw;
218
+ }
236
219
  }
237
220
 
238
-
239
- .manager--main-header.development,
240
- .manager--main-header.development_production {
221
+ .main-header.development,
222
+ .main-header.development_production {
241
223
  background: url('/assets/bg/weather-development.png');
242
224
  }
243
225
 
244
- .manager-galleries--index .mini {
245
- float: left;
246
- }
226
+ .menu-secondary {
227
+ margin: 20px 0;
228
+ padding: 0;
229
+ li {
230
+ display: inline;
231
+ a {
232
+ background: white;
233
+ }
234
+ }
247
235
 
248
- .manager-sites--title {
249
- padding: 1em;
250
- background: url('/assets/bg/weather.png');
251
- border-bottom: 1px solid red;
252
- }
236
+ li.active a {
237
+ border-bottom: 5px solid black;
238
+ }
253
239
 
254
- .markers--form .row {
255
- margin-bottom: 1em;
256
- padding-bottom: 1em;
257
- border-bottom: 1px solid blue;
258
240
  }
259
241
 
260
- .menu-secondary li {
261
- display: inline;
262
- }
263
- .menu-secondary li a {
264
- padding: 1rem;
265
- background: white;
266
- }
267
242
  .meta-edit {
268
243
  display: inline;
269
244
  }
270
245
 
271
246
  /* N */
272
247
 
248
+ .newsitems--item {
249
+ border: 1px solid green;
250
+ padding: 5px;
251
+ }
252
+
273
253
  .notice {
274
254
  border: 1px solid green;
275
255
  padding: .8em;
@@ -280,28 +260,6 @@ textarea.large {
280
260
  padding: .5em;
281
261
  }
282
262
 
283
- /* S */
284
- .small {
285
- font-size: .8em;
286
- }
287
-
288
- .thumb {
289
- background: dedede;
290
- border: 1px solid red;
291
- width: 100px;
292
- height: 100px;
293
- }
294
- ul.inline li {
295
- padding-right: 1em;
296
- }
297
-
298
-
299
-
300
- .youtube_img {
301
- width: 100px;
302
- }
303
-
304
-
305
263
  /* R */
306
264
  .red-border {
307
265
  border: 1px solid red;
@@ -309,38 +267,32 @@ ul.inline li {
309
267
  }
310
268
 
311
269
  /* S */
270
+
312
271
  .select2-container {
313
272
  max-width: 100%;
314
273
  display: block;
315
274
  }
316
275
 
276
+ .small {
277
+ font-size: .8em;
278
+ }
279
+
317
280
  /* T */
318
281
 
282
+ .thumb {
283
+ background: dedede;
284
+ border: 1px solid red;
285
+ width: 100px;
286
+ height: 100px;
287
+ }
288
+
319
289
  /* U */
320
290
 
321
291
  /* V */
322
292
 
323
293
  /* W */
324
294
 
325
- /*
326
- * Newsitems
327
- **/
328
- .newsitems--item {
329
- border: 1px solid green;
330
- padding: 5px;
331
- }
332
-
333
- .menu-secondary li.active a {
334
- border-bottom: 5px solid black;
295
+ .youtube_img {
296
+ width: 100px;
335
297
  }
336
298
 
337
-
338
- /**
339
- * Reports
340
- **/
341
- .descr,
342
- .description {
343
- border: 1px solid red;
344
- padding: 1em;
345
- font-size: 1.6em;
346
- }
@@ -1,31 +1,43 @@
1
- /* utils */
2
1
 
3
- .thumbnails {
4
- display: flex;
2
+
3
+ .galleries--index .mini {
4
+ float: left;
5
5
  }
6
6
 
7
- .row-thumbs .item {
8
- margin-bottom: 1em;
9
- border: 1px solid red;
10
- padding: 10px;
11
- img {
12
- margin-top: 10px;
7
+ .galleries--title {
8
+ text-align: center;
9
+ }
10
+
11
+ .galleries-show {
12
+ .row {
13
+ display: block;
14
+ border-bottom: 2px solid red;
15
+
16
+ }
17
+
18
+ .row-large .goto {
19
+ display: none;
13
20
  }
21
+
14
22
  }
15
23
 
24
+
25
+ // .row-thumbs .item {
26
+ // margin-bottom: 1em;
27
+ // img {
28
+ // margin-top: 10px;
29
+ // }
30
+ // }
31
+
16
32
  .row-large .item {
17
33
  border: 1px solid red;
18
- display: block;
19
34
 
35
+ display: block;
36
+ margin-bottom: 1em;
37
+ max-height: 95vh;
20
38
  padding: 10px;
21
- margin: 10px;
22
-
23
- height: 90vh;
24
- max-width: 100vw;
25
-
26
- .goto {
27
- display: none;
28
- }
39
+ padding-bottom: 50px;
40
+ background: #cecece;
29
41
 
30
42
  .wrapper {
31
43
  width: 100%;
@@ -1,13 +1,30 @@
1
- /**
2
- * utils first
3
- */
1
+ /*
2
+ * Alphabetized : )
3
+ **/
4
+
5
+
6
+ .flat-row {
7
+ display: flex;
8
+ flex-direction: row;
9
+ justify-content: flex-start;
10
+ align-content: flex-start;
11
+
12
+ height: 2.4em;
13
+ line-height: 3em;
14
+
15
+ width: 100%;
16
+ margin: 1em 0 0 0;
17
+ padding: 0;
18
+
19
+ > * {
20
+ padding-right: 1em;
21
+ }
22
+ }
23
+
4
24
  .red-cross {
5
25
  position: absolute;
6
26
  }
7
27
 
8
- /*
9
- * Main - Maps
10
- */
11
28
  .maps--map-meta-row {
12
29
  border-left: 10px solid #e3e3e3;
13
30
  padding-left: 10px;
@@ -19,11 +36,6 @@
19
36
 
20
37
  .maps-index {
21
38
 
22
- // h1 {
23
- // padding-bottom: 10px;
24
- // border-bottom: 10px solid #cecece;
25
- // }
26
-
27
39
  .item {
28
40
  display: flex;
29
41
  flex-direction: row;
@@ -56,6 +68,27 @@
56
68
  }
57
69
  }
58
70
 
71
+
72
+ .maps-map-editor {
73
+ .map-editor {
74
+ border: 1px solid red;
75
+ position: relative;
76
+
77
+ .marker {
78
+ position: absolute;
79
+ top: 0;
80
+ left: 0;
81
+
82
+ border: 1px solid yellow;
83
+ }
84
+ }
85
+ .markers-list {
86
+ .item {
87
+ border: 1px solid green;
88
+ }
89
+ }
90
+ }
91
+
59
92
  .maps-show {
60
93
  .the-map {
61
94
  position: relative;
@@ -81,24 +114,4 @@
81
114
 
82
115
 
83
116
  }
84
- }
85
-
86
- .maps-map-editor {
87
- .map-editor {
88
- border: 1px solid red;
89
- position: relative;
90
-
91
- .marker {
92
- position: absolute;
93
- top: 0;
94
- left: 0;
95
-
96
- border: 1px solid yellow;
97
- }
98
- }
99
- .markers-list {
100
- .item {
101
- border: 1px solid green;
102
- }
103
- }
104
- }
117
+ }
@@ -0,0 +1,8 @@
1
+
2
+
3
+ .markers--form .row {
4
+ margin-bottom: 1em;
5
+ padding-bottom: 1em;
6
+ border-bottom: 1px solid blue;
7
+ }
8
+
@@ -0,0 +1,54 @@
1
+
2
+
3
+ .pagination li {
4
+ display: inline-block;
5
+ border-radius: 2px;
6
+ text-align: center;
7
+ vertical-align: top;
8
+ height: 30px;
9
+ }
10
+
11
+ .pagination li a {
12
+ color: #444;
13
+ display: inline-block;
14
+ font-size: 1.2rem;
15
+ padding: 0 10px;
16
+ line-height: 30px;
17
+ }
18
+
19
+ .pagination li.active a {
20
+ color: #fff;
21
+ }
22
+
23
+ .pagination li.active {
24
+ background-color: #ee6e73;
25
+ }
26
+
27
+ .pagination li.disabled a {
28
+ cursor: default;
29
+ color: #999;
30
+ }
31
+
32
+ .pagination li i {
33
+ font-size: 2rem;
34
+ }
35
+
36
+ .pagination li.pages ul li {
37
+ display: inline-block;
38
+ float: none;
39
+ }
40
+
41
+ @media only screen and (max-width: 992px) {
42
+ .pagination {
43
+ width: 100%;
44
+ }
45
+ .pagination li.prev,
46
+ .pagination li.next {
47
+ width: 10%;
48
+ }
49
+ .pagination li.pages {
50
+ width: 80%;
51
+ overflow: hidden;
52
+ white-space: nowrap;
53
+ }
54
+ }