ish_manager 0.1.8.24 → 0.1.8.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a38a20e38b5e29c8e5f4258bd58942a922a0b369
-  data.tar.gz: bab59f30485aee9d86b95ef9c02627e1be30f985
+  metadata.gz: 79cc055b9d3e917ac21026239f608927adbafe20
+  data.tar.gz: cc41131395bc16f82ef15005b02c5819157e78de
 SHA512:
-  metadata.gz: 008e4acf1a5b152bf3c947f08877224205ece3b4c356ddda3763094ce6ecb6fcb7480345e045f2dda5dc582d54a9e7d5c22814c574530d78636f527cf5f42264
-  data.tar.gz: 604ca5f41e82ef3327774aa48aeaa613cbf279c7377b2f618d66ada64bdf544cf25ced91ae815b67c328f62af91b9df9051e48f8a0b6d2341fb19e8a786502ae
+  metadata.gz: 071945a0da857fcfb94340b896b714f50a77eced3fa6f48bf18ae9d56a1974b36f2fae3163f823210ef161be91be51a5dce24c2823802ab8e750039dd4b381d4
+  data.tar.gz: 81156a531ce00a71e6c94957c9081f8269aae09bfd5c5b1acab1e2a87ab29fb1c9f92f91b250786bad249ca367cc117bf1cc400b3b012fc87edd3a9670d1cf92

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

@@ -51,3 +51,12 @@ hr {
 .clearfix {
   clear: both;
 }
+
+.manager-galleries--index .mini {
+  float: left;
+}
+
+.manager-sites--title {
+  padding: 1em .2em;
+  background: url('/assets/bg/triangular.png');
+}

data/app/controllers/ish_manager/cities_controller.rb

@@ -11,6 +11,7 @@ class IshManager::CitiesController < IshManager::ApplicationController
   
   def show
     authorize! :show, @city
+    @videos = @city.videos.page( params[:videos_page] ).per( 10 )
   end
   
   def new

data/app/controllers/ish_manager/photos_controller.rb

@@ -14,6 +14,7 @@ class IshManager::PhotosController < IshManager::ApplicationController
     authorize! :destroy, @photo
     @photo.is_trash = true
     @photo.save
+    @photo.gallery.touch
     redirect_to request.referrer || root_path
   end
 

data/app/controllers/ish_manager/videos_controller.rb

@@ -72,7 +72,7 @@ class IshManager::VideosController < IshManager::ApplicationController
   end
   
   def edit
-    @video = Video.unscoped.find params[:video_id]
+    @video = Video.unscoped.find params[:id]
     authorize! :edit, @video
     
     @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
@@ -80,17 +80,32 @@ class IshManager::VideosController < IshManager::ApplicationController
   end
 
   def update
-    @video = Video.unscoped.find params[:video_id]
+    @video = Video.unscoped.find params[:id]
     authorize! :update, @video
 
     @video.update params[:video].permit!
     if @video.save
       flash[:notice] = 'Success.'
-      redirect_to organizer_path
+      redirect_to videos_path
     else
       flash[:error] = "No luck: #{@video.errors}"
       render :edit
     end
   end
+
+  def destroy
+    @video = Video.unscoped.find params[:id]
+    authorize! :destroy, @video
+    flag = @video.update_attributes( :is_trash => true )
+    @video.city.touch if @video.city
+    @video.site.touch if @video.site
+    @video.tag.touch if @video.tag
+    if flag
+      flash[:notice] = "deleted video"
+    else
+      flash[:alert] = "Cannot delete video: #{@video.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
   
 end

data/app/views/ish_manager/application/_meta.haml

@@ -0,0 +1,16 @@
+
+.meta
+  - if item.city
+    <b>City:</b> #{link_to item.city.name, city_path( item.city )}
+    %br
+  - if item.tag
+    <b>Tag:</b> #{link_to item.tag.name, tag_path( item.tag )}
+    %br
+  - if item.site
+    <b>Site:</b>
+    = link_to "#{item.site.domain}/#{item.site.lang}", site_path( item.site )
+    %br
+  - if item.user
+    <b>User:</b> #{item.user.email}
+    %br
+    

data/app/views/ish_manager/application/_meta.haml~

@@ -0,0 +1,3 @@
+
+.meta
+  

data/app/views/ish_manager/cities/_header.haml

@@ -1,2 +1,34 @@
+.a
+  .b
+    %h2
+      = @city.name
+      = link_to '[~]', edit_city_path(@city)
+      <#{@city.x}, #{@city.y}>
+    <em>#{@city.cityname}</em>
+    %br
+    - unless @city.profile_photo.blank?
+      = image_tag @city.profile_photo.photo.url(:thumb)
 
-%h5 Cities #{link_to '[+]', new_city_path}
+    %ul.menu-secondary
+      %li
+        = link_to '[+]', new_city_feature_path( @city )
+        Features (#{@city.features.length})
+      %li
+        = link_to '[+]', new_city_newsitem_path( @city )
+        Newsitems (#{@city.newsitems.length})
+      %li
+        = link_to '[+]', new_city_report_path( @city )
+        Reports (#{@city.reports.count})
+      %li
+        = link_to '[+]', new_city_gallery_path( @city )
+        Galleries (#{@city.galleries.count})
+      %li
+        = link_to '[+]', new_city_video_path( @city )
+        Videos (#{@city.videos.count})
+      %li
+        = link_to '[+]', new_city_venue_path( @city )
+        Venues (#{@city.venues.count})
+      %li
+        = link_to '[+]', new_city_event_path( @city )
+        Events (#{@city.events.count})
+    %hr

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

@@ -11,7 +11,7 @@
             = link_to city.name, city_path(city)
             = link_to '[~]', edit_city_path(city)
             .small.gray= city.id
-            .cities-meta= "(#{city.reports.length}) (#{city.galleries.length}) (#{city.current_users.length})"
+            .cities-meta= "R(#{city.reports.length}) G(#{city.galleries.length}) V(#{city.videos.length}) U(#{city.current_users.length})"
     
           - if city.profile_photo.blank?
             = image_missing

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

@@ -1,59 +1,17 @@
 
--# - title "City #{@city.name}"
-
+-#
+-# ish_manager / cities / show
+-#
+  
+= render 'header', :city => @city
+= render 'ish_manager/features/index', :features => @city.features, :city => @city
+= render 'ish_manager/newsitems/index', :newsitems => @city.newsitems, :city => @city
 .row
-  .large-12.columns
-
-    %h2
-      = @city.name
-      = link_to '[~]', edit_city_path(@city)
-
-    - unless @city.profile_photo.blank?
-      = image_tag @city.profile_photo.photo.url(:thumb)
-
-    %hr
-    %ul.menu-secondary
-      %li
-        = link_to '[+]', new_city_feature_path( @city )
-        Features (#{@city.features.length})
-      %li
-        = link_to '[+]', new_city_newsitem_path( @city )
-        Newsitems (#{@city.newsitems.length})
-      %li New Report
-      %li New Gallery
-      %li New Video
-      %li New Venue
-      %li New Event
-      %li New Community
-    %hr
-
-    = render 'ish_manager/features/index', :features => @city.features, :city => @city
-    = render 'ish_manager/newsitems/index', :newsitems => @city.newsitems, :city => @city
-    
-    %h3
-      = t('reports.list')
-      (#{@city.reports.length})
-    %ul
-      - @city.reports.each do |report|
-        %li
-          = link_to '[~]', edit_report_path(report)
-          = report.name
-
-    .galleries-list
-      %h3
-        = t('galleries.list')
-        (#{@city.galleries.length})
-      = render 'ish_manager/galleries/list_short', :galleries => @city.galleries
-
-    %h3
-      = t('users.list')
-      (#{@city.current_users.length})
-      
-    %h3 Events (#{@city.events.length})
-    %ul
-      - @city.events.each do |event|
-        %li= event.name
-
-    = render :partial => 'ish_manager/venues/index', :locals => { :venues => @city.venues }
-        
-    %h3 Videos (#{@city.videos.length})
+  .col-sm-6= render 'ish_manager/reports/index', :reports => @city.reports
+  .col-sm-6= render 'ish_manager/galleries/index', :galleries => @city.galleries # @TODO: why not render index?
+.row
+  .col-sm-6= render 'ish_manager/videos/index', :videos => @city.videos
+  .col-sm-6
+    = render 'ish_manager/users/index', :users => @city.current_users
+    = render 'ish_manager/events/index', :events => @city.events    
+    = render 'ish_manager/venues/index', :venues => @city.venues

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

@@ -0,0 +1,6 @@
+.manager-events--index
+  %h2 Events (#{@city.events.length})
+  %ul
+    - @city.events.each do |event|
+      %li= event.name
+  %hr

data/app/views/ish_manager/events/_index.haml~

@@ -0,0 +1,7 @@
+.manager-events--index
+  .a
+    %h3 Events (#{@city.events.length})
+    %ul
+      - @city.events.each do |event|
+        %li= event.name
+  %hr

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

@@ -13,11 +13,11 @@
     Features (#{features.length})
     = link_to '[+]', new_path
     
-  -# = paginate features, :param_name => 'features_page'
-  %ul.large-block-grid-4
+  .row
     - features.each_with_index do |feature, idx|
-      %li
-        = link_to '[~]', edit_url.call( feature )
-        = link_to '[x]', delete_url.call( feature ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-        .item= render 'ish_manager/features/item', :feature => feature
-         
+      .col-sm-3
+        .panel.panel-default
+          = link_to '[~]', edit_url.call( feature )
+          = link_to '[x]', delete_url.call( feature ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+          = render 'ish_manager/features/item', :feature => feature
+  %hr

data/app/views/ish_manager/features/_item.haml

@@ -1,14 +1,11 @@
 
 .panel
-  - if !feature.partial_name.blank?
-    = render feature.partial_name
-  - else
-    - unless feature[:name].blank?
-      %h3= link_to feature[:name].titleize, feature[:link_path]
-    - unless feature[:image_path].blank?
-      = link_to image_tag( feature[:image_path] ), feature[:link_path]
-    - unless feature[:subhead].blank?
-      .descr= raw feature[:subhead]
-    - unless feature.report.blank?
-      %h3= link_to feature.report.name, report_path(feature.report.name_seo)
-      .descr= raw feature.report.subhead
+  - unless feature[:name].blank?
+    %h3= link_to feature[:name].titleize, feature[:link_path]
+  - unless feature[:image_path].blank?
+    = link_to image_tag( feature[:image_path] ), feature[:link_path]
+  - unless feature[:subhead].blank?
+    .descr= raw feature[:subhead]
+  - unless feature.report.blank?
+    %h3= link_to feature.report.name, report_path(feature.report.name_seo)
+    .descr= raw feature.report.subhead

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

@@ -1,14 +1,18 @@
 
+- galleries = galleries.page( params[:galleries_page] ).per( 10 )
+
 .manager-galleries--index
   .row
-    .large-12.columns
+    .col-sm-12
       %h2 Galleries (#{galleries.length})
 
       = paginate galleries, :param_name => :galleries_page
       %ol
         - galleries.each do |gallery|
           %li
-            - gallery.photos.unscoped.where({ :is_trash => false })[0..4].each do |photo|
-              .mini= image_tag photo.photo.url( :mini ), :alt => ''
+            - gallery.photos.unscoped.where({ :is_trash => false })[0...4].each do |photo|
+              .mini= image_tag photo.photo.url( :thumb ), :alt => ''
+            .clearfix
             #{link_to gallery.name, gallery_path( gallery )} (#{gallery.photos.unscoped.where({ :is_trash => false }).length})
       = paginate galleries, :param_name => :galleries_page
+  %hr

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

@@ -2,8 +2,8 @@
 %ul
   - galleries.each do |gallery|
     %li
-      = link_to '[~]', edit_manager_gallery_path( gallery )
-      = link_to gallery.name, manager_gallery_path( gallery )
+      = link_to '[~]', edit_gallery_path( gallery )
+      = link_to gallery.name, gallery_path( gallery )
       %br
       \      
       N photos: #{gallery.photos.length}

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

@@ -5,18 +5,24 @@
 - if defined? city
   - edit_url   = ->(n) { edit_city_newsitem_path( city, n ) }
   - delete_url = ->(n) { city_newsitem_path( city, n ) }
-  
-.row
-  .small-12.columns
-    %h2 Newsitems (#{newsitems.count})
-    %ol
-      - newsitems.each do |n|
-        %li
-          %ul
-            %li
-              = link_to '[~]', edit_url.call( n )
-              = link_to '[x]', delete_url.call( n ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-              Name: #{n.name}
-              Desc: #{n.descr}
-            %li Report id: #{n.report_id}
-            %li Gallery id: #{n.gallery_id}
+
+- newsitems = newsitems.page( params[:newsitems_page] ).per( 10 )
+
+.manager-newsitems--index
+  .row
+    .col-sm-12
+      %h2 Newsitems (#{newsitems.count})
+      = paginate newsitems, :param_name => 'newsitems_page'
+      %ol
+        - newsitems.each do |n|
+          %li
+            %ul
+              %li
+                = link_to '[~]', edit_url.call( n )
+                = link_to '[x]', delete_url.call( n ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+                Name: #{n.name}
+                Desc: #{n.descr}
+              %li Report id: #{n.report_id}
+              %li Gallery id: #{n.gallery_id}
+            = render 'ish_manager/newsitems/item', :newsitem => newsitem
+  %hr

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

@@ -1,7 +1,9 @@
 
+- reports = reports.page( params[:reports_page] ).per( 10 )
+
 .manager-reports--index
   .row
-    .large-12.columns
+    .col-sm-12
       %h2 Reports (#{reports.length})
 
       = paginate reports, :param_name => :reports_page
@@ -14,3 +16,4 @@
             - if report.subhead && report.subhead.length > 3
               .subhead= report.subhead
       = paginate reports, :param_name => :reports_page
+  %hr

data/app/views/ish_manager/sites/_title.haml

@@ -0,0 +1,5 @@
+
+.manager-sites--title
+  %h1
+    Site http://#{@site.domain}/#{@site.lang}
+    = link_to '[~]', edit_site_path( @site.id )

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

@@ -1,37 +1,18 @@
 
 .manager-sites-show
-  .row
-    .large-12.columns
-      %h1
-        Site http://#{@site.domain}/#{@site.lang}
-        = link_to '[~]', edit_site_path( @site.id )
+  = render 'title', :site => @site    
+  = render 'ish_manager/features/index', :features => @features, :site => @site
+  = render 'ish_manager/newsitems/index', :newsitems => @newsitems
       
   .row
-    .large-6.columns
+    .col-sm-6
       = render 'ish_manager/galleries/index', :galleries => @galleries
-    .large-6.columns
+    .col-sm-6
       = render 'ish_manager/reports/index', :reports => @reports
 
   .row
-    .large-6.columns
+    .col-sm-6
       = render 'ish_manager/videos/index', :videos => @videos
-    .large-6.columns
+    .col-sm-6
       = render 'ish_manager/tags/index', :tags => @tags
-            
-  .row
-    .large-12.columns
-      = render 'ish_manager/features/index', :features => @features, :site => @site
 
-  .row
-    .large-12.columns
-      %h4
-        Newsitems (#{@newsitems.length})
-        = link_to "[+]", new_site_newsitem_path( @site )
-      
-      %ol
-        - @newsitems.each do |newsitem|
-          %li
-            %ul
-              %li= button_to '[x]', site_newsitem_path(@site.id, newsitem.id), :method => :delete, :data => { :confirm => 'Are you sure?' }
-            = render 'ish_manager/newsitems/item', :newsitem => newsitem
-      = paginate @newsitems, :param_name => 'newsitems_page'

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

@@ -1,17 +1,16 @@
 
 - content_for :title do
-  = t('tags.list')
+  Tags
 
-.row
-  .small-12.columns
-    .center
-      %h1= t('tags.list')
-  
-    %ul.large-block-grid-2
-      - @tags.each do |tag|
-        = render 'ish_manager/tags/item', :tag => tag
-      - if @tags.blank?
-        %li No Tags
+.manager-tags--index
+  .center
+    %h1 Tags (#{tags.count})
 
+  %ul.large-block-grid-2
+    - @tags.each do |tag|
+      = render 'ish_manager/tags/item', :tag => tag
+    - if @tags.blank?
+      %li No Tags
+  %hr
 
 

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

@@ -0,0 +1,5 @@
+.manager-users--index
+  %h2
+    People
+    (#{@city.current_users.length})
+  %hr

data/app/views/ish_manager/users/_index.haml~

@@ -0,0 +1,6 @@
+.manager-users--index
+  .a
+    %h3
+      People
+      (#{@city.current_users.length})
+  %hr

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

@@ -1,14 +1,15 @@
-.a
-  .b
-    %h3
-      Venues (#{venues.length})
-      = link_to '[+]', new_venue_path
-    %ol
-      - venues.each do |venue|
-        %li
-          = link_to '[~]', edit_venue_path( venue )
-          .float-left= button_to '[x]', venue_path( venue ), :method => 'delete', :html => { :confirm => 'Are you sure?' }
-          = link_to venue.name, venue_path( venue )
-          %br
-          %br
-          .clearfix
+
+.manager-venues--index
+  %h2
+    Venues (#{venues.length})
+    = link_to '[+]', new_venue_path
+  %ol
+    - venues.each do |venue|
+      %li
+        = link_to '[~]', edit_venue_path( venue )
+        .float-left= button_to '[x]', venue_path( venue ), :method => 'delete', :html => { :confirm => 'Are you sure?' }
+        = link_to venue.name, venue_path( venue )
+        %br
+        %br
+        .clearfix
+  %hr

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

@@ -1,6 +1,5 @@
 
-- url = video.persisted? ? update_video_path( video ) : videos_path
-= form_for video, :url => url do |f|
+= form_for video do |f|
 
   = render 'form_errors', :item => @video
  

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

@@ -1,12 +1,21 @@
 
+- videos = videos.page( params[:videos_page] ).per( 10 )
+
 .manager-videos--index
   .row
-    .large-12.columns
+    .col-sm-12
       %h2 Videos (#{videos.length})
 
       = paginate videos, :param_name => :videos_page
       %ol
         - videos.each do |video|
-          %li= video.name
+          %li
+            = button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+            = link_to '[~]', edit_video_path( video )
+            = link_to video.name, video_path( video )
+            = render 'meta', :item => video
+            -# = render 'embed', :video => video
+            = image_tag "https://img.youtube.com/vi/#{video.youtube_id}/0.jpg"
       = paginate videos, :param_name => :videos_page
-
+  %hr
+  

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

@@ -4,4 +4,4 @@
 .row
   .large-12.columns
     %h2 Edit video
-    = render 'videos/form', :video => @video
+    = render 'form', :video => @video

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

@@ -5,12 +5,5 @@
       %h2
         Videos (#{Video.count})
         = link_to '[+]', new_video_path
-
-      = paginate @videos, :param_name => :videos_page
-      %ol
-        - @videos.each do |video|
-          %li
-            = video.name
-            = render :partial => 'embed', :locals => { :video => video }
-      = paginate @videos, :param_name => :videos_page
+      = render 'index', :videos => @videos
 

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

@@ -1,6 +1,6 @@
 
 - content_for :title do
-  #{@video.name} | #{@site.title}
+  #{@video.name} | #{@site ? @site.title : ''}
 
 .row
   .large-12.columns
@@ -10,7 +10,7 @@
         = t('videos.no_title')
       - else
         = @video.name
-    = render 'application/meta', :item => @video
+    = render 'ish_manager/application/meta', :item => @video
     .text-center= render 'embed', :video => @video
 
-    = render 'disqus'
+    -# = render 'disqus'

data/config/routes.rb

@@ -4,6 +4,12 @@ IshManager::Engine.routes.draw do
   resources :cities do
     resources :features
     resources :newsitems
+    resources :reports
+    resources :galleries
+    resources :users
+    resources :videos
+    resources :events
+    resources :venues
   end
   resources :events
   resources :galleries do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.24
+  version: 0.1.8.25
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-17 00:00:00.000000000 Z
+date: 2017-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,6 +119,8 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/ish_manager_manifest.js
+- app/assets/images/bg/gplaypattern.png
+- app/assets/images/bg/triangular.png
 - app/assets/images/favicon.gif
 - app/assets/images/missing.png
 - app/assets/images/wait.gif
@@ -156,6 +158,8 @@ files:
 - app/views/ish_manager/application/_main_footer.haml
 - app/views/ish_manager/application/_main_header.haml
 - app/views/ish_manager/application/_main_header.haml~
+- app/views/ish_manager/application/_meta.haml
+- app/views/ish_manager/application/_meta.haml~
 - app/views/ish_manager/application/home.haml
 - app/views/ish_manager/cities/_form.haml
 - app/views/ish_manager/cities/_header.haml
@@ -166,6 +170,8 @@ files:
 - app/views/ish_manager/cities/new_feature.haml
 - app/views/ish_manager/cities/new_newsitem.haml
 - app/views/ish_manager/cities/show.haml
+- app/views/ish_manager/events/_index.haml
+- app/views/ish_manager/events/_index.haml~
 - app/views/ish_manager/features/_form.haml
 - app/views/ish_manager/features/_index.haml
 - app/views/ish_manager/features/_index.haml~
@@ -221,6 +227,7 @@ files:
 - app/views/ish_manager/reports/new.haml
 - app/views/ish_manager/reports/show.haml
 - app/views/ish_manager/sites/_form.haml
+- app/views/ish_manager/sites/_title.haml
 - app/views/ish_manager/sites/edit.haml
 - app/views/ish_manager/sites/index.haml
 - app/views/ish_manager/sites/new.haml
@@ -234,6 +241,8 @@ files:
 - app/views/ish_manager/tags/index.haml
 - app/views/ish_manager/tags/new.haml
 - app/views/ish_manager/tags/show.haml
+- app/views/ish_manager/users/_index.haml
+- app/views/ish_manager/users/_index.haml~
 - app/views/ish_manager/venues/_form.haml
 - app/views/ish_manager/venues/_form.haml~
 - app/views/ish_manager/venues/_index.haml