ish_manager 0.1.8.111 → 0.1.8.112

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2fe8feaad942e2a7b7009512fb10ab07ab714e7
-  data.tar.gz: 62c3ffaa7feddc8818a78fbc15c5643e38cd1015
+  metadata.gz: 43d9554c44ef10693ca633bc0dcb061e0835998f
+  data.tar.gz: '080cde60ef8bad363ba1bf1515394764e5f11fe5'
 SHA512:
-  metadata.gz: 6bca517e687351762eca142a06d33167e7c67006fab97593366c88e541fb7dfad645f30ec12e3ea4c97cb8d3949a12e85d490c95422c0ce2e29562c38e595055
-  data.tar.gz: 9ab75aff82fe8b7537f4bbcd52a38e46a19110b0d69320c5bb4c4e7195ccbcaf2e84d9b73cbb789838d1001152b79af80acbe14b402970506029bb1f2475957d
+  metadata.gz: 5b3e0f15d56e22fc79788e3de4d716a99e0b486736d0d64003eab85abfc35bba27a092f28658ea82d4ade7b66b36ba010fa50af68b23ac22e7a89e24c2c70f22
+  data.tar.gz: 3954d0f5fbde16ee9fc5ed7164518103128ce54402562099557b07c5a71014006f920151949b4ba4021767e8b679ccc422b57cc485e18d16ce123857bf0a3a6d

data/app/controllers/ish_manager/tags_controller.rb

@@ -11,6 +11,9 @@ class IshManager::TagsController < IshManager::ApplicationController
   def show
     @tag = Tag.unscoped.find params[:id]
     authorize! :show, @tag
+
+    @galleries = @tag.galleries.page( params[:galleries_page] ).per( 10 )
+    @videos = @tag.videos.page( params[:videos_page ]).per( 10 )
   end
 
   def new

data/app/helpers/ish_manager/images_helper.rb

@@ -107,11 +107,7 @@ module IshManager::ImagesHelper
   def image_close
     image_tag('close.png')
   end
-  
-  def image_edit
-    image_tag('icons/24x24/edit.png', :alt => '[~]')
-  end
-  
+    
   def image_email
     image_tag 'email.gif'
   end
@@ -242,5 +238,8 @@ module IshManager::ImagesHelper
   def edit_img
     raw('<i class="fa fa-pencil-square"></i>')
   end
+  def image_edit
+    raw('<i class="fa fa-pencil-square"></i>')
+  end
 
 end

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

@@ -11,7 +11,7 @@
 .manager-features--index
   %h3
     Features (#{features.length})
-    = link_to '[+]', new_path
+    = link_to image_new, new_path
     
   .row
     - features.each_with_index do |feature, idx|

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

@@ -0,0 +1 @@
+_list.haml

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

@@ -1,17 +1,22 @@
 
+-# galleries / _index_title
+  
 - n_thumbs   ||= 8
 - param_name ||= :galleries_page
 
-- if galleries.length > 0
-  .galleries--list
-    - galleries.each do |g|
-      %h5
-        = link_to '[~]', edit_gallery_path( g )
-        = link_to g.name, gallery_path(g.galleryname)
-    .c
+.manager--galleries-index
+  %h5 Galleries (#{galleries.count}) #{link_to image_new, new_gallery_path}
 
-    - if galleries.respond_to? :total_pages
-      = paginate galleries, :param_name => param_name
-    
-- else
-  %p No Galleries
+  - if galleries.length > 0
+    .galleries--list
+      - galleries.each do |g|
+        %h5
+          = link_to '[~]', edit_gallery_path( g )
+          = link_to g.name, gallery_path(g.galleryname)
+      .c
+
+      - if galleries.respond_to? :total_pages
+        = paginate galleries, :param_name => param_name, :views_prefix => :ish_manager
+
+  - else
+    %p No Galleries

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

@@ -1,6 +1,6 @@
 
 - reports = reports.page( params[:reports_page] ).per( 10 )
-- if site
+- if defined? site
   - new_path = new_site_report_path( site.id )
 - else
   - new_path = new_report_path
@@ -8,7 +8,7 @@
 .manager-reports--index
   .row
     .col-sm-12
-      %h2
+      %h5
         Reports (#{reports.length})
         = link_to image_new, new_path
 
@@ -22,4 +22,4 @@
             - if report.subhead && report.subhead.length > 3
               .subhead= report.subhead
       = paginate reports, :param_name => :reports_page
-  %hr
+

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

@@ -7,7 +7,7 @@
     = link_to '[+]', new_tag_path( :for_tag => tag.id )
     = link_to '[~]', edit_tag_path( tag )
     .inline= button_to '[x]', tag_path( tag ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-    (#{tag.reports.length}) (#{tag.galleries.length}) (#{tag.videos.length})
+    (R #{tag.reports.length}) (G #{tag.galleries.length}) (V #{tag.videos.length})
       
     -# .descr= tag.descr
   

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

@@ -6,28 +6,24 @@
 .row
   .large-12.columns
     %h5.center
+      Tag
       = @tag.name
-      = link_to '[~]', edit_tag_path( @tag )
+      = 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'
     -# .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]
       
 .row
-  .large-6.columns  
-    %h4 Reports
+  .col-sm-6
     = render 'ish_manager/reports/index', :reports => @tag.reports, :n_ads => 0
-    %hr
     
-  .large-6.columns
-    %h4 Galleries
-    = render 'ish_manager/galleries/index', :galleries => @tag.galleries, :n_thumbs => 4
-    %hr
+  .col-sm-6
+    = render 'ish_manager/galleries/index_title', :galleries => @galleries, :n_thumbs => 4
     
 .row
-  .large-12.columns
-    %h4
-      = t('videos.list')
-      = link_to '[+]', new_video_path( :tag_id => @tag.id )
-    = render 'ish_manager/videos/index', :videos => @tag.videos
-    
+  .col-sm-6
+    = render 'ish_manager/videos/index_title', :videos => @videos
+  .col-sm-6
+    %h5 Here, nothing yet

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

@@ -4,20 +4,20 @@
 
 .row
   .col-sm-12
-    %h2
+    %h5
       Videos (#{videos.count})
       = link_to '[+]', new_video_path
 
-    - if @current_user.profile.videos_embed
+    - if current_user.profile.videos_embed
       Embed?
       .inline
-        = form_tag user_profile_path( @current_user.profile ), :method => :patch do 
+        = form_tag user_profile_path( current_user.profile ), :method => :patch do 
           = hidden_field_tag 'ish_models_user_profile[videos_embed]', false
           = hidden_field_tag 'redirect_to', videos_path
           = submit_tag 'Preview?'
     - else
       .inline
-        = form_tag user_profile_path( @current_user.profile ), :method => :patch do
+        = form_tag user_profile_path( current_user.profile ), :method => :patch do
           = hidden_field_tag 'ish_models_user_profile[videos_embed]', true
           = hidden_field_tag 'redirect_to', videos_path
           = submit_tag 'Embed?'

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

@@ -0,0 +1,26 @@
+
+-# videos ||= @videos
+-# videos = videos.page params[:videos_page]
+
+.row
+  .col-sm-12
+    %h5
+      Videos (#{videos.count})
+      = link_to image_new, new_video_path
+    
+    = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
+    
+    - videos.each do |video|
+      .panel
+        .panel-content
+          .row
+            .col-xs-12
+              .center
+                = link_to video.name, video_path( video )
+                = link_to image_edit, edit_video_path( video )
+                .inline= button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+                = render 'meta', :item => video
+        
+    = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.111
+  version: 0.1.8.112
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2017-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -218,6 +218,7 @@ files:
 - app/views/ish_manager/features/show.haml
 - app/views/ish_manager/friends/index.haml
 - app/views/ish_manager/galleries/_form.haml
+- app/views/ish_manager/galleries/_index.haml
 - app/views/ish_manager/galleries/_index_title.haml
 - app/views/ish_manager/galleries/_list.haml
 - app/views/ish_manager/galleries/_list.haml~
@@ -328,6 +329,7 @@ files:
 - app/views/ish_manager/videos/_form.haml
 - app/views/ish_manager/videos/_form.haml~
 - app/views/ish_manager/videos/_index.haml
+- app/views/ish_manager/videos/_index_title.haml
 - app/views/ish_manager/videos/_list.haml
 - app/views/ish_manager/videos/_list_small.haml
 - app/views/ish_manager/videos/_preview.haml