ish_manager 0.1.8.509 → 0.1.8.510

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd13ef71c3bd12569b9401a9be38e9046c15bca41e4ff0bd9ca73335098effef
-  data.tar.gz: 98929b528624c57bc4c7b7b1f37a5170037037124dc656adad7f207bd5b18bcb
+  metadata.gz: 7410ad605ec60a2c1d3e18d12a0941f8178e8274d1db191a6767be2b82e4b25c
+  data.tar.gz: 7fd2f22743700b5b9e3e94ed171af40072b3873bde876d3d29f40d59edb7f5d8
 SHA512:
-  metadata.gz: 6e3c2c79bcbeb9320091dfbe14061f752a5218694e5ba3ade53e376c4c7e85be929833a41705690364bf835f9df3de7d9263855910675bdeb19003e1d1c774c1
-  data.tar.gz: 6b627e65b3a1deec14978d8bcd158edfa05581c7a7d9bb50d9ea8bc3afea428ba6017ca96740efa1a4c4d2d7ff6ac5a45db8c68d0c3608813a9e53031bbf7622
+  metadata.gz: 499d5267cc3bd622f3d5a8a5e871fa696ca4beeadc6db550decb10849777024577304aaf4b9dc5c971ff23378cf1757fa8bb7fbde30549b6c56d5954a6258ef4
+  data.tar.gz: fa5cc5925197cfba2fdbd27648e36c2dcbc8bb019bd2ba48a5986fbcad77eeccde2396090a40d71b4dda235089459c8887f070a9943c51c94288fe69e5c2d867

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

@@ -144,13 +144,13 @@ $(function () {
       lengthChange: true,
       lengthMenu: [[10, 25, 100, -1], [10, 25, 100, 'All']],
       pageLength: -1,
+      aoColumnDefs: [ {
+        bSortable: false,
+        aTargets: [ "nosort" ],
+      } ],
+      order: [ 4, 'desc' ],
     }
-    // $('#dataTable').DataTable(_props)
-    var dataTable = $('.data-table').DataTable(_props)
-
-    $('#dataTableSearch').on( 'keyup', function () {
-      dataTable.search( this.value ).draw();
-  } );
+    $('.data-table').DataTable(_props)
   }
 
   if ('function' === typeof $('body').datepicker) {

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

@@ -249,6 +249,11 @@ table.dataTable {
   box-sizing: border-box;
   background: white;
 
+  thread {
+    th {
+      padding: 8px 10px;
+    }
+  }
 }
 
 .datetime {

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

@@ -39,10 +39,10 @@
     }
   }
 
-  // refers to number of messages in a conversation
+  /* refers to number of messages in a conversation */
   .count {
-    display: inline;
-    width: 30px;
+    // display: inline;
+    // width: 30px;
     text-align: right;
   }
 
@@ -83,17 +83,20 @@
     }
   }
 
-  .select-all.chip {
+  .select-all {
+    // border: 1px solid red;
+
     display: flex;
-    border: 1px solid cyan;
+
+    padding: 8px 10px;
   }
 
   .subject {
     margin: 0 1em;
-    font-weight: bold;
+    text-overflow: ellipsis;
 
-    &:before {
-      content: "Subj: ";
+    a {
+      font-weight: bold;
     }
   }
 

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

@@ -73,11 +73,11 @@
   %table.conversations.bordered.data-table
     %thead
       %tr
-        %th
-          .chip.select-all
-            = check_box_tag :select_all
-            .n-selected -
-        %th Msgs
+        %th.select-all.nosort
+          = check_box_tag :select_all
+          .n-selected -
+        %th.nosort
+          -#  N Msgs
         %th From emails
         %th Subject
         %th Datetime
@@ -95,6 +95,7 @@
 
           %td.subject
             = link_to conv.subject, email_conversation_path( conv )
+            = conv.preview
 
           %td
             .datetime

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

@@ -12,8 +12,6 @@
           - if new_from_email.blank?
             - new_from_email = Ish::EmailTemplate::DEFAULT_FROM_EMAIL
 
-          - all_ccs = [] + (msg.tos||[]) + (msg.ccs||[]) + (msg.froms||[])
-
           .item.msg-container{ data: { msg: { id: msg.id } } }
             .gray.row
               .col-md-6
@@ -31,10 +29,10 @@
                   - msg.email_attachments.each_with_index do |attachment, idx|
                     - if attachment.filename
                       .a= link_to attachment.filename, email_attachment_path( attachment )
-                    - else
-                      .a
-                        = link_to '[view]', email_attachment_path( attachment )
-                        "#{attachment.content_type.split(';')[0]} #{attachment.filename} #{idx}"
+                    -# - else
+                    -#   .a
+                    -#     = link_to '[view]', email_attachment_path( attachment )
+                    -#     "#{attachment.content_type.split(';')[0]} #{attachment.filename} #{idx}"
 
 
               .position-absolute.top-0.right-0.datetime
@@ -67,8 +65,8 @@
                   - new_ctx[:lead_id] = lead.id
                   - new_ctx[:from_email] = new_from_email
                   - new_ctx[:subject] = msg.subject
-                  - new_ctx[:body] = Ish::EmailTemplate::SIGNATURE + ActionView::Base.full_sanitizer.sanitize( msg.part_html )
-                  - new_ctx[:cc] = all_ccs.join(', ')
+                  - new_ctx[:body] = Ish::EmailTemplate::SIGNATURE + msg.body_sanitized
+                  - new_ctx[:cc] = msg.all_ccs.join(', ')
 
                   = render 'ish_manager/email_contexts/form', ctx: new_ctx
 

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

@@ -12,7 +12,6 @@
     = render 'form', email_filter: @email_filter
   %hr
 
-  -# %input#dataTableSearch
   %table.bordered.data-table
     %thead
       %tr

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.509
+  version: 0.1.8.510
 platform: ruby
 authors:
 - piousbox