ish_manager 0.1.8.420 → 0.1.8.421
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/email_conversations.js +10 -9
- data/app/assets/stylesheets/ish_manager/email_conversations.scss +15 -14
- data/app/controllers/ish_manager/events_controller.rb +1 -1
- data/app/controllers/ish_manager/newsitems_controller.rb +6 -4
- data/app/views/ish_manager/application/_main_header_admin.haml +2 -2
- data/app/views/ish_manager/email_conversations/show.haml +19 -10
- data/app/views/ish_manager/galleries/_menu.haml +2 -4
- data/app/views/ish_manager/photos/_meta.haml +0 -2
- data/app/views/ish_manager/photos/show.haml +5 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3ed09f47dd1da9f389ed8d851a0606dae2f4596f617066c8a8aea021c661dd59
|
|
4
|
+
data.tar.gz: 124439f5be8caf79bd98e022c65c190a4ac58f54fc597279120b18bb24cc5b31
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c8f6cd77abbfce756e35bb9f918c071285828b43d17c0b176bab36438fa357f294e41b1e875e83accac69de0d767031b2034c2209534eac7c95e0d7bbf2e792d
|
|
7
|
+
data.tar.gz: 2c84c3cd1d4f4a1857e256b08d82d443725f0828de3b12a6f2d6c6f99724dcca2e3ea2949609343877ef9c3e80d6f7b3b23037417236cd6fc2acb605426e9e4f
|
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
|
|
2
2
|
$(document).ready(() => {
|
|
3
3
|
|
|
4
|
-
$("body.email_conversations-show
|
|
5
|
-
// logg(
|
|
4
|
+
$("body.email_conversations-show .preview-btn").click(function(e) {
|
|
5
|
+
// logg($(this).data(), 'clicked')
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
var msgId = $(this).data().msg.id
|
|
8
|
+
var msgC = $(`.msg-container[data-msg-id='${msgId}']`) // msgContainer
|
|
9
|
+
|
|
10
|
+
if ($(msgC).data('expanded')) {
|
|
11
|
+
$(msgC).data('expanded', false)
|
|
12
|
+
msgC.find(".to-expand").css('display', 'none')
|
|
11
13
|
} else {
|
|
12
|
-
$(
|
|
13
|
-
|
|
14
|
-
$(this).parent().find("iframe").css('display', 'block')
|
|
14
|
+
$(msgC).data('expanded', true)
|
|
15
|
+
msgC.find(".to-expand").css('display', 'block')
|
|
15
16
|
}
|
|
16
17
|
|
|
17
18
|
})
|
|
@@ -86,10 +86,19 @@
|
|
|
86
86
|
border-bottom: 1px solid yellow;
|
|
87
87
|
margin-bottom: 0.2em;
|
|
88
88
|
|
|
89
|
-
.expand {
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
89
|
+
// .expand {
|
|
90
|
+
// border: 1px solid red;
|
|
91
|
+
// max-height: 500px;
|
|
92
|
+
// overflow: auto;
|
|
93
|
+
// }
|
|
94
|
+
|
|
95
|
+
iframe {
|
|
96
|
+
border: 2px solid yellow;
|
|
97
|
+
|
|
98
|
+
width: 100%;
|
|
99
|
+
min-height: 500px;
|
|
100
|
+
height: 80vh;
|
|
101
|
+
// display: none;
|
|
93
102
|
}
|
|
94
103
|
|
|
95
104
|
.my-actions {
|
|
@@ -112,17 +121,9 @@
|
|
|
112
121
|
justify-content: space-between;
|
|
113
122
|
}
|
|
114
123
|
|
|
115
|
-
.
|
|
116
|
-
|
|
117
|
-
border: 2px solid yellow;
|
|
118
|
-
|
|
119
|
-
width: 100%;
|
|
120
|
-
min-height: 500px;
|
|
121
|
-
height: 80vh;
|
|
122
|
-
display: none;
|
|
123
|
-
}
|
|
124
|
+
.to-expand {
|
|
125
|
+
display: none;
|
|
124
126
|
}
|
|
125
|
-
|
|
126
127
|
}
|
|
127
128
|
}
|
|
128
129
|
|
|
@@ -20,7 +20,7 @@ class IshManager::EventsController < ::IshManager::ApplicationController
|
|
|
20
20
|
|
|
21
21
|
def index
|
|
22
22
|
authorize! :manage, Ish::Event
|
|
23
|
-
@events = Ish::Event.all
|
|
23
|
+
@events = Ish::Event.all.order_by({ start_at: :desc })
|
|
24
24
|
if params[:q]
|
|
25
25
|
@events = @events.where({ :name => /#{params[:q]}/i })
|
|
26
26
|
end
|
|
@@ -13,10 +13,12 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
|
|
|
13
13
|
authorize! :create_newsitem, @resource
|
|
14
14
|
|
|
15
15
|
if params[:photo]
|
|
16
|
-
photo = Photo.create(
|
|
17
|
-
:
|
|
18
|
-
|
|
19
|
-
subhead:
|
|
16
|
+
photo = Photo.create({
|
|
17
|
+
descr: params[:descr],
|
|
18
|
+
photo: params[:photo],
|
|
19
|
+
subhead: params[:subhead],
|
|
20
|
+
user_profile: @current_profile,
|
|
21
|
+
})
|
|
20
22
|
@newsitem.photo = photo
|
|
21
23
|
end
|
|
22
24
|
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
= text_field_tag :q
|
|
19
19
|
= link_to '[+]', new_report_path
|
|
20
20
|
%li
|
|
21
|
-
= link_to
|
|
21
|
+
= link_to "Videos (#{Video.all.length})", videos_path
|
|
22
22
|
.inline-search
|
|
23
23
|
= form_tag videos_path, method: :get do
|
|
24
24
|
= text_field_tag :q
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
= text_field_tag :q
|
|
34
34
|
|
|
35
35
|
%li
|
|
36
|
-
= link_to
|
|
36
|
+
= link_to "Locations (#{Location.all.length})", maps_path
|
|
37
37
|
.inline-search
|
|
38
38
|
= form_tag maps_path, method: :get do
|
|
39
39
|
= text_field_tag :q
|
|
@@ -23,24 +23,21 @@
|
|
|
23
23
|
- @email_messages.each do |msg|
|
|
24
24
|
- lead = msg.lead || Lead.new(email: 'NO LEAD!', id: 'no lead')
|
|
25
25
|
|
|
26
|
-
.item
|
|
26
|
+
.item.msg-container{ data: { msg: { id: msg.id } } }
|
|
27
27
|
.row-1
|
|
28
28
|
.gray
|
|
29
29
|
%ul
|
|
30
30
|
%li
|
|
31
31
|
= msg.id
|
|
32
32
|
<b>To:</b> #{msg.to}
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
-# #{msg.from}
|
|
36
|
-
= lead.email
|
|
37
|
-
%a.chip{ href: email_contexts_for_lead_path( lead ) }
|
|
33
|
+
<b>From:</b> #{lead.email}
|
|
34
|
+
= link_to email_contexts_for_lead_path( lead ) do
|
|
38
35
|
\(
|
|
39
36
|
= lead.email_contexts.count
|
|
40
37
|
%i.fa.fa-envelope
|
|
41
38
|
\)
|
|
42
39
|
.relative.inline-block
|
|
43
|
-
%i.fa.fa-clock-o.expand-next
|
|
40
|
+
%i.fa.fa-clock-o.expand-next{ style: "color: red;" }
|
|
44
41
|
.expand-hide= render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
|
|
45
42
|
|
|
46
43
|
.datetime
|
|
@@ -48,11 +45,23 @@
|
|
|
48
45
|
.time= msg.date&.strftime('%l:%M%P')
|
|
49
46
|
|
|
50
47
|
.row-2
|
|
48
|
+
.flexy
|
|
49
|
+
= 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 } }
|
|
50
|
+
\- or -
|
|
51
|
+
= 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 } }
|
|
52
|
+
= msg.preview_str
|
|
53
|
+
|
|
54
|
+
.to-expand
|
|
55
|
+
|
|
56
|
+
- if msg.attachments.present?
|
|
57
|
+
.attachments
|
|
58
|
+
- msg.attachments.map do |att|
|
|
59
|
+
.item
|
|
60
|
+
%h5= att.photo.original_filename
|
|
61
|
+
= image_tag att.photo.url(:original)
|
|
51
62
|
|
|
52
|
-
|
|
53
|
-
%iframe{ name: msg.message_id }
|
|
63
|
+
%iframe{ name: msg.message_id }
|
|
54
64
|
|
|
55
|
-
.my-actions.hide
|
|
56
65
|
= render 'ish_manager/email_contexts/form_reply', lead: lead
|
|
57
66
|
.bordered-card
|
|
58
67
|
= 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
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
|
|
2
2
|
.galleries--menu
|
|
3
3
|
|
|
4
|
-
= link_to
|
|
5
|
-
- if defined?(count)
|
|
6
|
-
(#{count})
|
|
4
|
+
= link_to "Galleries (#{Gallery.all.length})", galleries_path
|
|
7
5
|
|
|
8
6
|
.inline-search
|
|
9
7
|
= form_tag galleries_path, method: :get do
|
|
10
8
|
= text_field_tag :q
|
|
11
9
|
|
|
12
|
-
= link_to '[+]', new_gallery_path
|
|
10
|
+
= link_to '[+]', new_gallery_path
|
|
@@ -2,8 +2,6 @@
|
|
|
2
2
|
.photos-meta.row
|
|
3
3
|
.meta
|
|
4
4
|
On #{ pretty_date photo.created_at }
|
|
5
|
-
-# - unless photo.user.blank?
|
|
6
|
-
-# By #{ link_to photo.user.username, user_path(photo.user.username) }
|
|
7
5
|
- unless photo.gallery.blank?
|
|
8
6
|
In #{ link_to photo.gallery.name, gallery_path(photo.gallery.slug, 0) }
|
|
9
7
|
= photo.name unless photo.name.blank?
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ish_manager
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.8.
|
|
4
|
+
version: 0.1.8.421
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- piousbox
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2023-04-
|
|
11
|
+
date: 2023-04-13 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|