ish_manager 0.1.8.495 → 0.1.8.497

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61a08aa42686c6ad6bb986b26249d6fa7d43d286e178370ab85389e4220437f9
-  data.tar.gz: 1a99d14da57b8625b7ffd4e431df56eaf87f54d74fb7f4e311e99f1f59fbdb6b
+  metadata.gz: 4cc91f9b554ed9df6ac0f58a31e304f1724621e5a67f2e3e5215dd7ea30df711
+  data.tar.gz: 0725043735f539fab19f79235727127af569245611e84cc2c6747a24fc51ec93
 SHA512:
-  metadata.gz: 72a7c92da0efda3cac82cbf74529ae5ab301a3857f4e5c46499cff036ca0ef5e879f9e9f4171b5356422fd494128df45b72e55373b0baefba18a8778d905224d
-  data.tar.gz: 52c18f478b17fa446453169135c3d394f3ad07b1436176e4b7dfbee5175425d82f480aafec329ef3c8035eea739692ad3d2a03441dd925f912e8adc75f59b6e2
+  metadata.gz: 2f548df9bc7bb60a6a5a840e94c0e09f12eab494828c4125e3b9a57eec47c6c38be959aa5f69ec1625278254cd808c3c55d3d73edb1e103a52919b52583bf7c5
+  data.tar.gz: 76e9ba931280138047f57289577c31ee19b11ad4cd874af6f52d073f68ee03adf7f7d6a286687d48c4570eb6af831c8abe06aa4d46d53ea755f47677014210d6

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

@@ -18,6 +18,8 @@ $(document).ready(() => {
   })
 
   $(".archive-btn").click(function(e) {
+    if ( !confirm('Are you sure?') ) { return; }
+
     const jwt_token = $("#Config").data('jwt-token')
     const action_path = $(this).data('url')
     const out = []
@@ -45,7 +47,75 @@ $(document).ready(() => {
 
   })
 
+  $(".add-tag-btn").click(function(e) {
+    if ( !confirm('Are you sure?') ) { return; }
+
+    const jwt_token = $("#Config").data('jwt-token')
+    const action_path = $(this).data('url')
+    const emailtag = $("select[name='emailtag']").val()
+    const out = []
+
+    $( $("input[type='checkbox'].i-sel:checked") ).each( idx => {
+      let val = $($("input[type='checkbox'].i-sel:checked")[idx]).val()
+      out.push(val)
+    })
+
+    $.ajax({
+      url: action_path,
+      type: 'POST',
+      data: {
+        ids: out,
+        jwt_token: jwt_token,
+        emailtag: emailtag,
+
+      },
+      success: e => {
+        logg((e||{}).responseText, 'Ok')
+        location.reload()
+      },
+      error: e => {
+        logg((e||{}).responseText, 'Err')
+      },
+    })
+
+  })
+
+  $(".remove-tag-btn").click(function(e) {
+    if ( !confirm('Are you sure?') ) { return; }
+
+    const jwt_token = $("#Config").data('jwt-token')
+    const action_path = $(this).data('url')
+    const emailtag = $("select[name='emailtag']").val()
+    const out = []
+
+    $( $("input[type='checkbox'].i-sel:checked") ).each( idx => {
+      let val = $($("input[type='checkbox'].i-sel:checked")[idx]).val()
+      out.push(val)
+    })
+
+    $.ajax({
+      url: action_path,
+      type: 'POST',
+      data: {
+        ids: out,
+        jwt_token: jwt_token,
+        emailtag: emailtag,
+
+      },
+      success: e => {
+        logg((e||{}).responseText, 'Ok')
+        location.reload()
+      },
+      error: e => {
+        logg((e||{}).responseText, 'Err')
+      },
+    })
+
+  })
+
   $(".delete-btn").click(function(e) {
+    if ( !confirm('Are you sure?') ) { return; }
+
     const jwt_token = $("#Config").data('jwt-token')
     const action_path = $(this).data('url')
     const out = []

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

@@ -10,8 +10,8 @@
  * 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.
- */
- function logg (a, b="", c=null) {
+**/
+function logg (a, b="", c=null) {
   c = "string" === typeof c ? c : b.replace(/\W/g, "");
   if (c.length > 0) {
     window[c] = a;

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

@@ -5,6 +5,7 @@
  * require ish_manager/vendor/summernote-bs4.min
  *
  *= require ish_manager/variables
+ *= require ish_manager/utils_bootstrap
  *= require_self
  *= require ish_manager/appliances
  *= require ish_manager/email_contexts
@@ -15,7 +16,8 @@
  *= require ish_manager/galleries
  *= require ish_manager/iro
  *= require ish_manager/iro1
- *= require ish_manager/leads_leadsets
+ *= require ish_manager/leads
+ *= require ish_manager/leadsets
  *= require ish_manager/leadsets
  *= require ish_manager/maps
  *= require ish_manager/markers
@@ -99,11 +101,7 @@ ul:not(.browser-default).bullets, {
   width: 100vwh;
   overflow-x: auto;
 }
-// .application-home {
-//   .bordered-card {
-//     display: inline-block;
-//   }
-// }
+
 
 
 /* B */
@@ -137,14 +135,6 @@ table.bordered {
   }
 }
 
-// .bordered-card {
-//   border: 1px solid grey;
-//   padding: .5em;
-//   border-radius: 8px;
-//   margin-bottom: .5em;
-//   padding: 0.5em;
-// }
-
 .btn {
   border: 1px solid red;
 }
@@ -167,6 +157,14 @@ table.bordered {
   text-align: center;
 }
 
+.chip {
+  display: inline;
+
+  border: 1px solid #eee;
+  border-radius: 0.5em;
+  padding: 0.1em .3em;
+  background: #fff;
+}
 .chip {
   // border: 1px solid black;
   border-radius: 1em 0 0 1em;
@@ -269,6 +267,12 @@ table.dataTable {
 
 
 
+.doc {
+  max-width: 555px;
+}
+
+/* E */
+
 .expand-hide {
   display: none;
   position: absolute;
@@ -423,6 +427,12 @@ textarea.large {
   background: url('//d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/10/05192822/weather-bg-development.png');
 }
 
+#mainW {
+  // border: 1px solid red;
+  margin-top: -20px;
+  font-size: .8em;
+}
+
 .manager--main-footer {
   background: url('//d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/10/05192823/weather-bg.png');
   border-top: 2px solid red;
@@ -534,6 +544,9 @@ textarea.large {
   height: 100px;
 }
 
+
+
+
 /* U */
 
 /* V */

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

@@ -56,70 +56,6 @@
     }
   }
 
-  .leads-list {
-    margin: 1em 0;
-
-    .item {
-      display: inline;
-
-      border: 1px solid green;
-      border-radius: 0.5em;
-      padding: 0.5em;
-
-      margin-right: 0.5em;
-
-    }
-  }
-
-  /* these are inside a conversation. _vp_ 2023-02-28 */
-  .messages-list {
-    // border: 1px solid red;
-
-    padding-left: 0;
-    list-style-type: none;
-
-    .item:first-child {
-      border-top: 1px solid var(--m3-dol-accent-color);
-    }
-    .item {
-      border-bottom: 1px solid var(--m3-dol-accent-color);
-      margin-bottom: 0.2em;
-
-      padding: 0.5em 0;
-
-      iframe {
-        // border: 2px solid yellow;
-
-        width: 100%;
-        min-height: 500px;
-        height: 75vh;
-      }
-
-      .my-actions {
-        display: flex;
-        flex-direction: column;
-      }
-
-      .preview {
-        // border: 1px solid gold;
-
-        display: inline-block;
-        width: 100%;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      .row-1 {
-        display: flex;
-        justify-content: space-between;
-      }
-
-      .to-expand {
-        display: none;
-      }
-    }
-  }
 
   .participants {
     width: 250px;
@@ -155,6 +91,10 @@
   .subject {
     margin: 0 1em;
     font-weight: bold;
+
+    &:before {
+      content: "Subj: ";
+    }
   }
 
 

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

@@ -1,4 +1,55 @@
 
+.email-messages-list {
+  // border: 1px solid red;
+
+  padding-left: 0;
+  list-style-type: none;
+
+  .item:first-child {
+    border-top: 1px solid var(--m3-dol-accent-color);
+  }
+  .item {
+    border-bottom: 1px solid var(--m3-dol-accent-color);
+    margin-bottom: 0.2em;
+
+    padding: 0.5em 0;
+
+    position: relative;
+
+    iframe {
+      // border: 2px solid yellow;
+
+      width: 100%;
+      min-height: 500px;
+      height: 75vh;
+    }
+
+    .my-actions {
+      display: flex;
+      flex-direction: column;
+    }
+
+    .preview {
+      // border: 1px solid gold;
+
+      display: inline-block;
+      width: 100%;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    .row-1 {
+      display: flex;
+      justify-content: space-between;
+    }
+
+    .to-expand {
+      display: none;
+    }
+  }
+}
+
 .email-messages-show {
 
   .main-actions {

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

@@ -0,0 +1,26 @@
+
+
+.leads-list {
+  margin: 1em 0;
+
+  .item {
+    /* display-block in email-conversations-show */
+    // display: inline;
+
+    border: 1px solid green;
+    border-radius: 0.5em;
+    padding: 0.5em;
+    margin: 0 0.5em 0.5em 0;
+
+  }
+}
+
+// .manager-leads-index {
+//   th.company-url {
+//     width: 10px;
+//   }
+//   th.created-at,
+//   td.created-at {
+//     width: 200px;
+//   }
+// }

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

@@ -1,4 +1,78 @@
 
+
+.leadsets-index {
+  padding: 1em;
+
+  > .actions label {
+    border: 1px solid #fff;
+    padding: 0.5em;
+    border-radius: 0.5em;
+    background: #eee;
+
+    > * {
+      display: inline;
+    }
+  }
+
+  th.leads {
+    margin-left: 1em;
+  }
+  td.leads {
+    margin-left: 1em;
+    vertical-align: top;
+
+    .item {
+      display: flex;
+      align-items: flex-start;
+
+      .actions {
+        display: flex;
+      }
+    }
+  }
+
+  form.form-mini {
+    border: 1px solid red;
+    border-radius: .5em;
+    padding: 1em;
+    background: white;
+
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    position: absolute;
+    top: 0;
+    width: 300px;
+    right: -300px;
+
+    z-index: 2;
+
+    .field {
+      display: flex;
+    }
+
+    .actions {
+      margin-top: .5em;
+      width: 100%;
+      text-align: right;
+    }
+  }
+
+  .scheduled {
+    position: relative;
+    display: flex;
+
+    .chip {
+      border: 2px solid cyan;
+      display: flex;
+      flex-direction: column;
+    }
+  }
+
+}
+
+
 .leadsets-show {
   .serverhosts--index {
     li.leadset_id {

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

@@ -1,4 +1,20 @@
 
+
+.tags {
+  // background: #eee;
+
+  display: flex;
+  flex-wrap: wrap;
+
+  max-width: 400px;
+}
+
+.tags-add {
+  position: relative;
+  vertical-align: top;
+}
+
+
 form.tags--form-mini {
   display: flex;
 }
@@ -25,4 +41,3 @@ form.tags--form-mini {
   }
 }
 
-

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

@@ -0,0 +1,21 @@
+
+/* I */
+
+.inline-block {
+  form {
+    display: inline-block;
+  }
+}
+
+/* R */
+
+.right-0 {
+  right: 0;
+}
+
+/* T */
+
+.top-0 {
+  top: 0;
+}
+

data/app/controllers/ish_manager/categories_controller.rb

@@ -22,5 +22,12 @@ class ::IshManager::CategoriesController < IshManager::ApplicationController
     @leads = @leads.page( params[:leads_page] ).per( current_profile.per_page )
   end
 
+  def create_email_tag
+    @tag = WpTag.emailtag( params[:tag][:name] )
+    authorize! :create, @tag
+    @tag.persisted? ? flash_notice('persisted') : flash_alert('cannot save tag')
+    redirect_to request.referrer ? request.referrer : email_conversations_path
+  end
+
 end
 

data/app/controllers/ish_manager/email_conversations_controller.rb

@@ -7,6 +7,10 @@ class ::IshManager::EmailConversationsController < IshManager::ApplicationContro
     authorize! :email_conversations_index, IshManager::Ability
     @email_conversations = ::Office::EmailConversation.all
 
+    @new_tag = WpTag.new
+    @emailtags = WpTag.emailtags
+    @emailtags_list = [[nil,nil]] + WpTag.emailtags.map { |p| [ p.name, p.slug ] }
+
     per_page = current_profile.per_page
     # if current_profile.per_page > 100
     #   flash_notice "Cannot display more than 100 conversations per page."

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

@@ -3,21 +3,26 @@
 
   .second-header
     %i.material-icons mail
-    = link_to email_conversations_in_path(WpTag::INBOX) do
-      Inbox (#{Office::EmailConversation.in_emailtag(WpTag::INBOX).length})
-    = link_to email_conversations_notin_path(WpTag::INBOX) do
-      Not Inbox (#{Office::EmailConversation.not_in_emailtag(WpTag::INBOX).length})
-
-    = link_to email_conversations_in_path(WpTag::TRASH) do
-      Trash (#{Office::EmailConversation.in_emailtag(WpTag::TRASH).length})
-    = link_to email_conversations_notin_path(WpTag::TRASH) do
-      Not Trash (#{Office::EmailConversation.not_in_emailtag(WpTag::TRASH).length})
 
     - if params[:slug]
       slug: #{params[:slug]}
     - if params[:not_slug]
       not slug: #{params[:not_slug]}
 
+    - @emailtags.each do |emailtag|
+      .bordered.inline-block
+        = link_to email_conversations_in_path(emailtag.slug) do
+          #{emailtag.name} (#{Office::EmailConversation.in_emailtag(emailtag.slug).length})
+        = link_to email_conversations_notin_path(emailtag.slug) do
+          Not #{emailtag.name} (#{Office::EmailConversation.not_in_emailtag(emailtag.slug).length})
+
+
+    .bordered.inline-block
+      = form_for @new_tag, url: :create_email_tag, as: :tag do |f|
+        %label New Tag:
+        = f.text_field :name
+        = f.submit '>'
+
   .actions
 
     %a.btn.archive-btn{ href: "javascript: void(0)", data: { url: "/api/email_conversations/rmtag/#{WpTag::INBOX}" } }
@@ -30,6 +35,17 @@
       %i.material-icons refresh
       refresh
 
+    .bordered.inline-block
+      = select_tag :emailtag, options_for_select(@emailtags_list)
+      %a.btn.add-tag-btn{ href: "javascript: void(0)", data: { url: "/api/email_conversations/addtag" } }
+        %i.material-icons add
+        Addtag
+      %a.btn.remove-tag-btn{ href: "javascript: void(0)", data: { url: "/api/email_conversations/rmtag" } }
+        %i.material-icons remove
+        Rmtag
+
+
+
   %br
   %br
   = render 'paginate',  resource: @email_conversations, param_name: :conv_page, views_prefix: :ish_manager

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

@@ -1,79 +1,82 @@
 
-.email-conversations-show
+.email-conversations-show.padded
+  .row
+    .col-sm-12.col-md-8
 
-  .padded
+      .email-messages-list
+        - @email_messages.each do |msg|
+          - lead = msg.lead || Lead.new(email: 'NO LEAD!', id: 'no lead')
 
-    .header
-      = link_to '[<<-]', email_conversations_path
-      %i.material-icons mail
+          .item.msg-container{ data: { msg: { id: msg.id } } }
+            .gray.row
+              .col-md-6
+                .a <b>From:</b> #{lead.email}
+                .a <b>To:</b> #{msg.to}
+              .col-md-6
+                .a <b>msg.id:</b> #{msg.id}
+                .a <b>object_key:</b> #{msg.object_key}
 
-      .subject #{@email_conversation.subject}
-      (#{@email_conversation.email_messages.all.count})
 
-    .tags-list
-      %b Tags (#{@email_conversation.tags.length}):
-      -# = @email_conversation.wp_term_ids
-      - @email_conversation.tags.each do |tag|
-        .chip= link_to "[#{tag.term_id}] #{tag.name}", category_path( tag )
+              .position-absolute.top-0.right-0.datetime
+                .date= msg.date&.strftime('%Y-%m-%d') || 'none'
+                .time= msg.date&.strftime('%l:%M%P') || 'none'
 
-    .leads-list
-      %b Leads (#{@email_conversation.leads.length}):
-      - @email_conversation.leads.each do |lead|
-        .item
-          = link_to "#{lead.id} #{lead.email}", lead_path(lead)
-          \(ctxs:
-          = link_to email_contexts_for_lead_path( lead ) do
-            = lead.email_contexts.count
-            %i.fa.fa-envelope
-          .relative.inline-block
-            %i.fa.fa-plus.expand-next
-            .expand-hide= render 'ish_manager/email_contexts/form', ctx: Ctx.new({ lead_id: lead.id, email_template: Tmpl.blank })
-          \)
-          .relative.inline-block
-            %i.fa.fa-clock-o.expand-next{ style: "color: red;" }
-            .expand-hide= render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
+            .row-2
+              .flexy
+                = link_to "Expand w/img", ishapi.email_message_path(msg, jwt_token: @jwt_token, load_images: true ), target: msg.message_id, class: 'preview-btn', data: { msg: { id: msg.id.to_s } }
+                \- or -
+                = link_to "Expand",       ishapi.email_message_path(msg, jwt_token: @jwt_token ),                    target: msg.message_id, class: 'preview-btn', data: { msg: { id: msg.id.to_s } }
+                = msg.preview_str
 
-    .messages-list
-      - @email_messages.each do |msg|
-        - lead = msg.lead || Lead.new(email: 'NO LEAD!', id: 'no lead')
+              .ml-200.to-expand
 
-        .item.msg-container{ data: { msg: { id: msg.id } } }
-          .row-1
-            .gray
-              <b>From:</b> #{lead.email}
-              <b>To:</b> #{msg.to}
-              = msg.id
-              <b>object_key:</b> #{msg.object_key}
+                - if msg.attachments.present?
+                  .attachments
+                    - msg.attachments.map do |att|
+                      .item
+                        %h5= att.photo.original_filename
+                        = image_tag att.photo.url(:original)
 
+                %iframe{ name: msg.message_id }
 
-            .datetime
-              .date= msg.date&.strftime('%Y-%m-%d')
-              .time= msg.date&.strftime('%l:%M%P')
+                = render 'ish_manager/email_contexts/form_reply', lead: lead
+                .collapse-expand.wco-collapse Reply
+                .bordered.mt-3.wco-collapsed
+                  = render 'ish_manager/email_contexts/form', ctx: Ctx.new({ lead_id: lead.id, email_template: Tmpl.blank_template, from_email: msg.to, subject: msg.subject, body: (msg.part_html||msg.part_txt) }), lead: lead
+                -# = button_to 'Reply'
+                -# = button_to 'Reply All'
+                -# = button_to 'New Template'
+                -# = button_to 'Schedule Reply'
+                -# = render 'ish_manager/email_templates/form_schedule_mini'
 
-          .row-2
-            .flexy
-              = link_to "Expand w/img", ishapi.email_message_path(msg, jwt_token: @jwt_token, load_images: true ), target: msg.message_id, class: 'preview-btn', data: { msg: { id: msg.id.to_s } }
-              \- or -
-              = link_to "Expand",       ishapi.email_message_path(msg, jwt_token: @jwt_token ),                    target: msg.message_id, class: 'preview-btn', data: { msg: { id: msg.id.to_s } }
-              = msg.preview_str
+    .col-sm-12.col-md-4
 
-            .ml-200.to-expand
+      .header
+        = link_to '[<<-]', email_conversations_path
+        %i.material-icons mail
 
-              - if msg.attachments.present?
-                .attachments
-                  - msg.attachments.map do |att|
-                    .item
-                      %h5= att.photo.original_filename
-                      = image_tag att.photo.url(:original)
+        .subject #{@email_conversation.subject}
+        (#{@email_conversation.email_messages.all.count})
 
-              %iframe{ name: msg.message_id }
+      .tags-list
+        %b Tags (#{@email_conversation.tags.length}):
+        -# = @email_conversation.wp_term_ids
+        - @email_conversation.tags.each do |tag|
+          .chip= link_to "[#{tag.term_id}] #{tag.name}", category_path( tag )
 
-              = render 'ish_manager/email_contexts/form_reply', lead: lead
-              .collapse-expand.wco-collapse Reply
-              .bordered.mt-3.wco-collapsed
-                = render 'ish_manager/email_contexts/form', ctx: Ctx.new({ lead_id: lead.id, email_template: Tmpl.blank_template, from_email: msg.to, subject: msg.subject, body: (msg.part_html||msg.part_txt) }), lead: lead
-              -# = button_to 'Reply'
-              -# = button_to 'Reply All'
-              -# = button_to 'New Template'
-              -# = button_to 'Schedule Reply'
-              -# = render 'ish_manager/email_templates/form_schedule_mini'
+      .leads-list
+        %b Leads (#{@email_conversation.leads.length}):
+        - @email_conversation.leads.each do |lead|
+          .item
+            = link_to "#{lead.id} #{lead.email}", lead_path(lead)
+            \(ctxs:
+            = link_to email_contexts_for_lead_path( lead ) do
+              = lead.email_contexts.count
+              %i.fa.fa-envelope
+            .relative.inline-block
+              %i.fa.fa-plus.expand-next
+              .expand-hide= render 'ish_manager/email_contexts/form', ctx: Ctx.new({ lead_id: lead.id, email_template: Tmpl.blank })
+            \)
+            .relative.inline-block
+              %i.fa.fa-clock-o.expand-next{ style: "color: red;" }
+              .expand-hide= render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })

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

@@ -20,7 +20,7 @@
       .row
         - galleries.each do |g|
           .col-sm-12.col-md-6
-            .bordered-card
+            .Card
               %h5
                 = link_to '[~]', edit_gallery_path( g )
                 = link_to g.name, gallery_path(g.slug)

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

@@ -1,5 +1,5 @@
 
-.manager-leadsets-index
+.leadsets-index
   %h5
     = link_to 'Leadsets', leadsets_path
     (#{Leadset.kept.length})

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

@@ -1,5 +1,5 @@
 
-.manager-leadsets-index
+.leadsets-index
   %h5
     = link_to 'Leadsets', leadsets_path
     (#{Leadset.kept.length})

data/config/routes.rb

@@ -15,6 +15,7 @@ IshManager::Engine.routes.draw do
   resources :appliance_tmpls
 
   # get 'categories', to: 'categories#index'
+  post '/categories/create-email-tag', to: 'categories#create_email_tag', as: :create_email_tag
   resources :categories
 
   resources 'events'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.495
+  version: 0.1.8.497
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-29 00:00:00.000000000 Z
+date: 2023-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -464,7 +464,7 @@ files:
 - app/assets/stylesheets/ish_manager/galleries.scss
 - app/assets/stylesheets/ish_manager/iro.scss
 - app/assets/stylesheets/ish_manager/iro1.scss
-- app/assets/stylesheets/ish_manager/leads_leadsets.scss
+- app/assets/stylesheets/ish_manager/leads.scss
 - app/assets/stylesheets/ish_manager/leadsets.scss
 - app/assets/stylesheets/ish_manager/maps.scss
 - app/assets/stylesheets/ish_manager/markers.scss
@@ -477,6 +477,7 @@ files:
 - app/assets/stylesheets/ish_manager/tags.scss
 - app/assets/stylesheets/ish_manager/trash/pagination.scss
 - app/assets/stylesheets/ish_manager/user_profiles.scss
+- app/assets/stylesheets/ish_manager/utils_bootstrap.scss
 - app/assets/stylesheets/ish_manager/variables.css
 - app/assets/stylesheets/ish_manager/vendor/jquery-ui.css
 - app/assets/stylesheets/ish_manager/vendor/summernote-bs4.min.css
@@ -568,6 +569,8 @@ 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/202310 Email Templates/_acknowledgement_of_document_receipt.html.erb
+- app/views/202310 Email Templates/_support_ticket_created.html.erb
 - app/views/ish_manager/analytics/_menu.haml
 - app/views/ish_manager/analytics/index.haml
 - app/views/ish_manager/analytics/test.haml
@@ -639,7 +642,30 @@ files:
 - 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/_acknowledgement_of_document_receipt.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_black_friday.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_christmas.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_cinco_de_mayo.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_columbus_day.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_cyber_monday.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_easter.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_fathers_day.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_flag_day.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_groundhog_day.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_halloween.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_inauguration_day.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_independence_day.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_juneteenth.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_labor_day.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_may_forth.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_memorial_day.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_mlk.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_mothers_day.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_newyear.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_presidents_day.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_st_patricks.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_thanksgiving.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_valentines.html.erb
+- app/views/ish_manager/email_template_holiday_cards/_m202309_holiday_veterans_day.html.erb
 - 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
@@ -648,30 +674,6 @@ files:
 - app/views/ish_manager/email_templates/_m20221201react.html.erb
 - app/views/ish_manager/email_templates/_m20221222merryxmas.html.erb
 - app/views/ish_manager/email_templates/_m202309_feedback.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_black_friday.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_christmas.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_cinco_de_mayo.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_columbus_day.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_cyber_monday.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_easter.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_fathers_day.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_flag_day.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_groundhog_day.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_halloween.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_inauguration_day.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_independence_day.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_juneteenth.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_labor_day.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_may_forth.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_memorial_day.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_mlk.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_mothers_day.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_newyear.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_presidents_day.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_st_patricks.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_thanksgiving.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_valentines.html.erb
-- app/views/ish_manager/email_templates/_m202309_holiday_veterans_day.html.erb
 - app/views/ish_manager/email_templates/_m202309_ror4.html.erb
 - app/views/ish_manager/email_templates/_marketing_node_1.html.erb
 - app/views/ish_manager/email_templates/_marketing_react_1.html
@@ -691,7 +693,6 @@ files:
 - app/views/ish_manager/email_templates/_slug-1.html.erb
 - app/views/ish_manager/email_templates/_slug-2.html.erb
 - app/views/ish_manager/email_templates/_slug-3.html.erb
-- app/views/ish_manager/email_templates/_support_ticket_created.html.erb
 - app/views/ish_manager/email_templates/_tracking_footer.html.erb
 - app/views/ish_manager/email_templates/_wasyaco_roundborders.html.erb
 - app/views/ish_manager/email_templates/_wasyaco_social.html.erb
@@ -699,7 +700,6 @@ files:
 - app/views/ish_manager/email_templates/iframe_src.haml
 - app/views/ish_manager/email_templates/index.haml
 - app/views/ish_manager/email_templates/new.haml
-- app/views/ish_manager/email_templates/plain.html.erb-trash
 - app/views/ish_manager/email_templates/show.haml
 - app/views/ish_manager/email_unsubscribes/new.haml
 - app/views/ish_manager/events/_form.haml

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

@@ -1,115 +0,0 @@
-
-.doc {
-  max-width: 555px;
-}
-
-.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 #fff;
-    padding: 0.5em;
-    border-radius: 0.5em;
-    background: #eee;
-
-    > * {
-      display: inline;
-    }
-  }
-
-
-  .chip {
-    display: inline;
-
-    border: 1px solid #eee;
-    border-radius: 0.5em;
-    padding: 0.1em .3em;
-    background: #fff;
-  }
-
-
-  th.leads {
-    margin-left: 1em;
-  }
-  td.leads {
-    margin-left: 1em;
-    vertical-align: top;
-
-    .item {
-      display: flex;
-      align-items: flex-start;
-
-      .actions {
-        display: flex;
-      }
-    }
-  }
-
-  form.form-mini {
-    border: 1px solid red;
-    border-radius: .5em;
-    padding: 1em;
-    background: white;
-
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    position: absolute;
-    top: 0;
-    width: 300px;
-    right: -300px;
-
-    z-index: 2;
-
-    .field {
-      display: flex;
-    }
-
-    .actions {
-      margin-top: .5em;
-      width: 100%;
-      text-align: right;
-    }
-  }
-
-  .scheduled {
-    position: relative;
-    display: flex;
-
-    .chip {
-      border: 2px solid cyan;
-      display: flex;
-      flex-direction: column;
-    }
-  }
-
-  /* belongs here, not in tags.scss */
-
-  .tags {
-    // background: #eee;
-
-    display: flex;
-    flex-wrap: wrap;
-
-    max-width: 400px;
-  }
-
-  .tags-add {
-    position: relative;
-    vertical-align: top;
-  }
-
-
-}
-

data/app/views/ish_manager/email_templates/plain.html.erb-trash

@@ -1,4 +0,0 @@
-
-
-<%= raw @tmpl.body %>
-