RubyGems - mail_engine - Versions diffs - 0.0.1 → 0.1.0 - Mend

mail_engine 0.0.1 → 0.1.0

Files changed (452) hide show

data/app/models/mail_engine/mail_template_file.rb CHANGED Viewed

@@ -13,12 +13,13 @@ class MailEngine::MailTemplateFile < ActiveRecord::Base
   end
   def replace_url_in_mail_template
-    if self.file_changed?
+    if self.file_changed? and self.file_was.present?
       self.mail_template.update_attribute :body,
-        MailEngine::HtmlDocumentAssetsReplacer.replace_resource_filename_in_html(
+        MailEngine::HtmlDocumentAssetsReplacer.replace_resource_in_html(
           self.mail_template.body,
           self.file_was,
-          File.basename(self.file.url)
+          File.basename(self.file.url),
+          :filename
         )
     end
   end

data/app/views/layouts/mail_engine/mail_engine.html.erb CHANGED Viewed

@@ -2,29 +2,42 @@
 <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
 <head>
-  <%= stylesheet_link_tag "style", "/javascripts/jquery.nyroModal/styles/nyroModal" %>
-  <%= javascript_include_tag "jquery", "rails", "jquery.iframe-auto-height.plugin", "jquery.string", "jquery.nyroModal/js/jquery.nyroModal.custom" %>
+  <%= stylesheet_link_tag "mail_engine/style", "mail_engine/jquery-ui/smoothness/jquery-ui" %>
+  <%= javascript_include_tag "jquery", "rails",
+                             "mail_engine/jquery-ui.min",
+                             "mail_engine/jquery.iframe-auto-height.plugin",
+                             "mail_engine/jquery.string" %>
-  <!-- markitup -->
-  <%= stylesheet_link_tag "/javascripts/markitup/skins/markitup/style",
-    "/javascripts/markitup/sets/default/style",
-    "/javascripts/markitup/sets/html/style" %>
-  <%= javascript_include_tag "markitup/jquery.markitup",
-    "markitup/sets/default/set",
-    "markitup/sets/html/set" %>
-  <!-- used for google chart -->
-  <script type='text/javascript' src='https://www.google.com/jsapi'></script>
+  <!-- modal lib -->
+  <%= stylesheet_link_tag "/javascripts/mail_engine/fancybox/jquery.fancybox-1.3.4.css" %>
+  <%= javascript_include_tag "mail_engine/fancybox/jquery.mousewheel-3.0.4.pack.js",
+                             "mail_engine/fancybox/jquery.easing-1.3.pack.js",
+                             "mail_engine/fancybox/jquery.fancybox-1.3.4.pack.js" %>
-  <!--[if IE 6]>
-    <script type="text/javascript" src="/javascripts/jquery.nyroModal/js/jquery.nyroModal-ie6.min.js"></script>
-  <![endif]-->
+  <!-- markitup -->
+  <%= stylesheet_link_tag "/javascripts/mail_engine/markitup/skins/markitup/style",
+    "/javascripts/mail_engine/markitup/sets/default/style",
+    "/javascripts/mail_engine/markitup/sets/html/style" %>
+  <%= javascript_include_tag "mail_engine/markitup/jquery.markitup",
+    "mail_engine/markitup/sets/default/set",
+    "mail_engine/markitup/sets/html/set" %>
   <%= csrf_meta_tag %>
   <script>
     $(function(){
-      $('.modal_link').nm();
-      jQuery('iframe').iframeAutoHeight({heightOffset: 50});
+      $("a.fancybox").fancybox({
+        'transitionIn'	:	'elastic',
+    		'transitionOut'	:	'elastic',
+    		'speedIn'		    :	600,
+    		'speedOut'		  :	200,
+    		'overlayShow'	  :	false,
+    		'scrolling'     : 'auto',
+    		'centerOnScroll': true,
+    		'autoDimensions' : true
+    	});
+      $('iframe').iframeAutoHeight({heightOffset: 50});
       $("#loading").ajaxStart(function(){
         $(this).slideDown("fast");
@@ -35,7 +48,7 @@
       });
     });
   </script>
-  <title>Mail Engine</title>
+  <title>Mail Engine Admin</title>
 </head>
 <body>

data/app/views/layouts/mail_engine/simple.html.erb ADDED Viewed

@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
+<head>
+  <%= stylesheet_link_tag "mail_engine/style" %>
+  <%= javascript_include_tag "jquery", "rails" %>
+  <%= csrf_meta_tag %>
+  <title>Mail Engine Admin</title>
+</head>
+<body>
+    <%= yield %>
+</body>
+</html>

data/app/views/mail_engine/dashboard/index.html.erb CHANGED Viewed

@@ -1,3 +1,6 @@
+<!-- used for google chart -->
+<script type='text/javascript' src='https://www.google.com/jsapi'></script>
 <script type="text/javascript">
   // show today's pie chart
   function drawPie() {
@@ -24,7 +27,7 @@
 <div class="today-report left">
   <h2>Report of Today</h2>
-  <div class="clearrer"></div>
+  <div class="clearer"></div>
   <div class="left">
     <table border="0" cellspacing="5" cellpadding="5" class="data-table" style="width: 500px; margin-top: 30px; margin-right: 30px">
@@ -61,4 +64,18 @@
     <div id='pie_chart'></div>
   </div>
 </div>
+<div class="clearer"></div>
+<div class="today-report left">
+  <h2>Next Scheduled Mail</h2>
+  <div class="clearer"></div>
+  <table border="0" cellspacing="5" cellpadding="5" class="data-table" style="width: 910px; margin-top: 30px; margin-right: 30px">
+    <tr>
+      <th>Schedule Name</th><th width="120">Send Time</th>
+    </tr>
+    <tr>
+      <td>New Jobs Newsletter</td><td>2011-3-4 12:00</td>
+    </tr>
+  </table>
+</div>
 <div class="clearer"></div>

data/app/views/mail_engine/mail_logs/_related_logs.html.erb ADDED Viewed

@@ -0,0 +1,29 @@
+<p>
+  <h4>Latest 10 Logs</h4>
+  <%= show_no_record(logs) do %>
+		<table class="data-table">
+      <tr>
+        <th>Subject</th>
+        <th>Sender</th>
+        <th>Recipient</th>
+        <th>mime_type</th>
+        <th>Sent at</th>
+        <th></th>
+      </tr>
+    <% logs.each do |log| %>
+      <tr class="even">
+        <td><%= log.subject %></td>
+        <td><%= log.sender %></td>
+        <td><%= log.recipient %></td>
+        <td><%= log.mime_type %></td>
+        <td><%= log.created_at %></td>
+        <td>
+          <%= link_to 'Show', mail_log_path(log) %>
+          <%= link_to 'Destroy', mail_log_path(log), :confirm => 'Are you sure?', :method => :delete %>
+        </td>
+      </tr>
+    <% end %>
+    </table>
+  <% end %>
+</p>

data/app/views/mail_engine/mail_logs/index.html.erb CHANGED Viewed

@@ -1,7 +1,7 @@
 <div class="post">
 	<div class="post-title"><h2>Mail Logs</h2></div>
 	<div class="post-body">
-	  <% show_no_record(@mail_logs) do %>
+	  <%= show_no_record(@mail_logs) do %>
 			<table class="data-table">
         <tr>
           <th>Subject</th>
@@ -9,7 +9,7 @@
           <th>Recipient</th>
           <th>mime_type</th>
           <th>Sent at</th>
-          <th></th>
+          <th width="50"></th>
         </tr>
       <% @mail_logs.each do |log| %>
@@ -20,13 +20,13 @@
           <td><%= log.mime_type %></td>
           <td><%= log.created_at %></td>
           <td>
-            <%= link_to 'Show', mail_log_path(log) %>
-            <%= link_to 'Destroy', mail_log_path(log), :confirm => 'Are you sure?', :method => :delete %>
+            <%= link_to image_tag('mail_engine/icons/show.png'), mail_log_path(log) %>
+            <%= link_to image_tag('mail_engine/icons/delete.png'), mail_log_path(log), :confirm => 'Are you sure?', :method => :delete %>
           </td>
         </tr>
       <% end %>
       </table>
-      <%= will_paginate @mail_logs %>
+      <%= paginate @mail_logs %>
     <% end %>
     <div class="clearer">&nbsp;</div>

data/app/views/mail_engine/mail_schedules/_form.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <% if @mail_schedule.errors.any? %>
-  <div id="error_explanation">
+  <p id="error_explanation">
     <h2><%= pluralize(@mail_schedule.errors.count, "error") %> prohibited this mail_schedule from being saved:</h2>
     <ul>
@@ -7,7 +7,7 @@
       <li><%= msg %></li>
     <% end %>
     </ul>
-  </div>
+  </p>
 <% end %>
 <div class="field">
@@ -16,11 +16,11 @@
 </div>
 <div class="field">
   <%= f.label :mail_template_id %><br />
-  <%= f.select :mail_template_id, MailEngine::MailTemplate.where(:for_marketing => true).map {|t| [t.name, t.id]} %>
+  <%= f.select :mail_template_id, MailEngine::MailTemplate.group("path").where(:for_marketing => true).map {|t| [t.name, t.id]} %>
 </div>
 <div class="field">
   <%= f.label :user_group %><br />
-  <%= f.select :user_group, User.groups %>
+  <%= f.select :user_group, MailEngine::USER_MODEL.groups %>
 </div>
 <div class="field">
   <%= f.label :count %><br />
@@ -36,10 +36,11 @@
 </div>
 <div class="field">
   <%= f.label :payload %><br />
-  <% User.payload_columns.each do |column| %>
+  <% MailEngine::USER_MODEL.payload_columns.each do |column| %>
     <%= check_box_tag "#{f.object_name}[payload][]", column, f.object.payload.try(:include?, column) %> <%= column %><br />
   <% end %>
 </div>
 <div class="actions">
   <%= f.submit :class => "button" %>
 </div>

data/app/views/mail_engine/mail_schedules/index.html.erb CHANGED Viewed

@@ -1,7 +1,7 @@
 <div class="post">
 	<div class="post-title"><h2>System Mail Schedules</h2></div>
 	<div class="post-body">
-	  <% show_no_record(@mail_schedules) do %>
+	  <%= show_no_record(@mail_schedules) do %>
 		<table class="data-table">
       <tr>
         <th>Name</th>
@@ -22,15 +22,20 @@
         <td><%= mail_schedule.count %></td>
         <td><%= mail_schedule.sent_count %></td>
         <td><%= mail_schedule.period %></td>
-        <td><%= mail_schedule.payload %></td>
+        <td><%= raw mail_schedule.payload.gsub(",", "<br/>") %></td>
         <td>
-          <%= link_to 'Show', mail_schedule_path(mail_schedule) %>
-          <%= link_to 'Edit', edit_mail_schedule_path(mail_schedule) %>
-          <%= link_to 'Destroy', mail_schedule_path(mail_schedule), :confirm => 'Are you sure?', :method => :delete %>
+          <%= link_to image_tag('mail_engine/icons/show.png'), mail_schedule_path(mail_schedule) %>
+          <%= link_to image_tag('mail_engine/icons/edit.gif'), edit_mail_schedule_path(mail_schedule) %>
+          <%= link_to image_tag('mail_engine/icons/delete.png'), mail_schedule_path(mail_schedule), :confirm => 'Are you sure?', :method => :delete %>
           <br>
           <%= form_tag send_test_mail_mail_schedule_path(mail_schedule), :remote => true do %>
-            <%= text_field_tag :recipient, "", :size => 10, :class => "text" %>
-            <%= submit_tag 'Send Test', :class => "button" %>
+            <div>
+              <span>Load data from user</span>: <%= select_tag :sample_user_id, options_from_collection_for_select(MailEngine::USER_MODEL.order('id asc').limit(10).send(mail_schedule.user_group), "id", "email") %>
+            </div>
+            <div>
+              <span>Send mail to</span>: <%= text_field_tag :recipient, "", :size => 14, :class => "text" %>
+              <%= submit_tag 'Send Test', :class => "button" %>
+            </div>
           <% end %>
         </td>
       </tr>
@@ -38,7 +43,7 @@
     </table>
     <div class="left">
-      <%= will_paginate @mail_schedules %>
+      <%= paginate @mail_schedules %>
     </div>
     <% end %>

data/app/views/mail_engine/mail_schedules/show.html.erb CHANGED Viewed

@@ -34,6 +34,8 @@
         <td><%= @mail_schedule.payload %></td>
       </tr>
     </table>
+    <%= render "mail_engine/mail_logs/related_logs", :logs => @mail_schedule.logs %>
   </div>
   <br />
   <h2>

data/app/views/mail_engine/mail_template_files/_form.html.erb CHANGED Viewed

@@ -1,28 +1,38 @@
 <% if f.object.errors.any? %>
-  <div id="error_explanation">
-    <h2><%= pluralize(f.object.errors.count, "error") %> prohibited this mail_schedule from being saved:</h2>
+  <p id="error_explanation">
+    <h4><%= pluralize(f.object.errors.count, "error") %> prohibited this mail_schedule from being saved:</h4>
     <ul>
     <% f.object.errors.full_messages.each do |msg| %>
       <li><%= msg %></li>
     <% end %>
     </ul>
-  </div>
+  </p>
 <% end %>
 <div class="field">
   <%= f.label :file %><br />
   <%= f.file_field :file, :class => "text" %>
+  <div>
+    <i>Only allowed to upload Image file(.jpg, .jpeg, .gif, .png) and CSS file(.css).</i>
+  </div>
 </div>
 <% if f.object.attributes["file"] %>
-<p>
-  <b><%= link_to f.object.attributes["file"], f.object.file.url, :target => '_blank' %></b>
-  <i><%= "http://#{request.host}#{f.object.file.url}" %></i>
-</p>
-<%= image_tag f.object.file.url, :width => 200 if f.object.image? %>
+<table class="data-table" style="margin-top: 10px; margin-bottom: 0px">
+  <tr>
+    <td><h3><%= link_to f.object.attributes["file"], f.object.file.url, :target => '_blank' %></h3></td>
+  </tr>
+  <% if f.object.image? %>
+  <tr>
+    <td><%= image_tag f.object.file.url, :width => 200 %></td>
+  </tr>
+  <% end %>
+</table>
 <% end %>
-<div class="actions">
+<div class="clearer"></div>
+<div class="actions right">
   <%= f.submit :class => "button" %>
 </div>

data/app/views/mail_engine/mail_template_files/edit.html.erb CHANGED Viewed

@@ -1,5 +1,7 @@
 <div class="post">
   <div class="post-body">
+    <h1>Editing File</h1>
+    <hr />
     <%= form_for [@mail_template, @mail_template_file],
                  :url => mail_template_mail_template_file_path(@mail_template, @mail_template_file),
                  :html => {:multipart => true} do |f| %>

data/app/views/mail_engine/mail_template_files/new.html.erb CHANGED Viewed

@@ -1,5 +1,7 @@
 <div class="post">
   <div class="post-body">
+    <h1>Upload New File</h1>
+    <hr />
     <%= form_for @mail_template_file,
                  :url => mail_template_mail_template_files_path(@mail_template),
                  :html => {:multipart => true} do |f| %>

data/app/views/mail_engine/mail_templates/_form.html.erb CHANGED Viewed

@@ -1,15 +1,20 @@
+<%
+  is_current_template_for_marketing = f.object.for_marketing || params[:type] == 'marketing'
+  is_current_template_partial = f.object.partial || params[:type] == 'partial'
+%>
 <% if @mail_template.errors.any? %>
-  <div id="error_explanation">
+  <p id="error_explanation">
     <h2><%= pluralize(@mail_template.errors.count, "error") %> prohibited this mail_template from being saved:</h2>
     <ul>
     <% @mail_template.errors.full_messages.each do |msg| %>
       <li><%= msg %></li>
     <% end %>
     </ul>
-  </div>
+  </p>
 <% end %>
+<!-- basic columns -->
 <div class="field">
   <%= f.label :name %><br />
   <%= f.text_field :name, :class => "text" %>
@@ -20,6 +25,18 @@
   <%= f.text_field :path, :class => "text" %>
 </div>
+<% unless is_current_template_partial %>
+<div class="field">
+  <%= f.label :subject %><br />
+  <%= f.text_field :subject, :class => "text" %>
+  <div class="hint">
+  <span class='found_subject_hint hidden'>We found you have entered this subject in another template with same locale and path.</span>
+  <span class='found_same_path_template_hint <%= 'hidden' unless f.object.persisted? %>'>If you edit this subject here, the subject of current template with same locale will be changed.</span>
+  </div>
+</div>
+<% end %>
 <div class="field">
   <%= f.label :locale %><br />
   <%= f.select :locale, I18n.available_locales.map(&:to_s) %>
@@ -33,6 +50,7 @@
 <!-- layout selecter -->
 <%= render 'layout_selector', :f => f if params[:type] != 'partial' and f.object.partial != true %>
+<!-- template files -->
 <% if @mail_template.persisted? %>
 <div class="field">
   <label>Files</label>
@@ -42,9 +60,12 @@
       <p>
         <div style="margin-bottom: 5px">
           <b><%= link_to file.attributes["file"], file.url %></b>
-          <input type="text" class="text" style="width:700px" value="<%= "http://#{request.host}#{file.url}" %>" />
-          <b><%= link_to "[edit]", edit_mail_template_mail_template_file_path(@mail_template, file), :class => "modal_link", :blank => "_blank" %></b>
+          <!-- operation links -->
+          <b><%= link_to "[edit]", edit_mail_template_mail_template_file_path(@mail_template, file), :class => "fancybox iframe", :title => "Editing #{file.attributes["file"]}" %></b>
           <b><%= link_to "[delete]", mail_template_mail_template_file_path(@mail_template, file), :method => :delete, :confirm => 'Are you sure?', :remote => true %></b>
+          <br />
+          <!-- url preview input box -->
+          <input type="text" class="text click_to_select" style="width:910px" value="<%= "http://#{request.host}#{file.url}" %>" />
         </div>
         <%= image_tag file.url if file.image? %>
       </p>
@@ -53,40 +74,72 @@
   <% end %>
   <div class="clearer"></div>
-  <h3 class="right"><%= link_to "New File", new_mail_template_mail_template_file_path(@mail_template), :class => "modal_link" %></h3>
+  <h3 class="right"><%= link_to "New File", new_mail_template_mail_template_file_path(@mail_template), :class => "fancybox iframe", :title => "Upload A New File" %></h3>
   <div class="clearer"></div>
 </div>
 <% end %>
+<!-- template zip file which uploaded when create from zip file -->
 <% if @mail_template.zip_file.present? %>
 <div class="field">
   <label>ZIP Files</label>
   <h4><%= link_to @mail_template.attributes["zip_file"], @mail_template.zip_file.url %></h4>
-  <p class="hint">If you want to do batch editing, we recommend you to download the original file then edit it on your local computer.</p>
+  <div class="hint">If you want to do batch editing, we recommend you to download the original file then edit it on your local computer.</div>
 </div>
 <% end %>
-<!-- the editor -->
+<!-- html or text editor -->
 <div class="field">
   <%= f.label :body %><br />
   <%= f.text_area :body, :class => "markitup w910", :rows => "10" %>
 </div>
-<%= f.hidden_field :for_marketing, :value => (f.object.for_marketing || params[:type] == 'marketing') %>
-<%= f.hidden_field :partial, :value => (f.object.partial || params[:type] == 'partial') %>
+<%= f.hidden_field :for_marketing, :value => is_current_template_for_marketing %>
+<%= f.hidden_field :partial, :value => is_current_template_partial %>
 <div class="actions">
   <%= f.submit :class => "button" %>
 </div>
 <script>
-  $(function(){
+  function get_subject() {
+    options = {
+      path : $("#mail_engine_mail_template_path").val(),
+      for_marketing : <%= is_current_template_for_marketing %>,
+      locale : $("#mail_engine_mail_template_locale").val()
+    };
+    $.get("<%= get_existed_subject_mail_templates_path %>", options, function(data){
+      if(data.length > 0) {
+        $("#mail_engine_mail_template_subject").val(data);
+        $(".found_subject_hint, .found_same_path_template_hint").fadeIn('slow');
+      } else {
+        $(".found_subject_hint, .found_same_path_template_hint").fadeOut('slow');
+      }
+    });
+  }
+  $(function(){
+    // if path, locale changed should check if subject's existance.
+    $("#mail_engine_mail_template_path, #mail_engine_mail_template_locale").change(function(){
+      get_subject();
+    });
+    $("#mail_engine_mail_template_subject").change(function(){
+      if($(this).val().length == 0) {
+        $(".found_subject_hint, .found_same_path_template_hint").fadeOut('slow');
+      }
+    });
+    $(".click_to_select").click(function(){ $(this).select(); });
     // when the format chenged, should reload the same format of partial options.
     $("#mail_engine_mail_template_format, #mail_engine_mail_template_locale").change(function(){
       $(".layout_option:checked").click();
     });
     // init markitup
+    // FIXME: when format changed the preview.{format} can't change.
     $.extend(mySettings, {
       previewParserPath: '~/preview.' + $("#mail_engine_mail_template_format").val(),
       previewParserVar: 'new_body',