ish_manager 0.1.8.315 → 0.1.8.316

Sign up to get free protection for your applications and to get access to all the features.
Files changed (40) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/ish_manager/application.js +0 -4
  3. data/app/assets/stylesheets/ish_manager/application.scss +87 -152
  4. data/app/assets/stylesheets/ish_manager/galleries.scss +32 -16
  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/photos.scss +39 -2
  8. data/app/assets/stylesheets/ish_manager/{tags.css → tags.scss} +0 -0
  9. data/app/assets/stylesheets/ish_manager/{bootstrap.css → trash/bootstrap.css} +0 -0
  10. data/app/assets/stylesheets/ish_manager/{materialize.css → trash/materialize.css} +0 -0
  11. data/app/assets/stylesheets/ish_manager/{reset.css → trash/reset.css} +0 -0
  12. data/app/controllers/ish_manager/galleries_controller.rb +1 -1
  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 +0 -3
  18. data/app/helpers/ish_manager/application_helper.rb +1 -1
  19. data/app/views/ish_manager/application/_main_footer.haml +3 -1
  20. data/app/views/ish_manager/application/_main_header.haml +1 -1
  21. data/app/views/ish_manager/application/_main_header_admin.haml +3 -7
  22. data/app/views/ish_manager/application/_main_header_guy.haml +1 -1
  23. data/app/views/ish_manager/application/_main_header_manager.haml +1 -1
  24. data/app/views/ish_manager/galleries/_index.haml +4 -5
  25. data/app/views/ish_manager/galleries/_menu.haml +11 -12
  26. data/app/views/ish_manager/galleries/_menu_secondary.haml +12 -0
  27. data/app/views/ish_manager/galleries/_title.haml +12 -14
  28. data/app/views/ish_manager/galleries/{index_ajax.haml → index_ajax.haml-trash} +0 -0
  29. data/app/views/ish_manager/galleries/show.haml +24 -33
  30. data/app/views/ish_manager/markers/_index.haml +1 -1
  31. data/app/views/ish_manager/photos/_index_thumbs.haml +7 -0
  32. data/app/views/ish_manager/photos/_meta_manager.haml +5 -5
  33. data/app/views/ish_manager/photos/_multinew.haml +4 -6
  34. data/app/views/ish_manager/videos/_index.haml +1 -1
  35. data/app/views/layouts/ish_manager/application.haml +17 -10
  36. data/app/views/layouts/ish_manager/{application_no_material.haml → application.haml-trash} +8 -15
  37. metadata +10 -10
  38. data/app/assets/stylesheets/ish_manager/trash/bootstrap.min.css +0 -6
  39. data/app/assets/stylesheets/ish_manager/trash/bootstrap.min.css.map +0 -1
  40. data/app/views/ish_manager/galleries/_index_thumbs.haml +0 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2004c1173de616a39ef2d2b185f1bd906a30dea6a77989847d549e976284f36a
4
- data.tar.gz: b6d799d9a77d78a2db6cb591ab0e836e5aed4e17c9c2b85901bee69c7b1be328
3
+ metadata.gz: 18b3141485361167090653528482f267142c3bab300104bbfadeb37be603c74b
4
+ data.tar.gz: 1fe3ab212b45dfdc7bc4be1370090e6dc884b9f8e4e4d59fd769f862279d51f1
5
5
  SHA512:
6
- metadata.gz: 3246003592e1c7e17a696cc2036007fd8f680349947d1477a698aae7ab824339e18e2990bd3a04e0bf06fda8cf0d4e2491bd66b2c5c38a9e7f2eedc1b4c8c1bb
7
- data.tar.gz: 03063e33940ecced352f7fa41ea2fe60e60a984f686863cde1d52b86062d9120d9a31095369c206eeb77dcebbc3fa20fa0a265db227c07aa1c39380b00262f05
6
+ metadata.gz: 40051254ade984fbacbb6ea63843d525ef6f6a9778259203488a6ea2b473b1ae17a6812ee2cff5903a95db72542fcfef6ef8bd45fd899c928dc0a2efa579f7b6
7
+ data.tar.gz: 68ec34c76a50135d8da176fec88fc975e9e94ef2b9535cc09a53f9b4f65ae3f3652607e7200d1a23152970fe5e23d20bf0917ed6d51dd531c02cbc7d01d4f88c
@@ -90,10 +90,6 @@ $(function () {
90
90
  })
91
91
  }
92
92
 
93
- $(".addToggle").on('click', function () {
94
- $(this).next().toggle(500)
95
- })
96
-
97
93
  if ('function' === typeof $('body').datepicker) {
98
94
  $(".datepicker").datepicker({ dateFormat: 'yy-mm-dd' })
99
95
  }
@@ -1,45 +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
14
  *= require ish_manager/pagination
30
- */
31
-
32
-
33
-
34
- /*
35
- * Utils
36
15
  **/
37
16
 
17
+
38
18
  body {
39
19
  background: #dedede;
40
20
  font-size: 20px;
41
21
  }
42
-
22
+ hr {
23
+ background: red;
24
+ height: 1px !important;
25
+ }
43
26
  pre {
44
27
  background: #e0e0e0;
45
28
  padding: 1em;
@@ -53,34 +36,12 @@ ul:not(.browser-default).bullets, {
53
36
  }
54
37
  }
55
38
 
56
- .-index {
57
- .item {
58
- margin-bottom: 3em;
59
- }
60
-
61
- /* clear nth! */
62
- .row div:nth-child(2n+1) {
63
- clear:left
64
- }
65
-
66
- .row h3 {
67
- margin-bottom: 0;
68
- }
69
- }
70
-
71
-
72
-
73
39
 
74
40
  /* A */
75
41
 
76
- .addToggle::after {
42
+ .collapse-expand::after {
77
43
  content: " [<>]";
78
44
  }
79
- .addToggle {
80
- + * {
81
- display: none;
82
- }
83
- }
84
45
  .alert {
85
46
  border: 1px solid red;
86
47
  padding: .8em;
@@ -125,6 +86,10 @@ ul:not(.browser-default).bullets, {
125
86
 
126
87
  /* C */
127
88
 
89
+ .c {
90
+ clear: both;
91
+ }
92
+
128
93
  .Card {
129
94
  border: 1px solid gray;
130
95
  border-radius: 8px;
@@ -136,18 +101,20 @@ ul:not(.browser-default).bullets, {
136
101
  text-align: center;
137
102
  }
138
103
 
139
- .c {
140
- clear: both;
141
- }
142
-
143
104
  .collapse-expand {
144
105
  cursor: pointer;
145
106
  }
146
- #collapseFooter {
147
- float: left;
148
- }
149
107
 
150
108
  /* D */
109
+
110
+ .descr,
111
+ .description {
112
+ border: 1px solid red;
113
+ padding: 1em;
114
+ font-size: 1.6em;
115
+ }
116
+
117
+
151
118
  /* E */
152
119
  .error_explanation {
153
120
  border: 1px solid red;
@@ -156,49 +123,29 @@ ul:not(.browser-default).bullets, {
156
123
 
157
124
  /* F */
158
125
 
159
- .--form {
160
- margin-bottom: 2em;
161
- }
162
-
163
- .flat-row {
164
- display: flex;
165
- flex-direction: row;
166
- justify-content: flex-start;
167
- align-content: flex-start;
168
-
169
- height: 2.4em;
170
- line-height: 3em;
171
-
172
- width: 100%;
173
- margin: 1em 0 0 0;
174
- padding: 0;
175
-
176
- > * {
177
- padding-right: 1em;
178
- }
179
- }
180
-
181
-
182
126
  .flex-row {
183
127
  display: flex;
184
- flex-wrap: wrap; /* @TODO: why does it wrap? in ish_manager/show , I'd prefer it didn't. */
185
-
128
+ flex-wrap: wrap;
129
+ > div {
130
+ margin-right: 10px;
131
+ }
132
+ > div:last-child {
133
+ margin-right: 0;
134
+ }
186
135
  }
187
136
 
188
137
  .float-left {
189
138
  float: left;
190
139
  padding-right: 1em;
191
140
  }
141
+
192
142
  .float-right {
193
143
  float: right;
194
144
  }
195
- hr {
196
- background: red;
197
- height: 1px !important;
198
- }
145
+
199
146
 
200
147
  /* I */
201
- img .img-400 {
148
+ img.img-400 {
202
149
  width: 400px;
203
150
  }
204
151
 
@@ -208,13 +155,20 @@ img .img-400 {
208
155
  }
209
156
  ul.inline li {
210
157
  display: inline;
158
+ padding-right: 1em;
211
159
  }
160
+
212
161
  .inline-search {
213
- width: 20px;
214
- bordeR: 1px solid white;
162
+ border: 1px solid white;
215
163
  display: inline-block;
164
+ width: 20px;
165
+
166
+ input[type='text'] {
167
+ width: 20px;
168
+ }
216
169
  }
217
170
 
171
+
218
172
  /* L */
219
173
  textarea.large {
220
174
  height: 400px;
@@ -227,7 +181,7 @@ textarea.large {
227
181
  /* M */
228
182
 
229
183
 
230
- .manager--main-header {
184
+ .main-header {
231
185
  background: url('/assets/bg/weather.png');
232
186
 
233
187
  a {
@@ -239,35 +193,34 @@ textarea.large {
239
193
  margin-top: 0;
240
194
  }
241
195
 
242
- ul {
243
- li {
244
- display: inline;
245
- padding: 1em;
246
- }
247
- }
248
196
 
249
- }
250
197
 
198
+ ul {
199
+ margin: 0;
200
+ padding: 0;
201
+ display: flex;
202
+ flex-wrap: wrap;
251
203
 
252
- .manager--main-header.development,
253
- .manager--main-header.development_production {
254
- background: url('/assets/bg/weather-development.png');
255
- }
204
+ li {
205
+ margin: 0 0 10px 0;
206
+ display: inline-block;
207
+ min-width: 200px;
256
208
 
257
- .manager-galleries--index .mini {
258
- float: left;
209
+ > div { /* for example .galleries--menu */
210
+ display: inline-block;
211
+ }
212
+ }
213
+ }
259
214
  }
260
-
261
- .manager-sites--title {
262
- padding: 1em;
263
- background: url('/assets/bg/weather.png');
264
- border-bottom: 1px solid red;
215
+ @media only screen and (max-width: 400px) {
216
+ .main-header ul li {
217
+ min-width: 45vw;
218
+ }
265
219
  }
266
220
 
267
- .markers--form .row {
268
- margin-bottom: 1em;
269
- padding-bottom: 1em;
270
- border-bottom: 1px solid blue;
221
+ .main-header.development,
222
+ .main-header.development_production {
223
+ background: url('/assets/bg/weather-development.png');
271
224
  }
272
225
 
273
226
  .menu-secondary {
@@ -279,6 +232,11 @@ textarea.large {
279
232
  background: white;
280
233
  }
281
234
  }
235
+
236
+ li.active a {
237
+ border-bottom: 5px solid black;
238
+ }
239
+
282
240
  }
283
241
 
284
242
  .meta-edit {
@@ -287,6 +245,11 @@ textarea.large {
287
245
 
288
246
  /* N */
289
247
 
248
+ .newsitems--item {
249
+ border: 1px solid green;
250
+ padding: 5px;
251
+ }
252
+
290
253
  .notice {
291
254
  border: 1px solid green;
292
255
  padding: .8em;
@@ -297,28 +260,6 @@ textarea.large {
297
260
  padding: .5em;
298
261
  }
299
262
 
300
- /* S */
301
- .small {
302
- font-size: .8em;
303
- }
304
-
305
- .thumb {
306
- background: dedede;
307
- border: 1px solid red;
308
- width: 100px;
309
- height: 100px;
310
- }
311
- ul.inline li {
312
- padding-right: 1em;
313
- }
314
-
315
-
316
-
317
- .youtube_img {
318
- width: 100px;
319
- }
320
-
321
-
322
263
  /* R */
323
264
  .red-border {
324
265
  border: 1px solid red;
@@ -326,38 +267,32 @@ ul.inline li {
326
267
  }
327
268
 
328
269
  /* S */
270
+
329
271
  .select2-container {
330
272
  max-width: 100%;
331
273
  display: block;
332
274
  }
333
275
 
276
+ .small {
277
+ font-size: .8em;
278
+ }
279
+
334
280
  /* T */
335
281
 
282
+ .thumb {
283
+ background: dedede;
284
+ border: 1px solid red;
285
+ width: 100px;
286
+ height: 100px;
287
+ }
288
+
336
289
  /* U */
337
290
 
338
291
  /* V */
339
292
 
340
293
  /* W */
341
294
 
342
- /*
343
- * Newsitems
344
- **/
345
- .newsitems--item {
346
- border: 1px solid green;
347
- padding: 5px;
348
- }
349
-
350
- .menu-secondary li.active a {
351
- border-bottom: 5px solid black;
295
+ .youtube_img {
296
+ width: 100px;
352
297
  }
353
298
 
354
-
355
- /**
356
- * Reports
357
- **/
358
- .descr,
359
- .description {
360
- border: 1px solid red;
361
- padding: 1em;
362
- font-size: 1.6em;
363
- }
@@ -1,28 +1,44 @@
1
- /* utils */
2
1
 
3
- .row-thumbs .item {
4
- margin-bottom: 1em;
5
- border: 1px solid red;
6
- padding: 10px;
7
- img {
8
- margin-top: 10px;
9
- }
2
+
3
+ .galleries--index .mini {
4
+ float: left;
10
5
  }
11
6
 
12
- .row-large .item {
13
- border: 1px solid red;
14
- display: block;
7
+ .galleries--title {
8
+ text-align: center;
9
+ }
15
10
 
16
- padding: 10px;
17
- margin: 10px;
11
+ .galleries-show {
12
+ .row {
13
+ display: block;
14
+ border-bottom: 2px solid red;
18
15
 
19
- height: 90vh;
20
- max-width: 100vw;
16
+ }
21
17
 
22
- .goto {
18
+ .row-large .goto {
23
19
  display: none;
24
20
  }
25
21
 
22
+ }
23
+
24
+
25
+ // .row-thumbs .item {
26
+ // margin-bottom: 1em;
27
+ // img {
28
+ // margin-top: 10px;
29
+ // }
30
+ // }
31
+
32
+ .row-large .item {
33
+ border: 1px solid red;
34
+
35
+ display: block;
36
+ margin-bottom: 1em;
37
+ max-height: 95vh;
38
+ padding: 10px;
39
+ padding-bottom: 50px;
40
+ background: #cecece;
41
+
26
42
  .wrapper {
27
43
  width: 100%;
28
44
  height: 80vh;
@@ -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
+
@@ -1,12 +1,49 @@
1
1
 
2
- .--meta-manager {
2
+ .photos--index-mini {
3
+ }
4
+ .photos--index-thumbs {
5
+ .item {
6
+ border: 1px solid red;
7
+ padding: 10px;
8
+
9
+ max-width: Min(125px, 30vw);
10
+ }
11
+ }
12
+ .photos--meta-manager {
3
13
  display: flex;
4
14
  justify-content: space-between;
5
15
 
16
+ .right-hand {
17
+ text-align: right;
18
+ }
6
19
  .right-hand a {
20
+
7
21
  }
8
- .right-hand a:not(:last-child):after {
22
+ .right-hand a:not(:first-child):before {
9
23
  content: "|";
10
24
  padding: 0 10px 0 15px;
11
25
  }
12
26
  }
27
+ .photos--multinew {
28
+ border: 1px dashed #356;
29
+ display: inline-block;
30
+ margin-bottom: 2em;
31
+ padding: 10px;
32
+
33
+ input[type='file'] {
34
+ overflow-x: auto;
35
+ max-width: Max( 300px, 50vw );
36
+ }
37
+ }
38
+
39
+ .row-deleted {
40
+ .goto,
41
+ .x {
42
+ display: none;
43
+ }
44
+ }
45
+ .row-mini {
46
+ .flex-row {
47
+ margin-bottom: 500px;
48
+ }
49
+ }
@@ -48,7 +48,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
48
48
  # @galleries.selector.delete('is_done')
49
49
  end
50
50
  @galleries = @galleries.page( params[:galleries_page] ).per( 10 )
51
- render params[:render_type], layout: 'ish_manager/application_no_material'
51
+ render params[:render_type]
52
52
  end
53
53
 
54
54
  def j_show
@@ -27,7 +27,6 @@ class IshManager::LeadsController < IshManager::ApplicationController
27
27
  else
28
28
  @leads = @leads.where( :is_done => false )
29
29
  end
30
- render :layout => 'ish_manager/application_no_material'
31
30
  end
32
31
 
33
32
  def new
@@ -4,8 +4,6 @@ class IshManager::MapsController < IshManager::ApplicationController
4
4
  before_action :set_map, only: [ :destroy, :edit, :export, :map_editor, :show, :update, ] # alphabetized
5
5
  before_action :set_lists
6
6
 
7
- layout 'ish_manager/application_no_material', only: %w| index |
8
-
9
7
  # alphabetized
10
8
 
11
9
  def create
@@ -5,8 +5,6 @@ class IshManager::MarkersController < IshManager::ApplicationController
5
5
  before_action :set_marker, only: [ :edit, :update ]
6
6
  before_action :set_lists
7
7
 
8
- layout 'ish_manager/application_no_material'
9
-
10
8
  def new
11
9
  authorize! :new_marker, ::Gameui::Map
12
10
  @marker = ::Gameui::Marker.new
@@ -1,8 +1,6 @@
1
1
 
2
2
  class IshManager::MeetingsController < IshManager::ApplicationController
3
3
 
4
- layout 'ish_manager/application_no_material'
5
-
6
4
  # alphabetized
7
5
 
8
6
  def create
@@ -59,8 +59,6 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
59
59
  authorize! :destroy, @newsitem
60
60
 
61
61
  if @newsitem.destroy
62
- # City.find(@newsitem.city_id).touch if @newsitem.city_id
63
- # Site.find(@newsitem.site_id).touch if @newsitem.site_id
64
62
  Tag.find(@newsitem.tag_id).touch if @newsitem.tag_id
65
63
  Map.find(@newsitem.map_id).touch if @newsitem.map_id
66
64
 
@@ -107,7 +105,6 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
107
105
  @newsitem.tag = @tag
108
106
  end
109
107
  authorize! :new, @newsitem
110
- render layout: 'ish_manager/application_no_material'
111
108
  end
112
109
 
113
110
  def update
@@ -62,7 +62,7 @@ module IshManager
62
62
  end
63
63
 
64
64
  def api_marker_path marker
65
- "/api/markers/view/#{marker.slug}"
65
+ "/api/markers/view/#{marker.id}"
66
66
  end
67
67
 
68
68
  end