ish_manager 0.1.8.311 → 0.1.8.313

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 775bfc00b6ac264246781cada39abccc116bd31147ce9c01e9c3a69745b27935
-  data.tar.gz: 4f8c04eb7e9222a568b13e4173f0b6d717ae8b2ff9128280597fb854c3e4f751
+  metadata.gz: c2264f938ca1b829a33a034b011f8b772f7d70475cdac1ffeb244ef2668baf5d
+  data.tar.gz: 2ac39dfcd50a93c87c603a627dba86470a8490f13b5a6fd490265a0e48c2f7f8
 SHA512:
-  metadata.gz: 98bbd01e9f60bc860e864a5990598a980b853a264ce20397d5b1671b51b045e9eb1ec001f29295c3ada9c8b3923bf3ee931d3da1b6da35ecac66624990a0baf4
-  data.tar.gz: 463aa08364d17f216c47626c47d1ddce099a13678c0438804e8474c3c12c720558dc9617940e6920b851a23afd68a0df6e28288e3a618de9338af21c19c1b310
+  metadata.gz: c9afd9b1e238acc8d192d447fb3fd11f29c039246fb6e598a7cd8d147a5a4f6a37f5b08f3d7d93fd3206f7aae3e7c1048c06b1891a569ad5f0281d466dff2ec0
+  data.tar.gz: 363a73b3dd5221f9b55f20486ea3504c6b0f04aac26674a6ee2b762f7c732831a858e6c2443c10a6e43c79e62e0ffb8dab1d52f99d0add890aa24ea7e1acc151

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

@@ -47,29 +47,21 @@ $(function () {
   })
 
 
-
-
-
-
-
-
-
-
-  // material_select & select2
+  /*
+   * material_select & select2
+  **/
   if ($('body').length > 0) {
     if ('function' === typeof $('body').material_select ) {
       $('select').material_select()
     }
-    if (!!$('body').select2) { $('.select2').select2() }
+    if (!!$('body').select2) {
+      $('.select2').select2({
+        width: 'element'
+      })
+    }
   }
 
 
-
-
-
-
-
-
   var mainHeaderContext = $(".manager--main-header")
   $(".manager--main-header #collapseHeader").click(function (_e) {
     if ($(this).hasClass('fa-compress')) {

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

@@ -251,6 +251,12 @@ textarea.large {
   border-bottom: 1px solid red;
 }
 
+.markers--form .row {
+  margin-bottom: 1em;
+  padding-bottom: 1em;
+  border-bottom: 1px solid blue;
+}
+
 .menu-secondary li {
   display: inline;
 }

data/app/controllers/ish_manager/maps_controller.rb

@@ -137,7 +137,7 @@ class IshManager::MapsController < IshManager::ApplicationController
     authorize! :index, ::Gameui::Map
 
     if params[:q]
-      @maps = ::Gameui::Map.where({ slug: /#{params[:q]}/i })
+      @maps = ::Gameui::Map.or({ slug: /#{params[:q]}/i }, { name: /#{params[:q]}/i })
       if @maps.length == 1
         redirect_to map_path(@maps[0])
         return

data/app/controllers/ish_manager/markers_controller.rb

@@ -5,6 +5,8 @@ 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/views/ish_manager/maps/_form.haml

@@ -80,7 +80,7 @@
           description.collapsible: bool
           map_panel_type: "Equirectangular" | "Panoramic" |
             "MapPanel" | "MapPanelNoZoom" |
-            "ThreePanelV1" | "ThreePanelV4" |
+            "ThreePanelV1" | "ThreePanelV1Fullscreen" |
             "GoogleMaps" | "TabiversePlanet"
   .row
     .col.s6
@@ -92,6 +92,9 @@
         .col.s4
           = f.text_field :y
     .col.s6
-      unused
+      .field
+        = f.label :newsitems_page_size
+        = f.number_field :newsitems_page_size
+
   .actions
     = f.submit 'Save'

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

@@ -12,19 +12,19 @@
     .actions
       = f.submit 'Save'
     .row
-      .col.s4
+      .col-sm-4
         = f.label :map
-        = f.select :map_id, options_for_select(@maps_list, selected: @marker.map_id || params[:map_id])
-      .col.s4
+        = f.select :map_id, options_for_select(@maps_list, selected: @marker.map_id || params[:map_id]), {}, class: 'select2'
+      .col-sm-4
         .field
           = f.label :name
           = f.text_field :name
-      .col.s4
+      .col-sm-4
         .field
           = f.label :destination
-          = f.select :destination_id, options_for_select(@maps_list, selected: @marker.destination_id)
+          = f.select :destination_id, options_for_select(@maps_list, selected: @marker.destination_id), {}, class: 'select2'
     .row
-      .col.s3
+      .col-sm-3
         .field
           = f.label :image
           = file_field_tag :image
@@ -34,21 +34,21 @@
         .field
           = f.label :asset3d
           = file_field_tag :asset3d
-      .col.s3
+      .col-sm-3
         .field
           = f.label :centerOffsetX
           = f.text_field :centerOffsetX
         .field
           = f.label :centerOffsetY
           = f.text_field :centerOffsetY
-      .col.s3
+      .col-sm-3
         .field
           = f.label :x
           = f.text_field :x
         .field
           = f.label :y
           = f.text_field :y
-      .col.s3
+      .col-sm-3
         .field
           = f.label :title_image
           = file_field_tag :title_image
@@ -60,21 +60,21 @@
       = f.label :url, "URL (if any)"
       = f.text_field :url
     .row
-      .col.s3  
-      .col.s6
+      .col-sm-3  
+      .col-sm-5
         .field
           = f.label :description
           = f.text_area :description
     .row
-      .col.s4
+      .col-sm-4
         .field
           = f.label :item_type
           = f.select :item_type, options_for_select( ::Gameui::Marker::ITEM_TYPES, selected: @marker.item_type )
-      .col.s4
+      .col-sm-4
         .field
           = f.label :ordering
           = f.text_field :ordering
-      .col.s4
+      .col-sm-4
         .field
           = f.check_box :is_active
           = f.label :is_active

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

@@ -7,7 +7,7 @@
       - else
         = image_missing_tag
       .flex-row
-        .a= marker.destination.name
+        .a= marker.destination&.name
         .a= button_to '~', edit_marker_path(marker), method: :get
         .a= button_to 'x', marker_path(marker), method: :delete, data: { confirm: 'Are you sure?' }
       .flex-row

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

@@ -6,11 +6,10 @@
 
 .newsitems-edit
   %h1 Edit Newsitem
-  - if @site
-    For site: #{@site.domain} #{@site.lang} <br />
-  - if @city
-    For city: #{@city.name} <br />
-
+    - if @site
+      For site: #{@site.domain} #{@site.lang} <br />
+    - if @city
+      For city: #{@city.name} <br />
   = render 'form', :newsitem => @newsitem, :url => url
 
 .debug

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

@@ -1,11 +1,10 @@
 
-.row
-  .small-12.columns
-    %h1
-      New Newsitem
+.newsitems-new
+  %h1
+    New Newsitem
     - if @site
       For Site #{@site.domain}
     - if @city
       For City #{@city.name}
-    = render 'form', :newsitem => @newsitem
-    
+  = render 'form', :newsitem => @newsitem
+

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

@@ -35,6 +35,9 @@
   .field
     = f.label :Description
     = f.text_area :descr, :class => 'tinymce'
+  .field
+    = f.label :raw_json
+    = f.text_area :raw_json
 
   %br
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.311
+  version: 0.1.8.313
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-17 00:00:00.000000000 Z
+date: 2022-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk