ish_manager 0.1.8.508 → 0.1.8.510
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/ish_manager/application.js +6 -6
- data/app/assets/stylesheets/ish_manager/application.scss +5 -0
- data/app/assets/stylesheets/ish_manager/email_conversations.scss +11 -8
- data/app/views/ish_manager/email_conversations/index.haml +6 -5
- data/app/views/ish_manager/email_conversations/show.haml +6 -8
- data/app/views/ish_manager/email_filters/index.haml +0 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7410ad605ec60a2c1d3e18d12a0941f8178e8274d1db191a6767be2b82e4b25c
|
4
|
+
data.tar.gz: 7fd2f22743700b5b9e3e94ed171af40072b3873bde876d3d29f40d59edb7f5d8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 499d5267cc3bd622f3d5a8a5e871fa696ca4beeadc6db550decb10849777024577304aaf4b9dc5c971ff23378cf1757fa8bb7fbde30549b6c56d5954a6258ef4
|
7
|
+
data.tar.gz: fa5cc5925197cfba2fdbd27648e36c2dcbc8bb019bd2ba48a5986fbcad77eeccde2396090a40d71b4dda235089459c8887f070a9943c51c94288fe69e5c2d867
|
@@ -144,13 +144,13 @@ $(function () {
|
|
144
144
|
lengthChange: true,
|
145
145
|
lengthMenu: [[10, 25, 100, -1], [10, 25, 100, 'All']],
|
146
146
|
pageLength: -1,
|
147
|
+
aoColumnDefs: [ {
|
148
|
+
bSortable: false,
|
149
|
+
aTargets: [ "nosort" ],
|
150
|
+
} ],
|
151
|
+
order: [ 4, 'desc' ],
|
147
152
|
}
|
148
|
-
|
149
|
-
var dataTable = $('.data-table').DataTable(_props)
|
150
|
-
|
151
|
-
$('#dataTableSearch').on( 'keyup', function () {
|
152
|
-
dataTable.search( this.value ).draw();
|
153
|
-
} );
|
153
|
+
$('.data-table').DataTable(_props)
|
154
154
|
}
|
155
155
|
|
156
156
|
if ('function' === typeof $('body').datepicker) {
|
@@ -39,10 +39,10 @@
|
|
39
39
|
}
|
40
40
|
}
|
41
41
|
|
42
|
-
|
42
|
+
/* refers to number of messages in a conversation */
|
43
43
|
.count {
|
44
|
-
display: inline;
|
45
|
-
width: 30px;
|
44
|
+
// display: inline;
|
45
|
+
// width: 30px;
|
46
46
|
text-align: right;
|
47
47
|
}
|
48
48
|
|
@@ -83,17 +83,20 @@
|
|
83
83
|
}
|
84
84
|
}
|
85
85
|
|
86
|
-
.select-all
|
86
|
+
.select-all {
|
87
|
+
// border: 1px solid red;
|
88
|
+
|
87
89
|
display: flex;
|
88
|
-
|
90
|
+
|
91
|
+
padding: 8px 10px;
|
89
92
|
}
|
90
93
|
|
91
94
|
.subject {
|
92
95
|
margin: 0 1em;
|
93
|
-
|
96
|
+
text-overflow: ellipsis;
|
94
97
|
|
95
|
-
|
96
|
-
|
98
|
+
a {
|
99
|
+
font-weight: bold;
|
97
100
|
}
|
98
101
|
}
|
99
102
|
|
@@ -73,11 +73,11 @@
|
|
73
73
|
%table.conversations.bordered.data-table
|
74
74
|
%thead
|
75
75
|
%tr
|
76
|
-
%th
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
76
|
+
%th.select-all.nosort
|
77
|
+
= check_box_tag :select_all
|
78
|
+
.n-selected -
|
79
|
+
%th.nosort
|
80
|
+
-# N Msgs
|
81
81
|
%th From emails
|
82
82
|
%th Subject
|
83
83
|
%th Datetime
|
@@ -95,6 +95,7 @@
|
|
95
95
|
|
96
96
|
%td.subject
|
97
97
|
= link_to conv.subject, email_conversation_path( conv )
|
98
|
+
= conv.preview
|
98
99
|
|
99
100
|
%td
|
100
101
|
.datetime
|
@@ -12,8 +12,6 @@
|
|
12
12
|
- if new_from_email.blank?
|
13
13
|
- new_from_email = Ish::EmailTemplate::DEFAULT_FROM_EMAIL
|
14
14
|
|
15
|
-
- all_ccs = (msg.tos||[]) + (msg.ccs||[]) + (msg.froms||[])
|
16
|
-
|
17
15
|
.item.msg-container{ data: { msg: { id: msg.id } } }
|
18
16
|
.gray.row
|
19
17
|
.col-md-6
|
@@ -31,10 +29,10 @@
|
|
31
29
|
- msg.email_attachments.each_with_index do |attachment, idx|
|
32
30
|
- if attachment.filename
|
33
31
|
.a= link_to attachment.filename, email_attachment_path( attachment )
|
34
|
-
- else
|
35
|
-
|
36
|
-
|
37
|
-
|
32
|
+
-# - else
|
33
|
+
-# .a
|
34
|
+
-# = link_to '[view]', email_attachment_path( attachment )
|
35
|
+
-# "#{attachment.content_type.split(';')[0]} #{attachment.filename} #{idx}"
|
38
36
|
|
39
37
|
|
40
38
|
.position-absolute.top-0.right-0.datetime
|
@@ -67,8 +65,8 @@
|
|
67
65
|
- new_ctx[:lead_id] = lead.id
|
68
66
|
- new_ctx[:from_email] = new_from_email
|
69
67
|
- new_ctx[:subject] = msg.subject
|
70
|
-
- new_ctx[:body] = Ish::EmailTemplate::SIGNATURE +
|
71
|
-
- new_ctx[:cc] = all_ccs.join(', ')
|
68
|
+
- new_ctx[:body] = Ish::EmailTemplate::SIGNATURE + msg.body_sanitized
|
69
|
+
- new_ctx[:cc] = msg.all_ccs.join(', ')
|
72
70
|
|
73
71
|
= render 'ish_manager/email_contexts/form', ctx: new_ctx
|
74
72
|
|