ish_manager 0.1.8.315 → 0.1.8.316

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

@@ -20,4 +20,6 @@
 
         .col-sm-2
           = button_to 'Logout', main_app.destroy_user_session_path, :method => :delete
-.c
+
+    .c
+    = render 'debug' if !Rails.env.production?

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

@@ -1,5 +1,5 @@
 
-.manager--main-header
+.main-header
   .container
     .row
       .col.s12

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

@@ -1,11 +1,11 @@
 
 
-.application--main-header-admin.manager--main-header{ class: "#{ENV['RAILS_ENV']} #{ENV['RAILS_ENV'][0...3]=="dev" ? "development" : ''}" }
+.application--main-header-admin.main-header{ class: "#{ENV['RAILS_ENV']} #{ENV['RAILS_ENV'][0...3]=="dev" ? "development" : ''}" }
   .container
     %i.fa.fa-compress.collapse-expand#collapseHeader
     .content
       %ul
-        %li{ :class => params[:controller] == 'ish_manager/maps' ? 'active' : '' }
+        %li{ :class => params[:controller] == 'ish_manager/maps'          ? 'active' : '' }
           = link_to 'Maps', maps_path
           .inline-search
             = form_tag maps_path, method: :get do
@@ -13,11 +13,7 @@
           = link_to '[+]', new_map_path
 
         %li{ :class => params[:controller] == 'ish_manager/galleries'     ? 'active' : '' }
-          = link_to 'Galleries', galleries_path
-          .inline-search
-            = form_tag galleries_path, method: :get do
-              = text_field_tag :q
-          = link_to '[+]', new_gallery_path
+          = render 'ish_manager/galleries/menu'
         %li{ :class => params[:controller] == 'ish_manager/reports'       ? 'active' : '' }
           = link_to 'Reports',   reports_path
           .inline-search

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

@@ -1,5 +1,5 @@
 
-.manager--main-header
+.main-header
   .container
     .row
       .col.s12

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

@@ -1,5 +1,5 @@
 
-.manager--main-header
+.main-header
   .container
     .row
       .col.s12

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

@@ -5,16 +5,15 @@
 -#
 
 - n_thumbs   ||= 8
-- param_name ||= :galleries_page
 
-.galleries--index.-index
+.galleries--index
 
-  = render 'ish_manager/galleries/menu'
+  = render 'ish_manager/galleries/menu', count: @galleries.count
 
   - if @galleries.length > 0
 
     - if @galleries.respond_to? :total_pages
-      = paginate @galleries, :param_name => param_name, :views_prefix => 'ish_manager'
+      = paginate @galleries, :param_name => :galleries_page, :views_prefix => 'ish_manager'
 
     .row
       - @galleries.each do |g|
@@ -33,7 +32,7 @@
                   = link_to image_tag(photo.photo.url(:thumb), :alt => g.name), gallery_path(g.slug)
 
     - if @galleries.respond_to? :total_pages
-      = paginate @galleries, :param_name => param_name, :views_prefix => 'ish_manager'
+      = paginate @galleries, :param_name => :galleries_page, :views_prefix => 'ish_manager'
 
   - else
     %h5 No Galleries

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

@@ -1,15 +1,14 @@
 
 .galleries--menu
-  .flex-row
-    .title Galleries (#{@galleries.count}) #{link_to '[+]', new_gallery_path}
-    = render 'search', path: galleries_path
-  %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
 
+  -# .title Galleries (#{@galleries.count}) #{link_to '[+]', new_gallery_path}
+  = link_to 'Galleries', galleries_path
+  - if defined?(count)
+    (#{count})
+
+  -# = render 'search', path: galleries_path
+  .inline-search
+    = form_tag galleries_path, method: :get do
+      = text_field_tag :q
+
+  = link_to '[+]', new_gallery_path

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

@@ -0,0 +1,12 @@
+
+.galleries--menu-secondary
+  %ul
+    %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/_title.haml

@@ -1,15 +1,13 @@
 
-.row
-  .col.s12
-    .center
-      %h2
-        = link_to gallery.name, gallery_path(gallery)
-        (#{gallery.photos.length})
-        = link_to '[~]', edit_gallery_path( gallery )
-        [x]
-        - if gallery.is_public && !gallery.is_trash && !gallery.is_done
-          %i.material-icons visibility
-        - else
-          %i.material-icons visibility_off
-      slug :: #{gallery.slug}
-      = render 'meta', :item => gallery
+.galleries--title
+  %h2
+    = link_to gallery.name, gallery_path(gallery)
+    (#{gallery.photos.length})
+    = link_to '[~]', edit_gallery_path( gallery )
+    [x]
+    - if gallery.is_public && !gallery.is_trash && !gallery.is_done
+      %i.material-icons visibility
+    - else
+      %i.material-icons visibility_off
+  slug :: #{gallery.slug}
+  = render 'meta', :item => gallery

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

@@ -1,41 +1,32 @@
 -#
--# ish_manager / galleries / show.haml
+-# ish_manager / galleries / show
 -#
 
-= render 'title', :gallery => @gallery
-= render 'ish_manager/photos/multinew', :gallery => @gallery
+.galleries-show
+  = render 'title', :gallery => @gallery
 
--# deleted
-.row
-  %p.addToggle Deleted [<>]
-  .a
-    %ul.inline
-      - @deleted_photos.each do |ph|
-        %li.border-red= image_tag ph.photo.url( :mini )
-    %hr
+  = render 'ish_manager/photos/multinew', :gallery => @gallery
 
--# mini
-.row
-  %ul
-    - @photos.each do |photo|
-      %li.col.s1
-        = link_to image_tag(photo.photo.url( :mini ), :alt => ''), "#large_#{photo.id}"
+  .row.row-deleted
+    %p.collapse-expand#rowDeleted Deleted
+    = render 'ish_manager/photos/index_thumbs', photos: @deleted_photos
 
-.spacer{ :style => 'height: 500px' }
+  .row.row-mini
+    %p.collapse-expand#rowMinis Mini's
+    .flex-row
+      - @photos.each do |photo|
+        .item
+          = link_to image_tag(photo.photo.url( :mini ), :alt => ''), "#large_#{photo.id}"
 
--# thumb
-.row.row-thumbs
-  - @photos.each do |photo|
-    .col.s3
-      .item
-        = render 'ish_manager/photos/meta_manager', photo: photo
-        = image_tag photo.photo.url( :thumb ), :alt => ''
-.spacer{ :style => 'height: 100px' }
+  .row.row-thumbs
+    %p.collapse-expand#rowThumbs Thumbs
+    = render 'ish_manager/photos/index_thumbs', photos: @photos
 
--# large
-.row.row-large
-  - @photos.each do |photo|
-    .item
-      %a{id: "large_#{photo.id}" }
-      = render 'ish_manager/photos/meta_manager', photo: photo
-      .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }
+  .row.row-large
+    %p.collapse-expand#rowLarge Large
+    .a
+      - @photos.each do |photo|
+        .item
+          %a{id: "large_#{photo.id}" }
+          = render 'ish_manager/photos/meta_manager', photo: photo
+          .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }

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

@@ -12,7 +12,7 @@
         .a= button_to 'x', marker_path(marker), method: :delete, data: { confirm: 'Are you sure?' }
       .flex-row
         .a= link_to '[api]', api_marker_path(marker)
-        .a= link_to '[this map]', edit_map_path(marker.slug)
+        .a= link_to '[this map]', edit_map_path(marker.destination.slug)
     .hide
       %ul.bullets
         %li <b>item_type:</b> #{marker.item_type}

data/app/views/ish_manager/photos/_index_thumbs.haml

@@ -0,0 +1,7 @@
+
+.photos--index-thumbs
+  .flex-row
+    - photos.each do |photo|
+      .item
+        = render 'ish_manager/photos/meta_manager', photo: photo
+        = image_tag photo.photo.url( :thumb )

data/app/views/ish_manager/photos/_meta_manager.haml

@@ -1,7 +1,7 @@
 
-.--meta-manager
-  = button_to '[x]', photo_path( :id => photo.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+.photos--meta-manager
+  = button_to '[x]', photo_path( :id => photo.id ), class: 'x', :method => :delete, :data => { :confirm => 'Are you sure?' }
   .right-hand
-    = link_to "go to", "#large_#{photo.id}", class: 'goto'
-    = link_to "large", photo.photo.url(:large)
-    = link_to "original", photo.photo.url(:original)
+    = link_to "Goto", "#large_#{photo.id}", class: 'goto'
+    = link_to "Lg", photo.photo.url(:large)
+    = link_to "Orig", photo.photo.url(:original)

data/app/views/ish_manager/photos/_multinew.haml

@@ -1,7 +1,5 @@
 
-.container.photos--multinew
-  .row
-    .small-12.columns
-      %h3.center Add Photos
-      %ul{ :id => 'photos', :class => 'thumbnails' }
-      %input{ :id => 'fileupload', :type => 'file', :name => 'photo[photo]', 'data-url' => gallery_multiadd_path( gallery.id ), :multiple => '' }
+.photos--multinew
+  %h3 Add Photos
+  %ul{ :id => 'photos', :class => 'thumbnails' }
+  %input{ :id => 'fileupload', :type => 'file', :name => 'photo[photo]', 'data-url' => gallery_multiadd_path( gallery.id ), :multiple => '' }

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

@@ -1,7 +1,7 @@
 
 - videos ||= @videos
 
-.videos--index.-index
+.videos--index
 
   %h5
     Videos (#{videos.count})

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

@@ -6,26 +6,33 @@
     %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1.0' }
     %meta{ :charset => 'UTF-8' }
     %meta{ :description => 'some description' }
-    %script{ :src => "//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js" }
-    %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/jquery.tinymce.min.js" }
-    %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/tinymce.min.js" }
+
+    = javascript_include_tag "//code.jquery.com/jquery-3.3.1.min.js"
+
     %script{ :src => "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" }
     = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
+
+    %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/jquery.tinymce.min.js" }
+    %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/tinymce.min.js" }
+
     = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
     = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
 
-    = stylesheet_link_tag "ish_manager/materialize", media: "all"
-    = stylesheet_link_tag "ish_manager/application", media: "all"
+    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+    = javascript_include_tag "//cdn.jsdelivr.net/npm/popper.js@1.14.7/dist/umd/popper.min.js"
+    = javascript_include_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/js/bootstrap.min.js"
+
+    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css"
+    = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"
 
+    = stylesheet_link_tag "ish_manager/application", media: "all"
     = javascript_include_tag "ish_manager/application"
-    = javascript_include_tag "ish_manager/materialize"
-    = javascript_include_tag "ish_manager/application_materialize"
 
     = csrf_meta_tags
   %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action]] }
     .bg-white
       = render :partial => "ish_manager/application/main_header_#{current_user.profile.role_name}"
-      .container
+      - if notice || alert
         .row
           .col.s12
             - if notice
@@ -38,9 +45,9 @@
               %p.notice= notice
             - if alert
               %p.alert= alert
-
+      .container
         = yield
     = render 'ish_manager/application/main_footer'
     = render 'analytics' if Rails.env.production?
-    = render 'debug' if !Rails.env.production?
+
 

data/app/views/layouts/ish_manager/{application_no_material.haml → application.haml-trash}

@@ -6,27 +6,20 @@
     %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1.0' }
     %meta{ :charset => 'UTF-8' }
     %meta{ :description => 'some description' }
-
-    = javascript_include_tag "//code.jquery.com/jquery-3.3.1.min.js"
-
-    %script{ :src => "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" }
-    = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
-
+    %script{ :src => "//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js" }
     %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/jquery.tinymce.min.js" }
     %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/tinymce.min.js" }
-
+    %script{ :src => "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" }
+    = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
     = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
     = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
 
-    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
-    = javascript_include_tag "//cdn.jsdelivr.net/npm/popper.js@1.14.7/dist/umd/popper.min.js"
-    = javascript_include_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/js/bootstrap.min.js"
-
-    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css"
-    = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"
-
+    = stylesheet_link_tag "ish_manager/materialize", media: "all"
     = stylesheet_link_tag "ish_manager/application", media: "all"
+
     = javascript_include_tag "ish_manager/application"
+    = javascript_include_tag "ish_manager/materialize"
+    = javascript_include_tag "ish_manager/application_materialize"
 
     = csrf_meta_tags
   %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action]] }
@@ -45,7 +38,7 @@
               %p.notice= notice
             - if alert
               %p.alert= alert
-      .container
+
         = yield
     = render 'ish_manager/application/main_footer'
     = render 'analytics' if Rails.env.production?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.315
+  version: 0.1.8.316
 platform: ruby
 authors:
 - piousbox
@@ -251,18 +251,17 @@ files:
 - app/assets/javascripts/ish_manager/vendor/jquery.iframe-transport.js
 - app/assets/javascripts/ish_manager/vendor/jquery.ui.widget.js
 - app/assets/stylesheets/ish_manager/application.scss
-- app/assets/stylesheets/ish_manager/bootstrap.css
 - app/assets/stylesheets/ish_manager/galleries.scss
 - app/assets/stylesheets/ish_manager/jquery-ui.css
 - app/assets/stylesheets/ish_manager/leads.scss
 - app/assets/stylesheets/ish_manager/maps.scss
-- app/assets/stylesheets/ish_manager/materialize.css
+- app/assets/stylesheets/ish_manager/markers.scss
 - app/assets/stylesheets/ish_manager/pagination.scss
 - app/assets/stylesheets/ish_manager/photos.scss
-- app/assets/stylesheets/ish_manager/reset.css
-- app/assets/stylesheets/ish_manager/tags.css
-- app/assets/stylesheets/ish_manager/trash/bootstrap.min.css
-- app/assets/stylesheets/ish_manager/trash/bootstrap.min.css.map
+- app/assets/stylesheets/ish_manager/tags.scss
+- app/assets/stylesheets/ish_manager/trash/bootstrap.css
+- app/assets/stylesheets/ish_manager/trash/materialize.css
+- app/assets/stylesheets/ish_manager/trash/reset.css
 - app/assets/stylesheets/ish_manager/user_profiles.scss
 - app/assets/stylesheets/ish_manager/videos.scss
 - app/controllers/ish_manager/application_controller.rb
@@ -338,13 +337,13 @@ files:
 - app/views/ish_manager/features/show.haml
 - app/views/ish_manager/galleries/_form.haml
 - app/views/ish_manager/galleries/_index.haml
-- app/views/ish_manager/galleries/_index_thumbs.haml
 - app/views/ish_manager/galleries/_index_title.haml
 - app/views/ish_manager/galleries/_menu.haml
+- app/views/ish_manager/galleries/_menu_secondary.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_ajax.haml
+- app/views/ish_manager/galleries/index_ajax.haml-trash
 - app/views/ish_manager/galleries/index_thumbs.haml
 - app/views/ish_manager/galleries/index_titles.haml
 - app/views/ish_manager/galleries/new.haml
@@ -391,6 +390,7 @@ files:
 - app/views/ish_manager/newsitems/index.haml
 - app/views/ish_manager/newsitems/new.haml
 - app/views/ish_manager/payments/index.haml
+- app/views/ish_manager/photos/_index_thumbs.haml
 - app/views/ish_manager/photos/_meta.haml
 - app/views/ish_manager/photos/_meta_manager.haml
 - app/views/ish_manager/photos/_multinew.haml
@@ -455,7 +455,7 @@ files:
 - app/views/ish_manager/videos/show.haml
 - app/views/layouts/ish_manager/README.txt
 - app/views/layouts/ish_manager/application.haml
-- app/views/layouts/ish_manager/application_no_material.haml
+- app/views/layouts/ish_manager/application.haml-trash
 - config/routes.rb
 - config/systemd/system/README.txt
 - config/systemd/system/stockwatcher.service