ish_manager 0.1.8.309 → 0.1.8.311

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f948aa756d8a13b14117e8819559ee2bfc88ebf66fb32a54bedeb81cac8e11e6
-  data.tar.gz: 1df9329a3ebf0c3e43b1c2404b817079355a564e632a7cf47af1ec6e8055f073
+  metadata.gz: 775bfc00b6ac264246781cada39abccc116bd31147ce9c01e9c3a69745b27935
+  data.tar.gz: 4f8c04eb7e9222a568b13e4173f0b6d717ae8b2ff9128280597fb854c3e4f751
 SHA512:
-  metadata.gz: 2ca93af8c6c0564d87771759e284b291727431c4f4235a2a1f339a69a7e4c1eac42c07dc2f3869d0f3cbb7fbf8e711ee724feb9b283ba6cdc8843c5a74185793
-  data.tar.gz: 7471a9047b7f6d44babd1eee76f6062e0a14c0cccd0e9ab4e0c55366572be25ed2f5e249446ee9b7da690828ec45a73b54eb76271d2a14ab0d1b9b9193cfcc02
+  metadata.gz: 98bbd01e9f60bc860e864a5990598a980b853a264ce20397d5b1671b51b045e9eb1ec001f29295c3ada9c8b3923bf3ee931d3da1b6da35ecac66624990a0baf4
+  data.tar.gz: 463aa08364d17f216c47626c47d1ddce099a13678c0438804e8474c3c12c720558dc9617940e6920b851a23afd68a0df6e28288e3a618de9338af21c19c1b310

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

@@ -92,20 +92,20 @@ $(function () {
 
   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')
-      $('.content', $(this).parent()).css('display', 'none')
+      $(el, $(this).parent()).css('display', 'none')
     } else {
       $(this).removeClass('fa-expand')
       $(this).addClass('fa-compress')
       localStorage.setItem('mainFooterCollapsed', 'false')
-      $('.content', $(this).parent()).css('display', 'block')
+      $(el, $(this).parent()).css('display', 'block')
     }
   })
   if (localStorage.getItem('mainFooterCollapsed') === 'true') {
-    console.log('here')
     $("#collapseFooter").addClass('fa-expand')
     $("#collapseFooter").removeClass('fa-compress')
     $(".content", mainFooterContext).css("display", 'none')

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

@@ -13,6 +13,11 @@
  * alphabetized : )
  *
  *= require_self
+ *
+ ** Utils
+ ** Newsitems
+ ** Reports
+ *
  *= require ish_manager/galleries
  *= require ish_manager/jquery-ui
  *= require ish_manager/maps
@@ -23,6 +28,12 @@
  *= require ish_manager/videos
  */
 
+
+
+/*
+ * Utils
+**/
+
 body {
   background: #dedede;
   font-size: 20px;
@@ -41,10 +52,6 @@ ul:not(.browser-default).bullets, {
   }
 }
 
-/**
- * utils
- */
-
 .-index {
   .item {
     margin-bottom: 3em;
@@ -124,6 +131,9 @@ ul:not(.browser-default).bullets, {
 .collapse-expand {
   cursor: pointer;
 }
+#collapseFooter {
+  float: left;
+}
 
 /* D */
 /* E */
@@ -292,20 +302,23 @@ ul.inline li {
   padding: .2em;
 }
 
-/**
- * reports
- */
-.descr,
-.description {
-  border: 1px solid red;
-  padding: 1em;
-  font-size: 1.6em;
+/* S */
+.select2-container {
+  max-width: 100%;
+  display: block;
 }
 
+/* T */
+
+/* U */
+
+/* V */
+
+/* W */
 
 /*
- * newsitems
- */
+ * Newsitems
+**/
 .newsitems--item {
   border: 1px solid green;
   padding: 5px;
@@ -315,3 +328,13 @@ ul.inline li {
   border-bottom: 5px solid black;
 }
 
+
+/**
+ * Reports
+**/
+ .descr,
+ .description {
+   border: 1px solid red;
+   padding: 1em;
+   font-size: 1.6em;
+ }

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

@@ -1,27 +1,24 @@
 
 .manager--main-footer
   .container
-    .row
-      %i.fa.fa-compress.collapse-expand#collapseFooter
-      .content
-        .col.s5
-          - if defined?( current_user ) && current_user
+
+    %i.fa.fa-compress.collapse-expand#collapseFooter
+    .a
+      .row
+        .col-sm-6
+          - if @current_user
             %ul
-              %li >[ #{current_user.email} ]<
-              %li >[ #{current_user.profile.role_name} ]<
+              %li >[ #{@current_user.email} ]<
+              %li >[ #{@current_user.profile&.role_name} ]<
           - else
             Please log in
             = link_to '[+]', main_app.new_user_session_path
 
-        .col.s5
+        .col-sm-4
           %br
           \~__^
           = @version
           -# <pre>#{@changelog}</pre>
-          %br
-          %br
-          %br
-          %br
-          %br
-        .col.s2
+
+        .col-sm--2
           = button_to 'Logout', main_app.destroy_user_session_path, :method => :delete

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

@@ -75,21 +75,8 @@
           = f.label :ordering
           = f.text_field :ordering
       .col.s4
-    .row
-      .col.s3  
-      .col.s6
-        .row
-          .col.s6
-            .field
-              = f.check_box :is_active
-              = f.label :is_active
-          .col.s6
-            .google-maps.row
-              .col.s4
-                = f.label "x, y"
-              .col.s4
-                = f.text_field :x
-              .col.s4
-                = f.text_field :y
+        .field
+          = f.check_box :is_active
+          = f.label :is_active
     .actions
       = f.submit 'Save'

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

@@ -4,7 +4,21 @@
 
 = form_for newsitem, :html => { :multipart => true } do |f|
   .row
+    .col-sm-6
+      .field
+        = f.label :map
+        = 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] ) )
+    .col-sm-6
+      = f.submit :submit
 
+  %hr
+  .row
     .col-sm-6
       .field
         = f.label :name
@@ -16,31 +30,16 @@
         = f.label :descr
         = f.text_area :descr, :class => :tinymce
 
-
     .col-sm-6
-      .field
-        = f.label :map
-        = 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] ) )
-
-  %hr
-  .row
-    .col.s6
       .field
         = f.label :video
-        = f.select :video_id, options_for_select( @videos_list, :selected => @newsitem.video_id )
+        = f.select :video_id, options_for_select( @videos_list, :selected => @newsitem.video_id ), {}, class: 'select2'
       .field
         = f.label :gallery
-        = f.select :gallery_id, options_for_select( @galleries_list, :selected => @newsitem.gallery_id )
+        = f.select :gallery_id, options_for_select( @galleries_list, :selected => @newsitem.gallery_id ), {}, class: 'select2'
       .field
         = f.label :report
-        = f.select :report_id, options_for_select( @reports_list, :selected => @newsitem.report_id )
+        = f.select :report_id, options_for_select( @reports_list, :selected => @newsitem.report_id ), {}, class: 'select2'
+
 
-    .col.s6
-      = f.submit :submit
 

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

@@ -8,12 +8,7 @@
   .col.s12
     = render 'meta', tag: @tag
     .descr= @tag.descr # I don't wanna show this every time to everyone, they know what they are here for.
-    = render 'ish_manager/features/index', :features => @tag.features[0, Tag.n_features], resource: @tag
-
-- proc do # nothing
-  .row
-    .col.s12
-      = render 'ish_manager/newsitems/index', :newsitems => @tag.newsitems, :resource => @tag, :tag => @tag
+    -# = render 'ish_manager/features/index', :features => @tag.features[0, Tag.n_features], resource: @tag
 
 .row
   .col.s12

metadata

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