ish_manager 0.1.8.322 → 0.1.8.323

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f685b8fe37214d8a572e315c280446e97c5c4b03cc005d881a167ad41d9fb320
-  data.tar.gz: f83dc62a1e6373c87d29918efc457f43a2bc0b997d77d3a23444b9cdace9704c
+  metadata.gz: 242184b51f9bcdd45bddc22ffb717d21276564471986e87405758c3d918db3e2
+  data.tar.gz: 7f94f8f0d60f68c264a636a3198c12c26e1797026e907775f4c3d7ed4a13818a
 SHA512:
-  metadata.gz: b49d5ef8d417871ce7f82dd62b824756640cd4f77fa838015f6ae8ab5db7b7ef68f6469197bf6f7c811203ca0afe3bd6d2272fb32d8294a92445b40384cf0ee4
-  data.tar.gz: a891419ec414ac3fd995c1df5556a769aac1ab1d15ca0ae7fd9f2b1266518bacf7dfee531c7835702b0a29eda5890a2c2a4a419a7aafcad98b1cd93a72940e5c
+  metadata.gz: 3cfb4ecb6c2532892b29fa9c175f6a6c82e86b158d65868ab2e143beeac9f5519dad950a353d2ea6ba46226761d9c7a95e4bfa86f308dc981587629fc408e013
+  data.tar.gz: ad87c8bc229c961b65d1fb0aa90a84c24f032bf7c205d57d59c83d0a7b56b33815e33c276a19160154a885c81383135b30966cf88389e3383c32ef28c8ab15fc

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

@@ -192,6 +192,7 @@ ul.inline li {
 /* L */
 textarea.large {
   height: 400px;
+  width: 100%;
 }
 
 .large-photos img {

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

@@ -17,7 +17,8 @@
 }
 
 .email-templates-index ul li,
-.email-contexts-index {
+.email-contexts-index .header,
+.email-contexts-index ul.main li {
 
    a {
     margin-right: 0.5em;

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

@@ -2,6 +2,16 @@
  * Alphabetized : )
 **/
 
+.is_active {
+}
+.not_is_active {
+  color: #ccc;
+}
+
+.not_is_3d {
+  text-decoration: line-through;
+}
+
 .maps--map-meta-row {
   .flat-row {
     display: flex;

data/app/controllers/ish_manager/application_controller.rb

@@ -63,14 +63,6 @@ module IshManager
       else
         flash[:alert] = "No Luck. #{@photo.errors.messages} #{@resource.errors.messages}"
       end
-      # redirect_to resource_path( @resource )
-    end
-
-    def resource_path resource
-      case resource.class.name
-      when 'Event'
-        event_path( resource.id )
-      end
     end
 
   end

data/app/controllers/ish_manager/email_campaigns_controller.rb

@@ -3,7 +3,7 @@ class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
 
   def index
     authorize! :index, Ish::Campaign
-    @campaigns = Ish::Campaign.where( :profile => current_user.profile, :is_trash => false )
+    @campaigns = Ish::Campaign.where( :profile => @current_profile, :is_trash => false )
     if params[:is_done]
       @campaigns = @campaigns.where( :is_done => true )
     else
@@ -18,7 +18,7 @@ class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
 
   def create
     @campaign = Ish::Campaign.new params[:campaign].permit!
-    @campaign.profile = current_user.profile
+    @campaign.profile = @current_profile
     authorize! :create, @campaign
     if @campaign.save
       flash[:notice] = "created campaign"

data/app/controllers/ish_manager/email_contexts_controller.rb

@@ -1,6 +1,8 @@
 
 class ::IshManager::EmailContextsController < ::IshManager::ApplicationController
 
+  # alphabetized : )
+
   before_action :set_lists
 
   def create
@@ -17,6 +19,18 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
     end
   end
 
+  def destroy
+    @email_ctx = EmailContext.find params[:id]
+    authorize! :destroy, @email_ctx
+    flag = @email_ctx.destroy
+    if flag
+      flash[:notice] = 'Destroyed the email context'
+    else
+      flash[:alert] = 'Could not destroy email context'
+    end
+    redirect_to action: :index
+  end
+
   def do_send
     authorize! :send, ::Ish::EmailContext
     IshManager::OfficeMailer.send_context_email(params[:id]).deliver_later
@@ -25,20 +39,24 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
   end
 
   def edit
-    authorize! :edit, ::Ish::EmailContext
     @email_ctx = ::Ish::EmailContext.find params[:id]
+    authorize! :edit, @email_ctx
   end
 
   def iframe_src
-    authorize! :iframe_src, Ish::EmailContext
     @email_ctx = EmailContext.find params[:id]
+    authorize! :iframe_src, @email_ctx
     @email_template = @email_ctx.email_template
     render 'ish_manager/email_templates/iframe_src', layout: false
   end
 
   def index
     authorize! :index, ::Ish::EmailContext
-    @email_ctxs = ::Ish::EmailContext.all.page( params[:contexts_page] )
+    @email_ctxs = ::Ish::EmailContext.all
+    if params[:notsent]
+      @email_ctxs = @email_ctxs.where( sent_at: nil )
+    end
+    @email_ctxs = @email_ctxs.page( params[Ish::EmailContext::PAGE_PARAM_NAME] )
   end
 
   def new
@@ -47,13 +65,13 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
   end
 
   def show
-    authorize! :show, ::Ish::EmailContext
     @email_ctx = ::Ish::EmailContext.find( params[:id] )
+    authorize! :show, @email_ctx
   end
 
   def update
-    authorize! :update, ::Ish::EmailContext
     @email_ctx = ::Ish::EmailContext.find params[:id]
+    authorize! :update, @email_ctx
     if @email_ctx.update_attributes params[:ish_email_context].permit!
       flash[:notice] = 'Saved.'
       redirect_to action: 'show', id: @email_ctx.id
@@ -65,6 +83,9 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
     end
   end
 
+  #
+  # private
+  #
   private
 
   def set_lists

data/app/controllers/ish_manager/galleries_controller.rb

@@ -10,7 +10,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     params[:gallery][:shared_profiles].delete('')
     params[:gallery][:shared_profiles] = Ish::UserProfile.find params[:gallery][:shared_profiles]
     @gallery = Gallery.new params[:gallery].permit!
-    @gallery.user_profile = current_user.profile
+    @gallery.user_profile = @current_profile
     authorize! :create, @gallery
 
     if @gallery.save
@@ -42,7 +42,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     @galleries = Gallery.unscoped.where( ## This must be so for role `guy`. _vp_ 2022-10-03
       :is_done.in => [false, nil],
       :is_trash.in => [false, nil],
-      :user_profile => current_user.profile
+      :user_profile => @current_profile,
     ).order_by( :created_at => :desc )
 
     if params[:q]
@@ -78,7 +78,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
   def shared_with_me
     authorize! :index, Gallery
     @page_title = 'Galleries Shared With Me'
-    @galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false
+    @galleries = @current_profile.shared_galleries.unscoped.where( :is_trash => false
       ).order_by( :created_at => :desc
       ).page( params[:shared_galleries_page] ).per( 10 )
     render params[:render_type]
@@ -94,8 +94,6 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     old_shared_profile_ids = @gallery.shared_profiles.map(&:id)
     authorize! :update, @gallery
 
-    params[:gallery][:tag_ids].delete('') if params[:gallery][:tag_ids]
-
     params[:gallery][:shared_profiles].delete('')
     params[:gallery][:shared_profile_ids] = params[:gallery][:shared_profiles]
     params[:gallery].delete :shared_profiles

data/app/controllers/ish_manager/leads_controller.rb

@@ -5,7 +5,7 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
 
   def create
     @lead = Ish::Lead.new params[:lead].permit!
-    @lead.profile = current_user.profile
+    @lead.profile = @current_profile
     authorize! :create, @lead
     if @lead.save
       flash[:notice] = "created lead"
@@ -22,7 +22,7 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
 
   def index
     authorize! :index, Ish::Lead
-    @leads = Ish::Lead.all # where( :profile => current_user.profile, :is_trash => false )
+    @leads = Ish::Lead.all # where( :profile => @current_profile, :is_trash => false )
     if params[:is_done]
       @leads = @leads.where( :is_done => true )
     else

data/app/controllers/ish_manager/maps_controller.rb

@@ -93,11 +93,7 @@ class IshManager::MapsController < IshManager::ApplicationController
       else
         p = Profile.new({ email: profile[:email], _id: profile[:_id] })
         u = User.where( email: profile[:email] ).first
-        if u
-          u.profile = p
-        else
-          u = User.new( email: profile[:email], password: rand.to_s, profile: p )
-        end
+        u ||= User.new( email: profile[:email], password: rand.to_s )
         flag = u.save && p.save
         if flag
           errors.push({ message: "Profile created for #{profile[:email]}." })
@@ -182,16 +178,21 @@ class IshManager::MapsController < IshManager::ApplicationController
       end
     end
 
+    if map_params[:parent_slug].present?
+      @map.parent = ::Gameui::Map.find_by({ slug: map_params[:parent_slug] })
+    else
+      @map.parent = nil
+    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.' }
+        format.html do # format is required
+          redirect_to edit_map_path(@map), notice: 'Map was successfully updated.'
+        end
       else
-        format.html { render :edit }
+        format.html do
+          render :edit
+        end
       end
     end
   end

data/app/controllers/ish_manager/markers_controller.rb

@@ -21,7 +21,7 @@ class IshManager::MarkersController < IshManager::ApplicationController
     @marker.map = @map
     authorize! :create_marker, @map
     @map_id = @map.id
-    @marker.creator_profile_id = current_user.profile.id
+    @marker.creator_profile_id = @current_profile.id
 
     if params[:image]
       @marker.image = ::Ish::ImageAsset.new :image => params[:image]

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -5,12 +5,6 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
 
   def create
     @newsitem = Newsitem.new params[:newsitem].permit!
-    @resource ||= City.find params[:city_id]              if params[:city_id]
-    @resource ||= City.find params[:newsitem][:city_id]   if !params[:newsitem][:city_id].blank? # blank? required
-    @resource ||= Site.find params[:site_id]              if params[:site_id]
-    @resource ||= Site.find params[:newsitem][:site_id]   if !params[:newsitem][:site_id].blank?
-    @resource ||= Tag.find params[:tag_id]                if params[:tag_id]
-    @resource ||= Tag.find params[:newsitem][:tag_id]     if !params[:newsitem][:tag_id].blank?
     @resource ||= Ish::UserProfile.find params[:newsitem][:user_profile_id] if !params[:newsitem][:user_profile_id].blank?
     @resource ||= ::Gameui::Map.find params[:newsitem][:map_id] if !params[:newsitem][:map_id].blank?
     @resource.newsitems << @newsitem
@@ -20,22 +14,15 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
 
     if params[:photo]
       photo = Photo.create( :photo => params[:photo],
-        :user_profile => current_user.profile,
+        :user_profile => @current_profile,
         descr: params[:descr],
         subhead: params[:subhead] )
       @newsitem.photo = photo
     end
 
     url = case @resource.class.name
-    when "City"
-      edit_city_path( @resource.id )
     when "Ish::UserProfile"
       user_profiles_path
-    when "Site"
-      edit_site_path( @resource.id )
-    when "Tag"
-      @resource.site.touch
-      tag_path( @resource.id )
     else
       root_path
     end
@@ -48,8 +35,6 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     else
       error = 'No Luck. ' + @newsitem.errors.messages.to_s  + " :: " + photo.errors.messages.to_s
       flash[:alert] = error
-      @sites = Site.list
-      @cities = City.list
       render :action => :new
     end
   end
@@ -59,9 +44,6 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     authorize! :destroy, @newsitem
 
     if @newsitem.destroy
-      Tag.find(@newsitem.tag_id).touch if @newsitem.tag_id
-      Map.find(@newsitem.map_id).touch if @newsitem.map_id
-
       flash[:notice] = "Destroyed the newsitem."
     else
       flash[:alert] = "Cannot destroy the newsitem: #{@newsitem.errors.full_messages}."
@@ -75,35 +57,18 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     authorize! :edit, @newsitem
 
     ## @TODO: what on earth is this?
-    out = Gallery.unscoped.where( :is_trash => false, :user_profile => current_user.profile ).order_by( :created_at => :desc )
+    out = Gallery.unscoped.where( :is_trash => false, :user_profile => @current_profile ).order_by( :created_at => :desc )
     @galleries_list = [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
 
   end
 
   def index
-    @resource = Site.find( params[:site_id] ) if params[:site_id]
-    @resource = City.find( params[:site_id] ) if params[:city_id]
-
     authorize! :newsitems_index, @resource
     @newsitems = @resource.newsitems
   end
 
   def new
-
     @newsitem = Newsitem.new
-
-    if params[:city_id]
-      @city = City.find params[:city_id]
-      @newsitem.city = @city
-    end
-    if params[:site_id]
-      @site = Site.find params[:site_id]
-      @newsitem.site = @site
-    end
-    if params[:tag_id]
-      @tag = Tag.unscoped.find params[:tag_id]
-      @newsitem.tag = @tag
-    end
     authorize! :new, @newsitem
   end
 
@@ -111,17 +76,9 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     @newsitem = Newsitem.find params[:id]
     authorize! :update, @newsitem
 
-    ## @TODO: re-add site management here, probably.
-
-    if params[:city_id]
-      @city = City.find params[:city_id]
-      @newsitem = @city.newsitems.find params[:id]
-      url = edit_city_path( @city )
-    end
-
     if params[:photo]
       photo = Photo.new :photo => params[:photo]
-      photo.user_profile = current_user.profile
+      photo.user_profile = @current_profile
       @newsitem.photo = photo
     end
 
@@ -132,7 +89,12 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       flash[:alert] = "No Luck: #{@newsitem.errors.messages}"
     end
 
-    redirect_to edit_newsitem_path(@newsitem)
+    if (@newsitem.map)
+      redirect_to map_path(@newsitem.map)
+    else
+      redirect_to edit_newsitem_path(@newsitem)
+    end
+
   end
 
 end

data/app/controllers/ish_manager/photos_controller.rb

@@ -42,8 +42,6 @@ class IshManager::PhotosController < IshManager::ApplicationController
     @photo.gallery = gallery
 
     # cache
-    @photo.gallery.site.touch if @photo.gallery.site
-    @photo.gallery.city.touch if @photo.gallery.city
     @photo.gallery.touch
 
     if @photo.save

data/app/controllers/ish_manager/reports_controller.rb

@@ -7,7 +7,7 @@ class IshManager::ReportsController < IshManager::ApplicationController
 
   def create
     @report = Report.new params[:report].permit!
-    @report.user_profile = current_user.profile # @TODO: this should not be hard-coded
+    @report.user_profile = @current_profile # @TODO: this should not be hard-coded
     authorize! :create, @report
 
     flag = @report.save
@@ -56,7 +56,7 @@ class IshManager::ReportsController < IshManager::ApplicationController
   def index
     authorize! :index, Report
     @reports = Report.unscoped.order_by( :created_at => :desc
-      ).where( :is_trash => false, :user_profile => current_user.profile
+      ).where( :is_trash => false, :user_profile => @current_profile
       ).page( params[:reports_page] ).per( Report::PER_PAGE )
     if params[:q]
       @reports = @reports.or({ slug: /#{params[:q]}/i }, { name: /#{params[:q]}}/i }) # @TODO: why can't I have space in search term?

data/app/controllers/ish_manager/user_profiles_controller.rb

@@ -4,7 +4,7 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
   before_action :set_lists
 
   def index
-    @user_profiles = Ish::UserProfile.all.includes( :user )
+    @user_profiles = Ish::UserProfile.all
     authorize! :index, Ish::UserProfile
   end
 
@@ -49,21 +49,21 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
   def create
     @user = User.find_or_create_by( :email => params[:profile][:email] )
     @user.password ||= (0...12).map { rand(100) }.join
-    @user.profile = Ish::UserProfile.new params[:profile].permit!
-    authorize! :create, @user.profile
+    @user_profile = Ish::UserProfile.new params[:profile].permit!
+    authorize! :create, @user_profile
 
     if params[:photo]
       photo = Photo.new :photo => params[:photo]
-      @profile.profile_photo = photo
+      @user_profile.profile_photo = photo
     end
 
     if !@user.save
-      raise "cannot save profile.user: #{@profile.user.errors.full_messages} profile errors: #{@profile.errors.full_messages}"
+      raise "cannot save profile.user: #{@user.errors.full_messages} profile errors: #{@user_profile.errors.full_messages}"
     end
-    if @user.profile.save
+    if @user_profile.save
       flash[:notice] = "Created profile"
     else
-      flash[:alert] = "Cannot create profile: #{@profile.errors.messages}"
+      flash[:alert] = "Cannot create profile: #{@user_profile.errors.messages}"
     end
     redirect_to :action => :index
   end

data/app/controllers/ish_manager/videos_controller.rb

@@ -8,16 +8,7 @@ class IshManager::VideosController < IshManager::ApplicationController
   def create
     @video = Video.new params[:video].permit(%i| name descr is_public is_trash is_feature x y lang youtube_id
       site user_profile premium_tier premium_purchases thumb video |)
-    @video.user_profile = current_user.profile
-    if !params[:video][:site_id].blank?
-      @video.site = Site.find params[:video][:site_id]
-      @video.site.touch
-    else
-      if @site
-        @video.site = @site
-        @site.touch
-      end
-    end
+    @video.user_profile = @current_profile
     authorize! :create, @video
 
     if @video.save
@@ -25,7 +16,6 @@ class IshManager::VideosController < IshManager::ApplicationController
       redirect_to videos_path
     else
       flash[:alert] = 'No luck'
-      @tags_list = Tag.list
       render :action => 'new'
     end
   end
@@ -34,8 +24,6 @@ class IshManager::VideosController < IshManager::ApplicationController
     @video = Video.unscoped.find params[:id]
     authorize! :destroy, @video
     flag = @video.delete
-    @video.site.touch if @video.site
-    @video.tags.map &:touch
     if flag
       flash[:notice] = "deleted video"
     else
@@ -48,23 +36,11 @@ class IshManager::VideosController < IshManager::ApplicationController
     @video = Video.unscoped.find params[:id]
     @user_profiles_list = Ish::UserProfile.list
     authorize! :edit, @video
-
-    @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
   end
 
   def index
     authorize! :index, Video.new
-    @videos = Video.unscoped.where( is_trash: false, :user_profile => current_user.profile ).order_by( :created_at => :desc )
-
-    if params[:tag_id]
-      tag = Tag.find params[:tag_id]
-      @videos = @videos.where( :tag => tag )
-    end
-
-    if params[:site_id]
-      @site = Site.find params[:site_id]
-      @videos = @site.videos
-    end
+    @videos = Video.unscoped.where( is_trash: false, :user_profile => @current_profile ).order_by( :created_at => :desc )
 
     if params[:q]
       @videos = @videos.where({ :name => /#{params[:q]}/i })
@@ -98,8 +74,6 @@ class IshManager::VideosController < IshManager::ApplicationController
   def new
     @video = Video.new
     authorize! :new, @video
-
-    @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
   end
 
   def update
@@ -108,7 +82,6 @@ class IshManager::VideosController < IshManager::ApplicationController
 
     @video.update params[:video].permit!
     if @video.save
-      @video.site.touch if @video.site
       flash[:notice] = 'Success.'
       redirect_to videos_path
     else

data/app/helpers/ish_manager/application_helper.rb

@@ -39,24 +39,9 @@ module IshManager
       "$ #{'%.2f' % a}"
     end
 
-    def resource_path resource
-      case resource.class.name
-      when 'City'
-        city_path( resource.id )
-      when 'Event'
-        event_path( resource.id )
-      when 'Venue'
-        venue_path( resource.id )
-      end
-    end
-
     #
     # api paths
     #
-    def api_city_path city
-      "/api/cities/view/#{city.cityname}.json"
-    end
-
     def api_map_path map
       "/api/maps/view/#{map.slug}"
     end

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

@@ -0,0 +1,4 @@
+
+-# Used only in email_contexts#index right now. _vp_ 2022-10-06
+
+= paginate resource, param_name: resource.klass::PAGE_PARAM_NAME, views_prefix: 'ish_manager'

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

@@ -1,19 +1,25 @@
 
 .email-contexts-index
 
-  %h2
-    Paginated Email Contexts (aka emails)
-    = link_to '+', new_email_context_path
+  .collapse-expand#emailContextsIndex
+    %h2.header
+      Paginated Email Contexts (aka emails)
+      = link_to '+', new_email_context_path
+      = link_to 'to-send', notsent_email_contexts_path
 
-  %ul
-    - @email_ctxs.each do |ctx|
-      %li
-        - if ctx.sent_at
-          \----
-        - else
-          = link_to '~', edit_email_context_path(ctx)
-        = link_to email_context_path(ctx) do
-          view
-        -# = link_to 'iframe', email_context_iframe_path(ctx), target: :_blank do
+  .W0
+    = render 'paginate', resource: @email_ctxs, param_name: :email_contexts_page, views_prefix: :ish_manager
 
-        To #{ctx.to_email}: #{ctx.subject}
+    %ul.main
+      - @email_ctxs.each do |ctx|
+        %li
+          - if ctx.sent_at
+            \----
+          - else
+            = link_to '~', edit_email_context_path(ctx)
+          = link_to email_context_path(ctx) do
+            view
+          = button_to '[x]', email_context_path(ctx), method: :delete, form_class: :inline, data: { confirm: 'Are you sure?' }
+          -# = link_to 'iframe', email_context_iframe_path(ctx), target: :_blank do
+
+          To #{ctx.to_email}: #{ctx.subject}

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

@@ -13,10 +13,6 @@
     .col.s6
       = f.label :slug
       = f.text_field :slug
-  .row
-    .col.s4
-      = f.label :tags
-      = f.select :tag_ids, @tags_list, {}, { multiple: true }
 
   = render 'ish_manager/application/form_nonpublic', f: f, model: gallery
 

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

@@ -42,7 +42,7 @@
           = 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)
+          = f.select :creator_profile, options_for_select(@user_profiles_list, selected: @current_profile.id)
 
       .col-sm-4
         .field
@@ -64,10 +64,6 @@
           = 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
 
@@ -88,9 +84,16 @@
       .col.s6
         = f.label "Config"
         = f.text_area :config, class: 'large'
+
         %pre.small
           :plain
-            description.collapsible: bool
+            studio.hasFloor: bool
+            studio.studioLength: centimeters
+            studio.studioWidth: centimeters
+
+            <label>.collapsible: bool
+            eg: description.collapsible: bool
+
             map_panel_type: "Equirectangular" | "Panoramic" |
               "MapPanel" | "MapPanelNoZoom" |
               "ThreePanelV1" | "ThreePanelV1Fullscreen" |

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

@@ -48,6 +48,9 @@
         .field
           = f.label :y
           = f.text_field :y
+        .field
+          = f.label :z
+          = f.text_field :z
       .col-sm-3
         .field
           = f.label :title_image