ish_manager 0.1.8.260 → 0.1.8.265

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6ee451db63e9c25624675fce5f5e85c80a60c9705f2b5b3cd5e3d6aaa88bb7a
-  data.tar.gz: 78df149f47519467e53b72c845b13897b035f799fe29f183aaf3291ca1a71577
+  metadata.gz: f4d3cabdb357877960884b6e131a7afce5814ef6577a387493cee3ca93d3eb9c
+  data.tar.gz: acf80e11c1387f3abec24be7e59671c75173f1f840fbfc86995c6f6a8c204a3f
 SHA512:
-  metadata.gz: bf7e81a7587039a8bb5be6960eee9ed7a7c23ec25c45f97c53fec1535afd9691c34788ccd40174ac7b88fbfee883dec169ff9f1f31621d9cda5ea6d773050df1
-  data.tar.gz: b768486aae09ef375d4a11f05198821eb4033577fb02770b429ac83238971941b26a6bdef720e77d647ebd54cb430af38d28051f756e8f722056921e4ee9873b
+  metadata.gz: c88bc894f5eef54c7375d1c11594dfbb67b1430f2b0093155113325cef6e33c00ec1d56e3136c4658355ee01af4fbab9ce9ed95f4f0613c255405c419961e607
+  data.tar.gz: 1d073d153aeb300ea6f5299c92343886f3614965e5c0f1f3d12f7c81cc41b0513739b2c5ce72b89a188d39fd387871bcff52bf349d247c2ef49b28b9108d2b43

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

@@ -13,7 +13,6 @@
  *= require_self
  *= require ish_manager/tags
  *= require ish_manager/maps
- *= require ish_manager/utils
  *= require ish_manager/jquery-ui
  *= require ish_manager/galleries
  *= require ish_manager/photos
@@ -21,19 +20,63 @@
  *= require ish_manager/videos
  */
 
- body {
+body {
   background: #dedede;
   font-size: 20px;
 }
+
 pre {
   background: #e0e0e0;
   padding: 1em;
 }
 
+ul:not(.browser-default).errors,
+ul:not(.browser-default).bullets, {
+  > li {
+    list-style-type: circle;
+    margin-left: 1em;
+  }
+}
+
 /**
  * utils
  */
 
+.-index {
+  .item {
+    margin-bottom: 3em;
+  }
+
+  /* clear nth! */
+  .row div:nth-child(2n+1) {
+    clear:left
+  }
+
+  .row h3 {
+    margin-bottom: 0;
+  }
+}
+
+
+.flat-row {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-content: flex-start;
+
+  height: 2.4em;
+  line-height: 3em;
+
+  width: 100%;
+  margin: 1em 0 0 0;
+  padding: 0;
+
+  > * {
+    padding-right: 1em;
+  }
+}
+
+
 /* A */
 
 .addToggle + * {
@@ -89,6 +132,7 @@ pre {
 
 .flex-row {
   display: flex;
+  flex-wrap: wrap;
 }
 
 .float-left {
@@ -111,6 +155,11 @@ hr {
 ul.inline li {
   display: inline;
 }
+.inline-search {
+  width: 20px;
+  bordeR: 1px solid white;
+  display: inline-block;
+}
 
 /* L */
 textarea.large {

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

@@ -8,15 +8,22 @@
 /*
  * Main - Maps
  */
-.maps--map-meta-row .a {
-  line-height: 1em;
+.maps--map-meta-row {
+  border-left: 10px solid #e3e3e3;
+  padding-left: 10px;
+
+  .a {
+    line-height: 1em;
+  }
 }
 
 .maps-index {
-  h1 {
-    padding-bottom: 10px;
-    border-bottom: 10px solid #cecece;
-  }
+
+  // h1 {
+  //   padding-bottom: 10px;
+  //   border-bottom: 10px solid #cecece;
+  // }
+
   .item {
     display: flex;
     flex-direction: row;

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

@@ -1,11 +1 @@
 
-.videos--index {
-  .item {
-    margin-bottom: 3em;
-  }
-
-  /* clear nth! */
-  .row div:nth-child(2n+1) {
-    clear:left
-  }
-}

data/app/controllers/ish_manager/maps_controller.rb

@@ -41,7 +41,16 @@ class IshManager::MapsController < IshManager::ApplicationController
 
   def index
     authorize! :index, ::Gameui::Map
-    @maps = ::Gameui::Map.unscoped.where( parent_slug: "" ).order( slug: :asc )
+
+    if params[:q]
+      @maps = ::Gameui::Map.where({ slug: /#{params[:q]}/i })
+      if @maps.length == 1
+        redirect_to map_path(@maps[0])
+        return
+      end
+    end
+
+    @maps ||= ::Gameui::Map.unscoped.where( parent_slug: "" ).order( slug: :asc )
     @all_maps = Gameui::Map.all.order( slug: :asc )
   end
 

data/app/controllers/ish_manager/reports_controller.rb

@@ -3,6 +3,8 @@ class IshManager::ReportsController < IshManager::ApplicationController
 
   before_action :set_lists
 
+  # alphabetized : )
+
   def create
     @report = Report.new params[:report].permit!
     @report.user_profile = current_user.profile # @TODO: this should not be hard-coded
@@ -40,12 +42,24 @@ class IshManager::ReportsController < IshManager::ApplicationController
     end
   end
 
+  def destroy
+    @report = Report.unscoped.find params[:id]
+    authorize! :destroy, @report
+    @report.is_trash = true
+    @report.save
+    redirect_to request.referrer
+  end
+
+  def edit
+    @report = Report.unscoped.find params[:id]
+    authorize! :edit, @report
+  end
+
   def index
     authorize! :index, Report
     @reports = Report.unscoped.order_by( :created_at => :desc
-                                       ).where( :is_trash => false, :user_profile => current_user.profile
-                                              ).page( params[:reports_page]
-                                                    ).per( Report::PER_PAGE )
+      ).where( :is_trash => false, :user_profile => current_user.profile
+      ).page( params[:reports_page] ).per( Report::PER_PAGE )
     if false === params[:site]
       @reports = @reports.where( :site_id => nil )
     end
@@ -53,24 +67,34 @@ class IshManager::ReportsController < IshManager::ApplicationController
       @site = Site.find params[:site_id]
       @reports = @reports.where( :site_id => params[:site_id] )
     end
+    if params[:q]
+      @reports = @reports.or({ slug: /#{params[:q]}/i }, { name: /#{params[:q]}}/i }) # @TODO: why can't I have space in search term?
+      if @reports.length == 1
+        redirect_to report_path(@reports[0])
+        return
+      end
+    end
   end
 
-  def show
-    @report = Report.unscoped.find params[:id]
-    authorize! :show, @report
-  end
+  def new
+    @report = Report.new
+    authorize! :new, @report
+    @tags_list = Tag.all.where( :is_public => true ).list
+    @sites_list = Site.all.list
+    @cities_list = City.list
+    @venues_list = Venue.all.list
 
-  def edit
-    @report = Report.unscoped.find params[:id]
-    authorize! :edit, @report
+    respond_to do |format|
+      format.html do
+        render
+      end
+      format.json { render :json => @report }
+    end
   end
 
-  def destroy
+  def show
     @report = Report.unscoped.find params[:id]
-    authorize! :destroy, @report
-    @report.is_trash = true
-    @report.save
-    redirect_to request.referrer
+    authorize! :show, @report
   end
 
   def update
@@ -95,23 +119,5 @@ class IshManager::ReportsController < IshManager::ApplicationController
     end
   end
 
-  def new
-    @report = Report.new
-    authorize! :new, @report
-    @tags_list = Tag.all.where( :is_public => true ).list
-    @sites_list = Site.all.list
-    @cities_list = City.list
-    @venues_list = Venue.all.list
-
-    respond_to do |format|
-      format.html do
-        render
-      end
-      format.json { render :json => @report }
-    end
-  end
-
-
-
 end
 

data/app/controllers/ish_manager/stock_watches_controller.rb

@@ -1,17 +1,8 @@
 
 class IshManager::StockWatchesController < IshManager::ApplicationController
 
-  def index
-    authorize! :index, Ish::StockWatch
-    @profiles = Ish::UserProfile.all
-    @stock_watches = Ish::StockWatch.order_by( ticker: :asc, direction: :asc, price: :desc
-      ).includes( :profile )
-    @stock_watch = Ish::StockWatch.new
-    render 'index', :layout => 'ish_manager/application_no_materialize'
-  end
-
   def create
-    @stock_watch = Ish::StockWatch.new params[:ish_stock_watch].permit!
+    @stock_watch = Warbler::StockWatch.new permitted_params
     authorize! :create, @stock_watch
     flag = @stock_watch.save
     if flag
@@ -22,10 +13,31 @@ class IshManager::StockWatchesController < IshManager::ApplicationController
     redirect_to :action => 'index'
   end
 
+  def destroy
+    @w = Warbler::StockWatch.find params[:id]
+    authorize! :destroy, @w
+    flag = @w.destroy
+    if flag
+      flash[:notice] = 'Success.'
+    else
+      flash[:alert] = @w.errors.messages
+    end
+    redirect_to action: 'index'
+  end
+
+  def index
+    authorize! :index, Warbler::StockWatch
+    @profiles = Ish::UserProfile.all
+    @stock_watches = Warbler::StockWatch.order_by( ticker: :asc, direction: :asc, price: :desc
+      ).includes( :profile )
+    @stock_watch = Warbler::StockWatch.new
+    # render 'index', :layout => 'ish_manager/application_no_materialize'
+  end
+
   def update
-    @stock_watch = Ish::StockWatch.find params[:id]
+    @stock_watch = Warbler::StockWatch.find params[:id]
     authorize! :update, @stock_watch
-    flag = @stock_watch.update_attributes params[:ish_stock_watch].permit!
+    flag = @stock_watch.update_attributes permitted_params
     if flag
       flash[:notice] = 'Updated stock watch.'
     else
@@ -34,16 +46,10 @@ class IshManager::StockWatchesController < IshManager::ApplicationController
     redirect_to :action => 'index'
   end
 
-  def destroy
-    @w = Ish::StockWatch.find params[:id]
-    authorize! :destroy, @w
-    flag = @w.destroy
-    if flag
-      flash[:notice] = 'Success.'
-    else
-      flash[:alert] = @w.errors.messages
-    end
-    redirect_to action: 'index'
+  private
+
+  def permitted_params
+    params[:warbler_stock_watch].permit!
   end
 
 end

data/app/controllers/ish_manager/videos_controller.rb

@@ -3,6 +3,58 @@ class IshManager::VideosController < IshManager::ApplicationController
 
   before_action :set_lists
 
+  # alphabetized : )
+
+  def create
+    @video = Video.new params[:video].permit(%i| name descr is_public is_trash is_feature x y lang youtube_id
+      tags city 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
+    authorize! :create, @video
+
+    if @video.save
+      flash[:notice] = 'Success'
+      redirect_to videos_path
+    else
+      flash[:alert] = 'No luck'
+      @tags_list = Tag.list
+      @cities_list = City.list
+      render :action => 'new'
+    end
+  end
+
+  def destroy
+    @video = Video.unscoped.find params[:id]
+    authorize! :destroy, @video
+    flag = @video.update_attributes( :is_trash => true )
+    @video.city.touch if @video.city
+    @video.site.touch if @video.site
+    @video.tags.map &:touch
+    if flag
+      flash[:notice] = "deleted video"
+    else
+      flash[:alert] = "Cannot delete video: #{@video.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
+  def edit
+    @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
+    @cities_list = City.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 )
@@ -59,41 +111,6 @@ class IshManager::VideosController < IshManager::ApplicationController
     @cities_list = City.list
   end
 
-  def create
-    @video = Video.new params[:video].permit(%i| name descr is_public is_trash is_feature x y lang youtube_id
-      tags city 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
-    authorize! :create, @video
-
-    if @video.save
-      flash[:notice] = 'Success'
-      redirect_to videos_path
-    else
-      flash[:alert] = 'No luck'
-      @tags_list = Tag.list
-      @cities_list = City.list
-      render :action => 'new'
-    end
-  end
-
-  def edit
-    @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
-    @cities_list = City.list
-  end
-
   def update
     @video = Video.unscoped.find params[:id]
     authorize! :update, @video
@@ -109,19 +126,4 @@ class IshManager::VideosController < IshManager::ApplicationController
     end
   end
 
-  def destroy
-    @video = Video.unscoped.find params[:id]
-    authorize! :destroy, @video
-    flag = @video.update_attributes( :is_trash => true )
-    @video.city.touch if @video.city
-    @video.site.touch if @video.site
-    @video.tags.map &:touch
-    if flag
-      flash[:notice] = "deleted video"
-    else
-      flash[:alert] = "Cannot delete video: #{@video.errors.messages}"
-    end
-    redirect_to :action => 'index'
-  end
-
 end

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

@@ -1,49 +1,38 @@
 
-.manager--main-header
+
+.application--main-header-admin.manager--main-header
   .container
     %i.fa.fa-compress.collapse-expand#collapseHeader
     .content
       %ul
         %li{ :class => params[:controller] == 'ish_manager/maps' ? 'active' : '' }
-          = link_to 'GameUi::Maps', maps_path
+          = link_to 'Maps', maps_path
+          .inline-search
+            = form_tag maps_path, method: :get do
+              = text_field_tag :q
           = link_to '[+]', new_map_path
-        %li{ :class => params[:controller] == 'ish_manager/cities'        ? 'active' : '' }= link_to 'Cities',    cities_path
-        %li{ :class => params[:controller] == 'ish_manager/events'        ? 'active' : '' }= link_to 'Events',    events_path
-        %li{ :class => params[:controller] == 'ish_manager/venues'        ? 'active' : '' }= link_to 'Venues',    venues_path
-        %li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Profiles',  user_profiles_path
-        %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path
 
-      %ul
-        %li{ class: params[:controller] == 'ish_manager/newsitems' ? 'active' : '' }= link_to '+Newsitem', new_newsitem_path
-        %li{ :class => params[:controller] == 'ish_manager/sites'         ? 'active' : '' }= link_to 'Sites',     sites_path
         %li{ :class => params[:controller] == 'ish_manager/galleries'     ? 'active' : '' }
           = link_to 'Galleries', galleries_path
+          .inline-search
+            = form_tag galleries_path, method: :get do
+              = text_field_tag :q
           = link_to '[+]', new_gallery_path
         %li{ :class => params[:controller] == 'ish_manager/reports'       ? 'active' : '' }
           = link_to 'Reports',   reports_path
+          .inline-search
+            = form_tag reports_path, method: :get do
+              = text_field_tag :q
           = link_to '[+]', new_report_path
         %li{ :class => params[:controller] == 'ish_manager/videos'        ? 'active' : '' }
           = link_to 'Videos',    videos_path
+          .inline-search
+            = form_tag videos_path, method: :get do
+              = text_field_tag :q
           = link_to '[+]', new_video_path
-        %li{ :class => params[:controller] == 'ish_manager/tags'          ? 'active' : '' }= link_to 'Tags',      tags_path
-
-      - proc do # nothing
-        %ul.nav.nav-pills
-          -# %li{ :class => params[:controller] == 'ish_manager/ally'          ? 'active' : '' }= link_to 'Ally',      ally_root_path
-          -# %li{ :class => params[:controller] == 'ish_manager/stock_actions' ? 'active' : '' }= link_to 'Stock Actions', stock_actions_path
-          -# %li{ :class => params[:controller] == 'ish_manager/stock_options' ? 'active' : '' }= link_to 'Stock Options', stock_options_path
-          %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches', stock_watches_path
-          -# %li{ :class => params[:controller] == 'ish_manager/iron_condors' ? 'active' : '' }= link_to 'Iron Condors', iron_condors_path
-          -# %li{ :class => params[:controller] == 'ish_manager/covered_calls' ? 'active' : '' }= link_to 'Covered Calls', covered_calls_path
-        %ul.nav.nav-pills
-          %li{ :class => params[:controller] == 'ish_manager/invoices'      ? 'active' : '' }= link_to 'Invoices', invoices_path
-          %li{ :class => params[:controller] == 'ish_manager/payments'      ? 'active' : '' }= link_to 'Payments', payments_path
-          %li{ :class => params[:controller] == 'ish_manager/orders'        ? 'active' : '' }= link_to 'Orders', orders_path
-          -# %li{ :class => params[:controller] == 'ish_manager/co_tailors'    ? 'active' : '' }= link_to 'Co Tailors', co_tailors_path
-        %ul.nav.nav-pills
-          %li{ :class => params[:controller] == 'ish_manager/leads'         ? 'active' : '' }= link_to 'Leads', leads_path
-          %li{ :class => params[:controller] == 'ish_manager/campaigns'     ? 'active' : '' }= link_to 'Campaigns', campaigns_path
-
-
+      %ul
+        %li{ class: params[:controller] == 'ish_manager/newsitems' ? 'active' : '' }= link_to '+Newsitem', new_newsitem_path
+        %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches', stock_watches_path
+        %li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Profiles',  user_profiles_path
   %hr
 

data/app/views/ish_manager/application/_main_header_admin.haml-trash

@@ -0,0 +1,21 @@
+
+
+        -# %li{ :class => params[:controller] == 'ish_manager/sites'         ? 'active' : '' }= link_to 'Sites',     sites_path
+        -# %li{ :class => params[:controller] == 'ish_manager/tags'          ? 'active' : '' }= link_to 'Tags',      tags_path
+        -# %li{ :class => params[:controller] == 'ish_manager/cities'        ? 'active' : '' }= link_to 'Cities',    cities_path
+        -# %li{ :class => params[:controller] == 'ish_manager/events'        ? 'active' : '' }= link_to 'Events',    events_path
+        -# %li{ :class => params[:controller] == 'ish_manager/venues'        ? 'active' : '' }= link_to 'Venues',    venues_path
+        -# %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path
+      - proc do # nothing
+        %ul.nav.nav-pills
+          -# %li{ :class => params[:controller] == 'ish_manager/stock_actions' ? 'active' : '' }= link_to 'Stock Actions', stock_actions_path
+          -# %li{ :class => params[:controller] == 'ish_manager/stock_options' ? 'active' : '' }= link_to 'Stock Options', stock_options_path
+          -# %li{ :class => params[:controller] == 'ish_manager/iron_condors' ? 'active' : '' }= link_to 'Iron Condors', iron_condors_path
+          -# %li{ :class => params[:controller] == 'ish_manager/covered_calls' ? 'active' : '' }= link_to 'Covered Calls', covered_calls_path
+        %ul.nav.nav-pills
+          %li{ :class => params[:controller] == 'ish_manager/invoices'      ? 'active' : '' }= link_to 'Invoices', invoices_path
+          %li{ :class => params[:controller] == 'ish_manager/payments'      ? 'active' : '' }= link_to 'Payments', payments_path
+          %li{ :class => params[:controller] == 'ish_manager/orders'        ? 'active' : '' }= link_to 'Orders', orders_path
+        %ul.nav.nav-pills
+          %li{ :class => params[:controller] == 'ish_manager/leads'         ? 'active' : '' }= link_to 'Leads', leads_path
+          %li{ :class => params[:controller] == 'ish_manager/campaigns'     ? 'active' : '' }= link_to 'Campaigns', campaigns_path

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

@@ -7,9 +7,9 @@
         .content
           %ul.nav.nav-pills
             %li{ :class => params[:controller] == 'ish_manager/galleries'     ? 'active' : '' }= link_to 'Galleries', galleries_path
-            %li{ :class => params[:controller] == 'ish_manager/reports'       ? 'active' : '' }= link_to 'Reports',   reports_path
-            %li{ :class => params[:controller] == 'ish_manager/videos'        ? 'active' : '' }= link_to 'Videos',    videos_path
-            %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path          
+            -# %li{ :class => params[:controller] == 'ish_manager/reports'       ? 'active' : '' }= link_to 'Reports',   reports_path
+            -# %li{ :class => params[:controller] == 'ish_manager/videos'        ? 'active' : '' }= link_to 'Videos',    videos_path
+            -# %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path
           %ul.nav.nav-pills
   %hr
 

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

@@ -1,20 +1,18 @@
 
 .meta
-  - if defined?(item.premium_tier) && item.premium_tier > 0
-    <b>$#{item.premium_tier}</b>
+
   <b>On</b> #{item.created_at.to_s[0...10]}
+  - if item.user_profile
+    <b>By:</b>
+    = link_to item.user_profile.name, edit_user_profile_path( item.user_profile )
 
+  - if item.tags.length > 0
+    <b>Tags:</b> #{ item.tags.map(&:name).join(', ') }
   - if item.city
     <b>In City:</b> #{link_to item.city.name, city_path( item.city )}
-  - if item.tags
-    <b>Tags:</b> #{ item.tags.map(&:name).join(', ') }
-  - if item.site
-    <b>Site:</b>
-    = link_to "#{item.site.domain}/#{item.site.lang}", site_path( item.site )
   - if item.respond_to?( :venue ) && item.venue
     <b>Venue:</b>
     = link_to item.venue.name, venue_path( item.venue )
-  - if item.user_profile
-    <b>By UserProfile:</b>
-    = link_to item.user_profile.name, edit_user_profile_path( item.user_profile )
-    
+
+  - if defined?(item.premium_tier) && item.premium_tier > 0
+    <b>Tier:$#{item.premium_tier}</b>

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

@@ -1,3 +1,9 @@
 
 Welcome home! Your role is #{current_user.profile.role_name}.
 
+.bordered{ style: 'width: 400px;' }
+  = form_tag "https://www.cgtrader.com/free-3d-models", method: :get do
+    %p Search CGTrader:
+    = hidden_field_tag "polygons", "lt_5k"
+    = text_field_tag "keywords"
+    = submit_tag 'search'

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

@@ -2,34 +2,38 @@
 -# ish_manager / galleries / _index.haml
 -#
 
-= render 'ish_manager/galleries/menu'
-
 - n_thumbs   ||= 8
 - param_name ||= :galleries_page
 
-- if @galleries.length > 0
-  .galleries--list
+.galleries--index.-index
+
+  = render 'ish_manager/galleries/menu'
+
+  - if @galleries.length > 0
+
     - if @galleries.respond_to? :total_pages
       = paginate @galleries, :param_name => param_name, :views_prefix => 'ish_manager'
 
-    - @galleries.each do |g|
-      .panel
-        .panel-body
-          %h3
-            = link_to '[~]', edit_gallery_path( g )
-            = link_to g.name, gallery_path(g.slug)
-            (#{g.photos.length})
-          = render 'meta', :item => g
-          - if g.photos.length == 0
-            = image_missing
-          - else
-            .thumbnails
-              - g.photos.limit( n_thumbs ).each do |photo|
-                = link_to image_tag(photo.photo.url(:thumb), :alt => g.name), gallery_path(g.slug)
+    .row
+      - @galleries.each do |g|
+        .col.s6
+          .item.panel
+            .panel-body
+              %h3
+                = link_to '[~]', edit_gallery_path( g )
+                = link_to g.name, gallery_path(g.slug)
+                (#{g.photos.length})
+              = render 'meta', item: g
+              - if g.photos.length == 0
+                = image_missing
+              - else
+                .thumbnails.flex-row
+                  - g.photos.limit( n_thumbs ).each do |photo|
+                    = link_to image_tag(photo.photo.url(:thumb), :alt => g.name), gallery_path(g.slug)
 
     - if @galleries.respond_to? :total_pages
       = paginate @galleries, :param_name => param_name, :views_prefix => 'ish_manager'
 
-- else
-  %h5 No Galleries
+  - else
+    %h5 No Galleries
 

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

@@ -2,7 +2,7 @@
 .title
   .row
     .col.s12.col.m12
-      %h1.center #{params[:action]} (#{@galleries.count}) #{link_to '[+]', new_gallery_path}
+      %h1.center Galleries #{params[:action]} (#{@galleries.count}) #{link_to '[+]', new_gallery_path}
       = render 'search', path: galleries_path
       %ul.menu-secondary
         %li{ class: "#{params[:render_type] == 'index_titles' ? 'active' : ''}" }

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

@@ -63,6 +63,6 @@
       = f.text_area :config, class: 'large'
       %pre.small
         description.collapsible: bool
-        map_panel_type: "MapPanel" | "MapPanelNoZoom" | "ThreePanelV1"
+        map_panel_type: "Equirectangular" | "MapPanel" | "MapPanelNoZoom" | "ThreePanelV1" | "ThreePanelV4"
   .actions
     = f.submit 'Save'

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

@@ -8,4 +8,4 @@
     .a= button_to '+newsitem', new_map_newsitem_path(map), method: :get
     .a= link_to '[api]', api_map_path(map)
     .a= button_to 'x', map_path(map), method: :delete, data: { confirm: 'Are you sure?' }
-  .a= map.slug
+  .a slug:#{map.slug}

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

@@ -1,5 +1,6 @@
 
 .maps-map-editor
+  = render 'map_meta_row', map: @map
   %h1 Map Editor
 
   .map-editor

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

@@ -42,3 +42,5 @@
       .item
         = link_to m.slug, edit_map_path(m.id)
 
+%hr
+= render 'form'

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

@@ -16,7 +16,8 @@
       .field
         = f.label :"Name"
         = f.text_field :name, :class=> 'form-control', :placeholder => "name of report", :type => "text"
-        -# = f.text_field :slug, :class=> 'form-control', :placeholder => "name seo", :type => "text"
+        = f.label "Slug"
+        = f.text_field :slug, :class=> 'form-control', :placeholder => "name seo", :type => "text"
 
     .col.s4
       .field

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

@@ -2,19 +2,12 @@
 .manager-reports-show
   .row
     .large-12.columns
-      %h1
+      %h1.flex-row
         = @report.name
         = link_to '[~]', edit_report_path( @report )
+        = button_to '[x]', report_path( @report ), :method => :delete, :data => { :confirm => 'Are you sure?' }
 
-      .meta
-        -# By #{link_to @report.user_profile.username, user_path( @report.user )}
-        On #{@report.created_at.to_s.slice(0, 10)}
-        - if @report.site
-          In #{link_to "http://#{@report.site.domain}/#{@report.site.lang}", site_path( @report.site )}
-        -# - if @report.tag
-        -#   Tagged #{link_to @report.tag.name, manager_tag_path( @report.tag )}
-        - if @report.city
-          In #{link_to @report.city.name, city_path( @report.city )}
+      = render 'meta', item: @report
 
       - if @report.subhead.length > 3
         .subhead= @report.subhead
@@ -23,6 +16,5 @@
         - if @report.photo
           .float-left= image_tag @report.photo.photo.url( :small )
         = raw @report.descr
-        .c
-
-      .c
+  %hr
+  = render 'form', :url => report_path(@report.id), :report => @report

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

@@ -3,23 +3,26 @@
   .float-left= button_to '[X]', stock_watch_path(stock_watch.id), method: :delete, data: { confirm: 'Are you sure?' }
 
 
-- url = stock_watches_path if !stock_watch.persisted? 
+- url = stock_watches_path if !stock_watch.persisted?
 - url = stock_watch_path( stock_watch ) if stock_watch.persisted?
 
 = form_for stock_watch, :url => url, :html => { :class => 'form-inline well' } do |f|
-  .form-group
-    = f.select :action, options_for_select( Ish::StockWatch::ACTIONS.map{|a|[a,a]}, :selected => stock_watch.action )
-  .form-group
-    = f.select :profile, options_for_select( [[nil,nil]]+@profiles.map{|p|[p.email,p.id]}, :selected => stock_watch.profile ? stock_watch.profile.id : nil )
-  .form-group
-    %label.control-label When
-    = f.text_field :ticker, :class => 'form-control', :placeholder => 'ticker'
-  .form-group
-    %label.control-label Price
-    = f.select :direction, options_for_select( Ish::StockWatch::DIRECTIONS.map{|d|[d,d]}, :selected => stock_watch.direction )
-  .form-group
-    %label.control-label $
-    = f.number_field :price, :step => 0.01, :placeholder => "0.01"
-  .form-group
-    = f.submit ">", :class => %w(btn blue)
-  .c
+  .flex-row
+    .form-group
+      = f.label :action
+      = f.select :action, options_for_select( Warbler::StockWatch::ACTIONS.map{|a|[a,a]}, :selected => stock_watch.action )
+    .form-group
+      = f.label :profile
+      = f.select :profile, options_for_select( [[nil,nil]]+@profiles.map{|p|[p.email,p.id]}, :selected => stock_watch.profile ? stock_watch.profile.id : nil )
+    .form-group
+      %label.control-label When
+      = f.text_field :ticker, :class => 'form-control', :placeholder => 'ticker'
+    .form-group
+      %label.control-label Price
+      = f.select :direction, options_for_select( Warbler::StockWatch::DIRECTIONS.map{|d|[d,d]}, :selected => stock_watch.direction )
+    .form-group
+      %label.control-label $
+      = f.number_field :price, :step => 0.01, :placeholder => "0.01"
+    .form-group
+      = f.submit ">", :class => %w(btn blue)
+

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

@@ -1,7 +1,7 @@
 
 - videos ||= @videos
 
-.videos--index
+.videos--index.-index
 
   %h5
     Videos (#{videos.count})

data/config/routes.rb

@@ -48,7 +48,8 @@ IshManager::Engine.routes.draw do
       resources 'markers'
       resources 'newsitems'
     end
-    resources 'markers' # redundant
+    get 'maps/:id', to: 'maps#edit'
+    resources 'markers'
   end
 
   resources :newsitems

data/lib/tasks/ish_manager_tasks.rake

@@ -21,7 +21,7 @@ namespace :ish_manager do
   desc 'watch the stocks, and trigger actions - not alphavantage, tda now. 2021-08-08'
   task watch_stocks: :environment do
     while true
-      stocks = Ish::StockWatch.where( :notification_type => :EMAIL )
+      stocks = Warbler::StockWatch.where( :notification_type => :EMAIL )
       stocks.each do |stock|
         begin
           Timeout::timeout( 10 ) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.260
+  version: 0.1.8.265
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-12 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -189,19 +189,13 @@ files:
 - 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/assets/stylesheets/ish_manager/videos.scss
 - app/controllers/ish_manager/application_controller.rb
 - app/controllers/ish_manager/campaigns_controller.rb
 - app/controllers/ish_manager/cities_controller.rb
-- app/controllers/ish_manager/co_tailors_controller.rb
-- app/controllers/ish_manager/covered_calls_controller.rb
-- app/controllers/ish_manager/events_controller.rb
 - app/controllers/ish_manager/features_controller.rb
-- app/controllers/ish_manager/friends_controller.rb
 - app/controllers/ish_manager/galleries_controller.rb
 - app/controllers/ish_manager/invoices_controller.rb
-- app/controllers/ish_manager/iron_condors_controller.rb
 - app/controllers/ish_manager/leads_controller.rb
 - app/controllers/ish_manager/maps_controller.rb
 - app/controllers/ish_manager/markers_controller.rb
@@ -213,6 +207,11 @@ 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/co_tailors_controller.rb
+- app/controllers/ish_manager/trash/covered_calls_controller.rb
+- app/controllers/ish_manager/trash/events_controller.rb
+- app/controllers/ish_manager/trash/friends_controller.rb
+- app/controllers/ish_manager/trash/iron_condors_controller.rb
 - app/controllers/ish_manager/user_profiles_controller.rb
 - app/controllers/ish_manager/users_controller.rb
 - app/controllers/ish_manager/venues_controller.rb
@@ -230,6 +229,7 @@ files:
 - app/views/ish_manager/application/_main_footer.haml
 - app/views/ish_manager/application/_main_header.haml
 - app/views/ish_manager/application/_main_header_admin.haml
+- app/views/ish_manager/application/_main_header_admin.haml-trash
 - app/views/ish_manager/application/_main_header_guy.haml
 - app/views/ish_manager/application/_main_header_manager.haml
 - app/views/ish_manager/application/_meta.haml

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

@@ -1,26 +0,0 @@
-
-ul:not(.browser-default).errors,
-ul:not(.browser-default).bullets, {
-  > li {
-    list-style-type: circle;
-    margin-left: 1em;
-  }
-}
-
-.flat-row {
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
-  align-content: flex-start;
-
-  height: 3em;
-  line-height: 3em;
-
-  width: 100%;
-  margin: 1em 0 0 0;
-  padding: 0;
-
-  > * {
-    padding-right: 1em;
-  }
-}