ish_manager 0.1.8.150 → 0.1.8.151

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3479ece9847ed1414578d8f24ca20a59356c6b44
-  data.tar.gz: f395c798337588c72d1dc4fe63dd7e276547abde
+  metadata.gz: 52156b51fdbf09a5c8efac6be9a6de7883c75282
+  data.tar.gz: 842c2caaa4d2a8861249804f5b05cdb23b0d4991
 SHA512:
-  metadata.gz: 7971deec9afa9ddbfa32a620da0928b193ad77b554e55f6510ed63a71f9cb5110966324a7fd4eb5b09ce722351bc06a54d5d08b363076795ae664f13596f1d07
-  data.tar.gz: e746f75f1028e3b1c96e3b33173686e2cf3d506d1afca4995c5a168e2240897d2f912029fad9083eb037786ec06a4675c441a1e852df079e4d652f952e96da37
+  metadata.gz: 1391e6acf3bf5c639750fe7be668cca44f1627b67e68defa64f6d19804972f2eda7cdbeaaf3ed6c49088a5b090b99de0908f1cfc9247f07e6677e52ac9630fd9
+  data.tar.gz: 22f67ed96a9494eccdf12da8695e6c9bced442978b3d18f9c622f03b905d46e68aa47b0dadd66f4845d53d6be8cdea3000403dad7d04aeed3ee94019acb4886e

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

@@ -94,17 +94,25 @@ ul.inline li {
   display: inline;
 }
 
-/* R */
 .border-red,
 .red-border {
   border: 1px solid red;
   padding: 1em;
 }
-/* T */
+
 .addToggle + * {
   display: none;
 }
 
+.menu-secondary {}
+.menu-secondary li {
+  display: inline;
+}
+.menu-secondary li a {
+  padding: 1rem;
+  background: white;
+}
+
 /**
  * manager... 
  */
@@ -137,6 +145,7 @@ ul.inline li {
 nav.pagination
 */
 
+
 /**
  * reports
  */
@@ -147,6 +156,7 @@ nav.pagination
   font-size: 1.6em;
 }
 
+
 /**
  * ally, stock watches
  */

data/app/controllers/ish_manager/galleries_controller.rb

@@ -5,13 +5,19 @@ class IshManager::GalleriesController < IshManager::ApplicationController
   def index
     authorize! :index, Gallery
     @galleries = Gallery.unscoped.where( :is_trash => false, :user_profile => current_user.profile
-                                       ).order_by( :created_at => :desc 
-                                                 ) # .page( params[:galleries_page] ).per( 10 )
-    if params[:q]
-      @galleries = @galleries.where({ :name => /#{params[:q]}/i })      
+                                       ).order_by( :created_at => :desc )
+
+    if params[:render_type] == Gallery::RENDER_TITLES
+      render 'index_titles'
+      return
+    else
+      if params[:q]
+        @galleries = @galleries.where({ :name => /#{params[:q]}/i })      
+      end
+      @galleries = @galleries.page( params[:galleries_page] ).per( 20 )
+      @shared_galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false ).page( params[:shared_galleries_page] ).per( 10 )
     end
 
-    @shared_galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false ).page( params[:shared_galleries_page] ).per( 10 )
   end
 
 =begin

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

@@ -2,16 +2,13 @@
 - content_for :title do
   Manager Galleries Index
 
-- content_for :menu do
-  - # nothing
-
 = render 'ish_manager/sites/header', :site => @site if @site
 
 .title
   .row
     .col-sm-12.col-md-12
       %h1.center Galleries
-      %ul
+      %ul.menu-secondary
         %li= link_to 'titles list', galleries_index_titles_path( :render_type => Gallery::RENDER_THUMBS )
         %li= link_to 'thumbs list', galleries_index_thumbs_path( :render_type => Gallery::RENDER_TITLES )
 

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

@@ -0,0 +1,21 @@
+
+.row
+  .large-12.columns
+    %h1 Titled Galleries
+
+%table#dataTable
+  %thead
+    %tr
+      %th Public?
+      %th Title
+      %th Created At
+      %th Actions
+  %tbody
+    - @galleries.each do |g|
+      %tr
+        %td= is_public_image_tag( g )
+        %td= link_to g.name, gallery_path( g )
+        %td= g.created_at.to_s.slice(0, 10)
+        %td
+          = link_to '[~]', edit_gallery_path( g )
+          = link_to '[x]', gallery_path( g ), :method => :delete, :data => { :confirm => 'Are you sure?' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.150
+  version: 0.1.8.151
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -137,6 +137,8 @@ files:
 - app/assets/images/bg/triangular.png
 - app/assets/images/bg/weather.png
 - app/assets/images/favicon.gif
+- app/assets/images/icons/20x20/private.png
+- app/assets/images/icons/20x20/public2.png
 - app/assets/images/missing.png
 - app/assets/images/wait.gif
 - app/assets/javascripts/ish_manager/application.js
@@ -224,23 +226,23 @@ 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_short.haml
-- app/views/ish_manager/galleries/_menu_secondary.haml
 - app/views/ish_manager/galleries/_search.haml
-- app/views/ish_manager/galleries/_thumbs.haml
 - app/views/ish_manager/galleries/_title.haml
-- app/views/ish_manager/galleries/all_photos.haml
 - app/views/ish_manager/galleries/edit.haml
 - app/views/ish_manager/galleries/index.haml
 - app/views/ish_manager/galleries/index_ajax.haml
-- app/views/ish_manager/galleries/index_short.haml
-- app/views/ish_manager/galleries/index_thumb.haml
-- app/views/ish_manager/galleries/index_title.haml
+- app/views/ish_manager/galleries/index_titles.haml
 - app/views/ish_manager/galleries/new.haml
 - app/views/ish_manager/galleries/show.haml
+- app/views/ish_manager/galleries/trash/_index.haml
+- app/views/ish_manager/galleries/trash/_list_short.haml
+- app/views/ish_manager/galleries/trash/_menu_secondary.haml
+- app/views/ish_manager/galleries/trash/_thumbs.haml
+- app/views/ish_manager/galleries/trash/all_photos.haml
+- app/views/ish_manager/galleries/trash/index_short.haml
+- app/views/ish_manager/galleries/trash/index_thumb.haml
 - app/views/ish_manager/invoices/_form.haml
 - app/views/ish_manager/invoices/index.haml
 - app/views/ish_manager/invoices/new.haml

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

@@ -1,15 +0,0 @@
-
-.row
-  .large-12.columns
-    %h1 Titled Galleries
-
-    %ul
-      - @galleries.each do |gallery|
-        %li
-          %h4= link_to gallery.name, manager_gallery_path(gallery)
-          %span
-            = link_to '[~]', edit_manager_gallery_path( gallery )
-            = link_to '[x]', manager_gallery_path( gallery ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-            = is_public_image_tag( gallery )
-            <i>#{gallery.created_at.to_s.slice(0, 10)}</i>
-