mail_manager 3.0.0 → 3.2.0

data/app/views/mail_manager/contacts/edit.html.erb

@@ -1,12 +1,12 @@
-<% title "Edit Contact" %>
+<%= title "Edit Contact" %>
 
 <%= render :partial => 'form' %>
 
 <%= content_for :page_navigation do %>
   <div>
   <% if use_show_for_resources? %>
-    <%= link_to "Show", @contact, :class => 'button' %><div class="linkbuttonEnding"></div>
+    <%= link_to "Show", @contact, :class => 'button' %>
   <% end %>
-    <%= link_to "View All", mail_manager.contacts_path, :class => 'button' %><div class="linkbuttonEnding"></div>
+    <%= link_to "View All", mail_manager.contacts_path, :class => 'button' %>
   </div>
 <% end %>

data/app/views/mail_manager/contacts/index.html.erb

@@ -1,16 +1,12 @@
-<% title "Contacts" %>
-
+<%= title "Listing Contacts" %>
 
 <%= form_tag mail_manager.contacts_path(), :id => 'search_form', :method => 'get' do %>
-  <label class="form">Contact Search:</label> <%= text_field_tag "term","",  :class => "text"%>
-  <label class="form">Mailing List:</label><%= select_tag "mailing_list_id", options_for_select([['','']] + ::MailManager::MailingList.order(:name).map{|mailing_list|
-      [mailing_list.name, mailing_list.id]
-    }, params[:mailing_list_id].to_i), {onChange: "return toggleStatus()"} %>
+  <label class="form" for="term">Contact Search:</label> <%= text_field_tag "term","", title: "First or last name or email" ,  :class => "text", :style => "width: 400px;" %><br />
+  <label class="form" for="mailing_list_id">Mailing List:</label><%= select_tag "mailing_list_id", options_for_select([['','']] + @mailing_lists, params[:mailing_list_id].to_i), {onChange: "return toggleStatus()"} %><br />
   <div id="subscription_status_selector" style="display: <%= params[:mailing_list_id].present? ? 'inline' : 'none' %>">
-    <label class="form">Status:</label><%= select_tag "status", options_for_select(['active','unsubscribed','failed_address','pending'].map{|status|
-      [status.humanize,status]}, params[:status]) %>
+    <label class="form" for="status">Status:</label><%= select_tag "status", options_for_select(@statuses, params[:status]) %>
   </div>    
-  <%= submit_tag "Search", :class => 'button' %><div class="buttonEnding"></div>
+  <%= submit_tag "Search", :class => 'button' %>
 <% end %>
 <% content_for :head do %>
 <script language="javascript">
@@ -25,10 +21,10 @@ function toggleStatus() {
 <% end %>
 
 <br/>
-<b>Listing Contacts </b>
     
-<%= will_paginate @contacts %>
-
+<% if @contacts.length <= 0 %>
+   <p>No contacts exist.</p>
+<% else %>
 <table class="list" cellpadding="1" cellspacing="0">
   <tr class="title">
     <td>First Name</td>
@@ -46,7 +42,7 @@ function toggleStatus() {
       <td><%=h contact.email_address %></td>
       <% if params[:mailing_list_id].present? %>  <td><%= params[:status].humanize %></td> <% end %>
     <% if use_show_for_resources? %>
-      <td><%= link_to "View", contact, :class => 'button' %><div class="linkbuttonEnding"></div></td>
+      <td><%= link_to "View", contact, :class => 'button' %></td>
     <% end %>
     <% if (contactable = contact.contactable).present? %>
       <% if contactable.respond_to?(:is_deleted?) && contactable.is_deleted? %>
@@ -58,29 +54,19 @@ function toggleStatus() {
         </td>
       <% end %>
     <% else %>
-      <td><%= link_to "Edit", mail_manager.edit_contact_path(contact), :class => 'button' %><div class="linkbuttonEnding"></div></td>
-      <td><%= link_to "Delete", contact, :confirm => 'Are you sure?', :method => :delete, :class => 'button' %><div class="linkbuttonEnding"></div>
+      <td><%= link_to "Edit", mail_manager.edit_contact_path(contact), :class => 'button' %></td>
+      <td><%= link_to "Delete", contact, :confirm => 'Are you sure?', :method => :delete, :class => 'button' %>
       </td>
     <% end %>
-<!--
-      <-% if @mailings.length > 0 %>
-      <td>
-        <-% form_tag mail_manager.send_one_off_message_contact_path(contact), :style => 'display:inline' do |f| %>
-        <-%= select_tag 'mailing_id',  
-              options_for_select(@mailings.collect{|mailing| [mailing.subject, mailing.id]}) %> 
-        <-%= submit_tag "Send One Off Message", :class => 'button' %><div class="buttonEnding"></div>
-        <-% end %>
-      </td>
-      <-% end %>
--->
     </tr>
   <% end %>
 </table>
+<% end %>
 
-<%= will_paginate @contacts %><br/>
 <%= content_for :page_navigation do %>
 <div>
-  <%= link_to "New Contact", mail_manager.new_contact_path, :class => 'button' %><div class="linkbuttonEnding"></div>
+  <%= will_paginate @contacts %><br/>
+  <%= link_to "New Contact", mail_manager.new_contact_path, :class => 'button' %>
 </div>
 <% end %>
 

data/app/views/mail_manager/contacts/new.html.erb

@@ -1,9 +1,9 @@
-<% title "New Contact" %>
+<%= title "New Contact" %>
 
 <%= render :partial => 'form' %>
 
 <%= content_for :page_navigation do %>
 <div>
-  <%= link_to "Back to List", mail_manager.contacts_path, :class => 'button' %><div class="linkbuttonEnding"></div>
+  <%= link_to "Back to List", mail_manager.contacts_path, :class => 'button' %>
 </div>
 <% end %>

data/app/views/mail_manager/contacts/show.html.erb

@@ -1,4 +1,4 @@
-<% title "Contact" %>
+<%= title "Contact" %>
 
 <p>
   <strong>First Name:</strong>
@@ -15,8 +15,8 @@
 
 <%= content_for :page_navigation do %>
 <div>
-  <%= link_to "Edit", mail_manager.edit_contact_path(@contact), :class => 'button' %><div class="linkbuttonEnding"></div> 
-  <%= link_to "Delete", @contact, :confirm => 'Are you sure?', :method => :delete, :class => 'button' %><div class="linkbuttonEnding"></div> 
-  <%= link_to "View All", mail_manager.contacts_path, :class => 'button' %><div class="linkbuttonEnding"></div>
+  <%= link_to "Edit", mail_manager.edit_contact_path(@contact), :class => 'button' %> 
+  <%= link_to "Delete", @contact, :confirm => 'Are you sure?', :method => :delete, :class => 'button' %> 
+  <%= link_to "View All", mail_manager.contacts_path, :class => 'button' %>
 </div>
-<% end %>
+<% end %>

data/app/views/mail_manager/contacts/subscribe.html.erb

@@ -1,2 +1,2 @@
-<% title "Thank You" %>
+<%= title "Thank You" %>
 <p>Thank you for signing up for our newsletter. Please check your email and follow the instructions to confirm your subscription.</p>

data/app/views/mail_manager/mailer/double_opt_in.erb

@@ -1,6 +1,6 @@
 Hello <%= @contact.full_name %>,
 
-To complete your subscription to <%= @mailing_list_names %> at <%= site_url %> please follow the link below:
+To complete your subscription to <%= @mailing_list_names %> at <%= ::MailManager.site_url %> please follow the link below:
 
 <%= @contact.double_opt_in_url %>
 

data/app/views/mail_manager/mailer/double_opt_in.html.erb

@@ -0,0 +1,6 @@
+<p>Hello <%= @contact.full_name %>,<br/>
+<br/>
+To complete your subscription to <%= @mailing_list_names %> at <%= ::MailManager.site_url %> please follow the link below:<br/>
+<br/>
+<%= link_to "Confirm", @contact.double_opt_in_url %>
+</p>

data/app/views/mail_manager/mailer/unsubscribed.erb

@@ -1,5 +1,5 @@
 Hi <%= @contact.full_name %>,
 
-You have successfully unsubscribed '<%= @contact.email_address %>' from '<%= @mailing_list.name %>'. This is merely a confirmation that the subscription has been ended.
+You have successfully unsubscribed '<%= @contact.email_address %>' from '<%= @mailing_lists.join(', ') %>'. This is merely a confirmation that the subscription has been ended.
 
 Thank you.

data/app/views/mail_manager/mailer/unsubscribed.html.erb

@@ -1,5 +1,5 @@
 <p>Hi <%= @contact.full_name %>,</p>
 
-<p>You have successfully unsubscribed '<%= @contact.email_address %>' from '<%= @mailing_list.name %>'. This is merely a confirmation that the subscription has been ended.</p>
+<p>You have successfully unsubscribed '<%= @contact.email_address %>' from '<%= @mailing_lists.join(', ') %>'. This is merely a confirmation that the subscription has been ended.</p>
 
 <p>Thank you.</p>

data/app/views/mail_manager/mailing_lists/_form.html.erb

@@ -1,20 +1,11 @@
 <%= form_for(@mailing_list) do |f| %>
   <%= f.error_messages %>
-  <table cellspacing='1' cellpadding='0' border='0'>  
-    <tr valign="top">
-       <td width='150'><%= f.label :name %></td>
-       <td><%= f.text_field :name %></td>
-    </tr>
-    <tr valign="top">
-       <td width='150'><%= f.label :description %></td>
-       <td><%= f.text_area :description %></td>
-    </tr>
-    <tr valign="top">
-       <td width='150'><%= f.label :defaults_to_active %></td>
-       <td><%= f.check_box :defaults_to_active %></td>
-    </tr>
-    <tr>
-      <td align="right" colspan="2"><%= f.submit "Submit", :class => 'button' %><div class="buttonEnding"></div></td>
-    </tr>
-  </table>
+       <%= f.label :name %>
+       <%= f.text_field :name %><br />
+       <%= f.label :description %>
+       <%= f.text_area :description, {:cols => 40, :rows => 10} %><br />
+       <%= f.label :defaults_to_active %>
+       <%= f.check_box :defaults_to_active %><br />
+       Note: If checked, the new contact form will default to checked for this mailing list.
+       <div class="submit_button"><%= f.submit "Submit", :class => 'button' %></div>
 <% end %>

data/app/views/mail_manager/mailing_lists/edit.html.erb

@@ -1,4 +1,4 @@
-<% title "Editing #{@mailing_list.name}" %>
+<%= title "Editing #{@mailing_list.name}" %>
 <%= render :partial => 'form' %>
 
 <% @page_title = "Editing #{@mailing_list.name}" %>
@@ -6,8 +6,8 @@
 <%= content_for :page_navigation do %>
   <div>
   <% if use_show_for_resources? %>
-    <%= link_to "Show", @mailing, :class => 'button' %><div class="linkbuttonEnding"></div>
+    <%= link_to "Show", @mailing, :class => 'button' %>
   <% end %>
-    <%= link_to "Back", mail_manager.mailing_lists_path, :class => 'button' %><div class="linkbuttonEnding"></div>
+    <%= link_to "Back", mail_manager.mailing_lists_path, :class => 'button' %>
   </div>
-<% end %>
+<% end %>

data/app/views/mail_manager/mailing_lists/index.html.erb

@@ -1,4 +1,4 @@
-<% title "Listing Mailing Lists" %>
+<%= title "Listing Mailing Lists" %>
 
 <% if @mailing_lists.length > 0 %>
 
@@ -20,9 +20,9 @@
     <td align="right"> <%= link_to(mailing_list.subscriptions.unsubscribed.size, mail_manager.contacts_path(mailing_list_id: mailing_list.id, status: 'unsubscribed')) %> </td>
     <td align="right"> <%= link_to(mailing_list.subscriptions.failed_address.size, mail_manager.contacts_path(mailing_list_id: mailing_list.id, status: 'failed_address')) %> </td>
     <td align="right"> <%= link_to(mailing_list.subscriptions.pending.size, mail_manager.contacts_path(mailing_list_id: mailing_list.id, status: 'pending')) %> </td>
-    <td><%= link_to 'Edit', mail_manager.edit_mailing_list_path(mailing_list), :class => 'button'  %><div class="linkbuttonEnding"></div></td>
-    <td><%= link_to 'Delete', mailing_list, :confirm => 'Are you sure?', :method => :delete, :class => 'button' %><div class="linkbuttonEnding"></div></td>
-    <td><%= link_to 'View Contacts', mail_manager.contacts_path(mailing_list_id: mailing_list.id), :class => 'button'  %><div class="linkbuttonEnding"></div></td>
+    <td><%= link_to 'Edit', mail_manager.edit_mailing_list_path(mailing_list), :class => 'button'  %></td>
+    <td><%= link_to 'Delete', mailing_list, :confirm => 'Are you sure?', :method => :delete, :class => 'button' %></td>
+    <td><%= link_to 'View Contacts', mail_manager.contacts_path(mailing_list_id: mailing_list.id), :class => 'button'  %></td>
   </tr>
 <% end %>
 </table>
@@ -34,6 +34,7 @@ No mailing lists exist.
 <% @page_title = "Mailing Lists" %>
 <%= content_for :page_navigation do %>
 <div>
-  <%= link_to "New Mailing List", mail_manager.new_mailing_list_path, :class => 'button' %><div class="linkbuttonEnding"></div>
+  <%= will_paginate @mailing_lists %>
+  <%= link_to "New Mailing List", mail_manager.new_mailing_list_path, :class => 'button' %>
 </div>
 <% end %>

data/app/views/mail_manager/mailing_lists/new.html.erb

@@ -1,9 +1,9 @@
-<% title "New Mailing List" %>
+<%= title "New Mailing List" %>
 
 <%= render :partial => 'form' %>
 
 <%= content_for :page_navigation do %>
   <div>
-    <%= link_to "Back", mail_manager.mailing_lists_path, :class => 'button' %><div class="linkbuttonEnding"></div>
+    <%= link_to "Back", mail_manager.mailing_lists_path, :class => 'button' %>
   </div>
-<% end %>
+<% end %>

data/app/views/mail_manager/mailings/_form.html.erb

@@ -1,72 +1,50 @@
 <%= form_for @mailing do |f| %>
   <%= f.error_messages %>
   <% if @all_mailing_lists.length == 1 %><%= hidden_field_tag 'mailing[mailing_list_ids][]', @mailing.mailing_lists.first.try(:id) %><% end %>
-  <table cellspacing='1' cellpadding='0' border='0'>  
-    <tr valign="top">
-       <td width='150'><%= f.label :subject %></td>
-       <td><%= f.text_field :subject %></td>
-    </tr>
-    <tr valign="top">
-       <td width='150'><%= f.label :from_email_address %></td>
-       <td><%= f.text_field :from_email_address %></td>
-    </tr>
+       <%= f.label :subject %>
+       <%= f.text_field :subject, title: "The email subject" %><br />
+       <%= f.label :from_email_address %>
+       <%= f.text_field :from_email_address, title: "The from email address. Default value configured in /config/mail_manager.yml", placeholder: "Example, Inc. <news@example.com>"  %><br />
     <% if @mailables.length > 0 %>
-    <tr valign="top">
-       <td width='150'><%= f.label "Select Mailable Item" %></td>
-  		 <td><%= select_tag 'mailing[mailable_class_and_id]',
+       <%= f.label "Select a newsletter" %>
+  		 <%= select_tag 'mailing[mailable_class_and_id]',
   		         options_for_select(@mailables_for_select,
   		         @mailing.mailable_thing_and_id), :onChange => "if($('mailing_mailable')."+
   		         "getValue() == 'Mailable_new') {$('new_mailable').show();}else"+
-  		         "{$('new_mailable').hide();}" %>
-  		 </td>
-    </tr>
+  		         "{$('new_mailable').hide();}" %><br />
   	<% else %>
   	  <!-- You need to create some mailable items! -->
   	<% end %>
   	<% unless @mailable.nil? %>
   	<%= div_for @mailable, (@mailables.length == 0) ? {} : {:style => 'display:none'} do %>
       <% f.fields_for @mailable do |fm| %>
-    <tr valign="top">
-      <td width='150'><%= fm.label :email_html %></td>
-      <td><%= fm.text_area :email_html %></td>
-    </tr>
-    <tr valign="top">
-      <td width='150'><%= fm.label :email_text %></td>
-      <td><%= fm.text_area :email_html %></td>
-    </tr>
+        <%= fm.label :email_html %>
+        <%= fm.text_area :email_html %><br />
+        <%= fm.label :email_text %>
+        <%= fm.text_area :email_html %><br />
       <% end %> 
     <% end %>
     <% end %>
-    <tr valign="top">
-       <td width='150'><%= f.label :scheduled_at %></td>
-       <td><%= f.text_field :scheduled_at, {class: 'datetime-picker', value: l(f.object.scheduled_at || Time.now)} %></td>
-    </tr>
-    <tr valign="top">
-       <td width='150'><%= f.label :include_images %></td>
-       <td><%= f.check_box :include_images %></td>
-    </tr>
-    <% if @all_mailing_lists.length > 1 %>
-  	<tr>
-  	  <td colspan="2">
-  	    <div class='newsletter_parts_group' style='margin-top: 10px; padding: 0 5px 5px 15px; border: thin dashed black; background-color: #eee'>
-           <h2 style='padding-bottom: 0; margin-bottom: 0; font-size: 10pt; '>Available Lists</h2>
+       <%= f.label :scheduled_at %>
+       <%= f.text_field :scheduled_at, {class: 'datetime-picker', value: l(f.object.scheduled_at || Time.now)} %><br />
+       <%= f.label :include_images %>
+       <%= f.check_box :include_images %><br />
+       Note: If checked, images are encoded and attached to the email (except for contacts with yahoo.com, gmail.com and
+           hotmail.com emails).  If unchecked, remote image references are used for all contacts.
+    <% if @all_mailing_lists.length > 0 %>
+  	    <div class='mailing_lists_group'>
+           <h2 class='list_group'>Send to these mailing lists:</h2>
            <p>
   		<% @all_mailing_lists.each do |mailing_list| %>
   				<%= check_box_tag 'mailing[mailing_list_ids][]', mailing_list.id, @mailing.mailing_lists.include?(mailing_list) %>
-  				<%= label_tag :mailing_mailing_list_id, "#{mailing_list.name}" %><br/>
+  				<%= label_tag :mailing_mailing_list_ids_, "#{mailing_list.name}" %><br/>
   		<% end %>
   		    </p>
   		  </div>
-  		</td>
     <% end %>
-    <tr>
-      <td align="right" colspan="2"><%= f.submit "Submit", :class => 'button' %><div class="buttonEnding"></div></td>
-    </tr>
-  </table>
-    
+      <div class="submit_button"><%= f.submit "Submit", :class => 'button' %></div>
 <% end %>
 
-
 <%= content_for :head do %>
 <script>
   jQuery(document).ready(function(){

data/app/views/mail_manager/mailings/edit.html.erb

@@ -1,12 +1,12 @@
-<% title "Edit #{@mailing.subject}"%>
+<%= title 'mail_manager/mailing.edit.title', subject: @mailing.subject, default: "Edit #{@mailing.subject}" %>
 
 <%= render :partial => 'form' %>
 
 <%= content_for :page_navigation do %>
   <div>
   <% if use_show_for_resources? %>
-    <%= link_to "Show", @mailing, :class => 'button' %><div class="linkbuttonEnding"></div>
+    <%= link_to "Show", @mailing, :class => 'button' %>
   <% end %>
-    <%= link_to "Back", mail_manager.mailings_path, :class => 'button' %><div class="linkbuttonEnding"></div>
+    <%= link_to "Back", mail_manager.mailings_path, :class => 'button' %>
   </div>
 <% end %>

data/app/views/mail_manager/mailings/index.html.erb

@@ -1,52 +1,48 @@
-<% title "Listing Mailings" %>
+<%= title "Listing Mailings" %>
 
 <% if @mailings.length > 0 %>
-
 	<table class="list" border="0" cellpadding="0" cellspacing="0">
 	  <tr class="title">
       <td>Subject</td>
+      <td>Mailable Name</td>
       <td>Scheduled At</td>
       <td>Status</td>
-      <td colspan="6"> </td>
+      <td colspan="2"> </td>
     </tr>
-		<% @mailings.each do |mailing| 
-         dynamic_tds_left = 5 %>
+		<% @mailings.each do |mailing| %>
 		<tr class="<%= cycle('odd','even') %>">
 			<td><%=h mailing.subject %></td>
-			<td><%=l mailing.scheduled_at %></td>
+			<td><%=h mailing.mailable.name rescue 'N/A' %></td>
+			<td><%=l(mailing.scheduled_at) rescue '' %></td>
 			<td><b><%=h mailing.status %></b></td>
-			<td align="center"><nobr><%= link_to 'Send Test', mail_manager.test_mailing_path(mailing), :id => 'Send_Test', :class => 'button' %></nobr><div class="linkbuttonEnding"></div></td>
-      <% if mailing.can_edit? 
-          dynamic_tds_left -= 1 %>
-			<td align="center"><%= link_to 'Edit', mail_manager.edit_mailing_path(mailing), :class => 'button' %><div class="linkbuttonEnding"></div></td>
-			<% if mailing.can_schedule? 
-           dynamic_tds_left -= 1 %>
-			<td align="center"><%= link_to 'Schedule', mail_manager.schedule_mailing_path(mailing), :class => 'button' %><div class="linkbuttonEnding"></div></td>
-			<% elsif mailing.can_cancel? 
-           dynamic_tds_left -= 1 %>
-			<td align="center"><%= link_to 'Cancel', mail_manager.cancel_mailing_path(mailing), :class => 'button' %>     <div class="linkbuttonEnding"></div></td>
+			<td align="center"><nobr><%= link_to 'Send Test', mail_manager.test_mailing_path(mailing), :id => 'Send_Test', :class => 'button' %></nobr></td>
+      <td>
+      <% if mailing.can_edit? %>
+			<%= link_to 'Edit', mail_manager.edit_mailing_path(mailing), :class => 'button' %>
+			<% if mailing.can_schedule? %>
+			<%= link_to 'Schedule', mail_manager.schedule_mailing_path(mailing), :method => :put, :class => 'button', :confirm => "Are you sure you want to start the mailing at #{l(mailing.scheduled_at) rescue "N/A"}?" %>
+			<% elsif mailing.can_cancel? %>
+			<%= link_to 'Cancel', mail_manager.cancel_mailing_path(mailing), :method => :put, :class => 'button', :id => "cancel_mailing_#{mailing.id}" %>
           <% end %>
 			<% end %>
-      <% if mailing.messages.length > 0 
-           dynamic_tds_left -= 1 %>
-			<td align="center"><%= link_to 'Messages', mail_manager.mailing_messages_path(mailing), :class => 'button' %><div class="linkbuttonEnding"></div></td>
-      <% end %>
-      <% if mailing.bounces.length > 0 
-           dynamic_tds_left -= 1 %>
-			<td align="center"><%= link_to 'Bounces', mail_manager.bounces_path(:mailing_id => mailing.id), :class => 'button' %><div class="linkbuttonEnding"></div></td>
+      <% if mailing.messages.size > 0 %>
+			<%= link_to 'Messages', mail_manager.mailing_messages_path(mailing), :class => 'button' %>
       <% end %>
-      <% 1.upto( dynamic_tds_left ) do %>
-      <td align="center"></td>
+      <% if mailing.bounces.size > 0 %>
+			<%= link_to 'Bounces', mail_manager.bounces_path(:mailing_id => mailing.id), :class => 'button' %>
       <% end %>
+			<%= link_to 'Delete', mail_manager.mailing_path(mailing), :method => :delete, :confirm => "Are you sure?", :class => 'button' %>
+      </td>
 		</tr>
 		<% end %>
 	</table>
 <% else %>
-No mailings exist.
+No mailings exist.<br /><br />
 <% end %>
 
 <%= content_for :page_navigation do %>
 <div>
-  <%= link_to "New Mailing", mail_manager.new_mailing_path, :class => 'button' %><div class="linkbuttonEnding"></div>
+  <%= will_paginate @mailings %>
+  <%= link_to "New Mailing", mail_manager.new_mailing_path, :class => 'button' %>
 </div>
 <% end %>