mail_manager 3.0.0 → 3.2.0

data/app/assets/stylesheets/mail_manager/admin.css

@@ -0,0 +1,261 @@
+body {
+   margin:0;
+   padding:0;
+   border:0;
+   font-family:Arial, Helvetica, sans-serif;
+   font-size:12px;
+   background:#fdba59;
+}
+
+#top {
+  background-image: url('/assets/i_reach/topMid.gif');
+  height: 85px;
+  min-width: 766px;
+}
+/*
+img {
+   display: block;
+}
+
+.main {	
+   font-family: helvetica, arial, sans-serif;
+	font-size: 11pt;
+	font-weight: normal;
+	padding-left: 20px;
+	padding-top: 20px;
+	padding-right: 10px;
+	padding-bottom: 5px; }
+
+#container{
+   margin:0;
+   padding:0;
+   width:100%;
+   float:left;
+}
+*/
+h1 {
+   font-size: 16pt;
+   color: #599c41;
+}
+
+h2.list_group {
+  padding-bottom: 0;
+  margin-bottom: 0;
+  font-size: 12pt;
+}
+
+#page_content {
+  overflow: hidden;
+  background-image: url('/assets/i_reach/MidRight.gif');
+  background-repeat: repeat-y;
+  background-position: right;
+  padding: 10px 40px 10px 10px;
+  min-height: 300px;
+}
+
+/*Content------------------------------------------------*/
+/*
+#content {
+        margin:0; 
+        padding:10px 15px 15px 15px;
+        clear:both; 
+        font-family: Arial, Helvetica, sans-serif;
+        border-top: 1px solid #c4c1a8;
+}
+
+#content table {
+        font-family:Arial, Helvetica, sans-serif;
+        font-size: 14px;
+}
+*/ 
+hr {
+        margin: 0 0 0 10px;
+        width: 620px;
+        text-align:center;
+        color: #636343;
+}
+
+
+/* tables used as lists ------------------------------*/
+table.list {
+        margin:10px 0 20px 20px; 
+        padding: 0; 
+        border-top: 1px solid #599c41;
+        border-right: 1px solid #599c41;
+        border-left: 1px solid #599c41;
+        font-size: 10pt;
+	border-collapse: collapse;
+}
+
+table.list th {
+	background-color: #fef1de;
+	border-bottom: 2px solid #599c41;
+	padding: 3px 10px 0;
+}
+
+table.list td {
+        margin:0; 
+        padding: 5px 5px 5px; 
+        border-bottom: 1px solid #599c41;
+}
+
+table.list tr.title {
+      font-weight: bold;
+      color: #ffffff;
+      font-size: 11pt;
+      background: #599c41;
+      white-space: nowrap;
+}
+
+                
+/* none of the hover stuff will work in IE 
+ * without a proper DOCTYPE declaration.
+ * HTML 1.0 Transitional//EN works, as does 
+ * XHTML 1.0 Strict//EN 
+ */
+                
+table.list tr.odd {
+   background: #d9eabd;
+} 
+table.list tr.even:hover {
+	background: #d9dcd3;
+}               
+
+table.list tr.odd:hover {
+	background: #e0f2c3;
+}
+
+table.list tr.even {
+	background: #e2e8d9;
+}
+
+
+/* form labels have different alignment*/
+label {font-size: 11pt;
+   font-family: helvetica, arial, sans-serif;
+   font-weight: bold;
+   text-align: right;
+   color:#555;
+   width: 145px;
+   float:left;
+   display: block;
+   text-align: right;
+   padding: 7px 7px 0 0;
+}       
+
+input, select, textarea {
+        margin: 6px 0;
+        padding: 2px;
+        text-align: left; 
+        color: #444;
+        border: 1px solid #599c41;
+        font-size: 10pt;
+        background-color: #e2e8d9;
+}
+
+
+/*Input style buttons within table*/
+
+
+input.button {
+    background: #ffd04f;
+    background-image: -webkit-linear-gradient(top, #ffd04f, #faeabe);
+    background-image: -moz-linear-gradient(top, #ffd04f, #faeabe);
+    background-image: -ms-linear-gradient(top, #ffd04f, #faeabe);
+    background-image: -o-linear-gradient(top, #ffd04f, #faeabe);
+    background-image: linear-gradient(to bottom, #ffd04f, #faeabe);
+    -webkit-border-radius: 12;
+    -moz-border-radius: 12;
+    border-radius: 10px;
+    padding: 0 10px;
+    border: solid #669421 1px;
+    text-decoration: none;
+    font-size: 11pt;
+    font-weight: bold;
+    color: #555;
+    margin-right: 10px;
+    cursor: pointer; 
+}
+
+input.button:hover {
+    background: #bafc56;
+    background-image: -webkit-linear-gradient(top, #bafc56, #f7ffeb);
+    background-image: -moz-linear-gradient(top, #bafc56, #f7ffeb);
+    background-image: -ms-linear-gradient(top, #bafc56, #f7ffeb);
+    background-image: -o-linear-gradient(top, #bafc56, #f7ffeb);
+    background-image: linear-gradient(to bottom, #bafc56, #f7ffeb);
+    text-decoration: none;
+}
+
+a.button:link, a.button:visited {
+/*  background: #a6f038;
+    background-image: -webkit-linear-gradient(top, #a6f038, #f4ffe3);
+    background-image: -moz-linear-gradient(top, #a6f038, #f4ffe3);
+    background-image: -ms-linear-gradient(top, #a6f038, #f4ffe3);
+    background-image: -o-linear-gradient(top, #a6f038, #f4ffe3);
+    background-image: linear-gradient(to bottom, #a6f038, #f4ffe3);*/
+    /* freaky orange background */
+    background: #ffd04f;
+    background-image: -webkit-linear-gradient(top, #ffd04f, #faeabe);
+    background-image: -moz-linear-gradient(top, #ffd04f, #faeabe);
+    background-image: -ms-linear-gradient(top, #ffd04f, #faeabe);
+    background-image: -o-linear-gradient(top, #ffd04f, #faeabe);
+    background-image: linear-gradient(to bottom, #ffd04f, #faeabe);
+    -webkit-border-radius: 10;
+    -moz-border-radius: 10;
+    border-radius: 10px;
+    padding: 2px 10px 1px 10px;
+    border: solid #669421 1px;
+    text-decoration: none; 
+    font-size: 11pt;
+    font-weight: bold;
+    color: #555;
+    margin-right: 10px;
+    /* do I need this? */
+    cursor: pointer; 
+}
+
+a.button:hover {
+    background: #bafc56;
+    background-image: -webkit-linear-gradient(top, #bafc56, #f7ffeb);
+    background-image: -moz-linear-gradient(top, #bafc56, #f7ffeb);
+    background-image: -ms-linear-gradient(top, #bafc56, #f7ffeb);
+    background-image: -o-linear-gradient(top, #bafc56, #f7ffeb);
+    background-image: linear-gradient(to bottom, #bafc56, #f7ffeb);
+    text-decoration: none;
+}
+
+.newsletter_parts_group {
+    margin-top: 10px;
+    padding: 0 5px 5px 15px;
+    border: thin dashed #599c41;
+    background-color: #eee;
+    width: 755px;
+}
+
+a:link {
+	color: #F60;
+	text-decoration:none;
+}
+
+a:visited {
+	color:#F60;
+	text-decoration:none;
+}
+
+a:hover {
+	color: #efaa45;
+}
+
+.submit_button {
+  width: 500px;
+  text-align: right;
+}
+
+.mailing_lists_group {
+  margin-top: 10px;
+  padding: 0 5px 5px 15px;
+  border: thin dashed black;
+  background-color: #eee;
+  width: 500px;
+}

data/app/assets/stylesheets/mail_manager/application.css

@@ -9,5 +9,7 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require_tree .
+ *= require mail_manager/timepicker
+ *= require mail_manager/nav
+ *= require mail_manager/admin
  */

data/app/assets/stylesheets/mail_manager/nav.css

@@ -0,0 +1,68 @@
+.line
+{	color: #d9eabd;
+	width:160px;
+	background: #d9eabd;
+	border:none;
+	height:1px;
+	margin:4px 0;
+	
+}
+
+#menu {font-size: 10pt;
+  float: left;
+  padding-left: 3px;
+  padding-bottom: 10px;
+  margin: 0 5px 5px 0;
+/*border-right: 1px solid #fdba59;
+  border-bottom: 1px solid #fdba59;*/
+  font-family: helvetica, arial, sans-serif;
+  font-weight: bold;
+  line-height: 12pt;
+  color: #000000;
+  width:176px;
+  background: #8fc23f; /* Old browsers */
+  background: -moz-linear-gradient(top, #8fc23f 0%, #b2d57b 50%, #fffffe 100%); /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#8fc23f), color-stop(50%,#b2d57b), color-stop(100%,#fffffe)); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #8fc23f 0%,#b2d57b 50%,#fffffe 100%); /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #8fc23f 0%,#b2d57b 50%,#fffffe 100%); /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #8fc23f 0%,#b2d57b 50%,#fffffe 100%); /* IE10+ */
+  background: linear-gradient(to bottom, #8fc23f 0%,#b2d57b 50%,#fffffe 100%); /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#8fc23f', endColorstr='#fffffe',GradientType=0 ); /* IE6-9 */
+}
+
+#menu a:link {  color: #000000; text-decoration: none; }
+#menu a:visited {  color: #000000; text-decoration: none; }
+#menu a:active {  color: #000000; text-decoration: none; }
+#menu a:hover {  color: #Fc6; text-decoration: none; }
+
+#menu ul {
+  padding-left: 10px;
+  list-style: outside none none;
+}
+
+#menu ul li {
+  border-bottom: 1px solid #fff;
+}
+
+#menu ul li ul {
+  padding-left: 20px;
+  list-style: outside none none;
+}
+
+#menu ul li ul li {font-size: 9pt;
+   font-family: helvetica, arial, sans-serif;
+   font-weight: bold;
+   line-height: 12pt;
+   color: #a42529;
+   border: none;
+   
+}
+#menu ul li ul li a:link {  color:#C18100; text-decoration: none; }
+#menu ul li ul li a:visited {  color:#a42529; text-decoration: none; }
+#menu ul li ul li a:hover {  color:#FC6; text-decoration: none; }
+
+.table-bk { 
+	background: url(/assets/i_reach/menuMain.gif) no-repeat top right;
+   padding-top: 20px;
+   padding-left:3px;
+}

data/app/assets/stylesheets/mail_manager/timepicker.css

@@ -0,0 +1,11 @@
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { float: left; clear:left; padding: 0 0 0 5px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 45%; }
+.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+
+.ui-timepicker-rtl{ direction: rtl; }
+.ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; }
+.ui-timepicker-rtl dl dt{ float: right; clear: right; }
+.ui-timepicker-rtl dl dd { margin: 0 45% 10px 10px; }

data/app/controllers/mail_manager/application_controller.rb

@@ -1,5 +1,10 @@
+require 'cancan'
+require 'dynamic_form'
 module MailManager
-  class ApplicationController < ApplicationController
-    load_and_authorize_resource if respond_to? :load_and_authorize_resource
+  class ApplicationController < ::ApplicationController
+    layout MailManager.layout
+    load_and_authorize_resource
+    helper :'mail_manager/layout'
+    helper :'mail_manager/subscriptions'
   end
 end

data/app/controllers/mail_manager/bounces_controller.rb

@@ -1,15 +1,14 @@
 module MailManager
-  class BouncesController < BaseController
-    before_filter :find_bounce, :except => [:new, :create, :index]
+  class BouncesController < ::MailManager::ApplicationController
     before_filter :find_mailing
   
     def index
       params[:bounce] = Hash.new unless params[:bounce]
-      @mailings = Mailing.with_bounces(params[:bounce][:status])
-      @bounces = []
+      status = params[:bounce][:status] || nil
+      @mailings = Mailing.order("created_at desc")
       @bounces = Bounce.scoped
       @bounces = @bounces.by_mailing_id(@mailing.id) if @mailing.present?
-      @bounces = @bounces.by_status(params[:bounce][:status]) if params[:bounce][:status].present?
+      @bounces = @bounces.by_status(status) if status.present?
       @bounces = @bounces.paginate(:page => params[:page])
     end
 
@@ -18,10 +17,6 @@ module MailManager
   
     protected 
   
-    def find_bounce
-      @bounce = Bounce.find(params[:id])
-    end
-
     def find_mailing
       return @mailing = Mailing.find_by_id(params[:mailing_id]) if params[:mailing_id]
       return @mailing = @bounce.mailing if @bounce
@@ -29,4 +24,4 @@ module MailManager
     end
 
   end
-end
+end

data/app/controllers/mail_manager/contacts_controller.rb

@@ -1,21 +1,41 @@
 module MailManager
-  class ContactsController < BaseController
+  class ContactsController < ::MailManager::ApplicationController
+
+    skip_before_filter :authorize, only: [:subscribe,:double_opt_in,:thank_you]
 
     include DeleteableActions
 
     def subscribe
-      if params[:contact].present? and params[:contact][:email_address].present?
-        @contact = MailManager::Contact.find_by_email_address(params[:contact][:email_address])
-        @contact = MailManager::Contact.new if @contact.nil?
-        @contact.update_attributes(params[:contact])
-        #check to see what list we subscribed to, if Austin local redirect, if San Antonio, redirect to their thank you page
+      if valid_subscribe_submission?
+        @contact = Contact.signup(params[:contact])
+        @contact.double_opt_in(params[:mailing_list_ids])
       end
 
-      if params[:redirect_url].present? #check to see if it came from SA
+      if params[:redirect_url].present?
         redirect_to params[:redirect_url]
       else
-        redirect_to mail_manager.thank_you_path #uncomment after testing...
+        redirect_to main_app.subscribe_thank_you_path
+      end
+    end
+
+    def thank_you
+    end
+
+    def double_opt_in
+      @contact = Contact.find_by_token(params[:login_token])
+      if @contact.authorized?(params[:login_token])
+        @mailing_list_names = []
+        @contact.subscriptions.select(&:"pending?").reject(&:new_record?).each do |subscription|
+          subscription.change_status(:active)
+          @mailing_list_names << subscription.mailing_list_name
+        end
+        @message = "You have successfully subscribed to #{@mailing_list_names.join(',')}!"
+      else
+        @contact.generate_login_token
+        @contact.delay.deliver_double_opt_in
+        @message = "Your token has expired! Please check your email for a new one."
       end
+      render :layout => ::MailManager.public_layout
     end
     
     def send_one_off_message
@@ -27,8 +47,13 @@ module MailManager
     end
 
     def index
-      @mailing_list = MailingList.find_by_id(params[:mailing_list_id])
+      @mailing_lists = MailingList.order('name').map{|mailing_list| [mailing_list.name,
+        mailing_list.id]
+      }
       params[:status] ||= 'active'
+      @statuses = [["Any", ""], ["Active", "active"], ["Unsubscribed", "unsubscribed"], 
+        ["Failed Address", "failed_address"], ["Pending", "pending"]
+      ]
       @contacts = Contact.search(params).paginate(:page => params[:page], :per_page => params[:per_page])
     end
 
@@ -37,7 +62,6 @@ module MailManager
     end
     
     def edit
-      find_contact
     end
     
     def create
@@ -51,7 +75,6 @@ module MailManager
     end
 
     def update
-      find_contact
       if @contact.update_attributes(params[:contact])
         flash[:notice] = 'Contact was successfully updated.'
         redirect_to(mail_manager.contacts_path)
@@ -60,16 +83,15 @@ module MailManager
       end
     end
 
-    def destroy
-      find_contact
-      @contact.delete
-      redirect_to(mail_manager.contacts_url)
+    protected
+
+    def honey_pot_violated?
+      params[MailManager.honey_pot_field].present?
     end
-  
-    protected 
-  
-    def find_contact
-      @contact = Contact.find(params[:id])
+
+    def valid_subscribe_submission? 
+      params[:contact].present? && params[:contact][:email_address].present? &&
+        !honey_pot_violated?
     end
   end
 end