ish_manager 0.1.8.445 → 0.1.8.446

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e51031178818cd067c18800cb04f5352b547715fc508529f3fa99839380dcf9
-  data.tar.gz: fb2076b07b12246bf16c4947e20ee0f4180b5efff25cf9cb0f19a261830a9236
+  metadata.gz: d154ea6e45e455faaf2205d05c3519ae004d30847ed466651c5ae5fc348a6e31
+  data.tar.gz: 9506ac062f59a796ea1e3bfc320f2e685554c4778e3726347206e3e2e009a483
 SHA512:
-  metadata.gz: 56be446e68fe1868cd13eca2d8f990de0f7b7b91780fc378ceadc8fe339469eaa14bfae5513c3876b1a2c245e77e59ddaeba2e544b6dc05068b664144e0c18fc
-  data.tar.gz: 2b6b9173b88e16b906610e690d40f0a5f1819950797ff6081986c49c9292ada18998b0e05d7a204f1c0374282121f5d5dfa7aacfd0525bb4fe1128646b43054a
+  metadata.gz: 3552c244eaaedd76d6c4700ceaa47b854850dd86fc5fa5afea44a00813599a8a1b73aad84bd3723f922d1dd98e1e53b9a8ec81887e75c7bb3af05436998294f0
+  data.tar.gz: 9dde257591cdf0ca77aabddcab53fc4050103257f3c86092daf109b8fdac7503ecf3ba3c2922186031cf92b3ace295d78af011470cc5bc278bda804a592f6976

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

@@ -27,8 +27,6 @@
 **/
 
 a[target='_blank'] {
-  display: flex;
-
   &::before {
     content: '[ ';
     display: inline;
@@ -36,8 +34,6 @@ a[target='_blank'] {
   &::after {
     content: ' ^]';
     display: inline;
-    // content: ' ^]' !important;
-    // font-size: .5em;
   }
 }
 html {

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

@@ -16,7 +16,6 @@
   iframe {
     min-height: 80vh;
   }
-
 }
 
 .email-contexts--form,
@@ -24,6 +23,7 @@
 
   .field-template {
     display: flex;
+    flex-wrap: wrap;
   }
 
   textarea {
@@ -47,7 +47,6 @@
     padding: 10px;
     margin: 10px;
   }
-
 }
 
 .email-contexts-index {
@@ -55,27 +54,12 @@
   > .header {
     display: flex;
     justify-content: center;
-
-    // .title {
-    //   a {
-    //     &:before {
-    //       content: '[';
-    //     }
-    //     &:after {
-    //       content: ']';
-    //     }
-    //   }
-    // }
-
   }
 
-
-
   table {
     th.actions {
       min-width: 100px;
     }
   }
-
 }
 

data/app/mailers/ish_manager/office_mailer.rb

@@ -15,6 +15,7 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
 
     ac   = ActionController::Base.new
     ac.instance_variable_set( :@ctx, @ctx )
+    ac.instance_variable_set( :@lead, @ctx.lead )
     ac.instance_variable_set( :@utm_tracking_str, @utm_tracking_str )
 
     rendered_str = ac.render_to_string("ish_manager/email_templates/_#{@ctx.tmpl.layout}")
@@ -25,7 +26,7 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
 
     mail( from: @ctx.from_email,
           to: @ctx.to_email,
-          subject: ERB.new( @ctx.subject ).result,
+          subject: ERB.new( @ctx.subject ).result( @ctx.get_binding ),
           template_name: "render/_#{@ctx.tmpl.layout}" )
   end
 

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

@@ -2,29 +2,25 @@
 .email-contexts--form
   - url = ctx.new_record? ? email_contexts_path : email_context_path(ctx)
   = form_for ctx, as: :ctx, url: url do |f|
-    .row
-      .col-md-6
-        .field.field-template
-          = f.label "Template"
-          = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || ctx.email_template_id ), {}, { class: 'select2' }
-          - if ctx.email_template_id
-            = link_to 'view', email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
-            = link_to '~', edit_email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
-            layout: #{ctx.tmpl.layout}
-
-        .field
-          = f.label "From"
-          = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: ctx.from_email)
-
-    .row
-      .col-md-4
-        .field.flex-row
-          = f.label "To lead"
-          = f.select :lead_id, options_for_select( @leads_list, selected: ctx.lead_id ), {}, { class: 'select2' }
-      .col-md-8
-        .field.field-subject
-          = f.label :subject
-          = f.text_field :subject
+    .field.field-template
+      = f.label "Template"
+      = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || ctx.email_template_id ), {}, { class: 'select2' }
+      - if ctx.email_template_id
+        = link_to 'view', email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
+        = link_to '~', edit_email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
+        layout: #{ctx.tmpl.layout}
+
+    .field
+      = f.label "From"
+      = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: ctx.from_email)
+
+    .field.flex-row
+      = f.label "To lead"
+      = f.select :lead_id, options_for_select( @leads_list, selected: ctx.lead_id ), {}, { class: 'select2' }
+
+    .field.field-subject
+      = f.label :subject
+      = f.text_field :subject
 
 
 

metadata

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