ish_manager 0.1.8.218 → 0.1.8.223

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1d86a2f745f9ccf9f6def03a60bddbc8a14d9be0201250ceaf37badbf32aca0c
4
- data.tar.gz: 599322d29c14ae0aff6427608e1be02ed8879284a20aa1528191f03d7a1f498a
3
+ metadata.gz: 369291675e2b11d99d6853980310f18ab835128ad442118fd3525269ee36c357
4
+ data.tar.gz: 28c59188ea0de333d77eb823d416be59c48b3ff0e39c47e64f89bf2fa8265864
5
5
  SHA512:
6
- metadata.gz: e01f66562f5a0daa1acf181ae596e81e8eda97219a230915c71f2cc239ae99fc96e8de1ced4273482b1ad6e3e0056f4ea4f8c12b485383920b6d76494c600c4e
7
- data.tar.gz: a245084a69f013cb2a5f518b897b1e5ed99b3c295f872f50bccc0fcce14ad9cf7f3d8a957211e98d93e7b6ac39481c8959fb4a1d6b481198448b5e78beace17e
6
+ metadata.gz: d5197f2fdfe7823899f3c60fda2994a29de7d058ae981d4c839741637b217bec541d02a49029aab41b1e98182ebbb0f4685e0f94576338e215275352b69687d7
7
+ data.tar.gz: 457766d099dab70569b3e28fb022cfe45f642a6736d6ed1e3c48c7ee9b6f4c00df2e0ab8d1740bcc819c5f6308e8e2ed6b51f4bc601e8fb7468839cc59581b58
@@ -91,9 +91,6 @@ hr {
91
91
  width: 100px;
92
92
  }
93
93
 
94
- .inline {
95
- display: inline;
96
- }
97
94
  ul.inline li {
98
95
  display: inline;
99
96
  }
@@ -11,6 +11,10 @@
11
11
  }
12
12
 
13
13
  .large-photos .item .wrapper {
14
+ width: 100%;
15
+ height: 100%;
16
+ background-repeat: no-repeat;
17
+ background-position: center center;
14
18
  }
15
19
 
16
20
  .large-photos .item .wrapper img {
@@ -1,13 +1,13 @@
1
1
  class IshManager::GalleriesController < IshManager::ApplicationController
2
2
 
3
3
  before_action :set_lists
4
-
4
+
5
5
  def index
6
6
  authorize! :index, Gallery
7
7
  @galleries = Gallery.unscoped.where( :is_trash => false, :user_profile => current_user.profile
8
8
  ).order_by( :created_at => :desc )
9
9
  if params[:q]
10
- @galleries = @galleries.where({ :name => /#{params[:q]}/i })
10
+ @galleries = @galleries.where({ :name => /#{params[:q]}/i })
11
11
  end
12
12
  @galleries = @galleries.page( params[:galleries_page] ).per( 20 )
13
13
 
@@ -16,8 +16,8 @@ class IshManager::GalleriesController < IshManager::ApplicationController
16
16
 
17
17
  def shared_with_me
18
18
  authorize! :index, Gallery
19
- @galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false
20
- ).order_by( :created_at => :desc
19
+ @galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false
20
+ ).order_by( :created_at => :desc
21
21
  ).page( params[:shared_galleries_page] ).per( 10 )
22
22
  render params[:render_type]
23
23
  end
@@ -68,7 +68,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
68
68
 
69
69
  # puts! params[:gallery][:shared_profiles], 'shared profiles'
70
70
  if @gallery.update_attributes( params[:gallery].permit! )
71
- new_shared_profiles = IshModels::UserProfile.find( params[:gallery][:shared_profile_ids]
71
+ new_shared_profiles = IshModels::UserProfile.find( params[:gallery][:shared_profile_ids]
72
72
  ).select { |p| !old_shared_profile_ids.include?( p.id ) }
73
73
  ::IshManager::ApplicationMailer.shared_galleries( new_shared_profiles, @gallery ).deliver
74
74
  flash[:notice] = 'Success.'
@@ -78,7 +78,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
78
78
  flash[:alert] = 'No Luck. ' + @gallery.errors.messages.to_s
79
79
  render :action => :edit
80
80
  end
81
- end
81
+ end
82
82
 
83
83
  def show
84
84
  begin
@@ -14,7 +14,12 @@ class IshManager::PhotosController < IshManager::ApplicationController
14
14
  authorize! :destroy, @photo
15
15
  @photo.gallery.touch if @photo.gallery
16
16
  @photo.is_trash = true
17
- @photo.save
17
+ flag = @photo.save
18
+ if flag
19
+ flash[:notice] = "Success"
20
+ else
21
+ flash[:alert] = "No luck: #{@photo.errors.messages}"
22
+ end
18
23
  redirect_to request.referrer || root_path
19
24
  end
20
25
 
@@ -2,7 +2,7 @@
2
2
  class IshManager::VideosController < IshManager::ApplicationController
3
3
 
4
4
  before_action :set_lists
5
-
5
+
6
6
  def index
7
7
  authorize! :index, Video.new
8
8
  @videos = Video.unscoped.where( is_trash: false, :user_profile => current_user.profile ).order_by( :created_at => :desc )
@@ -16,12 +16,16 @@ class IshManager::VideosController < IshManager::ApplicationController
16
16
  tag = Tag.find params[:tag_id]
17
17
  @videos = @videos.where( :tag => tag )
18
18
  end
19
-
19
+
20
20
  if params[:site_id]
21
21
  @site = Site.find params[:site_id]
22
22
  @videos = @site.videos
23
23
  end
24
-
24
+
25
+ if params[:q]
26
+ @videos = @videos.where({ :name => /#{params[:q]}/i })
27
+ end
28
+
25
29
  @videos = @videos.page( params[:videos_page] )
26
30
 
27
31
  respond_to do |format|
@@ -54,7 +58,7 @@ class IshManager::VideosController < IshManager::ApplicationController
54
58
  @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
55
59
  @cities_list = City.list
56
60
  end
57
-
61
+
58
62
  def create
59
63
  @video = Video.new params[:video].permit(%i| name descr is_public is_trash is_feature x y lang youtube_id
60
64
  tags city site user_profile premium_tier premium_purchases thumb video |)
@@ -69,9 +73,9 @@ class IshManager::VideosController < IshManager::ApplicationController
69
73
  end
70
74
  end
71
75
  authorize! :create, @video
72
-
76
+
73
77
  if @video.save
74
- flash[:notice] = 'Success'
78
+ flash[:notice] = 'Success'
75
79
  redirect_to videos_path
76
80
  else
77
81
  flash[:alert] = 'No luck'
@@ -80,11 +84,11 @@ class IshManager::VideosController < IshManager::ApplicationController
80
84
  render :action => 'new'
81
85
  end
82
86
  end
83
-
87
+
84
88
  def edit
85
89
  @video = Video.unscoped.find params[:id]
86
90
  authorize! :edit, @video
87
-
91
+
88
92
  @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
89
93
  @cities_list = City.list
90
94
  end
@@ -118,5 +122,5 @@ class IshManager::VideosController < IshManager::ApplicationController
118
122
  end
119
123
  redirect_to :action => 'index'
120
124
  end
121
-
125
+
122
126
  end
@@ -21,14 +21,13 @@
21
21
  %li{ :class => params[:controller] == 'ish_manager/videos' ? 'active' : '' }= link_to 'Videos', videos_path
22
22
  %li{ :class => params[:controller] == 'ish_manager/tags' ? 'active' : '' }= link_to 'Tags', tags_path
23
23
 
24
- - proc do # nothing
25
24
  %ul.nav.nav-pills
26
25
  -# %li{ :class => params[:controller] == 'ish_manager/ally' ? 'active' : '' }= link_to 'Ally', ally_root_path
27
26
  -# %li{ :class => params[:controller] == 'ish_manager/stock_actions' ? 'active' : '' }= link_to 'Stock Actions', stock_actions_path
28
27
  -# %li{ :class => params[:controller] == 'ish_manager/stock_options' ? 'active' : '' }= link_to 'Stock Options', stock_options_path
29
28
  %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches', stock_watches_path
30
- %li{ :class => params[:controller] == 'ish_manager/iron_condors' ? 'active' : '' }= link_to 'Iron Condors', iron_condors_path
31
- %li{ :class => params[:controller] == 'ish_manager/covered_calls' ? 'active' : '' }= link_to 'Covered Calls', covered_calls_path
29
+ -# %li{ :class => params[:controller] == 'ish_manager/iron_condors' ? 'active' : '' }= link_to 'Iron Condors', iron_condors_path
30
+ -# %li{ :class => params[:controller] == 'ish_manager/covered_calls' ? 'active' : '' }= link_to 'Covered Calls', covered_calls_path
32
31
 
33
32
  - proc do # nothing
34
33
  %ul.nav.nav-pills
@@ -1,6 +1,6 @@
1
1
 
2
2
  - # @TODO: definitely more abstract
3
- - path ||= galleries_path
3
+ - path ||= galleries_path
4
4
 
5
5
  = form_tag path, :method => :get, :class => :search do
6
6
  .field.search_words
@@ -1,3 +1 @@
1
-
2
- = render 'index'
3
-
1
+ = render 'ish_manager/galleries/index'
@@ -1 +1 @@
1
- = render 'index'
1
+ = render 'ish_manager/galleries/index'
@@ -3,7 +3,7 @@
3
3
  .row
4
4
  .col-sm-12.col-md-12
5
5
  %h1.center #{params[:action]} (#{@galleries.count}) #{link_to '[+]', new_gallery_path}
6
- = render 'search'
6
+ = render 'search', path: galleries_path
7
7
  %ul.menu-secondary
8
8
  %li{ class: "#{params[:render_type] == 'index_titles' ? 'active' : ''}" }
9
9
  = link_to 'titles list', galleries_index_titles_path( :render_type => Gallery::RENDER_THUMBS )
@@ -33,6 +33,6 @@
33
33
  .center.large-photos
34
34
  - @photos.each do |photo|
35
35
  .item
36
- .wrapper
37
- = image_tag photo.photo.url( :large ), :alt => ''
36
+ .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }
37
+ = button_to '[x]', photo_path( :id => photo.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
38
38
 
@@ -6,27 +6,23 @@
6
6
  Videos (#{videos.count})
7
7
  = link_to '[+]', new_video_path
8
8
  %br
9
-
9
+
10
10
  = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
11
-
11
+
12
12
  - videos.each do |video|
13
13
  .panel
14
14
  .panel-content
15
15
  .row
16
- .col-xs-12.col-sm-6
17
- .center
16
+ .col-sm-6
17
+ .float-left
18
+ .thumb= image_tag video.thumb.url(:thumb)
19
+ .a
18
20
  = link_to video.name, video_path( video )
19
21
  .inline= button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }
20
22
  = link_to '[~]', edit_video_path( video )
21
- = render 'meta', :item => video
22
- = image_tag video.thumb.url(:thumb)
23
- .col-xs-12.col-sm-6
24
- .center
25
- - if @current_user.profile.videos_embed
26
- = render 'ish_manager/videos/embed', :video => video
27
- - else
28
- = render 'ish_manager/videos/preview', :video => video
29
-
23
+ = render 'meta', :item => video
24
+ .c
25
+
30
26
  = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
31
27
  %hr
32
28
 
@@ -1,4 +1,6 @@
1
1
 
2
2
  = render 'ish_manager/sites/header', :site => @site if @site
3
- = render 'index', :videos => @videos
4
3
 
4
+ = render 'search', path: videos_path
5
+
6
+ = render 'index', :videos => @videos
@@ -15,4 +15,6 @@
15
15
  %hr
16
16
  = link_to @video.video.url, @video.video.url
17
17
 
18
- -# = render 'disqus'
18
+ %p <b>User Profile:</b> #{@video.user_profile.name}
19
+
20
+ = @video.inspect
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.218
4
+ version: 0.1.8.223
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-25 00:00:00.000000000 Z
11
+ date: 2020-07-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails