ish_manager 0.1.8.217 → 0.1.8.218
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 +4 -4
- data/app/assets/stylesheets/ish_manager/application.css +3 -2
- data/app/assets/stylesheets/ish_manager/galleries.css +18 -0
- data/app/controllers/ish_manager/photos_controller.rb +5 -6
- data/app/views/ish_manager/application/_main_header_admin.haml +7 -4
- data/app/views/ish_manager/galleries/_title.haml +2 -1
- data/app/views/ish_manager/galleries/edit.haml +1 -1
- data/app/views/ish_manager/galleries/show.haml +4 -3
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1d86a2f745f9ccf9f6def03a60bddbc8a14d9be0201250ceaf37badbf32aca0c
|
4
|
+
data.tar.gz: 599322d29c14ae0aff6427608e1be02ed8879284a20aa1528191f03d7a1f498a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e01f66562f5a0daa1acf181ae596e81e8eda97219a230915c71f2cc239ae99fc96e8de1ced4273482b1ad6e3e0056f4ea4f8c12b485383920b6d76494c600c4e
|
7
|
+
data.tar.gz: a245084a69f013cb2a5f518b897b1e5ed99b3c295f872f50bccc0fcce14ad9cf7f3d8a957211e98d93e7b6ac39481c8959fb4a1d6b481198448b5e78beace17e
|
@@ -16,6 +16,7 @@
|
|
16
16
|
*= require ish_manager/maps
|
17
17
|
*= require ish_manager/utils
|
18
18
|
*= require ish_manager/jquery-ui
|
19
|
+
*= require ish_manager/galleries
|
19
20
|
*/
|
20
21
|
|
21
22
|
|
@@ -58,7 +59,7 @@ hr {
|
|
58
59
|
border: 1px solid red;
|
59
60
|
width: 100px;
|
60
61
|
height: 100px;
|
61
|
-
}
|
62
|
+
}
|
62
63
|
.large-photos img {
|
63
64
|
width: 100%;
|
64
65
|
}
|
@@ -117,7 +118,7 @@ ul.inline li {
|
|
117
118
|
}
|
118
119
|
|
119
120
|
/**
|
120
|
-
* manager...
|
121
|
+
* manager...
|
121
122
|
*/
|
122
123
|
|
123
124
|
.manager--main-header {
|
@@ -0,0 +1,18 @@
|
|
1
|
+
|
2
|
+
.large-photos .item {
|
3
|
+
border: 1px solid red;
|
4
|
+
display: block;
|
5
|
+
|
6
|
+
padding: 10px;
|
7
|
+
margin: 10px;
|
8
|
+
|
9
|
+
height: 100vh;
|
10
|
+
max-width: 100vw;
|
11
|
+
}
|
12
|
+
|
13
|
+
.large-photos .item .wrapper {
|
14
|
+
}
|
15
|
+
|
16
|
+
.large-photos .item .wrapper img {
|
17
|
+
max-height: 100%;
|
18
|
+
}
|
@@ -3,7 +3,7 @@ class IshManager::PhotosController < IshManager::ApplicationController
|
|
3
3
|
|
4
4
|
# @TODO: this is bad? _vp_ 20170513
|
5
5
|
skip_authorization_check :only => [ :j_create ]
|
6
|
-
protect_from_forgery :except => [ :j_create]
|
6
|
+
protect_from_forgery :except => [ :j_create]
|
7
7
|
|
8
8
|
def without_gallery
|
9
9
|
@photos = Photo.unscoped.where( :gallery => nil, :is_trash => false )
|
@@ -12,10 +12,9 @@ class IshManager::PhotosController < IshManager::ApplicationController
|
|
12
12
|
def destroy
|
13
13
|
@photo = Photo.unscoped.find params[:id]
|
14
14
|
authorize! :destroy, @photo
|
15
|
-
|
15
|
+
@photo.gallery.touch if @photo.gallery
|
16
16
|
@photo.is_trash = true
|
17
17
|
@photo.save
|
18
|
-
g.touch
|
19
18
|
redirect_to request.referrer || root_path
|
20
19
|
end
|
21
20
|
|
@@ -36,9 +35,9 @@ class IshManager::PhotosController < IshManager::ApplicationController
|
|
36
35
|
authorize! :create_photo, gallery
|
37
36
|
|
38
37
|
@photo = Photo.new params[:photo].permit!
|
39
|
-
@photo.is_public = true
|
38
|
+
@photo.is_public = true
|
40
39
|
@photo.gallery = gallery
|
41
|
-
|
40
|
+
|
42
41
|
# cache
|
43
42
|
@photo.gallery.site.touch if @photo.gallery.site
|
44
43
|
@photo.gallery.city.touch if @photo.gallery.city
|
@@ -55,7 +54,7 @@ class IshManager::PhotosController < IshManager::ApplicationController
|
|
55
54
|
}
|
56
55
|
render :json => [ j ]
|
57
56
|
else
|
58
|
-
render :json => { "errors" => @photo.errors }
|
57
|
+
render :json => { "errors" => @photo.errors }
|
59
58
|
end
|
60
59
|
end
|
61
60
|
|
@@ -14,13 +14,14 @@
|
|
14
14
|
%li{ :class => params[:controller] == 'ish_manager/friends ' ? 'active' : '' }= link_to 'Friends', friends_path
|
15
15
|
|
16
16
|
%ul.nav.nav-pills
|
17
|
-
%li{ class: params[:controller] == 'ish_manager/newsitems' ? 'active' : '' }= link_to '+Newsitem', new_newsitem_path
|
17
|
+
%li{ class: params[:controller] == 'ish_manager/newsitems' ? 'active' : '' }= link_to '+Newsitem', new_newsitem_path
|
18
18
|
%li{ :class => params[:controller] == 'ish_manager/sites' ? 'active' : '' }= link_to 'Sites', sites_path
|
19
19
|
%li{ :class => params[:controller] == 'ish_manager/galleries' ? 'active' : '' }= link_to 'Galleries', galleries_path
|
20
20
|
%li{ :class => params[:controller] == 'ish_manager/reports' ? 'active' : '' }= link_to 'Reports', reports_path
|
21
21
|
%li{ :class => params[:controller] == 'ish_manager/videos' ? 'active' : '' }= link_to 'Videos', videos_path
|
22
|
-
%li{ :class => params[:controller] == 'ish_manager/tags' ? 'active' : '' }= link_to 'Tags', tags_path
|
22
|
+
%li{ :class => params[:controller] == 'ish_manager/tags' ? 'active' : '' }= link_to 'Tags', tags_path
|
23
23
|
|
24
|
+
- proc do # nothing
|
24
25
|
%ul.nav.nav-pills
|
25
26
|
-# %li{ :class => params[:controller] == 'ish_manager/ally' ? 'active' : '' }= link_to 'Ally', ally_root_path
|
26
27
|
-# %li{ :class => params[:controller] == 'ish_manager/stock_actions' ? 'active' : '' }= link_to 'Stock Actions', stock_actions_path
|
@@ -29,16 +30,18 @@
|
|
29
30
|
%li{ :class => params[:controller] == 'ish_manager/iron_condors' ? 'active' : '' }= link_to 'Iron Condors', iron_condors_path
|
30
31
|
%li{ :class => params[:controller] == 'ish_manager/covered_calls' ? 'active' : '' }= link_to 'Covered Calls', covered_calls_path
|
31
32
|
|
33
|
+
- proc do # nothing
|
32
34
|
%ul.nav.nav-pills
|
33
35
|
%li{ :class => params[:controller] == 'ish_manager/invoices' ? 'active' : '' }= link_to 'Invoices', invoices_path
|
34
36
|
%li{ :class => params[:controller] == 'ish_manager/payments' ? 'active' : '' }= link_to 'Payments', payments_path
|
35
37
|
%li{ :class => params[:controller] == 'ish_manager/orders' ? 'active' : '' }= link_to 'Orders', orders_path
|
36
38
|
-# %li{ :class => params[:controller] == 'ish_manager/co_tailors' ? 'active' : '' }= link_to 'Co Tailors', co_tailors_path
|
37
39
|
|
40
|
+
- proc do # nothing
|
38
41
|
%ul.nav.nav-pills
|
39
42
|
%li{ :class => params[:controller] == 'ish_manager/leads' ? 'active' : '' }= link_to 'Leads', leads_path
|
40
43
|
%li{ :class => params[:controller] == 'ish_manager/campaigns' ? 'active' : '' }= link_to 'Campaigns', campaigns_path
|
41
|
-
|
42
|
-
|
44
|
+
|
45
|
+
|
43
46
|
%hr
|
44
47
|
|
@@ -1,5 +1,6 @@
|
|
1
1
|
|
2
2
|
= render 'title', :gallery => @gallery
|
3
|
+
= render 'ish_manager/photos/multinew', :gallery => @gallery
|
3
4
|
|
4
5
|
-# deleted
|
5
6
|
.row
|
@@ -32,6 +33,6 @@
|
|
32
33
|
.center.large-photos
|
33
34
|
- @photos.each do |photo|
|
34
35
|
.item
|
35
|
-
|
36
|
-
|
37
|
-
|
36
|
+
.wrapper
|
37
|
+
= image_tag photo.photo.url( :large ), :alt => ''
|
38
|
+
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ish_manager
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.8.
|
4
|
+
version: 0.1.8.218
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- piousbox
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-05-
|
11
|
+
date: 2020-05-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -176,6 +176,7 @@ files:
|
|
176
176
|
- app/assets/javascripts/ish_manager/materialize.js
|
177
177
|
- app/assets/stylesheets/ish_manager/application.css
|
178
178
|
- app/assets/stylesheets/ish_manager/bootstrap.css
|
179
|
+
- app/assets/stylesheets/ish_manager/galleries.css
|
179
180
|
- app/assets/stylesheets/ish_manager/jquery-ui.css
|
180
181
|
- app/assets/stylesheets/ish_manager/maps.scss
|
181
182
|
- app/assets/stylesheets/ish_manager/materialize.css
|