ish_manager 0.1.8.123 → 0.1.8.124
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/ish_manager/features_controller.rb +5 -3
- data/app/controllers/ish_manager/newsitems_controller.rb +7 -0
- data/app/controllers/ish_manager/sites_controller.rb +21 -3
- data/app/controllers/ish_manager/tags_controller.rb +3 -0
- data/app/controllers/ish_manager/videos_controller.rb +7 -0
- data/app/views/ish_manager/features/index.haml +19 -19
- data/app/views/ish_manager/galleries/_list.haml +4 -1
- data/app/views/ish_manager/galleries/index.haml +3 -1
- data/app/views/ish_manager/leads/index.haml +0 -2
- data/app/views/ish_manager/newsitems/index.haml +9 -0
- data/app/views/ish_manager/reports/_index.haml +3 -2
- data/app/views/ish_manager/reports/index.haml +7 -4
- data/app/views/ish_manager/sites/_header.haml +16 -0
- data/app/views/ish_manager/sites/galleries.haml +19 -0
- data/app/views/ish_manager/sites/show.haml +2 -2
- data/app/views/ish_manager/tags/index.haml +2 -0
- data/app/views/ish_manager/videos/index.haml +1 -0
- data/config/routes.rb +8 -1
- metadata +5 -3
- data/app/views/ish_manager/sites/_title.haml +0 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f7cca36c631eccee721ad01581f4b71025273b60
|
4
|
+
data.tar.gz: f515eb9235563b9b83e668434b540912ee0c4e0f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e4e60bbe8b856e35a3651d715b34e2b22e68ce989cf6ef4ab773c3aeb04128a86bea2d3d850a44fa8516f3dbd234c357a784bfd0a6118fd9e88b0a825b4bbc51
|
7
|
+
data.tar.gz: 610da5990c1c1e2a15918e4b65522c29d01ce0c1bd2eb493c527d3609a7998d3517d3d569b65452cf61b95c30195400a346f817f9d7a377df657e3ace8c66ab5
|
@@ -112,14 +112,16 @@ class IshManager::FeaturesController < IshManager::ApplicationController
|
|
112
112
|
end
|
113
113
|
end
|
114
114
|
|
115
|
-
=begin
|
116
115
|
def index
|
117
116
|
if params[:tag_id]
|
118
117
|
@resource = Tag.find params[:tag_id]
|
119
118
|
end
|
120
|
-
|
119
|
+
if params[:site_id]
|
120
|
+
@resource = Site.find params[:site_id]
|
121
|
+
end
|
122
|
+
authorize! :features_index, @resource
|
123
|
+
@features = @resource.features
|
121
124
|
end
|
122
|
-
=end
|
123
125
|
|
124
126
|
def destroy
|
125
127
|
if params[:tag_id]
|
@@ -110,6 +110,13 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
|
|
110
110
|
authorize! :edit, @newsitem
|
111
111
|
end
|
112
112
|
|
113
|
+
def index
|
114
|
+
@resource = Site.find( params[:site_id] ) if params[:site_id]
|
115
|
+
@resource = City.find( params[:site_id] ) if params[:city_id]
|
116
|
+
authorize! :newsitems_index, @resource
|
117
|
+
@newsitems = @resource.newsitems
|
118
|
+
end
|
119
|
+
|
113
120
|
private
|
114
121
|
|
115
122
|
def set_lists
|
@@ -26,11 +26,11 @@ class IshManager::SitesController < IshManager::ApplicationController
|
|
26
26
|
def show
|
27
27
|
@site = Site.unscoped.find params[:id]
|
28
28
|
authorize! :show, @site
|
29
|
-
@galleries = @site.galleries.
|
30
|
-
@reports = @site.reports.
|
29
|
+
@galleries = @site.galleries.page( params[:galleries_page] ).per( 10 )
|
30
|
+
@reports = @site.reports.page( params[:reports_page] ).per( 10 )
|
31
31
|
@videos = @site.videos.page( params[:videos_page] ).per( 5 )
|
32
32
|
@tags = Tag.where( :site_id => @site.id, :parent_tag_id => nil ).page( params[:tags_page] ).per( 100 )
|
33
|
-
@features = @site.features.page( params[:features_page] ).per( 9 )
|
33
|
+
@features = @site.features.limit( @site.n_features ) # page( params[:features_page] ).per( 9 )
|
34
34
|
@newsitems = @site.newsitems.page( params[:newsitems_page] ).per( @site.newsitems_per_page )
|
35
35
|
end
|
36
36
|
|
@@ -77,5 +77,23 @@ class IshManager::SitesController < IshManager::ApplicationController
|
|
77
77
|
redirect_to site_path( @site.id )
|
78
78
|
end
|
79
79
|
|
80
|
+
def reports
|
81
|
+
@site = Site.find params[:site_id]
|
82
|
+
authorize! :reports_index, @site
|
83
|
+
@reports = @site.reports.page( params[:reports_page] )
|
84
|
+
render 'ish_manager/reports/index'
|
85
|
+
end
|
86
|
+
|
87
|
+
def galleries
|
88
|
+
@site = Site.find params[:site_id]
|
89
|
+
authorize! :galleries_index, @site
|
90
|
+
@galleries = @site.galleries.page( params[:galleries_page] )
|
91
|
+
end
|
92
|
+
|
93
|
+
#
|
94
|
+
# private
|
95
|
+
#
|
96
|
+
private
|
97
|
+
|
80
98
|
end
|
81
99
|
|
@@ -6,6 +6,9 @@ class IshManager::TagsController < IshManager::ApplicationController
|
|
6
6
|
def index
|
7
7
|
@tags = Tag.unscoped.where( :parent_tag_id => nil ).order_by( :name => :asc )
|
8
8
|
authorize! :index, Tag.new
|
9
|
+
|
10
|
+
@site = Site.find( params[:site_id] ) if params[:site_id]
|
11
|
+
@city = City.find( params[:city_id] ) if params[:city_id]
|
9
12
|
end
|
10
13
|
|
11
14
|
def show
|
@@ -17,6 +17,13 @@ class IshManager::VideosController < IshManager::ApplicationController
|
|
17
17
|
@videos = @videos.where( :tag => tag )
|
18
18
|
end
|
19
19
|
|
20
|
+
if params[:site_id]
|
21
|
+
@site = Site.find params[:site_id]
|
22
|
+
@videos = @site.videos
|
23
|
+
end
|
24
|
+
|
25
|
+
@videos = @videos.page( params[:videos_page] )
|
26
|
+
|
20
27
|
respond_to do |format|
|
21
28
|
format.html do
|
22
29
|
render
|
@@ -1,25 +1,25 @@
|
|
1
1
|
|
2
2
|
.row
|
3
3
|
.large-12.columns
|
4
|
-
%h5 Features in <b>#{@resource.class.name}</b> #{@resource.name}
|
4
|
+
%h5 Features in <b>#{@resource.class.name}</b> #{@resource.name}
|
5
5
|
|
6
6
|
%ul
|
7
7
|
- @resource.features.each do |feature|
|
8
|
-
%li
|
9
|
-
.
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
8
|
+
%li.panel
|
9
|
+
.panel-body
|
10
|
+
|
11
|
+
= link_to '[~]', edit_city_feature_path( @resource, feature ) if 'City' == @resource.class.name
|
12
|
+
= link_to '[~]', edit_tag_feature_path( @resource, feature ) if 'Tag' == @resource.class.name
|
13
|
+
= link_to '[~]', edit_site_feature_path( @resource, feature ) if 'Site' == @resource.class.name
|
14
|
+
= link_to '[~]', edit_venue_feature_path( @resource, feature ) if 'Venue' == @resource.class.name
|
15
|
+
|
16
|
+
= link_to( '[x]', city_feature_path( @resource, feature ), :method => :delete, :data => { :confirm => :'Are you sure?' } ) if 'City' == @resource.class.name
|
17
|
+
= link_to( '[x]', tag_feature_path( @resource, feature ), :method => :delete, :data => { :confirm => :'Are you sure?' } ) if 'Tag' == @resource.class.name
|
18
|
+
= link_to( '[x]', site_feature_path( @resource, feature ), :method => :delete, :data => { :confirm => :'Are you sure?' } ) if 'Site' == @resource.class.name
|
19
|
+
= link_to( '[x]', venue_feature_path( @resource, feature ), :method => :delete, :data => { :confirm => :'Are you sure?' } ) if 'Venue' == @resource.class.name
|
20
|
+
|
21
|
+
%ul
|
22
|
+
%li Name #{feature.name}
|
23
|
+
%li Subhead: #{feature.subhead}
|
24
|
+
%li Report: #{feature.report}
|
25
|
+
%li Gallery: #{feature.gallery}
|
@@ -4,6 +4,9 @@
|
|
4
4
|
|
5
5
|
- if galleries.length > 0
|
6
6
|
.galleries--list
|
7
|
+
- if galleries.respond_to? :total_pages
|
8
|
+
= paginate galleries, :param_name => param_name, :views_prefix => 'ish_manager'
|
9
|
+
|
7
10
|
- galleries.each do |g|
|
8
11
|
.panel
|
9
12
|
.panel-body
|
@@ -20,7 +23,7 @@
|
|
20
23
|
= link_to image_tag(photo.photo.url(:thumb), :alt => g.name, :class => :thumb ), gallery_path(g.galleryname)
|
21
24
|
|
22
25
|
- if galleries.respond_to? :total_pages
|
23
|
-
= paginate galleries, :param_name => param_name
|
26
|
+
= paginate galleries, :param_name => param_name, :views_prefix => 'ish_manager'
|
24
27
|
|
25
28
|
- else
|
26
29
|
%h5 No Galleries
|
@@ -5,6 +5,8 @@
|
|
5
5
|
- content_for :menu do
|
6
6
|
- # nothing
|
7
7
|
|
8
|
+
= render 'ish_manager/sites/header', :site => @site if @site
|
9
|
+
|
8
10
|
.container
|
9
11
|
.row
|
10
12
|
.col-sm-6
|
@@ -16,7 +18,7 @@
|
|
16
18
|
.col-sm-12
|
17
19
|
-# = render 'ish_manager/galleries/menu_secondary'
|
18
20
|
= render 'ish_manager/galleries/list', :galleries => @galleries, :param_name => :galleries_page
|
19
|
-
|
21
|
+
|
20
22
|
.container
|
21
23
|
.row
|
22
24
|
.col-sm-12
|
@@ -14,7 +14,6 @@
|
|
14
14
|
%th Email
|
15
15
|
%th Job Url
|
16
16
|
%th Description
|
17
|
-
%th Done?
|
18
17
|
- @leads.each do |lead|
|
19
18
|
%tr
|
20
19
|
%td= link_to raw('<i class="fa fa-play"></i>'), lead_path( lead )
|
@@ -23,4 +22,3 @@
|
|
23
22
|
%td= link_to raw('<i class="fa fa-envelope"></i>'), "mailto:#{lead.email}"
|
24
23
|
%td= link_to raw('<i class="fa fa-user-md"></i>'), lead.job_url, :target => '_blank'
|
25
24
|
%td= lead.description
|
26
|
-
%td= lead.is_done ? raw('<i class="fa fa-check"></i>') : nil
|
@@ -0,0 +1,9 @@
|
|
1
|
+
|
2
|
+
|
3
|
+
- if @resource.class.name == 'Site'
|
4
|
+
= render 'ish_manager/sites/header', :site => @resource
|
5
|
+
= render 'index', :newsitems => @newsitems, :site => @resource
|
6
|
+
|
7
|
+
- if @resource.class.name == 'City'
|
8
|
+
= render 'ish_manager/cities/header', :city => @resource
|
9
|
+
= render 'index', :newsitems => @newsitems, :city => @resource
|
@@ -1,4 +1,5 @@
|
|
1
1
|
|
2
|
+
- reports ||= @reports
|
2
3
|
- reports = reports.page( params[:reports_page] ).per( 10 )
|
3
4
|
- if defined? site
|
4
5
|
- new_path = new_site_report_path( site.id )
|
@@ -12,7 +13,7 @@
|
|
12
13
|
Reports (#{reports.length})
|
13
14
|
= link_to image_new, new_path
|
14
15
|
|
15
|
-
= paginate reports, :param_name => :reports_page
|
16
|
+
= paginate reports, :param_name => :reports_page, :views_prefix => 'ish_manager'
|
16
17
|
%ol
|
17
18
|
- reports.each do |report|
|
18
19
|
%li
|
@@ -21,5 +22,5 @@
|
|
21
22
|
= link_to report.name, report_path( report )
|
22
23
|
- if report.subhead && report.subhead.length > 3
|
23
24
|
.subhead= report.subhead
|
24
|
-
= paginate reports, :param_name => :reports_page
|
25
|
+
= paginate reports, :param_name => :reports_page, :views_prefix => 'ish_manager'
|
25
26
|
|
@@ -1,10 +1,13 @@
|
|
1
1
|
|
2
|
+
-# ish_manager / reports / index
|
3
|
+
|
4
|
+
- if @site
|
5
|
+
= render 'ish_manager/sites/header', :site => @site
|
6
|
+
|
2
7
|
.row
|
3
8
|
.large-12.columns
|
4
9
|
%h3
|
5
|
-
Reports
|
6
|
-
- if @site
|
7
|
-
In #{@site.domain}/#{@site.lang}
|
10
|
+
Reports (#{@reports.length})
|
8
11
|
= link_to image_new, new_report_path
|
9
12
|
|
10
13
|
= paginate @reports, :param_name => :reports_page, :views_prefix => 'ish_manager'
|
@@ -25,5 +28,5 @@
|
|
25
28
|
Site #{report.site.domain}/#{report.site.lang}
|
26
29
|
%br
|
27
30
|
= report.created_at
|
28
|
-
= paginate @reports, :param_name => :reports_page
|
31
|
+
= paginate @reports, :param_name => :reports_page, :views_prefix => 'ish_manager'
|
29
32
|
|
@@ -0,0 +1,16 @@
|
|
1
|
+
|
2
|
+
- site ||= @site
|
3
|
+
|
4
|
+
.manager-sites--title
|
5
|
+
%h1
|
6
|
+
Site http://#{site.domain}/#{site.lang}
|
7
|
+
= link_to '[~]', edit_site_path( site.id )
|
8
|
+
|
9
|
+
%ul
|
10
|
+
%li= link_to "Features (#{site.features.length})", site_features_path( site.id )
|
11
|
+
%li= link_to "Newsitems (#{site.newsitems.length})", site_newsitems_path( site.id )
|
12
|
+
%li= link_to "Reports (#{site.reports.length})", site_reports_path( site.id )
|
13
|
+
%li= link_to "Galleries (#{site.galleries.length})", site_galleries_path( site.id )
|
14
|
+
%li= link_to "Videos (#{site.videos.length})", site_videos_path( site.id )
|
15
|
+
%li= link_to "Tags (#{site.tags.length})", site_tags_path( site.id )
|
16
|
+
|
@@ -0,0 +1,19 @@
|
|
1
|
+
|
2
|
+
-# ish_manager / sites / galleries
|
3
|
+
|
4
|
+
- content_for :title do
|
5
|
+
Manager Galleries Index
|
6
|
+
|
7
|
+
- content_for :menu do
|
8
|
+
- # nothing
|
9
|
+
|
10
|
+
= render 'ish_manager/sites/header', :site => @site if @site
|
11
|
+
|
12
|
+
.container
|
13
|
+
.row
|
14
|
+
.col-sm-12
|
15
|
+
%h4
|
16
|
+
Galleries (#{@galleries.count})
|
17
|
+
= link_to image_new, new_gallery_path
|
18
|
+
= render 'ish_manager/galleries/list', :galleries => @galleries, :param_name => :galleries_page
|
19
|
+
|
@@ -1,7 +1,7 @@
|
|
1
1
|
|
2
2
|
.manager-sites-show
|
3
|
-
= render '
|
4
|
-
= render 'ish_manager/features/index',
|
3
|
+
= render 'header', :site => @site
|
4
|
+
-# = render 'ish_manager/features/index', :features => @features, :site => @site
|
5
5
|
= render 'ish_manager/newsitems/index', :newsitems => @newsitems.limit(@site.n_newsitems), :site => @site
|
6
6
|
|
7
7
|
.row
|
data/config/routes.rb
CHANGED
@@ -39,9 +39,16 @@ IshManager::Engine.routes.draw do
|
|
39
39
|
|
40
40
|
resources :sites do
|
41
41
|
resources :features
|
42
|
-
resources :galleries
|
43
42
|
resources :newsitems
|
43
|
+
|
44
|
+
get 'reports', :to => 'sites#reports'
|
44
45
|
resources :reports
|
46
|
+
|
47
|
+
get 'galleries', :to => 'sites#galleries'
|
48
|
+
|
49
|
+
resources :galleries
|
50
|
+
resources :videos
|
51
|
+
resources :tags
|
45
52
|
end
|
46
53
|
|
47
54
|
resources :stock_actions
|
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.124
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- piousbox
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-12-
|
11
|
+
date: 2017-12-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -272,6 +272,7 @@ files:
|
|
272
272
|
- app/views/ish_manager/newsitems/_item.haml
|
273
273
|
- app/views/ish_manager/newsitems/edit.haml
|
274
274
|
- app/views/ish_manager/newsitems/edit.haml~
|
275
|
+
- app/views/ish_manager/newsitems/index.haml
|
275
276
|
- app/views/ish_manager/newsitems/new.haml
|
276
277
|
- app/views/ish_manager/photos/_meta.haml
|
277
278
|
- app/views/ish_manager/photos/_multinew.haml
|
@@ -285,8 +286,9 @@ files:
|
|
285
286
|
- app/views/ish_manager/reports/new.haml
|
286
287
|
- app/views/ish_manager/reports/show.haml
|
287
288
|
- app/views/ish_manager/sites/_form.haml
|
288
|
-
- app/views/ish_manager/sites/
|
289
|
+
- app/views/ish_manager/sites/_header.haml
|
289
290
|
- app/views/ish_manager/sites/edit.haml
|
291
|
+
- app/views/ish_manager/sites/galleries.haml
|
290
292
|
- app/views/ish_manager/sites/index.haml
|
291
293
|
- app/views/ish_manager/sites/new.haml
|
292
294
|
- app/views/ish_manager/sites/show.haml
|