ish_manager 0.1.8.313 → 0.1.8.315

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2264f938ca1b829a33a034b011f8b772f7d70475cdac1ffeb244ef2668baf5d
-  data.tar.gz: 2ac39dfcd50a93c87c603a627dba86470a8490f13b5a6fd490265a0e48c2f7f8
+  metadata.gz: 2004c1173de616a39ef2d2b185f1bd906a30dea6a77989847d549e976284f36a
+  data.tar.gz: b6d799d9a77d78a2db6cb591ab0e836e5aed4e17c9c2b85901bee69c7b1be328
 SHA512:
-  metadata.gz: c9afd9b1e238acc8d192d447fb3fd11f29c039246fb6e598a7cd8d147a5a4f6a37f5b08f3d7d93fd3206f7aae3e7c1048c06b1891a569ad5f0281d466dff2ec0
-  data.tar.gz: 363a73b3dd5221f9b55f20486ea3504c6b0f04aac26674a6ee2b762f7c732831a858e6c2443c10a6e43c79e62e0ffb8dab1d52f99d0add890aa24ea7e1acc151
+  metadata.gz: 3246003592e1c7e17a696cc2036007fd8f680349947d1477a698aae7ab824339e18e2990bd3a04e0bf06fda8cf0d4e2491bd66b2c5c38a9e7f2eedc1b4c8c1bb
+  data.tar.gz: 03063e33940ecced352f7fa41ea2fe60e60a984f686863cde1d52b86062d9120d9a31095369c206eeb77dcebbc3fa20fa0a265db227c07aa1c39380b00262f05

data/app/assets/javascripts/ish_manager/application.js

@@ -62,46 +62,24 @@ $(function () {
   }
 
 
-  var mainHeaderContext = $(".manager--main-header")
-  $(".manager--main-header #collapseHeader").click(function (_e) {
-    if ($(this).hasClass('fa-compress')) {
-      $(this).addClass('fa-expand')
-      $(this).removeClass('fa-compress')
-      localStorage.setItem('mainHeaderCollapsed', 'true')
-      $('.content', $(this).parent()).css('display', 'none')
-    } else {
-      $(this).removeClass('fa-expand')
-      $(this).addClass('fa-compress')
-      localStorage.setItem('mainHeaderCollapsed', 'false')
-      $('.content', $(this).parent()).css('display', 'block')
+  $(".collapse-expand").each(function(idx, obj) {
+    const thisId = $(this).attr('id')
+    const state = localStorage.getItem("collapse-expand#"+thisId)
+    if (state === 'collapsed') {
+      $(this).next().slideToggle();
     }
   })
-  if (localStorage.getItem('mainHeaderCollapsed') === 'true') {
-    $("#collapseHeader").addClass('fa-expand')
-    $("#collapseHeader").removeClass('fa-compress')
-    $(".content", mainHeaderContext).css("display", 'none')
-  }
-
-  var mainFooterContext = $(".manager--main-footer")
-  $(".manager--main-footer #collapseFooter").click(function (_e) {
-    const el = $(this).next()
-    if ($(this).hasClass('fa-compress')) {
-      $(this).addClass('fa-expand')
-      $(this).removeClass('fa-compress')
-      localStorage.setItem('mainFooterCollapsed', 'true')
-      $(el, $(this).parent()).css('display', 'none')
+  $(".collapse-expand").click(function (_e) {
+    const thisId = $(this).attr('id')
+    const state = localStorage.getItem("collapse-expand#"+thisId)
+    if (state === 'collapsed') {
+      localStorage.removeItem("collapse-expand#"+thisId)
     } else {
-      $(this).removeClass('fa-expand')
-      $(this).addClass('fa-compress')
-      localStorage.setItem('mainFooterCollapsed', 'false')
-      $(el, $(this).parent()).css('display', 'block')
+      localStorage.setItem("collapse-expand#"+thisId, "collapsed")
     }
+    $(this).next().slideToggle();
   })
-  if (localStorage.getItem('mainFooterCollapsed') === 'true') {
-    $("#collapseFooter").addClass('fa-expand')
-    $("#collapseFooter").removeClass('fa-compress')
-    $(".content", mainFooterContext).css("display", 'none')
-  }
+
 
   if ('function' === typeof $('body').DataTable) {
     $('#dataTable').DataTable({

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

@@ -26,6 +26,7 @@
  *= require ish_manager/tags
  *= require ish_manager/user_profiles
  *= require ish_manager/videos
+ *= require ish_manager/pagination
  */
 
 
@@ -85,6 +86,17 @@ ul:not(.browser-default).bullets, {
   padding: .8em;
 }
 
+.application--debug {
+  width: 100vwh;
+  overflow-x: auto;
+}
+.application-home {
+  .bordered-card {
+    max-width: 400px;
+  }
+}
+
+
 /* B */
 
 .bg-white {
@@ -102,7 +114,7 @@ ul:not(.browser-default).bullets, {
   padding: 1em;
 }
 
-.bordered {
+.bordered-card {
   border: 1px solid grey;
   padding: .5em;
   border-radius: 8px;
@@ -124,7 +136,7 @@ ul:not(.browser-default).bullets, {
   text-align: center;
 }
 
-.clearfix {
+.c {
   clear: both;
 }
 
@@ -170,6 +182,7 @@ ul:not(.browser-default).bullets, {
 .flex-row {
   display: flex;
   flex-wrap: wrap; /* @TODO: why does it wrap? in ish_manager/show , I'd prefer it didn't. */
+
 }
 
 .float-left {
@@ -257,13 +270,17 @@ textarea.large {
   border-bottom: 1px solid blue;
 }
 
-.menu-secondary li {
-  display: inline;
-}
-.menu-secondary li a {
-  padding: 1rem;
-  background: white;
+.menu-secondary {
+  margin: 20px 0;
+  padding: 0;
+  li {
+    display: inline;
+    a {
+      background: white;
+    }
+  }
 }
+
 .meta-edit {
   display: inline;
 }

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

@@ -1,9 +1,5 @@
 /* utils */
 
-.thumbnails {
-  display: flex;
-}
-
 .row-thumbs .item {
   margin-bottom: 1em;
   border: 1px solid red;

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

@@ -0,0 +1,54 @@
+
+
+.pagination li {
+  display: inline-block;
+  border-radius: 2px;
+  text-align: center;
+  vertical-align: top;
+  height: 30px;
+}
+
+.pagination li a {
+  color: #444;
+  display: inline-block;
+  font-size: 1.2rem;
+  padding: 0 10px;
+  line-height: 30px;
+}
+
+.pagination li.active a {
+  color: #fff;
+}
+
+.pagination li.active {
+  background-color: #ee6e73;
+}
+
+.pagination li.disabled a {
+  cursor: default;
+  color: #999;
+}
+
+.pagination li i {
+  font-size: 2rem;
+}
+
+.pagination li.pages ul li {
+  display: inline-block;
+  float: none;
+}
+
+@media only screen and (max-width: 992px) {
+  .pagination {
+    width: 100%;
+  }
+  .pagination li.prev,
+  .pagination li.next {
+    width: 10%;
+  }
+  .pagination li.pages {
+    width: 80%;
+    overflow: hidden;
+    white-space: nowrap;
+  }
+}

data/app/controllers/ish_manager/galleries_controller.rb

@@ -48,7 +48,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
       # @galleries.selector.delete('is_done')
     end
     @galleries = @galleries.page( params[:galleries_page] ).per( 10 )
-    render params[:render_type]
+    render params[:render_type], layout: 'ish_manager/application_no_material'
   end
 
   def j_show

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,9 +59,10 @@ 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
+      # 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
 
       flash[:notice] = "Destroyed the newsitem."
     else

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

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,22 @@
 .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

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,6 +1,8 @@
 -#
 -# ish_manager / galleries / _index.haml
 -#
+-# _vp_ 2022-09-25 :: Small styling revision
+-#
 
 - n_thumbs   ||= 8
 - param_name ||= :galleries_page
@@ -16,20 +18,19 @@
 
     .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'

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

@@ -1,16 +1,15 @@
 
-.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
+  .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
 

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/newsitems/edit.haml

@@ -5,7 +5,8 @@
   - url = site_newsitem_path( @site, @newsitem ) if @site
 
 .newsitems-edit
-  %h1 Edit Newsitem
+  %h1
+    Edit Newsitem
     - if @site
       For site: #{@site.domain} #{@site.lang} <br />
     - if @city

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

@@ -0,0 +1,46 @@
+!!!
+%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' }
+    %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 "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]] }
+    .bg-white
+      = render :partial => "ish_manager/application/main_header_#{current_user.profile.role_name}"
+      .container
+        .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
+
+        = yield
+    = render 'ish_manager/application/main_footer'
+    = render 'analytics' if Rails.env.production?
+    = render 'debug' if !Rails.env.production?
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.313
+  version: 0.1.8.315
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-20 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -257,6 +257,7 @@ files:
 - 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/pagination.scss
 - app/assets/stylesheets/ish_manager/photos.scss
 - app/assets/stylesheets/ish_manager/reset.css
 - app/assets/stylesheets/ish_manager/tags.css
@@ -454,7 +455,6 @@ 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/application2.haml
 - app/views/layouts/ish_manager/application_no_material.haml
 - config/routes.rb
 - config/systemd/system/README.txt

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

@@ -1 +0,0 @@
-app/views/layouts/ish_manager/application2.haml

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

@@ -1,46 +0,0 @@
-!!!
-%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' }
-    %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 "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]] }
-    .bg-white
-      = render :partial => "ish_manager/application/main_header_#{current_user.profile.role_name}"
-      .container
-        .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
-
-        = yield
-    = render 'ish_manager/application/main_footer'
-    = render 'analytics' if Rails.env.production?
-    = render 'debug' if !Rails.env.production?
-