mail_engine 0.0.1 → 0.1.0

data/app/views/mail_engine/mail_templates/_layout_selector.html.erb

@@ -3,7 +3,7 @@
   <div class="clearer"></div>
 
   <!-- list all kinds of layouts -->
-  <% PLACEHOLDERS_IN_LAYOUT.keys.each do |layout_name| %>
+  <% MailEngine::PLACEHOLDERS_IN_LAYOUT.keys.each do |layout_name| %>
     <div class="layout_option_item left">
       <%= f.radio_button :layout, layout_name, :class => "layout_option hidden", :ref => layout_name %>
 
@@ -14,12 +14,12 @@
   <% end %>
   <div class="clearer"></div>
 
-  <% PLACEHOLDERS_IN_LAYOUT.keys.each do |layout_name| %>
+  <% MailEngine::PLACEHOLDERS_IN_LAYOUT.keys.each do |layout_name| %>
     <!-- list all placeholders -->
     <div class="placeholder_list <%= layout_name %> quiet" style="margin-left: 7px"></div>
   <% end %>
 
-  <p class="hint">Choose a template layout.</p>
+  <div class="hint">Choose a template layout.</div>
 </div>
 
 <script>

data/app/views/mail_engine/mail_templates/duplicate.html.erb

@@ -1,13 +1,11 @@
 <div class="post">
-  <div class="post-title">
-    <h2>
-      Duplicate Mail Tempate
-    </h2>
-  </div>
   <div class="post-body">
+    <h1>Duplicate Mail Tempate</h1>
+    <hr />
+
     <%= form_for(@mail_template, :url => duplicate_mail_template_path(@mail_template, :type => params[:type])) do |f| %>
       <% if @duplicated_mail_template.errors.any? %>
-        <div id="error_explanation">
+        <p id="error_explanation">
           <h2><%= pluralize(@duplicated_mail_template.errors.count, "error") %> prohibited this mail_template from being saved:</h2>
 
           <ul>
@@ -15,7 +13,7 @@
             <li><%= msg %></li>
           <% end %>
           </ul>
-        </div>
+        </p>
       <% end %>
 
       <div class="field">
@@ -23,6 +21,11 @@
         <%= f.text_field :name, :class => "text" %>
       </div>
 
+      <div class="field">
+        <%= f.label :subject %><br />
+        <%= f.text_field :subject, :class => "text" %>
+      </div>
+
       <div class="field">
         <%= f.label :path, 'Template Path' %><br />
         <%= f.text_field :path, :class => "text" %>
@@ -37,5 +40,6 @@
         <%= f.submit "Duplicate", :class => "button" %>
       </div>
     <% end %>
+
   </div>
 </div>

data/app/views/mail_engine/mail_templates/index.html.erb

@@ -1,12 +1,13 @@
 <div class="post">
 	<div class="post-title"><h2><%= mail_template_list_title(params[:type]) %></h2></div>
 	<div class="post-body">
-    <% show_no_record(@mail_templates) do %>
+    <%= show_no_record(@mail_templates) do %>
 		<table class="data-table">
       <tr>
         <th>Name</th>
         <th>Template Path</th>
         <% if params[:type] != 'partial' %>
+          <th>Subject</th>
           <th>Layout</th>
           <th>Partials</th>
         <% end %>
@@ -18,33 +19,36 @@
         <td><%= mail_template.name %></td>
         <td><%= mail_template.path %></td>
         <% if params[:type] != 'partial' %>
+          <td><%= mail_template.subject %></td>
           <td><%= mail_template.layout %></td>
           <td><%= mail_template.partials.map(&:name).join(" , ") %></td>
         <% end %>
-        <td>
-          <table style="margin-bottom: 0px">
+        <td style="width: 200px;">
+          <table style="margin-bottom: 0px;">
             <% mail_template.variations.group_by(&:locale).each do |locale, templates| %>
               <tr>
-                <td colspan="3" style="background-color: grey; font-weight: bold; color: white; padding: 2px 5px"><%= locale.humanize %></td>
+                <td colspan="2" style="background-color: grey; font-weight: bold; color: white; padding: 2px 5px"><%= locale.humanize %></td>
               </tr>
               <% templates.each do |template| %>
-              <tr>
-                <td><%= template.locale %>.<%= template.format %></td>
-                <td>
-                  <%= link_to 'Show', mail_template_path(template) %>
-                  <%= link_to 'Edit', edit_mail_template_path(template) %>
-                  <%= link_to 'Destroy', mail_template_path(template, :type => params[:type]), :confirm => 'Are you sure?', :method => :delete %>
-                  <%= link_to 'Duplicate', duplicate_mail_template_path(template, :type => params[:type]), :class => "modal_link" %>
-                </td>
-                <% unless mail_template.partial? %>
-                <td>
-                  <%= form_tag send_test_mail_mail_template_path(template), :remote => true do %>
-                    <%= text_field_tag :recipient, "", :size => 10, :class => "text" %>
-                    <%= submit_tag 'Send Test', :class => "button" %>
-                  <% end %>
-                </td>
+                <% if template.persisted? %>
+                <tr>
+                  <td><%= template.locale %>.<%= template.format %></td>
+                  <td>
+                    <%= link_to image_tag('mail_engine/icons/show.png', :alt => "Show"), mail_template_path(template) %>
+                    <%= link_to image_tag('mail_engine/icons/edit.gif', :alt => "Edit"), edit_mail_template_path(template) %>
+                    <%= link_to image_tag('mail_engine/icons/delete.png', :alt => "Delete"), mail_template_path(template, :type => params[:type]), :confirm => 'Are you sure?', :method => :delete %>
+                    <%= link_to image_tag('mail_engine/icons/copy.png', :alt => "Copy"), duplicate_mail_template_path(template, :type => params[:type]), :class => "fancybox iframe" %>
+                  </td>
+                </tr>
+                <% else %>
+                <tr>
+                  <td class='quiet' colspan='2'>
+                    <%= image_tag('mail_engine/icons/missing.png', :alt => "Missing", :class=>"left", :style => "margin-bottom: 0px") %>
+                    Missing: <%= template.locale %>.<%= template.format %>
+                  </td>
+                  <%#= link_to image_tag('mail_engine/icons/add.png', :alt => "Add"), new_mail_template_path(:type => params[:type]) %>
+                </tr>
                 <% end %>
-              </tr>
               <% end %>
             <% end %>
           </table>
@@ -54,7 +58,7 @@
     </table>
 
     <div class="left">
-      <%= will_paginate @mail_templates %>
+      <%= paginate @mail_templates %>
     </div>
     <% end %>
 

data/app/views/mail_engine/mail_templates/new_by_upload.html.erb

@@ -7,7 +7,7 @@
   <div class="post-body">
     <%= form_for(@mail_template, :url => create_by_upload_mail_templates_path, :html => {:multipart => true}) do |f| %>
       <% 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>
@@ -15,28 +15,36 @@
             <li><%= msg %></li>
           <% end %>
           </ul>
-        </div>
+        </p>
       <% end %>
 
       <div class="field">
         <%= f.label :name %><br />
         <%= f.text_field :name, :class => "text" %>
       </div>
+
+      <div class="field">
+        <%= f.label :subject %><br />
+        <%= f.text_field :subject, :class => "text" %>
+      </div>
+
       <div class="field">
         <%= f.label :path, 'Template Path' %><br />
         <%= f.text_field :path, :class => "text" %>
       </div>
+
       <div class="field">
         <%= f.label :locale %><br />
         <%= f.select :locale, I18n.available_locales.map(&:to_s) %>
       </div>
+
       <div class="field">
         <label>Zip File</label><br />
         <% if @mail_template.zip_file.present? %>
           <div class="loud">Do you to change this uploaded file: <b><%= link_to File.basename(@mail_template.zip_file_url), @mail_template.zip_file_url %></b> ?</div>
         <% end %>
 
-        <%= f.file_field :zip_file, :style => 'padding: 10px;' %>
+        <%= f.file_field :zip_file, :style => 'padding: 10px;', :class => "text" %>
         <%= f.hidden_field :zip_file_cache %>
 
         <h5>Note:</h5>
@@ -45,8 +53,6 @@
           <li>Only one html file.</li>
           <li>File should less than 1MB.</li>
         </ol>
-
-
       </div>
 
       <%= f.hidden_field :for_marketing, :value => (f.object.for_marketing || params[:type] == 'marketing') %>

data/app/views/mail_engine/mail_templates/partial_options.html.erb

@@ -1,9 +1,9 @@
 <% @tmp_mail_template.template_partials.each do |template_partial| %>
   <%= fields_for "mail_engine_mail_template[template_partials_attributes][#{template_partial.id || template_partial.object_id}]", template_partial do |partial_form| %>
-    <h3><%= partial_form.object.placeholder_name %></h3>
+    <b>Choose partial for <%= partial_form.object.placeholder_name %>:</b>
 
     <!-- list all partials -->
-    <% show_no_record partials = MailEngine::MailTemplate.partial.where(:format => params[:template_format], :locale => params[:template_locale]) do %>
+    <%= show_no_record partials = MailEngine::MailTemplate.partial.where(:format => params[:template_format], :locale => params[:template_locale]) do %>
       <ul class="partial_option_list">
       <% partials.each do |partial| %>
         <li>

data/app/views/mail_engine/mail_templates/show.html.erb

@@ -10,7 +10,25 @@
           <%= @mail_template.full_path %>
         </td>
       </tr>
+      <tr>
+        <td>Locale</td>
+        <td>
+          <%= @mail_template.locale %>
+        </td>
+      </tr>
+      <tr>
+        <td>Format</td>
+        <td>
+          <%= @mail_template.format %>
+        </td>
+      </tr>
       <% unless @mail_template.partial? %>
+      <tr>
+        <td>Subject</td>
+        <td>
+          <%= @mail_template.subject %>
+        </td>
+      </tr>
       <tr>
         <td>Layout</td>
         <td>
@@ -25,35 +43,7 @@
       <iframe width="100%" class="bordered" src="<%= body_mail_template_path(@mail_template, :format => @mail_template.format) %>"></iframe>
     </p>
 
-    <p>
-      <h4>Sending Logs</h4>
-      <% show_no_record(logs = @mail_template.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>
+    <%= render "mail_engine/mail_logs/related_logs", :logs => @mail_template.logs %>
   </div>
   <br />
   <h2>

data/app/views/mail_engine/reports/charts/blocks.html.erb

@@ -1,12 +1,12 @@
 <h1><%= params[:type].titleize %></h1>
 
-<% show_no_record(@result) do %>
+<%= show_no_record(@result) do %>
   <table class="data-table">
     <tr>
       <th>Email</th>
       <th>Status</th>
       <th>Reason</th>
-      <th>Created At</th>
+      <th width="120">Created At</th>
     </tr>
 
   <% @result.each do |record| %>

data/app/views/mail_engine/reports/charts/bounces.html.erb

@@ -1,12 +1,12 @@
 <h1><%= params[:type].titleize %></h1>
 
-<% show_no_record(@result) do %>
+<%= show_no_record(@result) do %>
   <table class="data-table">
     <tr>
       <th>Email</th>
       <th>Status</th>
       <th>Reason</th>
-      <th>Created At</th>
+      <th width="120">Created At</th>
     </tr>
 
   <% @result.each do |record| %>

data/app/views/mail_engine/reports/charts/invalidemails.html.erb

@@ -1,11 +1,11 @@
 <h1><%= params[:type].titleize %></h1>
 
-<% show_no_record(@result) do %>
+<%= show_no_record(@result) do %>
   <table class="data-table">
     <tr>
       <th>Email</th>
       <th>Reason</th>
-      <th>Created At</th>
+      <th width="120">Created At</th>
     </tr>
 
   <% @result.each do |record| %>

data/app/views/mail_engine/reports/charts/spamreports.html.erb

@@ -1,10 +1,10 @@
 <h1><%= params[:type].titleize %></h1>
 
-<% show_no_record(@result) do %>
+<%= show_no_record(@result) do %>
   <table class="data-table">
     <tr>
       <th>Email</th>
-      <th>Created At</th>
+      <th width="120">Created At</th>
     </tr>
 
   <% @result.each do |record| %>

data/app/views/mail_engine/reports/index.html.erb

@@ -1,3 +1,6 @@
+<!-- used for google chart -->
+<script type='text/javascript' src='https://www.google.com/jsapi'></script>
+
 <script type="text/javascript">
   // show historical line chart
   function drawLine() {
@@ -20,19 +23,51 @@
     chart.draw(data, {width: 960, height: 300, title: 'History Reports', chartArea: {left:0,top:0,width:"80%",height:"90%"} });
   }
 
+  // load google chart package.
   var stats_data = <%= raw @stats_data.to_json %>;
   google.load("visualization", "1", {packages:["corechart"]});
   google.setOnLoadCallback(drawLine);
+
+  $(function(){
+    // add date picker
+    var dates = $("#report_from, #report_to").datepicker({
+			defaultDate: "0",
+			changeMonth: false,
+			numberOfMonths: 1,
+			dateFormat: "yy-mm-dd",
+			onSelect: function(selectedDate) {
+				var option = this.id == "report_from" ? "minDate" : "maxDate",
+					instance = $(this).data("datepicker"),
+					date = $.datepicker.parseDate(
+						instance.settings.dateFormat ||	$.datepicker._defaults.dateFormat,
+						selectedDate,
+						instance.settings
+					);
+				dates.not(this).datepicker("option", option, date);
+			}
+		});
+  });
 </script>
 
 <div class="historical-report left" style="margin-top: 10px">
-  <h2>History Report</h2>
-  <div class="clearrer"></div>
+  <h2 class="left">History Report</h2>
+  <!-- data range select -->
 
-  <div id='line_chart'></div>
+  <div class="right" style="margin-right: 40px; margin-bottom: 50px">
+    <%= form_for :report, reports_path, :html => {:method => :get} do |f| %>
+      <%= f.label :from %>
+      <%= f.text_field :from, :class => "text", :value => params[:report].try(:[], :from) || 1.weeks.ago.to_date.to_s(:db) %>
 
-  <div class="history">
-    <table border="0" cellspacing="5" cellpadding="5" class="data-table" style="width: 95%; margin-top: 50px">
+      <%= f.label :to %>
+      <%= f.text_field :to, :class => "text", :value => params[:report].try(:[], :to) || Time.now.to_date.to_s(:db) %>
+      &nbsp; <input type="submit" class="refresh_report_list button" value="Submit">
+    <% end %>
+  </div>
+  <div class="clearer"></div>
+
+  <div id='line_chart'></div>
+  <div class="history" style="margin-top: 50px;">
+    <table border="0" cellspacing="5" cellpadding="5" class="data-table" style="width: 95%;">
       <tr>
         <th>Date</th>
         <th>Requests</th>

data/config/routes.rb

@@ -1,26 +1,24 @@
 module MailEngine
   Rails.application.routes.draw do
-    scope "/admin", :module => :mail_engine do
+    scope MailEngine::Base.current_config["mount_at"], :module => :mail_engine do
       match '/', :controller => "dashboard", :action => "index", :as => :mail_engine_dashboard
 
       resources :mail_templates do
         member do
           get :duplicate
           put :duplicate
-
           get :preview
           post :preview
-
           get :body
           post :body
-
           post :send_test_mail
         end
 
         collection do
-          # used before mail template be saved
+          # used before mail template been saved
           post :preview
 
+          get :get_existed_subject
           get :new_by_upload
           post :create_by_upload
           post :partial_options
@@ -35,12 +33,13 @@ module MailEngine
         end
       end
 
-      resources :mail_logs
       resources :reports do
         collection do
           get :chart
         end
       end
+
+      resources :mail_logs
     end
 
     # match ':controller(/:action(/:id(.:format)))', :controller => /admin\/[^\/]+/