ish_manager 0.1.8.355 → 0.1.8.357

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

@@ -1,21 +1,32 @@
 
 .email-contexts-show
+  .header
+    %h2.title Email Context
 
-  %ul
-    %li <b>Title:</b> #{@email_ctx.title}
-    %li <b>From:</b> #{@email_ctx.from_email}
-    %li <b>Subject:</b> #{@email_ctx.subject}
-    %li <b>To:</b> #{@email_ctx.to_email}
-    %li <b>Template:</b> #{@email_ctx.email_template.slug} <b>Type:</b> #{@email_ctx.email_template.type}
-    %li <b>Send at:</b> #{@email_ctx.send_at&.strftime('%Y-%m-%d %l:%M%P')}
-    %li <b>Sent at:</b> #{@email_ctx.sent_at&.strftime('%Y-%m-%d %l:%M%P')}
-    %li
-      = button_to 'Send', email_context_send_path(@email_ctx), form_class: 'inline', :data => { :confirm => 'Are you sure?' }
-      = link_to '[~]', edit_email_context_path(@email_ctx)
+  .row
+    .col-md-4
+      %ul
+        %li <b>From:</b> #{@ctx.from_email}
+        %li <b>To Lead:</b> #{@ctx.lead_id ? @ctx.lead.email : '-'}
+        %li <b>Subject:</b> #{@ctx.subject}
 
-  - if @email_ctx.sent_at
-    = raw @email_ctx.rendered_str
-    = @email_ctx.tmpl
+    .col-md-4
+      %ul
+        %li <b>Template:</b> #{link_to @ctx.email_template.slug, email_template_path(@ctx.email_template), target: :_blank }
+        %li <b>Layout:</b> #{@ctx.email_template.layout}
+
+    .col-md-4
+      %ul
+        %li <b>Send at:</b> #{@ctx.send_at&.strftime('%Y-%m-%d %l:%M%P')}
+        %li <b>Sent at:</b> #{@ctx.sent_at&.strftime('%Y-%m-%d %l:%M%P')}
+        %li
+          = button_to 'Send', email_context_send_path(@ctx), form_class: 'inline', :data => { :confirm => 'Are you sure?' }
+          = link_to '[~]', edit_email_context_path(@ctx)
+
+  - if @ctx.sent_at
+    = raw @ctx.rendered_str
+    = @ctx.tmpl
 
   - else
-    %iframe{ src: email_context_iframe_path(@email_ctx), width: '100%', height: '100%' }
+    = link_to 'i-src', email_context_iframe_path(@ctx), target: :_blank
+    %iframe{ src: email_context_iframe_path(@ctx), width: '100%', height: '100%' }

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

@@ -1,12 +1,49 @@
 
 .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})
+
+  .header
+    %i.material-icons mail
+    Inbox (#{Office::EmailConversation.all.length})
+
+  .actions
+
+    %a.btn.delete-btn{ href: "javascript: void(0)", data: { url: '/api/email_conversations' } }
+      %i.material-icons delete
+    %a.btn.reload-btn{ href: "javascript: location.reload()" }
+      %i.material-icons refresh
+
+  %table.conversations
+    %tr
+      %th
+        .chip.select-all
+          = check_box_tag :select_all
+          .n-selected -
+      %th Msgs
+      %th Leads
+      %th Subject
+      %th Datetime
+      %th Tags
+
+    - @email_conversations.each do |conv|
+      %tr{ class: [ conv.state ] }
+        .item
+          %td= check_box_tag 'email_conversation_ids[]', conv.id.to_s, nil, { class: 'i-sel' }
+          %td.count
+            (#{conv.email_messages.count})
+
+          %td.leads
+            = conv.leads.map { |lead| lead.email }.join(", ")
+
+          %td.subject
+            = link_to conv.subject, email_conversation_path( conv )
+
+          %td.datetime
+            .date= conv.latest_at.strftime('%Y-%m-%d')
+            .time= conv.latest_at.strftime('%l:%M%P')
+
+          %td
+            .tags
+              - conv.tags.each do |tag|
+                .chip
+                  = tag.name
 

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

@@ -1,27 +1,62 @@
 
 .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
+
+  .header.max-width
+    %i.material-icons mail
+    Inbox (#{Office::EmailConversation.all.length})
+
+    = link_to '[<<-]', email_conversations_path
+    -# = link_to '[<-]', email_conversations_path
+    #{@email_conversation.subject}
+    (#{@email_conversation.email_messages.all.count})
+
+  .leads.max-width
+    Leads (#{@email_conversation.leads.length}):
     %ul
-      - @email_conversation.participants.each do |p|
+      - @email_conversation.leads.each do |p|
         %li
-          = p
-          = render 'ish_manager/email_templates/form_reply_mini'
-          = render 'ish_manager/email_templates/form_schedule_mini'
+          = p.email
+          [existing actions?]
+          = render 'ish_manager/email_templates/form_reply_2_mini'
+          = render 'ish_manager/scheduled_actions/form_mini'
 
-  %ul.messages
+
+  .messages.max-width
     - @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]
+      - lead = m.lead || Lead.new(email: 'NO LEAD!', id: 'no lead')
+
+      .item
+        .row-1
+          .gray= m.id
+
+          .chip.from
+            -# = m.from
+            = lead.email
+
+          .relative
+            %a.chip{ href: email_contexts_for_lead_path( lead ) }
+              \(
+              = lead.email_contexts.count
+              %i.fa.fa-envelope
+              \)
+
+          .relative
+            %i.fa.fa-clock-o.expand-next
+            = render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
+
+          .datetime
+            .date= m.date&.strftime('%Y-%m-%d')
+            .time= m.date&.strftime('%l:%M%P')
+
+        .row-2
+          %a.preview{ href: "javascript: void(0)", data: { id: m.id.to_s } }
+            = (ActionView::Base.full_sanitizer.sanitize( m.part_html )||'<no-info>')[0..300]
+          .expand
+
+          .my-actions.hide
+            = render 'ish_manager/email_templates/form_reply_2_mini'
+            -# = button_to 'Reply'
+            -# = button_to 'Reply All'
+            -# = button_to 'New Template'
+            -# = button_to 'Schedule Reply'
+            -# = render 'ish_manager/email_templates/form_schedule_mini'

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

@@ -0,0 +1,12 @@
+
+- url = email_filter.new_record? ? email_filters_path : email_filter_path( email_filter )
+.email-filters--from
+  = form_for email_filter, url: url, as: :email_filter do |f|
+    .field
+      %label From Regex
+      = f.text_field :from_regex
+    .field
+      %label Kind
+      = f.select :kind, options_for_select( ::Office::EmailFilter::KINDS, selected: email_filter.kind )
+    .actions
+      = f.submit

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

@@ -0,0 +1,5 @@
+
+.emails-ns.email-filters-new
+  .header
+    %h2.title Edit Email Filter
+  = render 'form', email_filter: @email_filter

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

@@ -0,0 +1,24 @@
+
+.email-filters-index
+  .header
+    %h2.title
+      Email Filters (#{@email_filters.length})
+      = link_to '[+]', new_email_filter_path
+
+  %table.bordered
+    %tr
+      %th  
+      %th  
+      %th From Regex
+      %th Body Regex
+      %th Kind
+    - @email_filters.each do |ef|
+
+      %tr
+        %td= check_box_tag 'checked'
+        %td= link_to '[~]', edit_email_filter_path(ef)
+        %td= ef.from_regex
+        %td= ef.body_regex
+        %td= ef.kind
+
+

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

@@ -0,0 +1,5 @@
+
+.emails-ns.email-filters-new
+  .header
+    %h2.title New Email Filter
+  = render 'form', email_filter: @email_filter

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

@@ -1,22 +1,41 @@
 
-- url = %w| index new create |.include?( params[:action] ) ? email_templates_path : email_template_path(email_template.id)
+- url = email_template.new_record? ? email_templates_path : email_template_path(email_template.id)
 
 .email-templates--form
+
+  .header
+    %h2 Email Template
+
   = form_for email_template, url: url do |f|
-    .field
-      = f.label :type
-      = f.select :type, options_for_select(Ish::EmailTemplate.type_list, selected: email_template.type)
-    .field
-      = f.label :slug
-      = f.text_field :slug
-    .field
-      = f.label :from_email
-      = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: email_template.from_email)
+    .row
+      .col-md-4
+        .field
+          = f.label :slug
+          = f.text_field :slug
+      .col-md-4
+        .field
+          = f.label :layout
+          = f.select :layout, options_for_select(Ish::EmailTemplate::LAYOUTS, selected: email_template.layout)
+      .col-md-4
+        .field
+          = f.label "From"
+          = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: email_template.from_email)
     .field.field-subject
       = f.label :subject
       = f.text_field :subject
     .field
-      = f.label :body
-      = f.text_area :body, class: 'tinymce'
+      = f.label :preview_str
+      = f.text_field :preview_str
+
+    .tab-labels
+      %a.label-raw{ href: "javascript: void(0)", data: { ref: '.tab-raw' } } Raw
+      %a.label-preview.active{ href: "javascript: void(0)", data: { ref: '.tab-preview' } } Preview
+      .label-save-preview= f.submit 'Save & Preview'
+    .tabs
+      .tab-raw
+        = f.text_area :body
+      .tab-preview
+        -# .descr= render "ish_manager/email_templates/#{email_template.layout}", ctx: Ish::EmailContext.new, tmpl: email_template
+        %iframe{ src: email_template_iframe_path(email_template), width: '100%', height: '100%' }
     .actions
-      = f.submit 'Submit'
+      = f.submit 'Save'

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

@@ -0,0 +1,15 @@
+
+.email-templates--form-reply-2-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( @email_templates_list )
+    .action
+      = f.submit 'Reply'
+
+    .field.send-at
+      -# = f.label :send_at
+      = f.text_field :send_at, placeholder: 'YYYY-MM-DD', size: 10, class: 'input-date'
+
+    .action
+      = f.submit 'Schedule'

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

@@ -3,6 +3,6 @@
   = 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'] ])
+      = f.select :email_template_id, options_for_select( @email_templates_list )
     .actions
       = f.submit 'Reply'

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

@@ -1,16 +1,29 @@
 
-%h3.collapse-expand#emailTemplatesIndex
-  Email Templates
+%h3.center.collapse-expand#emailTemplatesIndex
+  Email Templates (#{Ish::EmailTemplate.all.count})
 .email-templates-index
 
-  = render 'ish_manager/email_templates/form_mini'
-  %ul
+  -# = render 'ish_manager/email_templates/form_mini'
+
+  %table.bordered
+    %tr
+      %th Actions
+      %th Slug
+      %th Created
+      %th Updated
+
+
     - @templates.each do |tmpl|
-      %li
-        = link_to 'Use', new_email_context_path({ email_template_id: tmpl.id })
-        = link_to 'Edit', edit_email_template_path({ id: tmpl })
-        = link_to 'View', email_template_path({ id: tmpl })
-        = link_to 'iFrame', email_template_iframe_path({ id: tmpl }), target: :_blank
-        = tmpl.slug
-        = button_to '[x]', email_template_path({ id: tmpl }), method: :delete, :data => { :confirm => 'Are you sure?' }, form_class: 'inline'
+      %tr
+        %td
+          = link_to '[use]', new_email_context_path({ email_template_id: tmpl.id })
+          = link_to '[~]', edit_email_template_path({ id: tmpl })
+          = button_to '[x]', email_template_path({ id: tmpl }), method: :delete, :data => { :confirm => 'Are you sure?' }, form_class: 'inline'
+        %td= link_to tmpl.slug, email_template_path({ id: tmpl })
+        %td= tmpl.created_at
+        %td= tmpl.updated_at
+
+        -# = link_to 'iFrame', email_template_iframe_path({ id: tmpl }), target: :_blank
+
+%hr
 

data/app/views/ish_manager/email_templates/_piousbox_roundborders.html.erb

@@ -1,3 +1,4 @@
+
 <!doctype html>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" >
 <head>
@@ -907,7 +908,9 @@ h4 {
                     <![endif]-->
 
                             <div style="border: 2px solid #999; border-radius: 4px; padding: 1em; margin-bottom: 1em;">
-                              <%== @email_ctx.body %>
+                              <!-- herehere -->
+                              <%== ERB.new(@tmpl.body).result((@ctx||@tmpl).get_binding) %>
+
                             </div>
 
                     <!--[if mso]>

data/app/views/ish_manager/email_templates/_wasyaco_roundborders.html.erb

@@ -13,7 +13,7 @@
   <meta charset="UTF-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>*|MC:SUBJECT|*</title>
+  <title><%= @ctx.preview_str %></title>
 
 <style type="text/css">
   .mcnTextBlock {
@@ -839,12 +839,11 @@ h4 {
 
 <body>
 
-<!--*|IF:MC_PREVIEW_TEXT|*-->
-<!--[if !gte mso 9]><span class="mcnPreviewText"
-  style="display:none; font-size:0px; line-height:0px; max-height:0px; max-width:0px; opacity:0; overflow:hidden; visibility:hidden; mso-hide:all;"
-  >*|MC_PREVIEW_TEXT|*</span>
+
+<!--[if !gte mso 9]>-->
+  <span class="mcnPreviewText" style="display:none; font-size:0px; line-height:0px; max-height:0px; max-width:0px; opacity:0; overflow:hidden; visibility:hidden; mso-hide:all;"
+  ><%= @ctx.preview_str %></span>
 <!--<![endif]-->
-<!--*|END:IF|*-->
 
 <center>
 <table align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" id="bodyTable">

data/app/views/ish_manager/email_templates/done/_form.haml

@@ -0,0 +1,22 @@
+
+- url = %w| index new create |.include?( params[:action] ) ? email_templates_path : email_template_path(email_template.id)
+
+.email-templates--form
+  = form_for email_template, url: url do |f|
+    .field
+      = f.label :type
+      = f.select :type, options_for_select(Ish::EmailTemplate.type_list, selected: email_template.type)
+    .field
+      = f.label :slug
+      = f.text_field :slug
+    .field
+      = f.label :from_email
+      = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: email_template.from_email)
+    .field.field-subject
+      = f.label :subject
+      = f.text_field :subject
+    .field
+      = f.label :body
+      = f.text_area :body, class: 'tinymce'
+    .actions
+      = f.submit 'Submit'

data/app/views/ish_manager/email_templates/done/_form2.haml

@@ -0,0 +1,26 @@
+
+- url = email_template.new_record? ? email_templates_path : email_template_path(email_template.id)
+
+.email-templates--form
+  = form_for email_template, url: url do |f|
+    .row
+      .col-md-4
+        .field
+          = f.label :slug
+          = f.text_field :slug
+      .col-md-4
+        .field
+          = f.label :layout
+          = f.select :layout, options_for_select(Ish::EmailTemplate::LAYOUTS, selected: email_template.layout)
+      .col-md-4
+        .field
+          = f.label "From"
+          = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: email_template.from_email)
+    .field.field-subject
+      = f.label :subject
+      = f.text_field :subject
+    .field
+      -# = f.label :body
+      = f.text_area :body, class: 'tinymce'
+    .actions
+      = f.submit 'Submit'

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

@@ -1,2 +1,3 @@
 
-= render 'form', email_template: @template
+.email-templates-edit.max-width
+  = render 'form', email_template: @email_template

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

@@ -1,4 +1,5 @@
 
--# = @email_template.inspect
-
-= render "ish_manager/email_templates/#{@email_template.slug}", ctx: @email_ctx
+- if @email_template.layout == 'plain'
+  = raw @email_template.body
+- else
+  = render "ish_manager/email_templates/#{@email_template.layout}", ctx: @email_ctx

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

@@ -0,0 +1,5 @@
+
+
+%h1 New Email Template
+
+= render 'form', email_template: @new_email_template

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

@@ -1,7 +1,13 @@
 
-= render 'index'
-%hr
+-# = render 'index'
+
 .email-templates-show
-  %h4.center= @email_template.slug
+  .header
+    %h2.title
+      = @email_template.slug
+      = link_to '[~]', edit_email_template_path( @email_template )
+      = link_to '[src ^]', '#'
+      = link_to '[preview ^]', '#'
+      = link_to '[use]', '#'
 
   %iframe{ src: email_template_iframe_path(@email_template.slug), width: '100%', height: '100%' }

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

@@ -22,7 +22,16 @@
 
   .row-thumbs
     %p.collapse-expand#rowThumbs Thumbs
-    = render 'ish_manager/photos/index_thumbs', photos: @photos
+    .orderable-items{ data: { id: @gallery.id.to_s, slug: @gallery.slug, token: form_authenticity_token } }
+      .flex-row.items
+        - @photos.each do |photo|
+          .itemW
+            %a.mvLeft <
+            %a.mvRight >
+            .item{ data: { id: photo.id.to_s } }
+              = render 'ish_manager/photos/meta_manager', photo: photo
+              = image_tag photo.photo.url( :thumb )
+      = button_tag 'Save ordering', class: 'save-ordering'
 
   .row-large
     %p.collapse-expand#rowLarge Large

data/app/views/ish_manager/leads/_form.haml

@@ -1,19 +1,24 @@
 
-- url = lead.persisted? ? lead_path( lead.id ) : leads_path
+- url = lead.new_record? ? leads_path : lead_path( lead.id )
 
 = form_for lead, :as => :lead, :url => url do |f|
+
   .field
     = f.label :name
     = f.text_field :name
+
   .field
     = f.label :email
     = f.text_field :email
+
   .field
-    = f.label :company
-    = f.select :m3_leadset_id, options_for_select(@leadsets_list, selected: lead.m3_leadset_id), { include_blank: true }, {class: 'select2' }
-  .field
-    = f.label :tag
-    = f.text_field :tag
+    = f.label "Leadset (company)"
+    = f.select :m3_leadset_id, options_for_select(@leadsets_list, selected: lead.m3_leadset_id), { include_blank: true }, { class: 'select2' }
+
+  -# .field
+  -#   = f.label "Tags"
+  -#   = f.text_field :wp_tags
+
   .actions
     = f.submit
 

data/app/views/ish_manager/leads/_form_import.haml

@@ -11,9 +11,9 @@
   -#   %label Leadset
   -#   = select_tag :leadset_id, options_for_select(@leadsets_list), class: 'select2'
 
-  .field
-    %label Campaign
-    = select_tag :email_campaign_id, options_for_select(@email_campaigns_list), class: 'select2'
+  -# .field
+  -#   %label Campaign
+  -#   = select_tag :email_campaign_id, options_for_select(@email_campaigns_list), class: 'select2'
 
   .actions
     = submit_tag 'Submit'

data/app/views/ish_manager/leads/edit.haml

@@ -1,19 +1,22 @@
 
-%h1 Edit lead
-= render 'form', :lead => @lead
+.leads-edit.max-width
+  .header
+    %h2.title Edit lead
 
-%hr
-%h1 Email Campaigns:
-%ul
-  - @lead.email_campaign_leads.each do |x|
-    %li
-      <b>Sent on ::</b> #{x.sent_at.to_s[0..10]}
-      <b>Slug ::</b> #{x.email_campaign.slug}
+  = render 'form', :lead => @lead
 
-%hr
-%h1 Single Emails:
-%ul
-  - @lead.email_contexts.each do |x|
-    %li
-      <b>Sent at ::</b> #{x.sent_at.to_s[0..10]}
-      <b>Subject ::</b> #{x.subject}
+  -# %hr
+  -# %h1 Email Campaigns:
+  -# %ul
+  -#   - @lead.email_campaign_leads.each do |x|
+  -#     %li
+  -#       <b>Sent on ::</b> #{x.sent_at.to_s[0..10]}
+  -#       <b>Slug ::</b> #{x.email_campaign.slug}
+
+  -# %hr
+  -# %h1 Single Emails:
+  -# %ul
+  -#   - @lead.email_contexts.each do |x|
+  -#     %li
+  -#       <b>Sent at ::</b> #{x.sent_at.to_s[0..10]}
+  -#       <b>Subject ::</b> #{x.subject}