ish_manager 0.1.8.314 → 0.1.8.316

data/app/assets/stylesheets/ish_manager/photos.scss

@@ -1,12 +1,49 @@
 
-.--meta-manager {
+.photos--index-mini {
+}
+.photos--index-thumbs {
+  .item {
+    border: 1px solid red;
+    padding: 10px;
+
+    max-width: Min(125px, 30vw);
+  }
+}
+.photos--meta-manager {
   display: flex;
   justify-content: space-between;
 
+  .right-hand {
+    text-align: right;
+  }
   .right-hand a {
+
   }
-  .right-hand a:not(:last-child):after {
+  .right-hand a:not(:first-child):before {
     content: "|";
     padding: 0 10px 0 15px;
   }
 }
+.photos--multinew {
+  border: 1px dashed #356;
+  display: inline-block;
+  margin-bottom: 2em;
+  padding: 10px;
+
+  input[type='file'] {
+    overflow-x: auto;
+    max-width: Max( 300px, 50vw );
+  }
+}
+
+.row-deleted {
+  .goto,
+  .x {
+    display: none;
+  }
+}
+.row-mini {
+  .flex-row {
+    margin-bottom: 500px;
+  }
+}

data/app/controllers/ish_manager/leads_controller.rb

@@ -27,7 +27,6 @@ class IshManager::LeadsController < IshManager::ApplicationController
     else
       @leads = @leads.where( :is_done => false )
     end
-    render :layout => 'ish_manager/application_no_material'
   end
 
   def new

data/app/controllers/ish_manager/maps_controller.rb

@@ -4,8 +4,6 @@ class IshManager::MapsController < IshManager::ApplicationController
   before_action :set_map, only: [ :destroy, :edit, :export, :map_editor, :show, :update, ] # alphabetized
   before_action :set_lists
 
-  layout 'ish_manager/application_no_material', only: %w| index |
-
   # alphabetized
 
   def create

data/app/controllers/ish_manager/markers_controller.rb

@@ -5,8 +5,6 @@ class IshManager::MarkersController < IshManager::ApplicationController
   before_action :set_marker, only: [ :edit, :update ]
   before_action :set_lists
 
-  layout 'ish_manager/application_no_material'
-
   def new
     authorize! :new_marker, ::Gameui::Map
     @marker = ::Gameui::Marker.new

data/app/controllers/ish_manager/meetings_controller.rb

@@ -1,8 +1,6 @@
 
 class IshManager::MeetingsController < IshManager::ApplicationController
 
-  layout 'ish_manager/application_no_material'
-
   # alphabetized
 
   def create

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -1,6 +1,5 @@
 class IshManager::NewsitemsController < IshManager::ApplicationController
   before_action :set_lists
-  layout 'ish_manager/application2'
 
   ## Alphabetized : )
 
@@ -20,7 +19,10 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     authorize! :create_newsitem, @resource
 
     if params[:photo]
-      photo = Photo.create :photo => params[:photo], :user_profile => current_user.profile
+      photo = Photo.create( :photo => params[:photo],
+        :user_profile => current_user.profile,
+        descr: params[:descr],
+        subhead: params[:subhead] )
       @newsitem.photo = photo
     end
 
@@ -57,8 +59,6 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     authorize! :destroy, @newsitem
 
     if @newsitem.destroy
-      # City.find(@newsitem.city_id).touch if @newsitem.city_id
-      # Site.find(@newsitem.site_id).touch if @newsitem.site_id
       Tag.find(@newsitem.tag_id).touch if @newsitem.tag_id
       Map.find(@newsitem.map_id).touch if @newsitem.map_id
 
@@ -105,7 +105,6 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       @newsitem.tag = @tag
     end
     authorize! :new, @newsitem
-    render layout: 'ish_manager/application_no_material'
   end
 
   def update

data/app/helpers/ish_manager/application_helper.rb

@@ -1,6 +1,17 @@
 module IshManager
   module ApplicationHelper
 
+    def current_layout
+      layout = controller.class.send(:_layout)
+      if layout.nil?
+        '<default>'
+      elsif layout.instance_of? String or layout.instance_of? Symbol
+        layout
+      else
+        File.basename(layout.identifier).split('.').first
+      end
+    end
+
     def pretty_date input
       return input.strftime("%Y-%m-%d")
     end
@@ -51,7 +62,7 @@ module IshManager
     end
 
     def api_marker_path marker
-      "/api/markers/view/#{marker.slug}"
+      "/api/markers/view/#{marker.id}"
     end
 
   end

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

@@ -1,7 +1,9 @@
 
-
-%ul{ style: "margin: 2em;" }
-  %li= params.inspect
-  %li= "Cached?: #{Rails.application.config.action_controller.perform_caching}"
-  %li= "Cache key: #{@cache_key.inspect}"     if @cache_key
-  %li= "Env: #{Rails.env}"
+%i.fa.fa-compress.collapse-expand#debug
+.application--debug
+  %ul.browser-default
+    %li= params.inspect
+    %li= "Cached?: #{Rails.application.config.action_controller.perform_caching}"
+    %li Cache key: #{@cache_key.inspect}
+    %li Layout: #{current_layout}
+    %li= "Env: #{Rails.env}"

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

@@ -2,23 +2,24 @@
 .manager--main-footer
   .container
 
-    %i.fa.fa-compress.collapse-expand#collapseFooter
+    %i.fa.fa-compress.collapse-expand#mainFooter
     .a
       .row
         .col-sm-6
           - if @current_user
-            %ul
-              %li >[ #{@current_user.email} ]<
-              %li >[ #{@current_user.profile&.role_name} ]<
+            %div >[ #{@current_user.email} ]<
+            %div >[ #{@current_user.profile&.role_name} ]<
           - else
             Please log in
             = link_to '[+]', main_app.new_user_session_path
 
         .col-sm-4
-          %br
           \~__^
           = @version
           -# <pre>#{@changelog}</pre>
 
-        .col-sm--2
+        .col-sm-2
           = button_to 'Logout', main_app.destroy_user_session_path, :method => :delete
+
+    .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/application/_search.haml

@@ -1,11 +1,6 @@
 
-- # @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'
-  .actions.hide
-    = submit_tag 'Search'
-  .c
+.application--search
+  = form_tag path, :method => :get, :class => :search do
+    .field.search_words
+      = text_field_tag 'q', nil, :placeholder => 'Search'
+    .c

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

@@ -1,9 +1,10 @@
 
-Welcome home! Your role is `#{current_user.profile.role_name}`.
+.application-home
+  Welcome home! Your role is `#{current_user.profile.role_name}`.
 
-.bordered{ style: 'width: 400px;' }
-  = form_tag "https://www.cgtrader.com/free-3d-models", method: :get do
-    %p Search CGTrader:
-    = hidden_field_tag "polygons", "lt_5k"
-    = text_field_tag "keywords"
-    = submit_tag 'search'
+  .bordered-card
+    = form_tag "https://www.cgtrader.com/free-3d-models", method: :get do
+      %p Search CGTrader:
+      = hidden_field_tag "polygons", "lt_5k"
+      = text_field_tag "keywords"
+      = submit_tag 'search'

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

@@ -1,38 +1,38 @@
 -#
 -# ish_manager / galleries / _index.haml
 -#
+-# _vp_ 2022-09-25 :: Small styling revision
+-#
 
 - 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|
-        .col.s6
-          .item.panel
-            .panel-body
-              %h4
-                = link_to '[~]', edit_gallery_path( g )
-                = link_to g.name, gallery_path(g.slug)
-                (#{g.photos.length})
-              = render 'meta', item: g
-              - if g.photos.length == 0
-                = image_missing
-              - else
-                .thumbnails.flex-row
-                  - g.photos.limit( n_thumbs ).each do |photo|
-                    = link_to image_tag(photo.photo.url(:thumb), :alt => g.name), gallery_path(g.slug)
+        .col-sm-12.col-md-6
+          .bordered-card
+            %h5
+              = link_to '[~]', edit_gallery_path( g )
+              = link_to g.name, gallery_path(g.slug)
+              (#{g.photos.length})
+            = render 'meta', item: g
+            - if g.photos.length == 0
+              No Photos
+            - else
+              .flex-row
+                - g.photos.limit( n_thumbs ).each do |photo|
+                  = 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,16 +1,14 @@
 
-.title
-  .row
-    .col.s12.col.m12
-      %h1.center Galleries #{params[:action]} (#{@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
+.galleries--menu
 
+  -# .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/newsitems/_form.haml

@@ -26,6 +26,9 @@
       .field
         = label_tag :photo
         = file_field_tag :photo
+      .field
+        = f.label :subhead
+        = f.text_area :subhead
       .field
         = f.label :descr
         = f.text_area :descr, :class => :tinymce

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

@@ -0,0 +1,53 @@
+!!!
+%html
+  %head
+    %title Ish Manager
+    %link{ :rel => 'icon', :href => "/favicon_#{ENV['RAILS_ENV']}.gif" }
+    %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 => "//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 "//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"
+
+    = 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}"
+      - if notice || alert
+        .row
+          .col.s12
+            - if notice
+              - if notice.class == Array
+                %ul
+                  - notice.map do |n|
+                    %li
+                      - n.map do |k,v|
+                        <b>#{k} :</b> #{v}
+              %p.notice= notice
+            - if alert
+              %p.alert= alert
+      .container
+        = yield
+    = render 'ish_manager/application/main_footer'
+    = render 'analytics' if Rails.env.production?
+
+