ish_manager 0.1.8.353 → 0.1.8.355

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f500786949e6f1958ad5ac26c25f2a9baa70caed1885797975834bdefb0e2bf
-  data.tar.gz: 77d7121fdee734f6b31b48c400ca1593ea8165eafb9d0b3b8042eb4d3c62b3b0
+  metadata.gz: 41936b74cab9eb00d566912ce0bf799cad9994da03ad6488c30f825996541d85
+  data.tar.gz: eaf88d58f3189d9e0155a5d0fa5c7da9aa7c1be560068de9cbfd5f88ae52c0f6
 SHA512:
-  metadata.gz: 77f127baaa28801fab1b71fd8cb10fcf1cc8e30379cbf75545d59cd11e0f6d5244035b8cedf31000656954bf28e550fe60298386eb13c84b3d8a76b211214292
-  data.tar.gz: 146a1427f11ec2206ce68a87716c8dfa765b6931bea4719d35a304451e4e2b9b2e9f22e14fed37bdaf9502223b29f57ed202beb56e90b50b9602338e4f6129a4
+  metadata.gz: eca56720c4ed0101a5e1b55bfa0f8b55169a72a4e2450b6f558b21523aa5c62eb0b73aeca2f15cb7639ab20af1ad9181886feedcd36eb5e2225177858ca515b9
+  data.tar.gz: 1e3e8b689b5edb016e5ba3e6b54ccee260c0b949c38f298e14315651ab59ad4cc55b37cc1fc3261ef75027f85cd47ea2716b76818355b109bb7d7689c0cc6660

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

@@ -86,12 +86,14 @@ $(function () {
 
 
   if ('function' === typeof $('body').DataTable) {
-    $('#dataTable').DataTable({
-        pageLength: 10,
-        lengthMenu: [[10, 25, 100, -1], [10, 25, 100, 'All']],
-        lengthChange: true,
-        "aLengthMenu": [[5, 10, 25, 50, -1], [5, 10, 25, 50, "All"]]
-    })
+    const _props = {
+      pageLength: 10,
+      lengthMenu: [[10, 25, 100, -1], [10, 25, 100, 'All']],
+      lengthChange: true,
+      "aLengthMenu": [[5, 10, 25, 50, -1], [5, 10, 25, 50, "All"]]
+    }
+    $('#dataTable').DataTable(_props)
+    $('.data-table').DataTable(_props)
   }
 
   if ('function' === typeof $('body').datepicker) {
@@ -99,7 +101,48 @@ $(function () {
   }
 
   // From: https://materializecss.com/select.html
-  $('select').formSelect();
+  if ('function' === typeof $('select').formSelect) {
+    $('select').formSelect();
+  }
+
+  if ($(".data-table").length) {
+    $("input[type='checkbox'].i-sel").change(() => {
+      $( $(".n-selected")[0] ).html( $("input[type='checkbox'].i-sel:checked").length )
+    })
+  }
+
+  $("button.delete-btn").click(e => {
+    let out = []
+
+    $( $("input[type='checkbox'].i-sel:checked") ).each( idx => {
+      let val = $($("input[type='checkbox'].i-sel:checked")[idx]).val()
+      out.push(val)
+    })
+
+    $.ajax({
+      url: '/api/leadsets',
+      type: 'DELETE',
+      data: { leadset_ids: out },
+      success: e => {
+        logg(e, 'deleted Ok')
+      },
+      error: e => {
+        logg(e, 'deleted Err')
+      },
+    })
+
+  })
+
+  $(".select-all input[type='checkbox']").change((e) => {
+    const count = $("input[type='checkbox'].i-sel:checked").length
+    const new_state = count ? false : true
+
+    $( $("input[type='checkbox'].i-sel") ).each( i => {
+      $( $("input[type='checkbox'].i-sel")[i] ).prop('checked', new_state)
+    })
+
+    $( $(".n-selected")[0] ).html( $("input[type='checkbox'].i-sel:checked").length )
+  })
 
 });
 

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

@@ -4,13 +4,14 @@
  *= require ish_manager/jquery-ui
  *= require_self
  *
- * includes email context:
- *= require ish_manager/email_templates
+ *= require ish_manager/email_contexts_templates
+ *= require ish_manager/email_conversations
+ *= require ish_manager/email_messages
  *
  *= require ish_manager/galleries
  *= require ish_manager/maps
  *= require ish_manager/markers
- *= require ish_manager/leads
+ *= require ish_manager/leads_leadsets
  *= require ish_manager/photos
  *= require ish_manager/user_profiles
  *= require ish_manager/videos
@@ -19,12 +20,18 @@
 **/
 
 a[target='_blank'] {
+  &::before {
+    content: '[ '
+  }
   &::after {
-    content: ' ^]' !important;
+    content: ' ^]';
+    // content: ' ^]' !important;
     // font-size: .5em;
   }
 }
-
+html {
+  height: 100%;
+}
 body {
   background: #dedede;
   font-size: 20px;
@@ -67,6 +74,11 @@ ul:not(.browser-default).bullets, {
   width: 100vwh;
   overflow-x: auto;
 }
+body.application-fullwidth {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
 .application-home {
   .bordered-card {
     max-width: 400px;
@@ -128,6 +140,15 @@ ul:not(.browser-default).bullets, {
 
 /* D */
 
+table.dataTable {
+  border: 1px solid red;
+  padding: 1em;
+  border-radius: 5px;
+  box-sizing: border-box;
+  background: white;
+
+}
+
 .descr,
 .description {
   border: 1px solid red;
@@ -164,6 +185,10 @@ ul:not(.browser-default).bullets, {
   float: right;
 }
 
+/* H */
+.hide, .hidden {
+  display: none;
+}
 
 /* I */
 img.img-400 {
@@ -205,6 +230,8 @@ textarea.large {
 
 .main-header {
   background: url('//d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/10/05192823/weather-bg.png');
+  border-bottom: 2px solid red;
+  margin-bottom: 1em;
 
   a {
     background: white;
@@ -215,8 +242,6 @@ textarea.large {
     margin-top: 0;
   }
 
-
-
   ul {
     margin: 0;
     padding: 0;
@@ -245,7 +270,17 @@ textarea.large {
 }
 
 .manager--main-footer {
+  background: url('//d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/10/05192823/weather-bg.png');
   border-top: 2px solid red;
+  margin-top: 1em;
+
+  flex-grow: 1;
+}
+
+.max-width {
+  max-width: 1140px;
+  width: 100%;
+  margin: auto;
 }
 
 .menu-secondary {
@@ -270,6 +305,15 @@ textarea.large {
 
 /* N */
 
+label.n-selected {
+  border: 1px solid red;
+  padding: 0.5em;
+
+  &::after {
+    content: " Selected";
+  }
+}
+
 .newsitems--item {
   border: 1px solid green;
   padding: 5px;

data/app/assets/stylesheets/ish_manager/{email_templates.scss → email_contexts_templates.scss}

@@ -52,6 +52,11 @@
 
 }
 
+.email-templates--form-reply-mini,
+.email-templates--form-schedule-mini {
+
+}
+
 .email-contexts--form,
 .email-templates--form {
 
@@ -76,4 +81,24 @@
     padding: 10px;
     margin: 10px;
   }
+
+
 }
+
+.form-mini {
+  margin-left: 20px;
+  display: inline-block;
+  border: 1px solid #666;
+  border-radius: 5px;
+  padding: 5px;
+  background: #eee;
+
+  * {
+    display: inline;
+  }
+  .send-at {
+    input {
+      width: 150px;
+    }
+  }
+}

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

@@ -0,0 +1,65 @@
+
+.email-conversations-index,
+.email-conversations-show {
+
+  .messages {
+    // border: 1px solid red;
+
+    padding-left: 0;
+
+    list-style-type: none;
+
+    li {
+
+      margin-bottom: 0.2em;
+
+      // clear: both;
+
+      .date {
+        // border: 1px solid orange;
+
+        width: 120px;
+        float: left;
+      }
+
+      .preview {
+        // border: 1px solid gold;
+
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+
+      }
+    }
+  }
+
+  .participants {
+    border: 1px solid #999900;
+    background: #ffffcc;
+    border-radius: 5px;
+    padding: 5px;
+    display: inline;
+
+    ul {
+      display: inline;
+      padding-left: 0;
+      li {
+        display: inline;
+      }
+    }
+  }
+
+}
+
+.email-conversations-show {
+  .header {
+    display: flex;
+    align-items: baseline;
+
+    .label {
+      padding-right: 0.2em;
+    }
+  }
+
+
+}

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

@@ -0,0 +1,4 @@
+
+html, body {
+  background: white;
+}

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

@@ -0,0 +1,15 @@
+
+.email-messages-show {
+
+  .main-actions {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .body {
+    border: 1px solid red;
+    border-radius: 5px;
+    padding: 1em;
+  }
+
+}

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

@@ -0,0 +1,21 @@
+
+.manager-leads-index {
+  th.company-url {
+    width: 10px;
+  }
+  th.created-at,
+  td.created-at {
+    width: 200px;
+  }
+}
+
+.manager-leadsets-index {
+  padding: 1em;
+
+  .actions label {
+    border: 1px solid gold;
+    padding: 0.5em;
+    border-radius: 0.5em;
+    background: #999900;
+  }
+}

data/app/controllers/ish_manager/application_controller.rb

@@ -4,12 +4,13 @@ module IshManager
     protect_from_forgery :with => :exception, :prepend => true
     before_action :set_current_ability
     before_action :set_changelog
+    before_action :set_title
     check_authorization
     rescue_from ::CanCan::AccessDenied, :with => :access_denied
 
     def home
       authorize! :home, IshManager::Ability
-      render 'home'
+      render 'home', layout: 'ish_manager/application_fullwidth'
     end
 
     #
@@ -22,6 +23,15 @@ module IshManager
       redirect_to user_signed_in? ? root_path : Rails.application.routes.url_helpers.new_user_session_path, :alert => exception.message
     end
 
+    def pp_errors err
+      err
+    end
+
+    def puts! a, b=''
+      puts "+++ +++ #{b}"
+      puts a.inspect
+    end
+
     def set_changelog
       @version = Gem.loaded_specs['ish_manager'].version.to_s
     end
@@ -43,13 +53,8 @@ module IshManager
       @videos_list = Video.all.list
     end
 
-    def pp_errors err
-      err
-    end
-
-    def puts! a, b=''
-      puts "+++ +++ #{b}"
-      puts a.inspect
+    def set_title
+      @page_title = "#{ params[:controller].gsub('ish_manager/', '') } #{params[:action]} #{params[:slug]||params[:id]} ".gsub("  ", " ")
     end
 
     # @TODO: obsolete, remove _vp_ 2022-10-15

data/app/controllers/ish_manager/categories_controller.rb

@@ -0,0 +1,14 @@
+
+class ::IshManager::CategoriesController < IshManager::ApplicationController
+
+  before_action :set_lists
+
+  def index
+    authorize! :categories_index, IshManager::Ability
+    # @categories = Category.all_hierarchical
+    @categories_flat = Category.all_flat
+    @tags = Category.all_tags
+  end
+
+end
+

data/app/controllers/ish_manager/email_conversations_controller.rb

@@ -0,0 +1,16 @@
+
+class ::IshManager::EmailConversationsController < IshManager::ApplicationController
+
+  def index
+    authorize! :email_conversations_index, IshManager::Ability
+    @email_conversations = ::Office::EmailConversation.all.order_by( latest_date: :desc )
+
+  end
+
+  def show
+    authorize! :email_conversations_show, IshManager::Ability
+    @email_conversation = ::Office::EmailConversation.find( params[:id] )
+    @email_messages = @email_conversation.email_messages.order_by( date: :desc )
+  end
+
+end

data/app/controllers/ish_manager/email_messages_controller.rb

@@ -0,0 +1,32 @@
+
+class ::IshManager::EmailMessagesController < IshManager::ApplicationController
+
+  def index
+    authorize! :email_messages_index, IshManager::Ability
+    @email_messages = Office::EmailMessage.all
+  end
+
+  def show
+    authorize! :email_messages_show, IshManager::Ability
+    @email_message = Office::EmailMessage.find params[:id]
+  end
+
+  def show_iframe
+    authorize! :email_messages_show, IshManager::Ability
+    @email_message = Office::EmailMessage.find params[:id]
+    render layout: 'ish_manager/email_iframe'
+  end
+
+  def show_source
+    authorize! :email_messages_show, IshManager::Ability
+    @email_message = Office::EmailMessage.find params[:id]
+    render layout: false
+  end
+
+  def show_stripped
+    authorize! :email_messages_show, IshManager::Ability
+    @email_message = Office::EmailMessage.find params[:id]
+    render layout: false
+  end
+
+end

data/app/controllers/ish_manager/leads_controller.rb

@@ -122,7 +122,7 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
   def set_lists
     super
     @leadsets_list = [ [nil,nil] ] + ::Leadset.all.map { |k| [ k.name, k.id ] }
-    @email_campaigns_list = [ [nil,nil] ] + Ish::EmailContext.unsent_campaigns.map { |k| [ k.slug, k.id ] }
+    @email_campaigns_list = [ [nil,nil] ] # + Ish::EmailContext.unsent_campaigns.map { |k| [ k.slug, k.id ] }
   end
 
 end

data/app/controllers/ish_manager/leadsets_controller.rb

@@ -15,6 +15,18 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
     redirect_to :action => 'index'
   end
 
+  def destroy
+    puts! params, 'params'
+
+    leadsets = Leadset.find( params[:leadset_ids] )
+    @results = []
+    leadsets.each do |leadset|
+      @results.push leadset.discard
+    end
+    flash[:notice] = "Discard outcome: #{@results.inspect}."
+    redirect_to action: 'index'
+  end
+
   def edit
     @leadset = Leadset.find params[:id]
     authorize! :edit, @leadset
@@ -22,12 +34,14 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
 
   def index
     authorize! :index, Leadset
-    @leadsets = Leadset.all # where( :profile => @current_profile, :is_trash => false )
+    @leadsets = Leadset.all.kept # where( :profile => @current_profile, :is_trash => false )
     # if params[:is_done]
     #   @leadsets = @leadsets.where( :is_done => true )
     # else
     #   @leadsets = @leadsets.where( :is_done => false )
     # end
+
+    render layout: 'ish_manager/application_fullwidth'
   end
 
   def new

data/app/helpers/ish_manager/application_helper.rb

@@ -1,6 +1,19 @@
 module IshManager
   module ApplicationHelper
 
+
+    #
+    # api paths
+    #
+    def api_map_path map
+      "/api/maps/view/#{map.slug}"
+    end
+
+    def api_marker_path marker
+      "/api/markers/view/#{marker.id}"
+    end
+
+
     def current_layout
       layout = controller.class.send(:_layout)
       if layout.nil?
@@ -40,16 +53,5 @@ module IshManager
       "$ #{'%.2f' % a}"
     end
 
-    #
-    # api paths
-    #
-    def api_map_path map
-      "/api/maps/view/#{map.slug}"
-    end
-
-    def api_marker_path marker
-      "/api/markers/view/#{marker.id}"
-    end
-
   end
 end

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

@@ -0,0 +1,18 @@
+
+- if notice || alert
+  .row
+    .col-sm-12
+      - if notice
+        - if notice.class == Array
+          %ul.notice
+            - notice.map do |n|
+              %li= n
+        - else
+          %p.notice= notice
+      - if alert
+        - if alert.class == Array
+          %ul.alert
+            - alert.map do |n|
+              %li= n
+        - else
+          %p.alert= alert

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

@@ -1,9 +1,9 @@
 
 %i.fa.fa-compress.collapse-expand#debug
+  Debug
 .application--debug
   %ul.browser-default
     %li= params.inspect
-    %li= "Cached?: #{Rails.application.config.action_controller.perform_caching}"
-    %li Cache key: #{@cache_key.inspect}
-    %li Layout: #{current_layout}
+    %li Cached? #{Rails.application.config.action_controller.perform_caching} :: Cache key: #{@cache_key.inspect}
+    -# %li Layout: #{current_layout}
     %li= "Env: #{Rails.env}"

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

@@ -3,6 +3,7 @@
   .container
 
     %i.fa.fa-compress.collapse-expand#mainFooter
+      Account & Session
     .a
       .row
         .col-sm-6

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

@@ -6,9 +6,9 @@
     %i.fa.fa-compress.collapse-expand#collapseHeaderPiCMS
       PiousboxCMS
     %ul
-      %li
-        = link_to 'Photos', photos_path
-        = link_to '[+]', new_photo_path
+      -# %li
+      -#   = link_to 'Photos', photos_path
+      -#   = link_to '[+]', new_photo_path
       %li
         = render 'ish_manager/galleries/menu'
       %li
@@ -23,6 +23,8 @@
           = form_tag videos_path, method: :get do
             = text_field_tag :q
         = link_to '[+]', new_video_path
+      %li
+        = link_to 'Categories & Tags', categories_path
     .c
 
     %i.fa.fa-compress.collapse-expand#collapseHeaderIsh
@@ -60,6 +62,10 @@
         %li
           = link_to 'Meetings', meetings_path
           = link_to '[+]', new_meeting_path
+        %li
+          -## superceded by conversations, below _vp_ 2023-02-26
+          -# = link_to "Email Messages (#{Office::EmailMessage.count})", email_messages_path
+          = link_to "Email Conv's (#{Office::EmailConversation.count})", email_conversations_path
       %ul
         %li
           = link_to 'Leads', leads_path
@@ -81,7 +87,7 @@
 
     .c
     %i.fa.fa-compress.collapse-expand#collapseHeaderIro
-      Iro
+      Iro Wor
     .content
       %ul
         %li
@@ -89,5 +95,3 @@
         %li
           = link_to 'Plots', 'http://localhost:3000/iron_warbler/NOPE-1', target: '_blank'
 
-  %hr
-

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

@@ -1,5 +1,5 @@
 
-.application-home
+.application-home.max-width
   Welcome home
 
   .bordered-card

data/app/views/ish_manager/categories/_subtree.haml

@@ -0,0 +1,12 @@
+
+-## provides local vars: subtree, config
+
+- puts! config, 'config'
+- puts! subtree, 'subtree'
+
+%ul
+  - subtree.select { |c| c[5] == config[:parent_id] }.each do |c|
+    %li
+      = c[1]
+      - if config[:parent_ids].include?( c[0] )
+        = render 'ish_manager/categories/subtree', subtree: subtree, config: { parent_id: c[0], parent_ids: config[:parent_ids] }

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

@@ -0,0 +1,11 @@
+
+.row
+  .col-md-6
+    %h1 Categories
+    = render 'ish_manager/categories/subtree', subtree: @categories_flat, config: { parent_id: nil, parent_ids: @categories_flat.map { |c| c[5] }.uniq }
+
+  .col-md-6
+    %h1 Tags
+    %ul
+      - @tags.each do |tag|
+        %li= tag[:name]

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

@@ -0,0 +1,12 @@
+
+.email-conversations-index
+  %h1 Email Conversations
+
+  %ul
+    - @email_conversations.each do |c|
+      %li
+        = c.latest_date.to_s[0...10]
+        .participants= c.participants.join(", ")
+        = link_to c.subject, email_conversation_path( c )
+        (#{c.email_messages.count})
+

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

@@ -0,0 +1,27 @@
+
+.email-conversations-show
+  .actions.hide
+    = link_to '[<- all conv]', email_conversations_path
+
+  .header
+    .label
+      = link_to '[<-]', email_conversations_path
+      Conversation:
+    %h1
+      #{@email_conversation.subject}
+      (#{@email_conversation.email_messages.all.count})
+
+  .participants
+    %ul
+      - @email_conversation.participants.each do |p|
+        %li
+          = p
+          = render 'ish_manager/email_templates/form_reply_mini'
+          = render 'ish_manager/email_templates/form_schedule_mini'
+
+  %ul.messages
+    - @email_messages.each do |m|
+      %li
+        .date= link_to m.date.to_s[0...10], email_message_path( m )
+        .preview
+          = (ActionView::Base.full_sanitizer.sanitize( m.part_html )||'<no-info>')[0..300]

data/app/views/ish_manager/email_messages/_show_iframe.haml

@@ -0,0 +1,8 @@
+
+-# receives local vars: email_message
+
+.email-messages-show-iframe
+
+  .body
+    = raw email_message.part_html
+

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

@@ -0,0 +1,8 @@
+
+%h2 Email Messages
+
+%ul
+  - @email_messages.each do |msg|
+    %li
+      #{msg.subject}
+      = link_to 'view', email_message_path(msg)

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

@@ -0,0 +1,31 @@
+
+.email-messages-show
+
+  .main-actions
+    .left
+      = link_to '[<<-]', email_conversations_path
+      = link_to '[<- Conversation]', email_conversation_path( @email_message.email_conversation )
+      Message
+    .right
+      = link_to 'source',   email_message_source_path( @email_message ),   target: :_blank
+      -# = link_to 'stripped', email_message_stripped_path( @email_message ), target: :_blank
+
+  %ul.headers
+    %li
+      <b>From:</b> #{@email_message.from}
+      = render 'ish_manager/email_templates/form_reply_mini'
+      = render 'ish_manager/email_templates/form_schedule_mini'
+    %li <b>To:</b> #{@email_message.to}
+    %li <b>Subj:</b> #{@email_message.subject}
+    %li <b>Date:</b> #{@email_message.date}
+    - if @email_message.ccs.present?
+      %li <b>CC:</b> #{@email_message.ccs}
+    - if @email_message.bccs.present?
+      %li <b>BCC:</b> #{@email_message.bccs}
+
+  %iframe{ src: email_message_iframe_path(@email_message), width: '100%', height: '800px' }
+
+  -# %hr
+  -# = ActionView::Base.full_sanitizer.sanitize( @email_message.part_html )
+
+

data/app/views/ish_manager/email_messages/show_iframe.haml

@@ -0,0 +1,6 @@
+
+.email-messages-show-iframe
+
+  .body
+    = raw @email_message.part_html
+

data/app/views/ish_manager/email_messages/show_source.haml

@@ -0,0 +1,5 @@
+
+
+<pre>
+= Nokogiri::HTML( @email_message.part_html ).to_xhtml(indent: 2)
+</pre>

data/app/views/ish_manager/email_messages/show_stripped.haml

@@ -0,0 +1,2 @@
+
+= ActionView::Base.full_sanitizer.sanitize( @email_message.part_html )

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

@@ -0,0 +1,8 @@
+
+.email-templates--form-reply-mini.form-mini
+  = form_for ::Ish::EmailContext.new, url: email_contexts_path do |f|
+    .field
+      -# = f.label :template
+      = f.select :email_template_id, options_for_select([ ['abba', 'abba'], ['zetta', 'zetta'] ])
+    .actions
+      = f.submit 'Reply'

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

@@ -0,0 +1,11 @@
+
+.email-templates--form-schedule-mini.form-mini
+  = form_for ::Ish::EmailContext.new, url: email_contexts_path do |f|
+    .field
+      -# = f.label :template
+      = f.select :email_template_id, options_for_select([ ['abba', 'abba'], ['zetta', 'zetta'] ])
+    .field.send-at
+      -# = f.label :send_at
+      = f.text_field :send_at, placeholder: 'YYYY-MM-DD'
+    .actions
+      = f.submit 'Schedule'

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

@@ -1,12 +1,18 @@
 
 .manager-leadsets-index
   %h5
-    SQL
     = link_to 'Leadsets', leadsets_path
     (#{Leadset.all.count})
     = link_to raw("<i class='fa fa-plus-square'></i>"), new_leadset_path
 
-  %table#dataTable.display.compact
+  .actions
+    %label.select-all
+      = check_box_tag :select_all
+      select all
+    %label.n-selected -
+    = button_tag 'Delete', method: :delete, class: 'delete-btn'
+
+  %table.data-table.compact
     %thead
       %tr
         %th &nbsp;
@@ -18,7 +24,7 @@
     %tbody
       - @leadsets.each do |leadset|
         %tr
-          %td= check_box_tag leadset.id
+          %td= check_box_tag 'leadset_ids[]', leadset.id, nil, { class: 'i-sel' }
           %td= leadset.created_at.strftime("%Y-%m-%d %H:%M")
           %td= link_to leadset.name, leadset_path( leadset )
           %td= leadset.tag

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

@@ -1,9 +1,9 @@
 !!!
 %html
   %head
-    %title #{@page_title} | PiousboxCMS
+    %title #{@page_title}| PiousboxCMS
     %link{ :rel => 'icon', :href => "/favicon_#{ENV['RAILS_ENV']}.gif" }
-    %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1.0' }
+    %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=2' }
     %meta{ :charset => 'UTF-8' }
     %meta{ :description => @page_description }
 

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

@@ -0,0 +1,45 @@
+!!!
+%html
+  %head
+    %title #{@page_title}| PiousboxCMS
+    %link{ :rel => 'icon', :href => "/favicon_#{ENV['RAILS_ENV']}.gif" }
+    %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=2' }
+    %meta{ :charset => 'UTF-8' }
+    %meta{ :description => @page_description }
+
+    = javascript_include_tag "//code.jquery.com/jquery-3.3.1.min.js"
+
+    %script{ :src => "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" }
+    = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
+
+    %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/jquery.tinymce.min.js" }
+    %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/tinymce.min.js" }
+
+    = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
+    = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
+
+    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+    = javascript_include_tag "//cdn.jsdelivr.net/npm/popper.js@1.14.7/dist/umd/popper.min.js"
+    = javascript_include_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/js/bootstrap.min.js"
+
+    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css"
+    = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"
+
+    - # @TODO: document? test-drive?
+    - if @include_materialize
+      = stylesheet_link_tag "//cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css"
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"
+
+    = stylesheet_link_tag "ish_manager/application", media: "all"
+    = javascript_include_tag "ish_manager/application"
+
+    = csrf_meta_tags
+  %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action], "application-fullwidth" ] }
+
+    = render :partial => "ish_manager/application/main_header_#{@current_profile.role_name}"
+    = render 'alerts_notices'
+    = yield
+    = render 'ish_manager/application/main_footer'
+    = render 'analytics' if Rails.env.production?
+
+

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

@@ -0,0 +1,6 @@
+!!!
+%html
+  %head
+    = stylesheet_link_tag "ish_manager/email_iframe"
+  %body
+    = yield

data/config/routes.rb

@@ -3,6 +3,8 @@ IshManager::Engine.routes.draw do
 
   root :to => 'application#home'
 
+  get 'categories', to: 'categories#index'
+
   get 'galleries', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
   get 'galleries/index_titles', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_TITLES }
   get 'galleries/index_thumbs', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
@@ -54,6 +56,14 @@ IshManager::Engine.routes.draw do
   resources :email_campaigns
   resources :email_campaign_leads, as: :campaign_leads
 
+  get 'email_messages/iframe/:id',   to: 'email_messages#show_iframe',   as: :email_message_iframe
+  get 'email_messages/source/:id',   to: 'email_messages#show_source',   as: :email_message_source
+  get 'email_messages/stripped/:id', to: 'email_messages#show_stripped', as: :email_message_stripped
+  resources :email_messages
+
+  get 'email_conversations', to: 'email_conversations#index'
+  get 'email_conversations/:id', to: 'email_conversations#show', as: :email_conversation
+
   get  'email_contexts/iframe_src/:id',          to: 'email_contexts#iframe_src', as: :email_context_iframe
   get  'email_contexts/new_with/:template_slug', to: 'email_contexts#new'
   post 'email_contexts/send/:id',                to: 'email_contexts#do_send',    as: :email_context_send

data/lib/ish_manager/engine.rb

@@ -13,6 +13,7 @@ module IshManager
       app.config.assets.precompile << %w( ish_manager/application.js ish_manager/application.css )
       app.config.assets.precompile << %w( ish_manager/materialize.js ish_manager/materialize.css )
       app.config.assets.precompile << %w( missing.png )
+      app.config.assets.precompile << %w( ish_manager/email_iframe.css )
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.353
+  version: 0.1.8.355
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -266,10 +266,13 @@ files:
 - app/assets/javascripts/ish_manager/vendor/jquery.iframe-transport.js
 - app/assets/javascripts/ish_manager/vendor/jquery.ui.widget.js
 - app/assets/stylesheets/ish_manager/application.scss
-- app/assets/stylesheets/ish_manager/email_templates.scss
+- app/assets/stylesheets/ish_manager/email_contexts_templates.scss
+- app/assets/stylesheets/ish_manager/email_conversations.scss
+- app/assets/stylesheets/ish_manager/email_iframe.css
+- app/assets/stylesheets/ish_manager/email_messages.scss
 - app/assets/stylesheets/ish_manager/galleries.scss
 - app/assets/stylesheets/ish_manager/jquery-ui.css
-- app/assets/stylesheets/ish_manager/leads.scss
+- app/assets/stylesheets/ish_manager/leads_leadsets.scss
 - app/assets/stylesheets/ish_manager/maps.scss
 - app/assets/stylesheets/ish_manager/markers.scss
 - app/assets/stylesheets/ish_manager/office.scss
@@ -281,9 +284,12 @@ files:
 - app/assets/stylesheets/ish_manager/user_profiles.scss
 - app/assets/stylesheets/ish_manager/videos.scss
 - app/controllers/ish_manager/application_controller.rb
+- app/controllers/ish_manager/categories_controller.rb
 - app/controllers/ish_manager/email_campaign_leads_controller.rb
 - app/controllers/ish_manager/email_campaigns_controller.rb
 - app/controllers/ish_manager/email_contexts_controller.rb
+- app/controllers/ish_manager/email_conversations_controller.rb
+- app/controllers/ish_manager/email_messages_controller.rb
 - app/controllers/ish_manager/email_templates_controller.rb
 - app/controllers/ish_manager/email_unsubscribes_controller.rb
 - app/controllers/ish_manager/galleries_controller.rb
@@ -345,6 +351,7 @@ files:
 - app/views/202212 Mailchimp Templates/202212 theme subtle.html
 - app/views/202212 Mailchimp Templates/202212 theme ticket.html
 - app/views/202212 Mailchimp Templates/202212 theme whale.html
+- app/views/ish_manager/application/_alerts_notices.haml
 - app/views/ish_manager/application/_analytics.html
 - app/views/ish_manager/application/_debug.haml
 - app/views/ish_manager/application/_form_errors.haml
@@ -359,14 +366,26 @@ 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/categories/_subtree.haml
+- app/views/ish_manager/categories/index.haml
 - app/views/ish_manager/email_campaign_leads/show.haml
 - app/views/ish_manager/email_contexts/_form.haml
 - app/views/ish_manager/email_contexts/edit.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_conversations/index.haml
+- app/views/ish_manager/email_conversations/show.haml
+- app/views/ish_manager/email_messages/_show_iframe.haml
+- app/views/ish_manager/email_messages/index.haml
+- app/views/ish_manager/email_messages/show.haml
+- app/views/ish_manager/email_messages/show_iframe.haml
+- app/views/ish_manager/email_messages/show_source.haml
+- app/views/ish_manager/email_messages/show_stripped.haml
 - app/views/ish_manager/email_templates/_form.haml
 - app/views/ish_manager/email_templates/_form_mini.haml
+- app/views/ish_manager/email_templates/_form_reply_mini.haml
+- app/views/ish_manager/email_templates/_form_schedule_mini.haml
 - app/views/ish_manager/email_templates/_index.haml
 - app/views/ish_manager/email_templates/_m20221201react.html.erb
 - app/views/ish_manager/email_templates/_m20221222merryxmas.html.erb
@@ -499,6 +518,8 @@ files:
 - app/views/ish_manager/videos/new.haml
 - app/views/ish_manager/videos/show.haml
 - app/views/layouts/ish_manager/application.haml
+- app/views/layouts/ish_manager/application_fullwidth.haml
+- app/views/layouts/ish_manager/email_iframe.haml
 - config/routes.rb
 - lib/ish_manager.rb
 - lib/ish_manager/engine.rb

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

@@ -1,10 +0,0 @@
-
-.manager-leads-index {
-  th.company-url {
-    width: 10px;
-  }
-  th.created-at,
-  td.created-at {
-    width: 200px;
-  }
-}