ish_manager 0.1.8.214 → 0.1.8.215

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97420d8d5159de8bd16e2e2b4c364c72c0f90f1de487c7d4b9346e557a2c603b
-  data.tar.gz: 98cf5b56ed11357f000d31f507f17834cdbbb1f97eeefc768511e71bce8f9042
+  metadata.gz: 9791d88698bca243d242655198761878359131f3101117d2451cef018afe5bb6
+  data.tar.gz: 15f1b4e28488b8c160097203e304c0d874dcff4be3501b537a3ed23b9237246f
 SHA512:
-  metadata.gz: b91384e992d08ac1dad9d6a9bef4b7ff43d5a04f4729d679ee27f0a6954a49235008890aed9e05b0a75bfd782a8914d4ec23e53a120cbbcd56a1adb49f20da52
-  data.tar.gz: fbd2cfaf7b4e1a436e62c57924f3f948bb996192e9f922603a63b1f02ab66243acfc6dbe219c304c8476c72c2e4177f7559dc89fec68aa598f35e3952f5559c1
+  metadata.gz: 7169b82928108aaa8a6bbc1306037899f9bea30623ee40a16cf7ec63064a8e3332557e538f2af63264ab1b0a00f68461e8aa610546d848c4bd1d5ae651827338
+  data.tar.gz: b86760c6d526595e2a10971fc3e493b5c11d1ae25f93204eb2e0536686ada3242936dd640087b4c2027007acd470449fdaf4eaea3bd4fd743b944965c05d09e2

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

@@ -202,3 +202,8 @@ table.stock_watches .trashy {
   border: 1px solid green;
   padding: 5px;
 }
+
+.menu-secondary li.active a {
+  border-bottom: 5px solid black;
+}
+

data/app/controllers/ish_manager/galleries_controller.rb

@@ -5,35 +5,22 @@ 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 )
-
-    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 )
+      ).order_by( :created_at => :desc )
+    if params[:q]
+      @galleries = @galleries.where({ :name => /#{params[:q]}/i })      
     end
+    @galleries = @galleries.page( params[:galleries_page] ).per( 20 )
 
+    render params[:render_type]
   end
 
-=begin
-  def index_title
-  end
-  def index_thumb
-    @galleries = Gallery.unscoped.where( :is_trash => false 
-                                       ).order_by( :created_at => :desc 
-                                                 ).page( params[:galleries_page] ).per( 10 )
-  end
-  def index_mini
-    @galleries = Gallery.unscoped.where( :is_trash => false 
-                                       ).order_by( :created_at => :desc 
-                                                 ).page( params[:galleries_page] ).per( 10 )
+  def shared_with_me
+    authorize! :index, Gallery
+    @galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false 
+      ).order_by( :created_at => :desc 
+      ).page( params[:shared_galleries_page] ).per( 10 )
+    render params[:render_type]
   end
-=end
 
   def new
     @gallery = Gallery.new
@@ -82,9 +69,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     # 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 do |p|
-        !old_shared_profile_ids.include?( p.id )
-      end
+        ).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

data/app/views/ish_manager/{galleries → application}/_search.haml

@@ -1,4 +1,8 @@
-= form_tag galleries_path, :method => :get, :class => :search do
+
+- # @TODO: definitely more abstract
+- path ||= galleries_path 
+
+= form_tag path, :method => :get, :class => :search do
   .field.search_words
     .hide [x]
     = text_field_tag 'q', nil, :placeholder => 'Search'

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

@@ -0,0 +1,16 @@
+
+.title
+  .row
+    .col-sm-12.col-md-12
+      %h1.center #{params[:action]} (#{@galleries.count}) #{link_to '[+]', new_gallery_path}
+      = render 'search'
+      %ul.menu-secondary
+        %li{ class: "#{params[:render_type] == 'index_titles' ? 'active' : ''}" }
+          = link_to 'titles list', galleries_index_titles_path( :render_type => Gallery::RENDER_THUMBS )
+        %li{ class: "#{params[:render_type] == 'index_thumbs' ? 'active' : ''}" }
+          = link_to 'thumbs list', galleries_index_thumbs_path( :render_type => Gallery::RENDER_TITLES )
+        %li{ class: "#{params[:render_type] == 'index_thumbs' ? 'active' : ''}" }
+          = link_to 'shared with me (thumbs)', galleries_shared_path( :render_type => Gallery::RENDER_THUMBS )
+        %li{ class: "#{params[:render_type] == 'index_titles' ? 'active' : ''}" }
+          = link_to 'shared with me (titles)', galleries_shared_titles_path
+

data/app/views/ish_manager/galleries/{_index.haml → index_thumbs.haml}

@@ -1,13 +1,18 @@
 
+-# = render 'ish_manager/sites/header', :site => @site if @site
+
+= render 'menu'
+
+
 - n_thumbs   ||= 8
 - param_name ||= :galleries_page
 
-- if galleries.length > 0
+- if @galleries.length > 0
   .galleries--list
-    - if galleries.respond_to? :total_pages
-      = paginate galleries, :param_name => param_name, :views_prefix => 'ish_manager'
+    - if @galleries.respond_to? :total_pages
+      = paginate @galleries, :param_name => param_name, :views_prefix => 'ish_manager'
 
-    - galleries.each do |g|
+    - @galleries.each do |g|
       .panel
         .panel-body
           %h3
@@ -22,8 +27,9 @@
             - g.photos.limit( n_thumbs ).each do |photo|
               = link_to image_tag(photo.photo.url(:thumb), :alt => g.name, :class => :thumb ), gallery_path(g.galleryname)
 
-    - if galleries.respond_to? :total_pages
-      = paginate galleries, :param_name => param_name, :views_prefix => 'ish_manager'
+    - if @galleries.respond_to? :total_pages
+      = paginate @galleries, :param_name => param_name, :views_prefix => 'ish_manager'
     
 - else
   %h5 No Galleries
+

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

@@ -1,7 +1,5 @@
 
-.row
-  .large-12.columns
-    %h1 Titled Galleries
+= render 'menu'
 
 %table#dataTable
   %thead
@@ -19,3 +17,4 @@
         %td
           = link_to '[~]', edit_gallery_path( g )
           = link_to '[x]', gallery_path( g ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+

data/config/routes.rb

@@ -23,12 +23,14 @@ IshManager::Engine.routes.draw do
   resources :feature
   resources :friends
 
-  get 'galleries',              :to => 'galleries#index'
+  get 'galleries', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
   get 'galleries/index_titles', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_TITLES }
   get 'galleries/index_thumbs', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
+  get 'galleries/shared', to: 'galleries#shared_with_me', defaults: { render_type: Gallery::RENDER_THUMBS }
+  get 'galleries/shared_titles', to: 'galleries#shared_with_me', defaults: { render_type: Gallery::RENDER_TITLES 
+    }, as: :galleries_shared_titles
   resources :galleries do
     post 'multiadd', :to => 'photos#j_create', :as => :multiadd
-    resources :newsitems
   end
   
   resources :invoices do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.214
+  version: 0.1.8.215
 platform: ruby
 authors:
 - piousbox
@@ -223,12 +223,12 @@ files:
 - app/views/ish_manager/application/_form_errors.haml
 - 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/_main_header_admin.haml
 - app/views/ish_manager/application/_main_header_guy.haml
 - app/views/ish_manager/application/_main_header_manager.haml
 - app/views/ish_manager/application/_meta.haml
 - app/views/ish_manager/application/_profile_pic.haml
+- app/views/ish_manager/application/_search.haml
 - app/views/ish_manager/application/home.haml
 - app/views/ish_manager/application_mailer/condor_followup_alerb.html.erb
 - app/views/ish_manager/application_mailer/shared_galleries.html.erb
@@ -261,14 +261,12 @@ 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/_search.haml
+- app/views/ish_manager/galleries/_menu.haml
 - app/views/ish_manager/galleries/_thumbs.haml
 - app/views/ish_manager/galleries/_title.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_thumbs.haml
 - app/views/ish_manager/galleries/index_titles.haml
 - app/views/ish_manager/galleries/new.haml
 - app/views/ish_manager/galleries/show.haml

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

@@ -1,15 +0,0 @@
-
-.manager--main-header
-  .container
-    .row
-      .col-sm-12
-        %i.fa.fa-compress.collapse-expand#collapseHeader
-        .content
-          %ul.nav.nav-pills
-            %li{ :class => params[:controller] == 'ish_manager/galleries'     ? 'active' : '' }= link_to 'Galleries', galleries_path
-            %li{ :class => params[:controller] == 'ish_manager/reports'       ? 'active' : '' }= link_to 'Reports',   reports_path
-            %li{ :class => params[:controller] == 'ish_manager/videos'        ? 'active' : '' }= link_to 'Videos',    videos_path
-            %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path          
-          %ul.nav.nav-pills
-  %hr
-

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

@@ -1,22 +0,0 @@
-
--# galleries / _index_title
-  
-- n_thumbs   ||= 8
-- param_name ||= :galleries_page
-
-.manager--galleries-index
-  %h5 Galleries (#{galleries.count}) #{link_to image_new, new_gallery_path}
-
-  - 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/galleries/index.haml

@@ -1,25 +0,0 @@
-
-- content_for :title do
-  Manager Galleries Index
-
-= render 'ish_manager/sites/header', :site => @site if @site
-
--# .title.hide
-  .row
-    .col-sm-12.col-md-12
-      %h1.center Galleries
-      %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 )
-
-.row
-  .col-sm-12.col-md-12
-    %h4 My Galleries (#{@galleries.count}) #{link_to '[+]', new_gallery_path}
-    = render 'search'
-    - if params[:render_type] == Gallery::RENDER_TITLES
-      = render 'ish_manager/galleries/index_title', :galleries => @galleries, :param_name => :galleries_page
-    - else
-      = render 'ish_manager/galleries/index', :galleries => @galleries, :param_name => :galleries_page    
-  .col-sm-12.col-md-6
-    %h4 Shared with me
-    = render 'ish_manager/galleries/index', :galleries => @shared_galleries, :param_name => :shared_galleries_page