ish_manager 0.1.8.316 → 0.1.8.318

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

@@ -0,0 +1,181 @@
+<table border="0" cellpadding="0" cellspacing="0" width="100%" class="mcnFollowBlock" style="min-width:100%;">
+  <tbody class="mcnFollowBlockOuter">
+    <tr>
+      <td align="center" valign="top" style="padding:9px" class="mcnFollowBlockInner">
+        <table border="0" cellpadding="0" cellspacing="0" width="100%" class="mcnFollowContentContainer"
+          style="min-width:100%;">
+          <tbody>
+            <tr>
+              <td align="center" style="padding-left:9px;padding-right:9px;">
+                <table border="0" cellpadding="0" cellspacing="0" width="100%" style="min-width:100%;"
+                  class="mcnFollowContent">
+                  <tbody>
+                    <tr>
+                      <td align="center" valign="top" style="padding-top:9px; padding-right:9px; padding-left:9px;">
+                        <table align="center" border="0" cellpadding="0" cellspacing="0">
+                          <tbody>
+                            <tr>
+                              <td align="center" valign="top">
+                                <!--[if mso]>
+                                <table align="center" border="0" cellspacing="0" cellpadding="0">
+                                <tr>
+                                <![endif]-->
+
+                                <!--[if mso]>
+                                <td align="center" valign="top">
+                                <![endif]-->
+
+
+                                <table align="left" border="0" cellpadding="0" cellspacing="0" style="display:inline;">
+                                  <tbody>
+                                    <tr>
+                                      <td valign="top" style="padding-right:10px; padding-bottom:9px;"
+                                        class="mcnFollowContentItemContainer">
+                                        <table border="0" cellpadding="0" cellspacing="0" width="100%"
+                                          class="mcnFollowContentItem">
+                                          <tbody>
+                                            <tr>
+                                              <td align="left" valign="middle"
+                                                style="padding-top:5px; padding-right:10px; padding-bottom:5px; padding-left:9px;">
+                                                <table align="left" border="0" cellpadding="0" cellspacing="0" width="">
+                                                  <tbody>
+                                                    <tr>
+
+                                                      <td align="center" valign="middle" width="24"
+                                                        class="mcnFollowIconContent">
+                                                        <a href="mailto:victor@piousbox.com" target="_blank"><img
+                                                            src="https://cdn-images.mailchimp.com/icons/social-block-v2/color-forwardtofriend-48.png"
+                                                            alt="Email" style="display:block;" height="24" width="24"
+                                                            class=""></a>
+                                                      </td>
+
+
+                                                    </tr>
+                                                  </tbody>
+                                                </table>
+                                              </td>
+                                            </tr>
+                                          </tbody>
+                                        </table>
+                                      </td>
+                                    </tr>
+                                  </tbody>
+                                </table>
+
+                                <!--[if mso]>
+                                </td>
+                                <![endif]-->
+
+                                <!--[if mso]>
+                                <td align="center" valign="top">
+                                <![endif]-->
+
+
+                                <table align="left" border="0" cellpadding="0" cellspacing="0" style="display:inline;">
+                                  <tbody>
+                                    <tr>
+                                      <td valign="top" style="padding-right:10px; padding-bottom:9px;"
+                                        class="mcnFollowContentItemContainer">
+                                        <table border="0" cellpadding="0" cellspacing="0" width="100%"
+                                          class="mcnFollowContentItem">
+                                          <tbody>
+                                            <tr>
+                                              <td align="left" valign="middle"
+                                                style="padding-top:5px; padding-right:10px; padding-bottom:5px; padding-left:9px;">
+                                                <table align="left" border="0" cellpadding="0" cellspacing="0" width="">
+                                                  <tbody>
+                                                    <tr>
+
+                                                      <td align="center" valign="middle" width="24"
+                                                        class="mcnFollowIconContent">
+                                                        <a href="https://github.com/piousbox" target="_blank"><img
+                                                            src="https://cdn-images.mailchimp.com/icons/social-block-v2/color-github-48.png"
+                                                            alt="Github" style="display:block;" height="24" width="24"
+                                                            class=""></a>
+                                                      </td>
+
+
+                                                    </tr>
+                                                  </tbody>
+                                                </table>
+                                              </td>
+                                            </tr>
+                                          </tbody>
+                                        </table>
+                                      </td>
+                                    </tr>
+                                  </tbody>
+                                </table>
+
+                                <!--[if mso]>
+                                </td>
+                                <![endif]-->
+
+                                <!--[if mso]>
+                                <td align="center" valign="top">
+                                <![endif]-->
+
+
+                                <table align="left" border="0" cellpadding="0" cellspacing="0" style="display:inline;">
+                                  <tbody>
+                                    <tr>
+                                      <td valign="top" style="padding-right:0; padding-bottom:9px;"
+                                        class="mcnFollowContentItemContainer">
+                                        <table border="0" cellpadding="0" cellspacing="0" width="100%"
+                                          class="mcnFollowContentItem">
+                                          <tbody>
+                                            <tr>
+                                              <td align="left" valign="middle"
+                                                style="padding-top:5px; padding-right:10px; padding-bottom:5px; padding-left:9px;">
+                                                <table align="left" border="0" cellpadding="0" cellspacing="0" width="">
+                                                  <tbody>
+                                                    <tr>
+
+                                                      <td align="center" valign="middle" width="24"
+                                                        class="mcnFollowIconContent">
+                                                        <a href="https://www.instagram.com/piousbox/"
+                                                          target="_blank"><img
+                                                            src="https://cdn-images.mailchimp.com/icons/social-block-v2/color-instagram-48.png"
+                                                            alt="Instagram" style="display:block;" height="24"
+                                                            width="24" class=""></a>
+                                                      </td>
+
+
+                                                    </tr>
+                                                  </tbody>
+                                                </table>
+                                              </td>
+                                            </tr>
+                                          </tbody>
+                                        </table>
+                                      </td>
+                                    </tr>
+                                  </tbody>
+                                </table>
+
+                                <!--[if mso]>
+                                </td>
+                                <![endif]-->
+
+                                <!--[if mso]>
+                                </tr>
+                                </table>
+                                <![endif]-->
+
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+
+      </td>
+    </tr>
+  </tbody>
+</table>

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

@@ -0,0 +1,18 @@
+
+
+.email-templates-index
+  %h3 Email Templates
+  = render 'ish_manager/email_templates/form', email_template: ::Ish::EmailTemplate.new
+
+
+
+  %ul
+    - @templates.each do |tmpl|
+      %li
+        = link_to 'Use', new_email_context_path({ email_template_id: tmpl.id })
+        = link_to email_template_path({ id: tmpl }), target: :_blank, class: 'external' do
+          View
+          %i.fa.fa-external-link
+        = tmpl.slug
+        = button_to '[x]', email_template_path({ id: tmpl }), method: :delete, :data => { :confirm => 'Are you sure?' }, form_class: 'inline'
+

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

@@ -0,0 +1,4 @@
+
+%p This view of an email_template has an empty context:
+
+= render @template.slug

data/app/views/ish_manager/maps/_map_meta_row.haml

@@ -6,6 +6,6 @@
     .a= button_to 'map editor', location_map_editor_path(map.id), method: :get
     .a= button_to '+marker', new_map_marker_path(map), method: :get
     .a= button_to '+newsitem', new_map_newsitem_path(map), method: :get
-    .a= link_to '[api]', api_map_path(map)
+    .a= link_to '[api]', api_map_path(map), target: :_blank
     .a= button_to 'x', map_path(map), method: :delete, data: { confirm: 'Are you sure?' }
   .a slug:#{map.slug}

data/app/views/ish_manager/office_mailer/render

@@ -0,0 +1 @@
+../email_templates

data/app/views/ish_manager/trash/meeting_mailer/README.txt

@@ -0,0 +1,5 @@
+
+
+it was meeting_mailer, not meetings_mailer.
+
+moved everything into office_mailer

data/app/views/layouts/ish_manager/application.haml

@@ -32,20 +32,20 @@
   %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action]] }
     .bg-white
       = render :partial => "ish_manager/application/main_header_#{current_user.profile.role_name}"
-      - if notice || alert
-        .row
-          .col.s12
-            - if notice
-              - if notice.class == Array
-                %ul
-                  - notice.map do |n|
-                    %li
-                      - n.map do |k,v|
-                        <b>#{k} :</b> #{v}
-              %p.notice= notice
-            - if alert
-              %p.alert= alert
       .container
+        - if notice || alert
+          .row
+            .col.s12
+              - if notice
+                - if notice.class == Array
+                  %ul
+                    - notice.map do |n|
+                      %li
+                        - n.map do |k,v|
+                          <b>#{k} :</b> #{v}
+                %p.notice= notice
+              - if alert
+                %p.alert= alert
         = yield
     = render 'ish_manager/application/main_footer'
     = render 'analytics' if Rails.env.production?

data/config/routes.rb

@@ -57,16 +57,33 @@ IshManager::Engine.routes.draw do
     resources 'markers'
   end
 
-  ## @TODO: move into a namespace, eg :office_suite
-  get 'leads',      :to => 'leads#index', :defaults => { :is_done => false }
+
+  #
+  # office, below
+  #
+  get 'leads',      :to => 'leads#index', :defaults => { :is_done => false }, as: :leads
   get 'leads/done', :to => 'leads#index', :defaults => { :is_done => true }, :as => :done_leads
   resources :leads
+
   resources :meetings
-  namespace :office_suite do
-    resources :campaigns
-    resources :email_templates
-    resources :unsubscribes
-  end
+  resources :email_campaigns, as: :email_campaigns
+
+  get 'email_contexts/iframe_src/:id', to: 'email_contexts#iframe_src', as: :email_context_iframe
+  get 'email_contexts/new_with/:template_slug', to: 'email_contexts#new'
+  post 'email_contexts/send/:id', to: 'email_contexts#do_send', as: :email_context_send
+  resources :email_contexts
+
+  get 'email_templates/iframe_src/:slug', to: 'email_templates#iframe_src'
+  get 'email_templates/show/:id', to: 'email_templates#show', as: :email_template
+  delete 'email_templates/show/:id', to: 'email_templates#destroy'
+  resources :email_templates
+
+  resources :unsubscribes
+  resources :sent_emails
+  #
+  # office, above
+  #
+
 
   resources :newsitems
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.316
+  version: 0.1.8.318
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2022-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -251,6 +251,7 @@ files:
 - app/assets/javascripts/ish_manager/vendor/jquery.iframe-transport.js
 - app/assets/javascripts/ish_manager/vendor/jquery.ui.widget.js
 - app/assets/stylesheets/ish_manager/application.scss
+- app/assets/stylesheets/ish_manager/email_templates.scss
 - app/assets/stylesheets/ish_manager/galleries.scss
 - app/assets/stylesheets/ish_manager/jquery-ui.css
 - app/assets/stylesheets/ish_manager/leads.scss
@@ -265,8 +266,9 @@ files:
 - app/assets/stylesheets/ish_manager/user_profiles.scss
 - app/assets/stylesheets/ish_manager/videos.scss
 - app/controllers/ish_manager/application_controller.rb
-- app/controllers/ish_manager/campaigns_controller.rb
-- app/controllers/ish_manager/cities_controller.rb
+- app/controllers/ish_manager/email_campaigns_controller.rb
+- app/controllers/ish_manager/email_contexts_controller.rb
+- app/controllers/ish_manager/email_templates_controller.rb
 - app/controllers/ish_manager/galleries_controller.rb
 - app/controllers/ish_manager/image_assets_controller.rb
 - app/controllers/ish_manager/invoices_controller.rb
@@ -275,16 +277,17 @@ files:
 - app/controllers/ish_manager/markers_controller.rb
 - app/controllers/ish_manager/meetings_controller.rb
 - app/controllers/ish_manager/newsitems_controller.rb
-- app/controllers/ish_manager/orders_controller.rb
 - app/controllers/ish_manager/payments_controller.rb
 - app/controllers/ish_manager/photos_controller.rb
 - app/controllers/ish_manager/reports_controller.rb
-- app/controllers/ish_manager/sites_controller.rb
 - app/controllers/ish_manager/tags_controller.rb
+- app/controllers/ish_manager/trash/cities_controller.rb
+- app/controllers/ish_manager/trash/orders_controller.rb
+- app/controllers/ish_manager/trash/sites_controller.rb
+- app/controllers/ish_manager/trash/venues_controller.rb
 - app/controllers/ish_manager/unsubscribes_controller.rb
 - app/controllers/ish_manager/user_profiles_controller.rb
 - app/controllers/ish_manager/users_controller.rb
-- app/controllers/ish_manager/venues_controller.rb
 - app/controllers/ish_manager/videos_controller.rb
 - app/helpers/ish_manager/application_helper.rb
 - app/helpers/ish_manager/images_helper.rb
@@ -292,6 +295,7 @@ files:
 - app/jobs/ish_manager/test_email_job.rb
 - app/mailers/ish_manager/application_mailer.rb
 - app/mailers/ish_manager/meeting_mailer.rb
+- app/mailers/ish_manager/office_mailer.rb
 - app/models/ish_manager/ability.rb
 - app/models/ish_manager/application_record.rb
 - app/views/ish_manager/application/_analytics.html
@@ -307,29 +311,25 @@ files:
 - app/views/ish_manager/application/_profile_pic.haml
 - app/views/ish_manager/application/_search.haml
 - app/views/ish_manager/application/home.haml
-- app/views/ish_manager/application_mailer/condor_followup_alerb.html.erb
-- app/views/ish_manager/application_mailer/option_alert.html.erb
 - app/views/ish_manager/application_mailer/shared_galleries.html.erb
-- app/views/ish_manager/application_mailer/stock_alert.html.erb
-- app/views/ish_manager/application_mailer/test_email.html.haml
 - app/views/ish_manager/application_mailer/welcome.html.erb
-- app/views/ish_manager/cities/_form.haml
-- app/views/ish_manager/cities/_header.haml
-- app/views/ish_manager/cities/edit.haml
-- app/views/ish_manager/cities/edit_feature.haml
-- app/views/ish_manager/cities/index.haml
-- app/views/ish_manager/cities/new.haml
-- app/views/ish_manager/cities/new_feature.haml
-- app/views/ish_manager/cities/new_newsitem.haml
-- app/views/ish_manager/cities/show.haml
-- app/views/ish_manager/events/_form.haml
-- app/views/ish_manager/events/_index.haml
-- app/views/ish_manager/events/edit.haml
-- app/views/ish_manager/events/index.haml
-- app/views/ish_manager/events/new.haml
+- app/views/ish_manager/email_contexts/_form.haml
+- app/views/ish_manager/email_contexts/edit.haml
+- app/views/ish_manager/email_contexts/iframe_src.haml
+- app/views/ish_manager/email_contexts/index.haml
+- app/views/ish_manager/email_contexts/new.haml
+- app/views/ish_manager/email_contexts/show.haml
+- app/views/ish_manager/email_templates/_form.haml
+- app/views/ish_manager/email_templates/_marketing_ror_1.html
+- app/views/ish_manager/email_templates/_marketing_ror_2.html
+- app/views/ish_manager/email_templates/_marketing_wordpress_1.html
+- app/views/ish_manager/email_templates/_marketing_wordpress_2.html
+- app/views/ish_manager/email_templates/_piousbox_roundborders.html.erb
+- app/views/ish_manager/email_templates/_social.html.erb
+- app/views/ish_manager/email_templates/index.haml
+- app/views/ish_manager/email_templates/show.haml
 - app/views/ish_manager/features/_form.haml
 - app/views/ish_manager/features/_index.haml
-- app/views/ish_manager/features/_index.haml-trash
 - app/views/ish_manager/features/_item.haml
 - app/views/ish_manager/features/edit.haml
 - app/views/ish_manager/features/index.haml
@@ -352,6 +352,9 @@ files:
 - app/views/ish_manager/invoices/_form.haml
 - app/views/ish_manager/invoices/index.haml
 - app/views/ish_manager/invoices/new.haml
+- app/views/ish_manager/iron_warbler_mailer/condor_followup_alerb.html.erb
+- app/views/ish_manager/iron_warbler_mailer/option_alert.html.erb
+- app/views/ish_manager/iron_warbler_mailer/stock_alert.html.erb
 - app/views/ish_manager/kaminari/_first_page.html.erb
 - app/views/ish_manager/kaminari/_gap.html.erb
 - app/views/ish_manager/kaminari/_last_page.html.erb
@@ -377,7 +380,6 @@ files:
 - app/views/ish_manager/markers/_index_small.haml-trash
 - app/views/ish_manager/markers/edit.haml
 - app/views/ish_manager/markers/new.haml
-- app/views/ish_manager/meeting_mailer/morning_reminder.haml
 - app/views/ish_manager/meetings/_form.haml
 - app/views/ish_manager/meetings/edit.haml
 - app/views/ish_manager/meetings/index.haml
@@ -389,6 +391,9 @@ files:
 - app/views/ish_manager/newsitems/edit.haml
 - app/views/ish_manager/newsitems/index.haml
 - app/views/ish_manager/newsitems/new.haml
+- app/views/ish_manager/office_mailer/morning_reminder.haml
+- app/views/ish_manager/office_mailer/render
+- app/views/ish_manager/office_mailer/test_email.html.haml
 - app/views/ish_manager/payments/index.haml
 - app/views/ish_manager/photos/_index_thumbs.haml
 - app/views/ish_manager/photos/_meta.haml
@@ -403,13 +408,6 @@ files:
 - app/views/ish_manager/reports/index.haml
 - app/views/ish_manager/reports/new.haml
 - app/views/ish_manager/reports/show.haml
-- app/views/ish_manager/sites/_form.haml
-- app/views/ish_manager/sites/_header.haml
-- app/views/ish_manager/sites/edit.haml
-- app/views/ish_manager/sites/galleries.haml
-- app/views/ish_manager/sites/index.haml
-- app/views/ish_manager/sites/new.haml
-- app/views/ish_manager/sites/show.haml
 - app/views/ish_manager/tags/_features.haml
 - app/views/ish_manager/tags/_form.haml
 - app/views/ish_manager/tags/_index.haml
@@ -421,6 +419,35 @@ files:
 - app/views/ish_manager/tags/index.haml
 - app/views/ish_manager/tags/new.haml
 - app/views/ish_manager/tags/show.haml
+- app/views/ish_manager/trash/cities/_form.haml
+- app/views/ish_manager/trash/cities/_header.haml
+- app/views/ish_manager/trash/cities/edit.haml
+- app/views/ish_manager/trash/cities/edit_feature.haml
+- app/views/ish_manager/trash/cities/index.haml
+- app/views/ish_manager/trash/cities/new.haml
+- app/views/ish_manager/trash/cities/new_feature.haml
+- app/views/ish_manager/trash/cities/new_newsitem.haml
+- app/views/ish_manager/trash/cities/show.haml
+- app/views/ish_manager/trash/events/_form.haml
+- app/views/ish_manager/trash/events/_index.haml
+- app/views/ish_manager/trash/events/edit.haml
+- app/views/ish_manager/trash/events/index.haml
+- app/views/ish_manager/trash/events/new.haml
+- app/views/ish_manager/trash/meeting_mailer/README.txt
+- app/views/ish_manager/trash/sites/_form.haml
+- app/views/ish_manager/trash/sites/_header.haml
+- app/views/ish_manager/trash/sites/edit.haml
+- app/views/ish_manager/trash/sites/galleries.haml
+- app/views/ish_manager/trash/sites/index.haml
+- app/views/ish_manager/trash/sites/new.haml
+- app/views/ish_manager/trash/sites/show.haml
+- app/views/ish_manager/trash/venues/_form.haml
+- app/views/ish_manager/trash/venues/_index.haml
+- app/views/ish_manager/trash/venues/_search.haml
+- app/views/ish_manager/trash/venues/edit.haml
+- app/views/ish_manager/trash/venues/index.haml
+- app/views/ish_manager/trash/venues/new.haml
+- app/views/ish_manager/trash/venues/show.haml
 - app/views/ish_manager/unsubscribes/new.haml
 - app/views/ish_manager/user_profiles/_form.haml
 - app/views/ish_manager/user_profiles/_show.haml
@@ -430,13 +457,6 @@ files:
 - app/views/ish_manager/user_profiles/show.haml
 - app/views/ish_manager/users/_index.haml
 - app/views/ish_manager/users/index.haml
-- app/views/ish_manager/venues/_form.haml
-- app/views/ish_manager/venues/_index.haml
-- app/views/ish_manager/venues/_search.haml
-- app/views/ish_manager/venues/edit.haml
-- app/views/ish_manager/venues/index.haml
-- app/views/ish_manager/venues/new.haml
-- app/views/ish_manager/venues/show.haml
 - app/views/ish_manager/videos/_embed.haml
 - app/views/ish_manager/videos/_embed_half.erb
 - app/views/ish_manager/videos/_embed_mini.erb

data/app/views/ish_manager/features/_index.haml-trash

@@ -1,36 +0,0 @@
--#
--# ish_manager / features / _index
--#
-
-- if defined? city
-  - edit_url   = -> (feature ) { edit_city_feature_path( city.id, feature.id ) }
-  - delete_url = -> (feature ) { city_feature_path(      city.id, feature.id ) }
-  - new_path   = new_city_feature_path( city.id )
-- if defined? site
-  - edit_url   = -> (feature) { edit_site_feature_path( site.id, feature.id ) }
-  - delete_url = -> (feature) { site_feature_path(      site.id, feature.id ) }
-  - new_path   = new_site_feature_path( site.id )
-- if defined?(tag)
-  - edit_url   = -> (feature) { edit_tag_feature_path( tag.id, feature.id ) }
-  - delete_url = -> (feature) { tag_feature_path(      tag.id, feature.id ) }
-  - new_path   = new_tag_feature_path( tag.id )
-- if params[:tag_id]
-  - edit_url   = -> (feature) { edit_tag_feature_path( params[:tag_id], feature.id ) }
-  - delete_url = -> (feature) { tag_feature_path(      params[:tag_id], feature.id ) }
-  - new_path   = new_tag_feature_path( params[:tag_id] )
-
-.manager-features--index
-  %h3
-    Features (#{features.length})
-    = link_to image_new, new_path
-
-  .row
-    - features.each_with_index do |feature, idx|
-      - if idx % 4 == 0
-        .clearfix
-      .col-sm-3
-        .a
-          = link_to '[~]', edit_url.call( feature )
-          = button_to '[x]', delete_url.call( feature ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-          = render 'ish_manager/features/item', :feature => feature
-  %hr