ish_manager 0.1.8.246 → 0.1.8.250

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfffb0ee4f6d94e5697f21cd1583d16831aa4e075a6cb2894952cb6b80d5fddb
-  data.tar.gz: 7f827deee207a28c7941436f5b2bb726c5579e45c0eb4fee31c22b1fb267a721
+  metadata.gz: 7426a98dcf9ef19629e9e4c49b5cc287484b1341b44186d29aa05d37b4699937
+  data.tar.gz: '09a4061ace477ebc319af781e8164c407a537616a940952e8f27ba2e308850d9'
 SHA512:
-  metadata.gz: 54239a3209466e3fd8d1310c0ddd4d43dce82da82b38e4870862a8553d7f9ef9c7723e5a4875232987796ddecb0ab20830d834a05871c1ac453205367006e17a
-  data.tar.gz: 9354d473aa127c4de7f52623a2dbffeddd863d86c34b077a1fe91e8363a93d4a3cf49d43cc594f1cbb11ca8958cfc4f6bb06f3de0431c153242adbe70168708b
+  metadata.gz: a75d2885a014246802f168275dafd1d1390c96d83273786304bc0d0e3d3d7ee5b2f34456583e199933d5ff4ad37864af4a3f816d388e14f3bf52660d3fab1829
+  data.tar.gz: 8c830b6f62d8c2549c131bd292be647341ad87750e0aa384ba84301a9b11b83ab43c47c5c41ebffecbd15beb09ea6077f0600dc3ed0b72ca194850d72c831f60

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

@@ -16,7 +16,8 @@
 //= require ish_manager/jquery.ui.widget
 //= require ish_manager/jquery.fileupload
 //= require ish_manager/jquery-ui.min
-//
+//= require ish_manager/shared
+//= require ish_manager/maps
 
 $(function () {
   $('#fileupload').fileupload({
@@ -29,7 +30,7 @@ $(function () {
   });
 });
 
-$(document).ready(function () {
+$(function () {
 
   $('*[data-confirm]').click(function(){
     return confirm($(this).attr('data-confirm'));
@@ -43,7 +44,7 @@ $(document).ready(function () {
     });
   }
 
-  if ($('body#application').length > 0) {
+  if ($('body').length > 0) {
       $('select').material_select()
   }
 

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

@@ -0,0 +1,53 @@
+
+/*
+ * only for maps map editor
+ */
+$(document).ready(() => {
+  if (!$("body.maps-map_editor").length) { return }
+  logg('maps#map_editor')
+
+  const mapEditorEl = $(".maps-map-editor .map-editor")
+  const mapEditorX = mapEditorEl.offset().left
+  const mapEditorY = mapEditorEl.offset().top
+
+  $(".maps-map-editor .map-editor .marker").each(function() {
+    const m = $(this)
+    const centerOffsetX = parseInt(m.attr('data-center-offset-x'))
+    const centerOffsetY = parseInt(m.attr('data-center-offset-y'))
+    const slug = m.attr('data-slug')
+    logg(slug, 'slug')
+
+    $(m).draggable({
+      drag: function () {
+        const x = $(this).offset().left - mapEditorX + centerOffsetX
+        const y = $(this).offset().top - mapEditorY + centerOffsetY
+        logg(`${x}, ${y}`, 'marker')
+        $(`.${slug} input[name='gameui_marker[x]']`).val(x)
+        $(`.${slug} input[name='gameui_marker[y]']`).val(y)
+      },
+    })
+  })
+
+})
+
+/*
+ * only for markers#edit
+ */
+$(document).ready(() => {
+  if (!$("body.markers-edit").length) { return }
+  logg('markers#edit')
+
+  $($(".image-thumb img")[0]).click(function (e) {
+    var posX = $(this).offset().left,
+        posY = $(this).offset().top;
+    logg((e.pageX - posX) + ' , ' + (e.pageY - posY));
+    const x = e.pageX - posX
+    const y = e.pageY - posY
+    $(".image-thumb .red-cross").css('top', y-10)
+    $(".image-thumb .red-cross").css('left', x-10)
+    $("#gameui_marker_centerOffsetX").val(x)
+    $("#gameui_marker_centerOffsetY").val(y)
+  })
+
+})
+

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

@@ -0,0 +1,22 @@
+
+/**
+ * Usage: logg(someObject, 'label')
+ *
+ * This development-grade logger can be used instead of console.log() with some advantages:
+ * * It encourages consistent labeling of logs. By labeling each log line, you can have dozens of log lines
+ * written per action, and still know which log line comes from where.
+ * The recommended label is the component name, or function name.
+ * * If the label is present, the logged object is placed in the window, allowing you to inspect it in the console. The
+ * label becomes the name of the object (stripped to [0-9a-zA-Z\-_] chars). If you're logging a function, you can execute it.
+ * If you log more than one thing, they can interact, allowing you to validate control flow.
+ * * the logger can be turned off by making this function simply return.
+ */
+ logg = (a, b="", c=null) => {
+  c = "string" === typeof c ? c : b.replace(/\W/g, "");
+  if (c.length > 0) {
+    window[c] = a;
+  }
+
+  console.log(`+++ ${b}:`, a); // eslint-disable-line no-console
+};
+

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

@@ -18,6 +18,7 @@
  *= require ish_manager/utils
  *= require ish_manager/jquery-ui
  *= require ish_manager/galleries
+ *= require ish_manager/photos
  *= require ish_manager/user_profiles
  */
 

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

@@ -0,0 +1,42 @@
+/* utils */
+
+.thumbnails {
+  display: flex;
+}
+
+.row-thumbs .item {
+  margin-bottom: 1em;
+  border: 1px solid red;
+  padding: 10px;
+  img {
+    margin-top: 10px;
+  }
+}
+
+.row-large .item {
+  border: 1px solid red;
+  display: block;
+
+  padding: 10px;
+  margin: 10px;
+
+  height: 90vh;
+  max-width: 100vw;
+
+  .goto {
+    display: none;
+  }
+
+  .wrapper {
+    width: 100%;
+    height: 80vh;
+    background-repeat: no-repeat;
+    background-position: center center;
+    background-size: contain;
+
+    img {
+      max-height: 100%;
+      max-width: 100%;
+    }
+  }
+}

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

@@ -1,3 +1,10 @@
+/**
+ * utils first
+ */
+.red-cross {
+  position: absolute;
+}
+
 
 .maps-index {
   h1 {
@@ -22,7 +29,7 @@
       align-content: flex-start;
 
       height: 3em;
-      line-height: 3em; 
+      line-height: 3em;
 
       width: 100%;
       margin: 0 0 1em 0;
@@ -43,17 +50,41 @@
       border: 1px solid yellow;
     }
   }
+  .markers-list {
+    .item {
+      border: 1px solid #d59d05; /* brown*/
+      padding: .5em;
+      margin: 1em 0 0 0;
+    }
+  }
 }
 
 .markers--form {
-  /* width: 300px;
-  margin: auto; */
+  .image-thumb {
+    border: 1px solid yellow;
+    position: relative;
+    display: inline-block;
+
+
+  }
 }
 
-.markers-list {
-  .item {
-    border: 1px solid #d59d05; /* brown*/
-    padding: .5em;
-    margin: 1em 0 0 0;
+.maps-map-editor {
+  .map-editor {
+    border: 1px solid red;
+    position: relative;
+
+    .marker {
+      position: absolute;
+      top: 0;
+      left: 0;
+
+      border: 1px solid yellow;
+    }
+  }
+  .markers-list {
+    .item {
+      border: 1px solid green;
+    }
   }
 }

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

@@ -0,0 +1,12 @@
+
+.--meta-manager {
+  display: flex;
+  justify-content: space-between;
+
+  .right-hand a {
+  }
+  .right-hand a:not(:last-child):after {
+    content: "|";
+    padding: 0 10px 0 15px;
+  }
+}

data/app/controllers/ish_manager/application_controller.rb

@@ -25,9 +25,11 @@ module IshManager
     end
 
     def set_lists
-      @sites_list = Site.all.list
       @cities_list = City.list
+      @locations_list = ::Gameui::Map.list
+      @sites_list = Site.all.list
       @venues_list = Venue.all.list
+
       @reports_list = Report.all.list
       @galleries_list = Gallery.all.list
       @videos_list = Video.all.list

data/app/controllers/ish_manager/cities_controller.rb

@@ -8,7 +8,7 @@ class IshManager::CitiesController < IshManager::ApplicationController
     @city = City.new
     @photo = Photo.new
   end
-  
+
   def show
     authorize! :show, @city
     @videos = @city.videos.page( params[:videos_page] ).per( Video::PER_PAGE )
@@ -20,7 +20,7 @@ class IshManager::CitiesController < IshManager::ApplicationController
       @venues = @venues.where({ :name => /#{params[:q]}/i })
     end
   end
-  
+
   def new
     @city = City.new
     authorize! :new, City
@@ -44,7 +44,7 @@ class IshManager::CitiesController < IshManager::ApplicationController
   def edit
     authorize! :edit, @city
   end
-  
+
   def update
     @city = City.find( params[:id] )
     authorize! :update, @city

data/app/controllers/ish_manager/maps_controller.rb

@@ -1,15 +1,17 @@
 
 class IshManager::MapsController < IshManager::ApplicationController
 
-  before_action :set_map, only: [:show, :edit, :update, :destroy]
+  before_action :set_map, only: [:destroy, :edit, :map_editor, :show, :update, ]
 
   def index
     authorize! :index, ::Gameui::Map
-    @maps = ::Gameui::Map.all
+    @maps = ::Gameui::Map.where( parent_slug: "" )
+    @all_maps = Gameui::Map.all
   end
 
   def show
     authorize! :show, @map
+    @maps = Gameui::Map.where( parent_slug: @map.slug )
   end
 
   def new
@@ -23,6 +25,16 @@ class IshManager::MapsController < IshManager::ApplicationController
 
   def create
     @map = ::Gameui::Map.new(map_params)
+
+    if params[:image]
+      image = ::Ish::ImageAsset.new :image => params[:image]
+      @map.image = image
+      image.save
+    end
+
+    if map_params[:parent_slug].present?
+      @map.parent = ::Gameui::Map.find_by({ slug: map_params[:parent_slug] })
+    end
     authorize! :create, @map
 
     respond_to do |format|
@@ -36,7 +48,18 @@ class IshManager::MapsController < IshManager::ApplicationController
 
   def update
     authorize! :update, @map
+
+    if params[:image]
+      image = ::Ish::ImageAsset.new :image => params[:image]
+      @map.image = image
+    end
+
     respond_to do |format|
+      if map_params[:parent_slug].present?
+        @map.parent = ::Gameui::Map.find_by({ slug: map_params[:parent_slug] })
+      else
+        @map.parent = nil
+      end
       if @map.update(map_params)
         format.html { redirect_to map_path(@map), notice: 'Map was successfully updated.' }
       else
@@ -53,10 +76,15 @@ class IshManager::MapsController < IshManager::ApplicationController
     end
   end
 
+  def map_editor
+    authorize! :update, @map
+  end
+
   private
 
     def set_map
-      @map = ::Gameui::Map.find(params[:id])
+      @map = ::Gameui::Map.where(id: params[:id]).first
+      @map ||= Gameui::Map.find_by(slug: params[:id])
     end
 
     def map_params

data/app/controllers/ish_manager/markers_controller.rb

@@ -25,8 +25,18 @@ class IshManager::MarkersController < IshManager::ApplicationController
     authorize! :create_marker, @map
     @map_id = @map.id
 
+    if params[:image]
+      @marker.image = ::Ish::ImageAsset.new :image => params[:image]
+      @marker.image.save
+    end
+    if params[:title_image]
+      @marker.title_image = ::Ish::ImageAsset.new :image => params[:title_image]
+      @marker.title_image.save
+    end
+
     respond_to do |format|
       if @marker.save
+        @marker.map.touch
         format.html { redirect_to map_path(@map), notice: 'Marker was successfully created.' }
       else
         format.html { render :new }
@@ -36,8 +46,19 @@ class IshManager::MarkersController < IshManager::ApplicationController
 
   def update
     authorize! :update_marker, @map
+
+    if params[:image]
+      @marker.image = ::Ish::ImageAsset.new :image => params[:image]
+      @marker.image.save
+    end
+    if params[:title_image]
+      @marker.title_image = ::Ish::ImageAsset.new :image => params[:title_image]
+      @marker.title_image.save
+    end
+
     respond_to do |format|
       if @marker.update(marker_params)
+        @marker.map.touch
         format.html { redirect_to maps_path(@map), notice: 'Marker was successfully updated.' }
       else
         format.html { render :edit }
@@ -49,6 +70,7 @@ class IshManager::MarkersController < IshManager::ApplicationController
     @marker = ::Gameui::Marker.find params[:id]
     @map = @marker.map
     authorize! :destroy_marker, @map
+    @marker.map.touch
     @marker.destroy
     respond_to do |format|
       format.html { redirect_to map_path(@map), notice: 'Marker was successfully destroyed.' }
@@ -57,17 +79,17 @@ class IshManager::MarkersController < IshManager::ApplicationController
 
   private
 
-    def set_map
-      @map = ::Gameui::Map.find(params[:map_id] || params[:gameui_marker][:map_id])
-    end
+  def set_map
+    @map = ::Gameui::Map.find(params[:map_id] || params[:gameui_marker][:map_id])
+  end
 
-    def set_marker
-      @marker = ::Gameui::Marker.find params[:id]
-      @map = @marker.map
-    end
+  def set_marker
+    @marker = ::Gameui::Marker.find params[:id]
+    @map = @marker.map
+  end
 
-    def marker_params
-      params.require(:gameui_marker).permit!
-    end
+  def marker_params
+    params.require(:gameui_marker).permit!
+  end
 
 end

data/app/controllers/ish_manager/user_profiles_controller.rb

@@ -21,6 +21,7 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
   def update
     @profile = IshModels::UserProfile.find params[:id]
     authorize! :update, @profile
+
     flag = @profile.update_attributes params[:profile].permit!
     if flag
       flash[:notice] = "Updated profile #{@profile.email}"

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

@@ -1,5 +1,6 @@
-
--# = render 'ish_manager/sites/header', :site => @site if @site
+-#
+-# ish_manager / galleries / _index.haml
+-#
 
 = render 'ish_manager/galleries/menu'
 
@@ -23,8 +24,9 @@
           - if g.photos.length == 0
             = image_missing
           - else
-            - g.photos.limit( n_thumbs ).each do |photo|
-              = link_to image_tag(photo.photo.url(:thumb), :alt => g.name, :class => :thumb ), gallery_path(g.galleryname)
+            .thumbnails
+              - g.photos.limit( n_thumbs ).each do |photo|
+                = link_to image_tag(photo.photo.url(:thumb), :alt => g.name), gallery_path(g.galleryname)
 
     - if @galleries.respond_to? :total_pages
       = paginate @galleries, :param_name => param_name, :views_prefix => 'ish_manager'

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

@@ -1,3 +1,6 @@
+-#
+-# ish_manager / galleries / show.haml
+-#
 
 = render 'title', :gallery => @gallery
 = render 'ish_manager/photos/multinew', :gallery => @gallery
@@ -15,28 +18,24 @@
 .row
   %ul
     - @photos.each do |photo|
-      %li.col-xs-1= image_tag photo.photo.url( :mini ), :alt => ''
+      %li.col-xs-1
+        = link_to image_tag(photo.photo.url( :mini ), :alt => ''), "#large_#{photo.id}"
+
 .spacer{ :style => 'height: 500px' }
 
 -# thumb
-.row
-  .a
-    - @photos.each do |photo|
-      .col-xs-4
-        .item{ :style => "border: 1px solid red;" }
-          .float-left= button_to '[x]', photo_path( :id => photo.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-          = link_to "go to", "#large_#{photo.id}"
-          %br
-          = image_tag photo.photo.url( :thumb ), :alt => ''
+.row.row-thumbs
+  - @photos.each do |photo|
+    .col-xs-3
+      .item
+        = render 'ish_manager/photos/meta_manager', photo: photo
+        = image_tag photo.photo.url( :thumb ), :alt => ''
 .spacer{ :style => 'height: 100px' }
 
 -# large
-.center.large-photos
+.row.row-large
   - @photos.each do |photo|
     .item
       %a{id: "large_#{photo.id}" }
-      .float-left= button_to '[x]', photo_path( :id => photo.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-      = link_to "large", photo.photo.url(:large)
-       | 
-      = link_to "original", photo.photo.url(:original)
+      = render 'ish_manager/photos/meta_manager', photo: photo
       .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }

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

@@ -2,9 +2,9 @@
 -# ish_manager / maps / _form
 -#
 
-- url = params[:action] == 'new' ? maps_path : map_path(@map)
+- url = params[:action] == 'new' ? maps_path : map_path(@map.id)
 
-= form_for @map, url: url do |f|
+= form_for @map, :html => { :multipart => true }, url: url do |f|
   - if @map.errors.any?
     #error_explanation
       %h2= "#{pluralize(@map.errors.count, "error")} prohibited this map from being saved:"
@@ -12,35 +12,35 @@
         - @map.errors.full_messages.each do |message|
           %li= message
 
-
   .row
+    .col-md-3
+      .field
+        = f.label :name
+        = f.text_field :name
+      .field
+        = f.label :map_slug, "Map slug (if any)"
+        = f.text_field :map_slug
     .col-md-3
       .field
         = f.label :slug
         = f.text_field :slug
-    .col-md-3
       .field
         = f.label :parent_slug
         = f.text_field :parent_slug
-    .col-md-3
+    .col-md-2
       .field
-        = f.label :w
-        = f.number_field :w
-    .col-md-3
+        = f.label :ordering_type
+        = f.select :ordering_type, options_for_select(::Gameui::Map::ORDERING_TYPES)
+    .col-md-4
+
       .field
-        = f.label :h
-        = f.number_field :h
+        = f.label :image
+        = file_field_tag :image
+        = image_tag @map.image.image.url(:thumb) rescue nil
+
   .field
     = f.label :description
     = f.text_area :description, class: 'tinymce'
 
-  .field
-    = f.label :img_path
-    = f.text_field :img_path
-  .row
-    .col-md-4
-      .field
-        = f.label :ordering_type
-        = select_tag :ordering_type, options_for_select(::Gameui::Map::ORDERING_TYPES)
   .actions
     = f.submit 'Save'

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

@@ -2,6 +2,7 @@
 .flat-row
   .a= link_to map.slug, map_path(map)
   .a= button_to '~', edit_map_path(map), method: :get
+  .a= button_to 'map editor', location_map_editor_path(map.id), method: :get
   .a <b>#{map.w}x#{map.h}_#{map.slug}</b>
   .a= button_to '+marker', new_map_marker_path(map), method: :get
   .a= button_to '+newsitem', new_map_newsitem_path(map), method: :get

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

@@ -1,6 +1,14 @@
+-#
+-# ish_manager / maps / index.haml
+-#
 
 .maps-index
-  %h1 Maps #{link_to '[+]', new_map_path}
+  %h1 Maps (#{@maps.length}) #{link_to '[+]', new_map_path}
   - @maps.each do |map|
     .item
       = render 'map_meta_row', map: map
+
+  %h1 All Maps (#{@all_maps.length})
+  %ul
+    - @all_maps.each do |m|
+      %li= link_to m.slug, edit_map_path(m.id)

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

@@ -0,0 +1,28 @@
+
+.maps-map-editor
+  %h1 Map Editor
+
+  .map-editor
+    = image_tag @map.image.image.url(:original)
+    - @map.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;" }
+        = image_tag m.image.image.url(:original)
+        = image_tag('icons/10x10_red-cross.png', class: 'red-cross', style: "top: #{m.centerOffsetY-10}px; left: #{m.centerOffsetX-10}px;" )
+
+  .markers-list
+    %h1
+      Markers (#{@map.markers.length})
+      = link_to '[+]', new_marker_path({ map_id: @map.id })
+    - @map.markers.each do |m|
+      = form_for m, { html: { class: "item #{m.slug}" }, url: marker_path(m.id) } do |f|
+        = m.slug
+        = link_to '[~]', edit_marker_path(m.id)
+        .field
+          = f.label :x
+          = f.text_field :x
+        .field
+          = f.label :y
+          = f.text_field :y
+        .field
+          = f.submit 'Save'
+

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

@@ -1,14 +1,22 @@
+-#
+-# ish_manager / maps / show.haml
+-#
 
 .maps-show
   = render 'map_meta_row', map: @map
   %p.addToggle Description [<>]
   .descr= raw @map.description
 
-  %p.addToggle The Map [<>]
+  %p.addToggle
+    The Map (#{@map.w}x#{@map.h})
+    = link_to 'Map Editor', location_map_editor_path(@map.id)
+    [<>]
   .the-map
-    = image_tag @map.img_path, width: @map.w
+    = image_tag @map.image.image.url(:original) rescue nil
     - @map.markers.each do |marker|
-      .marker{ style: "position: absolute; left: #{marker.x}px; top: #{marker.y}px;" }= image_tag marker.img_path
+      -# @TODO: this should be a partial
+      .marker{ style: "position: absolute; left: #{marker.x - marker.centerOffsetX}px; top: #{marker.y - marker.centerOffsetY}px;" }
+        = image_tag marker.image.image.url(:original)
 
   %p.addToggle Markers (#{@map.markers.count}) [<>]
   .markers-list
@@ -19,6 +27,7 @@
           .a= button_to '~', edit_marker_path(marker), method: :get
           .a= button_to 'x', marker_path(marker), method: :delete, data: { confirm: 'Are you sure?' }
           .a= link_to '[api]', api_marker_path(marker)
+          .a= link_to '[this map]', edit_map_path(marker.slug)
         %ul.bullets
           %li <b>item_type:</b> #{marker.item_type}
 
@@ -27,3 +36,10 @@
     - @map.newsitems.each do |newsitem|
       .item
         = newsitem.inspect
+
+  %p.addToggle Maps (#{@maps.count}) [<>]
+  .maps-list
+    - @maps.each do |m|
+      .item
+        = link_to m.slug, edit_map_path(m.id)
+

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

@@ -1,6 +1,13 @@
-- url = params[:action] == 'new' ? markers_path : marker_path(@marker)
+
+-#
+-# ish_manager / markers / _form
+-#
+
+-# @TODO: can I not have this url at all?
+- url = %w|new create|.include?(params[:action]) ? markers_path : marker_path(@marker.id)
 .markers--form
-  = form_for @marker, url: url do |f|
+  = form_for @marker, :html => { :multipart => true }, url: url do |f|
+    -# @TODO: yeah move the map id into this hidden field.
     -# = f.hidden_field :map_id, value: (params['map_id']||@map_id)
 
     - if @marker.errors.any?
@@ -25,26 +32,34 @@
     .row
       .col-md-3
         .field
-          = f.label :w
-          = f.number_field :w
+          = f.label :image
+          = file_field_tag :image
+          .image-thumb
+            = image_tag(@marker.image.image.url(:thumb)) rescue nil
+            = image_tag('icons/10x10_red-cross.png', class: 'red-cross', style: "top: #{@marker.centerOffsetY-10}px; left: #{@marker.centerOffsetX-10}px;" )
       .col-md-3
         .field
-          = f.label :h
-          = f.number_field :h
+          = f.label :centerOffsetX
+          = f.text_field :centerOffsetX
+        .field
+          = f.label :centerOffsetY
+          = f.text_field :centerOffsetY
       .col-md-3
         .field
           = f.label :x
-          = f.number_field :x
-      .col-md-3
+          = f.text_field :x
         .field
           = f.label :y
-          = f.number_field :y
-    .field
-      = f.label :img_path
-      = f.text_field :img_path
+          = f.text_field :y
+      .col-md-3
+        .field
+          = f.label :title_image
+          = file_field_tag :title_image
+          = image_tag @marker.title_image.image.url(:thumb) rescue nil
+
     .field
-      = f.label :title_img_path
-      = f.text_field :title_img_path
+      = f.label :url, "URL (if any)"
+      = f.text_field :url
     .row
       .col-md-3  
       .col-md-6

data/app/views/ish_manager/photos/_meta_manager.haml

@@ -0,0 +1,7 @@
+
+.--meta-manager
+  = button_to '[x]', photo_path( :id => photo.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+  .right-hand
+    = link_to "go to", "#large_#{photo.id}", class: 'goto'
+    = link_to "large", photo.photo.url(:large)
+    = link_to "original", photo.photo.url(:original)

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

@@ -72,6 +72,7 @@
           %button.btn.btn-primary.btn-lg.btn-block{:type => "button", :onClick => "upload()"} Upload File
       = file_field_tag :photo, :style => "display:none", :id=>"photo"
       .div.center
+        -# @TODO: wtf?
         %img#thumbnail_image_boy.img-thumbnail{:alt => "uploaded image", :width=>"200px"}
 
 

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

@@ -5,15 +5,11 @@
   .input-field
     %label name
     = f.text_field :name
-    
-  .input-field
-    %label username
-    = f.text_field :username
-    
+
   .input-field
     %label email
     = f.text_field :email
-    
+
   .input-field
     = f.select :role_name, options_for_select( [[nil, nil]] + IshModels::UserProfile::ROLES.map { |r| [ r, r ] }, :selected => profile.role_name )
     %label role name
@@ -21,14 +17,18 @@
   .input-field
     = f.select :current_city, options_for_select( @cities_list, :selected => profile.current_city_id )
     %label City
-    
+
   .input-field
     = f.label :fb_access_token
     = f.text_field :fb_access_token
   .input-field
     = f.label :fb_long_access_token
     = f.text_field :fb_long_access_token
-  
+
+  .input-field
+    = f.label :bookmarked_location_ids
+    = f.select :bookmarked_location_ids, @locations_list, {}, { multiple: true }
+
   = f.submit 'Save', :class => %w(button)
-  
-    
+
+

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

@@ -28,6 +28,14 @@
           - profile.newsitems.each do |n|
             = render 'ish_manager/newsitems/item', n: n, profile_id: profile.id
           <hr />
+
+          %h5 Bookmarked Locations
+          %ul
+            - profile.bookmarked_locations.each do |n|
+              %li
+                = n.id
+                = n.inspect
+
       .row
         Address:
         = profile.addresses[0].inspect

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

@@ -18,7 +18,7 @@
                 - if video.youtube_id.present?
                   -## doesn't work with private videos, which are most
                   -# .thumb-youtube= image_tag "https://img.youtube.com/vi/#{video.youtube_id}/1.jpg"
-                  = render 'embed_mini', video: video
+                  = render 'ish_manager/videos/embed_mini', video: video
                 - else
                   .thumb= image_tag video.thumb.url(:thumb)
               .a

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

@@ -21,7 +21,7 @@
     = javascript_include_tag "ish_manager/materialize"
 
     = csrf_meta_tags
-  %body#application
+  %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action]] }
     .bg-white
       - role = current_user ? current_user.profile.role_name : ''
       = render :partial => "ish_manager/application/main_header_#{role}"

data/config/routes.rb

@@ -43,6 +43,7 @@ IshManager::Engine.routes.draw do
   resources :leads
 
   scope 'gameui' do
+    get 'maps/:id/map-editor', to: 'maps#map_editor', as: :location_map_editor
     resources 'maps' do
       resources 'markers'
       resources 'newsitems'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.246
+  version: 0.1.8.250
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,6 +136,7 @@ files:
 - app/assets/images/bg/triangular.png
 - app/assets/images/bg/weather.png
 - app/assets/images/favicon.gif
+- app/assets/images/icons/10x10_red-cross.png
 - app/assets/images/icons/20x20/private.png
 - app/assets/images/icons/20x20/public2.png
 - app/assets/images/missing.png
@@ -173,20 +174,22 @@ files:
 - 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/stylesheets/ish_manager/application.css
 - app/assets/stylesheets/ish_manager/bootstrap.css
-- app/assets/stylesheets/ish_manager/galleries.css
+- app/assets/stylesheets/ish_manager/galleries.scss
 - app/assets/stylesheets/ish_manager/jquery-ui.css
 - app/assets/stylesheets/ish_manager/maps.scss
 - app/assets/stylesheets/ish_manager/materialize.css
+- app/assets/stylesheets/ish_manager/photos.scss
 - app/assets/stylesheets/ish_manager/reset.css
 - app/assets/stylesheets/ish_manager/tags.css
 - app/assets/stylesheets/ish_manager/trash/bootstrap.min.css
 - app/assets/stylesheets/ish_manager/trash/bootstrap.min.css.map
 - app/assets/stylesheets/ish_manager/user_profiles.scss
 - app/assets/stylesheets/ish_manager/utils.scss
-- app/controllers/ish_manager/ally_controller.rb
 - app/controllers/ish_manager/application_controller.rb
 - app/controllers/ish_manager/campaigns_controller.rb
 - app/controllers/ish_manager/cities_controller.rb
@@ -209,6 +212,7 @@ files:
 - app/controllers/ish_manager/sites_controller.rb
 - app/controllers/ish_manager/stock_watches_controller.rb
 - app/controllers/ish_manager/tags_controller.rb
+- app/controllers/ish_manager/trash/ally_controller.rb
 - app/controllers/ish_manager/trash/stock_actions_controller.rb
 - app/controllers/ish_manager/trash/stock_options_controller.rb
 - app/controllers/ish_manager/user_profiles_controller.rb
@@ -291,6 +295,7 @@ files:
 - app/views/ish_manager/maps/edit.haml
 - app/views/ish_manager/maps/index.haml
 - app/views/ish_manager/maps/index.haml-trash
+- app/views/ish_manager/maps/map_editor.haml
 - app/views/ish_manager/maps/new.haml
 - app/views/ish_manager/maps/show.haml
 - app/views/ish_manager/markers/_form.haml
@@ -304,6 +309,7 @@ files:
 - app/views/ish_manager/newsitems/new.haml
 - app/views/ish_manager/payments/index.haml
 - app/views/ish_manager/photos/_meta.haml
+- app/views/ish_manager/photos/_meta_manager.haml
 - app/views/ish_manager/photos/_multinew.haml
 - app/views/ish_manager/photos/show.haml
 - app/views/ish_manager/photos/without_gallery.haml

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

@@ -1,28 +0,0 @@
-
-.panel-body img.thumb {
-  display: inline;
-}
-
-.large-photos .item {
-  border: 1px solid red;
-  display: block;
-
-  padding: 10px;
-  margin: 10px;
-
-  height: 100vh;
-  max-width: 100vw;
-}
-
-.large-photos .item .wrapper {
-  width: 100%;
-  height: 100%;
-  background-repeat: no-repeat;
-  background-position: center center;
-  background-size: contain;
-}
-
-.large-photos .item .wrapper img {
-  max-height: 100%;
-  max-width: 100%;
-}