ish_manager 0.1.8.298 → 0.1.8.301

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 633c637aedac1a994211764707c2ebad1b69cd97410a1c90451f77c8a1cc3485
-  data.tar.gz: b4ca5ba260cb3476de1f41c5b2cce4d0bf70c4bb92cf632b297a17cd1af61e21
+  metadata.gz: a971d9583b81160fa18e0c56354fbe4a30aa5c1974037351576855c1be1145d9
+  data.tar.gz: cd1088767070e867c13f0375b8ee56e9e686e0253b72c697b60c6e3a1e34514a
 SHA512:
-  metadata.gz: b5ebf371b3be78b358e86b7b9745e8bb8d939eecf0bc34b3ef8248fbe5e8cf33844fa66947ac65e68ecc39000ff67eb9bc6b1e1b1d37a2ad31b3c21805b56452
-  data.tar.gz: c9cf963d8c86ae4e06dfd9067dd7d7a19decfe0aac69ea56f70ed7eb7ff59deea83f9326bc6f8d55edd6bb06d3bcedc77d9ccf95dfe55d4cdaa15025a36c6aa0
+  metadata.gz: f9658df5b5175cfc66efb1531f779f1d17a95d7ad04f002fb65dbaf4d3e657003927eb549e8907d50d5d6b43e2bc3816168a58add1478f779a4d763690ea6cc1
+  data.tar.gz: e8e6e0ced66cdc007ea3097a4f5eba4dc060060dadd6a456aaf24d23b7084cc5123bc107b849c2910535bb2f8e728dd8a16656d8301a7340d2a13690d01e34f3

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

@@ -10,12 +10,12 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-// require ish_manager/jquery-3.2.1.min
-// require ish_manager/bootstrap.min
-//= require ish_manager/jquery.iframe-transport
-//= require ish_manager/jquery.ui.widget
-//= require ish_manager/jquery.fileupload
-//= require ish_manager/jquery-ui.min
+// require ish_manager/vendor/jquery-3.2.1.min
+// require ish_manager/vendor/bootstrap.min
+//= require ish_manager/vendor/jquery.iframe-transport
+//= require ish_manager/vendor/jquery.ui.widget
+//= require ish_manager/vendor/jquery.fileupload
+//= require ish_manager/vendor/jquery-ui.min
 //= require ish_manager/shared
 //= require ish_manager/maps
 
@@ -42,14 +42,27 @@ $(function () {
     });
   }
 
-  if ($('body').length > 0) {
-      $('select').material_select()
-  }
 
   $(".caret").each(function(idx) {
     $($(".caret")[idx]).html('')
   })
 
+
+  // material_select & select2
+  if ($('body').length > 0) {
+    if ('function' === typeof $('body').material_select ) {
+      $('select').material_select()
+    }
+    $('.select2').select2()
+  }
+
+
+
+
+
+
+
+
   var mainHeaderContext = $(".manager--main-header")
   $(".manager--main-header #collapseHeader").click(function (_e) {
     if ($(this).hasClass('fa-compress')) {
@@ -91,18 +104,22 @@ $(function () {
     $(".content", mainFooterContext).css("display", 'none')
   }
 
-  $('#dataTable').DataTable({
-      pageLength: 10,
-      lengthMenu: [[10, 25, 100, -1], [10, 25, 100, 'All']],
-      lengthChange: true,
-      "aLengthMenu": [[5, 10, 25, 50, -1], [5, 10, 25, 50, "All"]]
-  });
+  if ('function' === typeof $('body').DataTable) {
+    $('#dataTable').DataTable({
+        pageLength: 10,
+        lengthMenu: [[10, 25, 100, -1], [10, 25, 100, 'All']],
+        lengthChange: true,
+        "aLengthMenu": [[5, 10, 25, 50, -1], [5, 10, 25, 50, "All"]]
+    })
+  }
 
   $(".addToggle").on('click', function () {
     $(this).next().toggle(500)
   })
 
-  $(".datepicker").datepicker({ dateFormat: 'yy-mm-dd' });
+  if ('function' === typeof $('body').datepicker) {
+    $(".datepicker").datepicker({ dateFormat: 'yy-mm-dd' })
+  }
 
 });
 

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -88,6 +88,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
   end
 
   def new
+
     @newsitem = Newsitem.new
 
     if params[:city_id]
@@ -103,6 +104,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       @newsitem.tag = @tag
     end
     authorize! :new, @newsitem
+    render layout: 'ish_manager/application_no_material'
   end
 
   def update

data/app/views/ish_manager/newsitems/_form.haml

@@ -5,7 +5,7 @@
 = form_for newsitem, :html => { :multipart => true } do |f|
   .row
 
-    .col.s6
+    .col-sm-6
       .field
         = f.label :name
         = f.text_field :name
@@ -17,13 +17,13 @@
         = f.text_area :descr, :class => :tinymce
 
 
-    .col.s6
+    .col-sm-6
       .field
         = f.label :map
-        = f.select :map_id, options_for_select( @maps_list, selected:( newsitem[:map_id] || params[:map_id] ) )
-      .field
-        = f.label :site
-        = f.select :site_id, options_for_select( @sites_list, :selected => ( newsitem[:site_id] || params[:site_id] ) )
+        = f.select :map_id, options_for_select( @maps_list, selected:( newsitem[:map_id] || params[:map_id] ) ), {}, class: 'select2'
+      -# .field
+      -#   = f.label :site
+      -#   = f.select :site_id, options_for_select( @sites_list, :selected => ( newsitem[:site_id] || params[:site_id] ) )
       .field
         = f.label :city
         = f.select :city_id, options_for_select( @cities_list, :selected => ( newsitem[:city_id] || params[:city_id] ) )

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

@@ -6,16 +6,27 @@
     %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"
+
+    %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/application", media: "all"
+    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+    = javascript_include_tag "//code.jquery.com/jquery-3.3.1.slim.min.js"
+    = 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.298
+  version: 0.1.8.301
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-06 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -219,35 +219,35 @@ files:
 - app/assets/images/ui-icons_ffffff_256x240.png
 - app/assets/images/wait.gif
 - app/assets/javascripts/ish_manager/application.js
-- app/assets/javascripts/ish_manager/bootstrap.min.js
-- app/assets/javascripts/ish_manager/jquery-3.2.1.min.js
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1.zip
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/AUTHORS.txt
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/LICENSE.txt
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/external/jquery/jquery.js
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/images/ui-icons_444444_256x240.png
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/images/ui-icons_555555_256x240.png
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/images/ui-icons_777620_256x240.png
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/images/ui-icons_777777_256x240.png
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/images/ui-icons_cc0000_256x240.png
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/images/ui-icons_ffffff_256x240.png
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/index.html
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/jquery-ui.css
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/jquery-ui.js
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/jquery-ui.min.css
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/jquery-ui.min.js
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/jquery-ui.structure.css
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/jquery-ui.structure.min.css
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/jquery-ui.theme.css
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/jquery-ui.theme.min.css
-- app/assets/javascripts/ish_manager/jquery-ui-1.12.1/package.json
-- app/assets/javascripts/ish_manager/jquery-ui.min.js
-- app/assets/javascripts/ish_manager/jquery.fileupload.js
-- app/assets/javascripts/ish_manager/jquery.iframe-transport.js
-- app/assets/javascripts/ish_manager/jquery.ui.widget.js
 - app/assets/javascripts/ish_manager/maps.js
 - app/assets/javascripts/ish_manager/materialize.js
 - app/assets/javascripts/ish_manager/shared.js
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1.zip
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/AUTHORS.txt
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/LICENSE.txt
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/external/jquery/jquery.js
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_444444_256x240.png
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_555555_256x240.png
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_777620_256x240.png
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_777777_256x240.png
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_cc0000_256x240.png
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_ffffff_256x240.png
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/index.html
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.css
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.js
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.min.css
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.min.js
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.structure.css
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.structure.min.css
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.theme.css
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.theme.min.css
+- app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/package.json
+- app/assets/javascripts/ish_manager/vendor/bootstrap.min.js
+- app/assets/javascripts/ish_manager/vendor/jquery-3.2.1.min.js
+- app/assets/javascripts/ish_manager/vendor/jquery-ui.min.js
+- app/assets/javascripts/ish_manager/vendor/jquery.fileupload.js
+- 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