ish_manager 0.1.8.231 → 0.1.8.236

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/ish_manager/application.js +5 -5
  3. data/app/controllers/ish_manager/galleries_controller.rb +2 -2
  4. data/app/views/ish_manager/application/_debug.haml +6 -0
  5. data/app/views/ish_manager/galleries/_form.haml +6 -3
  6. data/app/views/ish_manager/videos/_embed_mini.erb +4 -0
  7. data/app/views/ish_manager/videos/_index.haml +4 -2
  8. data/app/views/ish_manager/videos/show.haml +2 -2
  9. data/app/views/layouts/ish_manager/application.haml +2 -1
  10. data/app/views/layouts/ish_manager/application_no_materialize.haml +1 -0
  11. metadata +4 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: fa8c2d18f5b3b0f48bd15a601362e75d2790b11e49b7781ee4e70fb2a4e5088c
4
- data.tar.gz: 29bb625a7e3541bb7929f235ee5c29b348a62bfe4c762e57118f1ba57dc780ec
3
+ metadata.gz: a2f020eda26b6a31767203e56a31685541d53fcb46dd159eef5d5892cdd86625
4
+ data.tar.gz: 6e9716a83e48f3dd9a48b0402f80484604d964e66152d1601d5f5ca265ab1578
5
5
  SHA512:
6
- metadata.gz: f41c276c49a17f4255089ff57197dd3f807584e8c0441fa75587eb76c0de596418b58dff96a7344cce12cece15fe102c3a6f658d15b603ceeb12f01bf0d3f5b6
7
- data.tar.gz: 4198f92d62880365f251c01346ad743bdf0593294f2b7123d4bb44a0fecd1554af2824a0032e125e41a48f58b1579369caa4083212d0011386d6d27164821ef1
6
+ metadata.gz: ca19d0d7a205f5b39c61b7377fa4e557c1193b73b91b1d696b6d4672ab561815e9da0a743804484fcb2d0e307875e19241b2d2b219cfb65049c2ff00ffd78128
7
+ data.tar.gz: 4b814fc33bae0a228c3ff58d5db32cc79b89231485e7bd9e86d814ff9078ae792b057c66f3e51bad67a90537ffd146810b419a2ddead370fc075996593aff63f
data/app/assets/javascripts/ish_manager/application.js CHANGED
@@ -26,7 +26,7 @@ $(function () {
26
26
  var tempUrl = data.result[0].thumbnail_url;
27
27
  $('<img/>').attr('src', tempUrl).appendTo(photos);
28
28
  }
29
- });
29
+ });
30
30
  });
31
31
 
32
32
  $(document).ready(function () {
@@ -34,7 +34,7 @@ $(document).ready(function () {
34
34
  $('*[data-confirm]').click(function(){
35
35
  return confirm($(this).attr('data-confirm'));
36
36
  });
37
-
37
+
38
38
  if ($(".tinymce").length > 0) {
39
39
  tinymce.init({
40
40
  mode: "specific_textareas",
@@ -63,7 +63,7 @@ $(document).ready(function () {
63
63
  $(this).addClass('fa-compress')
64
64
  localStorage.setItem('mainHeaderCollapsed', 'false')
65
65
  $('.content', $(this).parent()).css('display', 'block')
66
- }
66
+ }
67
67
  })
68
68
  if (localStorage.getItem('mainHeaderCollapsed') === 'true') {
69
69
  $("#collapseHeader").addClass('fa-expand')
@@ -83,7 +83,7 @@ $(document).ready(function () {
83
83
  $(this).addClass('fa-compress')
84
84
  localStorage.setItem('mainFooterCollapsed', 'false')
85
85
  $('.content', $(this).parent()).css('display', 'block')
86
- }
86
+ }
87
87
  })
88
88
  if (localStorage.getItem('mainFooterCollapsed') === 'true') {
89
89
  console.log('here')
@@ -106,4 +106,4 @@ $(document).ready(function () {
106
106
  $(".datepicker").datepicker({ dateFormat: 'yy-mm-dd' });
107
107
 
108
108
  });
109
-
109
+
data/app/controllers/ish_manager/galleries_controller.rb CHANGED
@@ -4,8 +4,8 @@ class IshManager::GalleriesController < IshManager::ApplicationController
4
4
 
5
5
  def index
6
6
  authorize! :index, Gallery
7
- @galleries = Gallery.unscoped.where( :is_trash => false, :user_profile => current_user.profile
8
- ).order_by( :created_at => :desc )
7
+ @galleries = Gallery.unscoped.where( :is_done.in => [false, nil], :is_trash.in => [false, nil],
8
+ :user_profile => current_user.profile ).order_by( :created_at => :desc )
9
9
  if params[:q]
10
10
  @galleries = @galleries.where({ :name => /#{params[:q]}/i })
11
11
  end
data/app/views/ish_manager/application/_debug.haml ADDED
@@ -0,0 +1,6 @@
1
+
2
+
3
+ %ul{ style: "margin: 2em;" }
4
+ %li= params.inspect
5
+ %li= "Cache key: #{@cache_key.inspect}" if @cache_key
6
+ %li= "Cached? #{Rails.application.config.action_controller.perform_caching}"
data/app/views/ish_manager/galleries/_form.haml CHANGED
@@ -13,7 +13,7 @@
13
13
  .col-sm-6
14
14
  = f.label :galleryname
15
15
  = f.text_field :galleryname
16
-
16
+
17
17
  .row
18
18
  .col-sm-4
19
19
  = f.label :site
@@ -28,7 +28,7 @@
28
28
  .col-sm-4
29
29
  = f.label :tags
30
30
  = f.select :tag_ids, @tags_list, {}, { multiple: true }
31
-
31
+
32
32
  .row
33
33
  .panel
34
34
  .panel-body
@@ -46,7 +46,7 @@
46
46
  = f.text_area :subhead
47
47
  .row
48
48
  = f.text_area :descr, class: :tinymce
49
-
49
+
50
50
  .row
51
51
  .col-sm-3
52
52
  = f.check_box :is_public
@@ -54,6 +54,9 @@
54
54
  .col-sm-3
55
55
  = f.check_box :is_trash
56
56
  = f.label :is_trash
57
+ .col-sm-3
58
+ = f.check_box :is_done
59
+ = f.label :is_done
57
60
  .col-sm-3
58
61
  = f.label :premium_tier
59
62
  = f.number_field :premium_tier
data/app/views/ish_manager/videos/_embed_mini.erb ADDED
@@ -0,0 +1,4 @@
1
+
2
+ <div class="video-embed-half">
3
+ <iframe width="200" height="150" src="//www.youtube.com/embed/<%= video.youtube_id %>" frameborder="0" allowfullscreen></iframe>
4
+ </div>
data/app/views/ish_manager/videos/_index.haml CHANGED
@@ -15,8 +15,10 @@
15
15
  .row
16
16
  .col-sm-6
17
17
  .float-left
18
- - if video.youtube_id
19
- .thumb-youtube= image_tag "https://img.youtube.com/vi/#{video.youtube_id}/1.jpg"
18
+ - if video.youtube_id.present?
19
+ -## doesn't work with private videos, which are most
20
+ -# .thumb-youtube= image_tag "https://img.youtube.com/vi/#{video.youtube_id}/1.jpg"
21
+ = render 'embed_mini', video: video
20
22
  - else
21
23
  .thumb= image_tag video.thumb.url(:thumb)
22
24
  .a
data/app/views/ish_manager/videos/show.haml CHANGED
@@ -16,5 +16,5 @@
16
16
  = link_to @video.video.url, @video.video.url
17
17
 
18
18
  %p <b>User Profile:</b> #{@video.user_profile.name}
19
-
20
- = @video.inspect
19
+ %p= image_tag @video.thumb.url(:thumb)
20
+ %p <b>Video:</b> #{@video.inspect}
data/app/views/layouts/ish_manager/application.haml CHANGED
@@ -7,7 +7,6 @@
7
7
  %meta{ :charset => 'UTF-8' }
8
8
  %meta{ :description => 'some description' }
9
9
  %script{ :src => "//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js" }
10
- -# %script{ :src => "//code.jquery.com/jquery-3.3.1.slim.min.js" }
11
10
  %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/jquery.tinymce.min.js" }
12
11
  %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/tinymce.min.js" }
13
12
  %script{ :src => "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" }
@@ -34,3 +33,5 @@
34
33
  = yield
35
34
  = render 'ish_manager/application/main_footer'
36
35
  = render 'analytics' unless Rails.env.development?
36
+ = render 'debug' if Rails.env.development?
37
+
data/app/views/layouts/ish_manager/application_no_materialize.haml CHANGED
@@ -30,3 +30,4 @@
30
30
  .container
31
31
  = yield
32
32
  = render :partial => 'ish_manager/application/main_footer'
33
+ = render 'debug' if Rails.env.development?
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.231
4
+ version: 0.1.8.236
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-02-06 00:00:00.000000000 Z
11
+ date: 2021-04-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -220,6 +220,7 @@ files:
220
220
  - app/models/ish_manager/ability.rb
221
221
  - app/models/ish_manager/application_record.rb
222
222
  - app/views/ish_manager/application/_analytics.html
223
+ - app/views/ish_manager/application/_debug.haml
223
224
  - app/views/ish_manager/application/_form_errors.haml
224
225
  - app/views/ish_manager/application/_main_footer.haml
225
226
  - app/views/ish_manager/application/_main_header.haml
@@ -354,6 +355,7 @@ files:
354
355
  - app/views/ish_manager/venues/show.haml
355
356
  - app/views/ish_manager/videos/_embed.erb
356
357
  - app/views/ish_manager/videos/_embed_half.erb
358
+ - app/views/ish_manager/videos/_embed_mini.erb
357
359
  - app/views/ish_manager/videos/_form.haml
358
360
  - app/views/ish_manager/videos/_index.haml
359
361
  - app/views/ish_manager/videos/_index_title.haml