ish_manager 0.1.8.317 → 0.1.8.320

data/app/views/ish_manager/email_templates/_social.html.erb

@@ -45,7 +45,7 @@
                                                         class="mcnFollowIconContent">
                                                         <a href="mailto:victor@piousbox.com" target="_blank"><img
                                                             src="https://cdn-images.mailchimp.com/icons/social-block-v2/color-forwardtofriend-48.png"
-                                                            alt="Mail" style="display:block;" height="24" width="24"
+                                                            alt="Email" style="display:block;" height="24" width="24"
                                                             class=""></a>
                                                       </td>
 
@@ -90,7 +90,7 @@
                                                         class="mcnFollowIconContent">
                                                         <a href="https://github.com/piousbox" target="_blank"><img
                                                             src="https://cdn-images.mailchimp.com/icons/social-block-v2/color-github-48.png"
-                                                            alt="Git" style="display:block;" height="24" width="24"
+                                                            alt="Github" style="display:block;" height="24" width="24"
                                                             class=""></a>
                                                       </td>
 
@@ -136,7 +136,7 @@
                                                         <a href="https://www.instagram.com/piousbox/"
                                                           target="_blank"><img
                                                             src="https://cdn-images.mailchimp.com/icons/social-block-v2/color-instagram-48.png"
-                                                            alt="IG" style="display:block;" height="24"
+                                                            alt="Instagram" style="display:block;" height="24"
                                                             width="24" class=""></a>
                                                       </td>
 

data/app/views/ish_manager/email_templates/iframe_src.haml

@@ -0,0 +1,4 @@
+
+-# = @email_template.inspect
+
+= render "ish_manager/email_templates/#{@email_template.slug}", ctx: @email_ctx

data/app/views/ish_manager/email_templates/index.haml

@@ -1,18 +1,2 @@
 
-
-.email-templates-index
-  %h3 Email Templates
-  = render 'ish_manager/email_templates/form', email_template: ::Ish::EmailTemplate.new
-
-
-
-  %ul
-    - @templates.each do |tmpl|
-      %li
-        = link_to 'Use', new_email_context_path({ email_template_id: tmpl.id })
-        = link_to email_template_path({ id: tmpl }), target: :_blank, class: 'external' do
-          View
-          %i.fa.fa-external-link
-        = tmpl.slug
-        = button_to '[x]', email_template_path({ id: tmpl }), method: :delete, :data => { :confirm => 'Are you sure?' }, form_class: 'inline'
-
+= render 'index'

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

@@ -1,4 +1,7 @@
 
-%p This view of an email_template has an empty context:
+= render 'index'
+%hr
+.email-templates-show
+  %h4.center= @email_template.slug
 
-= render @template.slug
+  %iframe{ src: email_template_iframe_path(@email_template.slug), width: '100%', height: '100%' }

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

@@ -13,17 +13,6 @@
     .col.s6
       = f.label :slug
       = f.text_field :slug
-
-  .row
-    .col.s4
-      = f.label :site
-      = select :gallery, :site_id, @sites_list
-    .col.s4
-      = f.label :city
-      = select :gallery, :city_id, @cities_list
-    .col.s4
-      = f.label :venue
-      = select :gallery, :venue_id, @venues_list
   .row
     .col.s4
       = f.label :tags

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

@@ -6,10 +6,9 @@
 
 - n_thumbs   ||= 8
 
-.galleries--index
-
+.collapse-expand#galleriesIndex
   = render 'ish_manager/galleries/menu', count: @galleries.count
-
+.galleries--index
   - if @galleries.length > 0
 
     - if @galleries.respond_to? :total_pages

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

@@ -5,96 +5,97 @@
 
 - url = %w| new create |.include?( params[:action] ) ? maps_path : map_path(@map.id)
 
+.maps--form
+  %hr
+  = form_for @map, :html => { :multipart => true, class: '--form maps--form' }, url: url do |f|
+    .actions
+      = f.submit 'Save'
 
-= form_for @map, :html => { :multipart => true, class: '--form maps--form' }, url: url do |f|
-  .actions
-    = f.submit 'Save'
-
-  - if @map.errors.any?
-    #error_explanation
-      %h2= "#{pluralize(@map.errors.count, "error")} prohibited this map from being saved:"
-      %ul
-        - @map.errors.full_messages.each do |message|
-          %li= message
-
-  .row
-    .col.s3
-      .field
-        = f.label :name
-        = f.text_field :name
-      .field
-        = f.label :map_slug, "Map slug (if any)"
-        = f.text_field :map_slug
-    .col.s3
-      .field
-        = f.label :slug
-        = f.text_field :slug
-      .field
-        = f.label :parent_slug
-        = f.text_field :parent_slug
-    .col.s2
-      .field
-        = f.label :ordering_type
-        = f.select :ordering_type, options_for_select(::Gameui::Map::ORDERING_TYPES, selected: @map.ordering_type)
-      .field
-        = f.label :rated
-        = f.select :rated, options_for_select(Location::RATED_OPTIONS, selected: @map.rated)
-      .field
-        = f.label :premium_tier
-        = f.number_field :premium_tier
-    .col.s4
-      .field
-        = f.label :image
-        = file_field_tag :image
-        = image_tag @map.image.image.url(:thumb) rescue nil
-    .col.s4
-      .field
-        = f.label :creator_profile
-        = f.select :creator_profile, options_for_select(@user_profiles_list, selected: @current_user.profile.id)
-
-  = render 'ish_manager/application/form_nonpublic', f: f, model: @map
-
-
-  .row
-    = f.label :tags
-    = f.select :tag_ids, @tags_list, {}, { multiple: true }
-
-  .field
-    = f.label :description
-    = f.text_area :description, class: 'tinymce'
-
-  .row
-    .col.s6
-      = f.label "Labels"
-      = f.text_area :labels, class: 'large'
-      %pre.small
-        description
-        map
-        markers
-        newsitems
-    .col.s6
-      = f.label "Config"
-      = f.text_area :config, class: 'large'
-      %pre.small
-        :plain
-          description.collapsible: bool
-          map_panel_type: "Equirectangular" | "Panoramic" |
-            "MapPanel" | "MapPanelNoZoom" |
-            "ThreePanelV1" | "ThreePanelV1Fullscreen" |
-            "GoogleMaps" | "TabiversePlanet"
-  .row
-    .col.s6
-      .google-maps.row
-        .col.s4
+    - if @map.errors.any?
+      #error_explanation
+        %h2= "#{pluralize(@map.errors.count, "error")} prohibited this map from being saved:"
+        %ul
+          - @map.errors.full_messages.each do |message|
+            %li= message
+
+    .row
+      .col-sm-4
+        .field
+          = f.label :name
+          = f.text_field :name
+        .field
+          = f.label :slug
+          = f.text_field :slug
+        .field
+          = f.label :parent_slug
+          = f.text_field :parent_slug
+        .field
+          = f.label :map_slug, "Map slug (if any)"
+          = f.text_field :map_slug
+
+      .col-sm-4
+        .field
+          = f.label :ordering_type
+          = f.select :ordering_type, options_for_select(::Gameui::Map::ORDERING_TYPES, selected: @map.ordering_type)
+        .field
+          = f.label :rated
+          = f.select :rated, options_for_select(Location::RATED_OPTIONS, selected: @map.rated)
+        .field
+          = f.label :creator_profile
+          = f.select :creator_profile, options_for_select(@user_profiles_list, selected: @current_user.profile.id)
+
+      .col-sm-4
+        .field
+          = f.label :premium_tier
+          = f.number_field :premium_tier
+
+        .google-maps
           = f.label "x, y"
-        .col.s4
-          = f.text_field :x
-        .col.s4
-          = f.text_field :y
-    .col.s6
-      .field
-        = f.label :newsitems_page_size
-        = f.number_field :newsitems_page_size
-
-  .actions
-    = f.submit 'Save'
+          = f.text_field :x, style: 'width: 20px;'
+          = f.text_field :y, style: 'width: 20px;'
+
+        .field
+          = f.label :newsitems_page_size
+          = f.number_field :newsitems_page_size
+
+      .col-sm-4
+        .field
+          = f.label :image
+          = file_field_tag :image
+          = image_tag @map.image.image.url(:thumb) rescue nil
+
+      .col-sm-4
+        = f.label :tags
+        = f.select :tag_ids, @tags_list, {}, { multiple: true }
+
+      .col-sm-12
+        = render 'ish_manager/application/form_nonpublic', f: f, model: @map
+
+
+    .field
+      = f.label :description
+      = f.text_area :description, class: 'tinymce'
+
+    .row
+      .col.s6
+        = f.label "Labels"
+        = f.text_area :labels, class: 'large'
+        %pre.small
+          description
+          map
+          markers
+          newsitems
+      .col.s6
+        = f.label "Config"
+        = f.text_area :config, class: 'large'
+        %pre.small
+          :plain
+            description.collapsible: bool
+            map_panel_type: "Equirectangular" | "Panoramic" |
+              "MapPanel" | "MapPanelNoZoom" |
+              "ThreePanelV1" | "ThreePanelV1Fullscreen" |
+              "GoogleMaps" | "TabiversePlanet"
+
+
+    .actions
+      = f.submit 'Save'

data/app/views/ish_manager/maps/_map_meta_row.haml

@@ -7,5 +7,7 @@
     .a= button_to '+marker', new_map_marker_path(map), method: :get
     .a= button_to '+newsitem', new_map_newsitem_path(map), method: :get
     .a= link_to '[api]', api_map_path(map), target: :_blank
+    .a= button_to 'Export Subtree', export_map_path(map.id, format: :json)
     .a= button_to 'x', map_path(map), method: :delete, data: { confirm: 'Are you sure?' }
-  .a slug:#{map.slug}
+
+  .a slug: #{map.slug}

data/app/views/ish_manager/maps/map_editor.haml

@@ -6,7 +6,7 @@
   .map-editor
     = image_tag @map.image.image.url(:original)
     - @markers.each do |m|
-      .marker{ data: { 'slug': m.slug, 'center-offset-x': m.centerOffsetX, 'center-offset-y': m.centerOffsetY }, style: "top: #{m.y-m.centerOffsetY}px; left: #{m.x-m.centerOffsetX}px;" }
+      .marker{ data: { 'center-offset-x': m.centerOffsetX, 'center-offset-y': m.centerOffsetY }, style: "top: #{m.y-m.centerOffsetY}px; left: #{m.x-m.centerOffsetX}px;" }
         = image_tag m.image ? m.image.image.url(:original) : image_missing
         = image_tag('icons/10x10_red-cross.png', class: 'red-cross', style: "top: #{m.centerOffsetY-10}px; left: #{m.centerOffsetX-10}px;" )
 

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

@@ -4,10 +4,12 @@
 
 .maps-show
   = render 'map_meta_row', map: @map
-  %p.addToggle Description
+  %hr
+
+  .collapse-expand#mapDescription Description
   .descr= raw @map.description
 
-  %p.addToggle
+  .collapse-expand#mapPanel
     The Map (#{@map.w}x#{@map.h})
     = link_to 'Map Editor', location_map_editor_path(@map.id)
   .the-map
@@ -20,22 +22,25 @@
         - else
           = image_missing_tag
 
-  = render 'ish_manager/markers/header', markers: @markers, map: @map
+  .collapse-expand#markersIndex
+    = render 'ish_manager/markers/header', markers: @markers, map: @map
   = render 'ish_manager/markers/index', markers: @markers, map: @map
 
-  %p.addToggle= render 'ish_manager/newsitems/header', newsitems: @map.newsitems
+  .collapse-expand#newsitemsIndex
+    = render 'ish_manager/newsitems/header', newsitems: @map.newsitems
   = render 'ish_manager/newsitems/index', newsitems: @map.newsitems
 
-  %p.addToggle Maps (#{@maps.count})
+  .collapse-expand#mapChildrenMaps
+    Child Maps lvl-1 (#{@maps.count})
   .maps-list
     - @maps.each do |m|
       .item
         = link_to m.slug, edit_map_path(m.id)
 
-%hr
-= render 'form'
+  .collapse-expand#mapChildren All Child Maps
+  = render 'index_item', map: @map
 
-= button_to 'Export Subtree', export_map_path(@map.id, format: :json)
+  .collapse-expand#mapEdit Edit this map
+  = render 'form'
 
-= render 'index_item', map: @map
 

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

@@ -3,6 +3,6 @@
 -# ish_manager / markers / _header.haml
 -#
 
-%p.addToggle
-  Markers (#{markers.count})
-  = link_to image_new, new_marker_path(map_id: map.id)
+
+Markers (#{markers.count})
+= link_to image_new, new_marker_path(map_id: map.id)

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

@@ -1,18 +1,17 @@
 
-.markers--index
+
+.markers--index.row
   - markers.each do |marker|
-    .Card
-      - if marker.title_image
-        = image_tag marker.title_image.image.url(:thumb)
-      - else
-        = image_missing_tag
-      .flex-row
-        .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
-        .a= link_to '[api]', api_marker_path(marker)
-        .a= link_to '[this map]', edit_map_path(marker.destination.slug)
-    .hide
-      %ul.bullets
-        %li <b>item_type:</b> #{marker.item_type}
+    .col-sm-2
+      .Card
+        - if marker.title_image
+          = image_tag marker.title_image.image.url(:thumb)
+        - else
+          = image_missing_tag
+        .flex-row
+          .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
+          .a= link_to '[api]', api_marker_path(marker)
+          .a= link_to '[this map]', edit_map_path(marker.destination) if marker.destination

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

@@ -4,6 +4,7 @@
 
 - newsitems = newsitems.page( params[:newsitems_page] ).per( 10 )
 
+
 .manager-newsitems--index
   = paginate newsitems, :param_name => :newsitems_page, :views_prefix => 'ish_manager'
   - newsitems.each do |n|

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

@@ -43,9 +43,6 @@
 
   .row
     .col.s4
-      .field
-        %label City
-        = select :report, :city_id, @cities_list, :class=>"btn"
       .field
         = f.label :Coordinates
         .panel.panel-default
@@ -70,9 +67,6 @@
       unused
 
   .row
-    .col.s6
-      = f.label :site
-      = f.select :site_id, options_for_select(@sites_list, :selected => report.site_id || params[:site_id] )
     .col.s6
       = f.label :tags
       = f.select :tag_ids, @tags_list, {}, { multiple: true }

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

@@ -23,9 +23,6 @@
       .field
         = f.label :tags
         = f.select :tag_ids, @tags_list, {}, { multiple: true }
-      .field
-        = f.label :city_id
-        = select :video, :city_id, @cities_list
   .row
     .col.s3
       = f.label :premium_tier

data/config/routes.rb

@@ -73,7 +73,7 @@ IshManager::Engine.routes.draw do
   post 'email_contexts/send/:id', to: 'email_contexts#do_send', as: :email_context_send
   resources :email_contexts
 
-  get 'email_templates/iframe_src/:slug', to: 'email_templates#iframe_src'
+  get 'email_templates/iframe_src/:id', to: 'email_templates#iframe_src', as: :email_template_iframe
   get 'email_templates/show/:id', to: 'email_templates#show', as: :email_template
   delete 'email_templates/show/:id', to: 'email_templates#destroy'
   resources :email_templates

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.317
+  version: 0.1.8.320
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -313,19 +313,21 @@ files:
 - app/views/ish_manager/application/home.haml
 - app/views/ish_manager/application_mailer/shared_galleries.html.erb
 - app/views/ish_manager/application_mailer/welcome.html.erb
+- app/views/ish_manager/email_campaigns/index.haml
 - app/views/ish_manager/email_contexts/_form.haml
 - app/views/ish_manager/email_contexts/edit.haml
-- app/views/ish_manager/email_contexts/iframe_src.haml
 - app/views/ish_manager/email_contexts/index.haml
 - app/views/ish_manager/email_contexts/new.haml
 - app/views/ish_manager/email_contexts/show.haml
 - app/views/ish_manager/email_templates/_form.haml
+- app/views/ish_manager/email_templates/_index.haml
 - app/views/ish_manager/email_templates/_marketing_ror_1.html
 - app/views/ish_manager/email_templates/_marketing_ror_2.html
 - app/views/ish_manager/email_templates/_marketing_wordpress_1.html
 - app/views/ish_manager/email_templates/_marketing_wordpress_2.html
 - app/views/ish_manager/email_templates/_piousbox_roundborders.html.erb
 - app/views/ish_manager/email_templates/_social.html.erb
+- app/views/ish_manager/email_templates/iframe_src.haml
 - app/views/ish_manager/email_templates/index.haml
 - app/views/ish_manager/email_templates/show.haml
 - app/views/ish_manager/features/_form.haml

data/app/views/ish_manager/email_contexts/iframe_src.haml

@@ -1,4 +0,0 @@
-
--# = @email_ctx.email_template.inspect
-
-= render "ish_manager/email_templates/#{@email_ctx.email_template.slug}", ctx: @ctx