ish_manager 0.1.8.226 → 0.1.8.231

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85b4cab8bd5d1cd3c1774dee82948ee0d59b3ef4d28d13acdab2e2208771b05a
-  data.tar.gz: 38fb5c28ff903e6fcca7201452c627565788a13615c6c28a709668d2015c7226
+  metadata.gz: fa8c2d18f5b3b0f48bd15a601362e75d2790b11e49b7781ee4e70fb2a4e5088c
+  data.tar.gz: 29bb625a7e3541bb7929f235ee5c29b348a62bfe4c762e57118f1ba57dc780ec
 SHA512:
-  metadata.gz: 29f1dddb16814fa2ac28444b494a284fca08a4acd80049d5d4187c47215a773d4fdfe0acc3500de83e66fe3c283946e73dc86833085c12caf0ffd795322905b7
-  data.tar.gz: 66c57c05133f55095b575aa5856f84bb839b14d4555955e7c55b4be141e756cbfb63b842f8cc3762a26085b31e9808da72668dbd3da9b2c5d3ca38130d58667f
+  metadata.gz: f41c276c49a17f4255089ff57197dd3f807584e8c0441fa75587eb76c0de596418b58dff96a7344cce12cece15fe102c3a6f658d15b603ceeb12f01bf0d3f5b6
+  data.tar.gz: 4198f92d62880365f251c01346ad743bdf0593294f2b7123d4bb44a0fecd1554af2824a0032e125e41a48f58b1579369caa4083212d0011386d6d27164821ef1

data/app/assets/stylesheets/ish_manager/galleries.css

@@ -15,8 +15,10 @@
   height: 100%;
   background-repeat: no-repeat;
   background-position: center center;
+  background-size: contain;
 }
 
 .large-photos .item .wrapper img {
   max-height: 100%;
+  max-width: 100%;
 }

data/app/controllers/ish_manager/application_controller.rb

@@ -63,7 +63,7 @@ module IshManager
       end
       # redirect_to resource_path( @resource )
     end
-    
+
     def resource_path resource
       case resource.class.name
       when 'City'

data/app/controllers/ish_manager/galleries_controller.rb

@@ -61,18 +61,18 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     old_shared_profile_ids = @gallery.shared_profiles.map(&:id)
     authorize! :update, @gallery
 
+    params[:gallery][:tag_ids].delete('') if params[:gallery][:tag_ids]
+
     params[:gallery][:shared_profiles].delete('')
-    # params[:gallery][:shared_profiles] = IshModels::UserProfile.find( params[:gallery][:shared_profiles] ).to_a
     params[:gallery][:shared_profile_ids] = params[:gallery][:shared_profiles]
     params[:gallery].delete :shared_profiles
 
-    # puts! params[:gallery][:shared_profiles], 'shared profiles'
     if @gallery.update_attributes( params[:gallery].permit! )
       new_shared_profiles = IshModels::UserProfile.find( params[:gallery][:shared_profile_ids]
         ).select { |p| !old_shared_profile_ids.include?( p.id ) }
       ::IshManager::ApplicationMailer.shared_galleries( new_shared_profiles, @gallery ).deliver
       flash[:notice] = 'Success.'
-      redirect_to galleries_path
+      redirect_to gallery_path(@gallery)
     else
       puts! @gallery.errors.messages, 'cannot save gallery'
       flash[:alert] = 'No Luck. ' + @gallery.errors.messages.to_s

data/app/controllers/ish_manager/sites_controller.rb

@@ -1,5 +1,11 @@
+
 class IshManager::SitesController < IshManager::ApplicationController
-  
+
+  ## params:
+  ## :domain, :lang, :title, :subhead, :description, :homepage_layout, :layout,
+  ##   :n_features, :n_newsitems, :newsitems_per_page, :is_trash, :is_ads_enabled,
+  ##   :is_private, :play_videos_in_preview, :private_user_emails,
+
   def index
     authorize! :sites_index, ::Manager
     @site_groups = Site.where( :is_trash => false ).order_by( :lang => :desc ).group_by {|s|s.domain}
@@ -26,14 +32,15 @@ class IshManager::SitesController < IshManager::ApplicationController
     @site = Site.unscoped.find params[:id]
     authorize! :update, @site
   end
-  
+
   def new
-    authorize! :new, Site.new
     @site = Site.new
+    authorize! :new, @site
   end
 
   def create
     authorize! :create, Site.new
+    params[:site][:private_user_emails] = params[:site][:private_user_emails].gsub(/\s+/m, ' ').strip.split(" ") if params[:site][:private_user_emails]
     @site = Site.new params[:site].permit!
     if @site.save
       flash[:notice] = 'Success'
@@ -46,7 +53,7 @@ class IshManager::SitesController < IshManager::ApplicationController
   def update
     @site = Site.unscoped.find params[:id]
     authorize! :update, @site
-    
+
     params[:site][:private_user_emails] = params[:site][:private_user_emails].gsub(/\s+/m, ' ').strip.split(" ")
 
     if @site.update_attributes params[:site].permit!
@@ -57,9 +64,9 @@ class IshManager::SitesController < IshManager::ApplicationController
     redirect_to sites_path
   end
 
-  def newsitem_delete    
+  def newsitem_delete
     @site = Site.find params[:site_id]
-    authorize! :update, @site  
+    authorize! :update, @site
     n = @site.newsitems.find( params[:newsitem_id] )
     n.delete
     @site.touch

data/app/models/ish_manager/ability.rb

@@ -8,7 +8,7 @@ class IshManager::Ability
     # signed in user
     #
     unless user.blank?
-      
+
       #
       # only sudoer... total power
       #
@@ -17,7 +17,7 @@ class IshManager::Ability
       end
 
       can [ :home ], ::IshManager::Ability
-      
+
       #
       # role admin
       #
@@ -34,7 +34,7 @@ class IshManager::Ability
         can [ :edit, :update ], ::Gallery do |g|
           !g.is_trash && ( g.is_public || g.user_profile == user.profile )
         end
-        
+
         can [ :cities_index, :home, :sites_index ], ::Manager
 
         can [ :new ], Newsitem
@@ -44,7 +44,7 @@ class IshManager::Ability
           !g.is_trash && ( g.is_public || g.user_profile == user.profile )
         end
 
-        can [ :show, :edit, :update, :create_newsitem, :new_feature, :create_feature, :newsitems_index ], ::Site do |site|
+        can [ :new, :show, :edit, :update, :create_newsitem, :new_feature, :create_feature, :newsitems_index ], ::Site do |site|
           !site.is_private && !site.is_trash
         end
         can [ :manage ], Ish::StockWatch
@@ -85,15 +85,16 @@ class IshManager::Ability
         # can [ :index ], ::Report
 
         # can [ :index ], ::Video
-        
+
       end
 
     end
+
     #
     # anonymous user
     #
     user ||= ::User.new
-    
+
     can [ :show ], ::Gallery do |gallery|
       gallery.is_public
     end
@@ -101,6 +102,6 @@ class IshManager::Ability
     can [ :show ], ::Report do |report|
       report.is_public
     end
-    
+
   end
 end

data/app/views/ish_manager/galleries/show.haml

@@ -35,8 +35,6 @@
   - @photos.each do |photo|
     .item
       %a{id: "large_#{photo.id}" }
-      -# .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }
-      .wrapper
-        = button_to '[x]', photo_path( :id => photo.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-        = image_tag photo.photo.url(:large)
-        = link_to "large", photo.photo.url(:large)
+      .float-left= button_to '[x]', photo_path( :id => photo.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+      = link_to "large", photo.photo.url(:large)
+      .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }

data/app/views/ish_manager/tags/show.haml

@@ -2,33 +2,31 @@
 -# ish_manager / tags / show
 
 - content_for :title do
-  Topic #{@tag.name}
-  
+  Tag #{@tag.name}
+
 .row
   .col-sm-12
     %h5.center
       Tag
       = @tag.name
       = link_to image_edit, edit_tag_path( @tag )
-      -# = link_to_delete( @tag )
-      .inline= button_to 'X', tag_path( @tag ), :method => :delete, :data => { :confirm => 'Are you sure?' } 
-    -# = render 'ads/leaderboard'
+      .inline= button_to 'X', tag_path( @tag ), :method => :delete, :data => { :confirm => 'Are you sure?' }
     -# .descr= @tag.descr # I don't wanna show this every time to everyone, they know what they are here for.
-    = render 'ish_manager/features/index', :features => @tag.features[0, Tag.n_features]
-    
+    -# = render 'ish_manager/features/index', :features => @tag.features[0, Tag.n_features]
+
+- proc do # nothing
+  .row
+    .col-sm-12
+      = render 'ish_manager/newsitems/index', :newsitems => @tag.newsitems, :resource => @tag, :tag => @tag
+
 .row
   .col-sm-12
-    = render 'ish_manager/newsitems/index', :newsitems => @tag.newsitems, :resource => @tag, :tag => @tag
-    
-.row
-  .col-sm-6
     = render 'ish_manager/reports/index', :reports => @tag.reports, :n_ads => 0
-    
-  .col-sm-6
+
+.row
+  .col-sm-12
     = render 'ish_manager/galleries/index_title', :galleries => @galleries, :n_thumbs => 4
-    
+
 .row
-  .col-sm-6
+  .col-sm-12
     = render 'ish_manager/videos/index_title', :videos => @videos
-  .col-sm-6
-    %h5 Here, nothing yet

data/app/views/ish_manager/videos/_index.haml

@@ -15,7 +15,10 @@
           .row
             .col-sm-6
               .float-left
-                .thumb= image_tag video.thumb.url(:thumb)
+                - if video.youtube_id
+                  .thumb-youtube= image_tag "https://img.youtube.com/vi/#{video.youtube_id}/1.jpg"
+                - else
+                  .thumb= image_tag video.thumb.url(:thumb)
               .a
                 = link_to video.name, video_path( video )
                 .inline= button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }

data/app/views/ish_manager/videos/index.haml

@@ -1,6 +1,7 @@
 
-= render 'ish_manager/sites/header', :site => @site if @site
+.videos-index
+  = render 'ish_manager/sites/header', :site => @site if @site
 
-= render 'search', path: videos_path
+  = render 'search', path: videos_path
 
-= render 'index', :videos => @videos
+  = render 'index', :videos => @videos

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.226
+  version: 0.1.8.231
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-25 00:00:00.000000000 Z
+date: 2021-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails