From 7b2f1c090b3b62c8b545eb1423ca9ef3b2e0c679 Mon Sep 17 00:00:00 2001
From: spen <spen@rulingcom.com>
Date: Thu, 20 Mar 2014 15:08:54 +0800
Subject: [PATCH] Fix mail cron log list

---
 .../admin/mail_cron_logs_controller.rb        |  8 +++++
 .../admin/mail_crons_controller.rb            |  9 ++++--
 app/controllers/admin/plugins_controller.rb   |  4 +--
 app/views/admin/mail_cron_logs/show.html.erb  | 31 +++++++++++++++++++
 app/views/admin/mail_crons/show.html.erb      | 28 +++++++++++++++++
 app/views/admin/sites/_mail_cron.html.erb     |  3 +-
 app/views/admin/sites/_mail_cron_log.html.erb |  3 +-
 app/views/admin/sites/system_info.html.erb    |  2 --
 8 files changed, 77 insertions(+), 11 deletions(-)
 create mode 100644 app/views/admin/mail_cron_logs/show.html.erb
 create mode 100644 app/views/admin/mail_crons/show.html.erb

diff --git a/app/controllers/admin/mail_cron_logs_controller.rb b/app/controllers/admin/mail_cron_logs_controller.rb
index 7909427..4e959bd 100644
--- a/app/controllers/admin/mail_cron_logs_controller.rb
+++ b/app/controllers/admin/mail_cron_logs_controller.rb
@@ -16,6 +16,14 @@ class Admin::MailCronLogsController <  OrbitBackendController
     end
 
   end 
+
+  def show
+    @mail_cron_log = MailCronLog.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+    end
+  end
   
   def destroy 
     @mail_cron_log = MailCronLog.find(params[:id])
diff --git a/app/controllers/admin/mail_crons_controller.rb b/app/controllers/admin/mail_crons_controller.rb
index d0ff698..db8422e 100644
--- a/app/controllers/admin/mail_crons_controller.rb
+++ b/app/controllers/admin/mail_crons_controller.rb
@@ -16,8 +16,13 @@ class Admin::MailCronsController <  OrbitBackendController
     end
 
   end
-  
-  def show  
+
+  def show
+    @mail_cron = MailCron.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+    end
   end
   
   def new 
diff --git a/app/controllers/admin/plugins_controller.rb b/app/controllers/admin/plugins_controller.rb
index 2c90d13..407b53a 100644
--- a/app/controllers/admin/plugins_controller.rb
+++ b/app/controllers/admin/plugins_controller.rb
@@ -1,6 +1,4 @@
-class Admin::PluginsController < ApplicationController
-  
-  layout "back_end"
+class Admin::PluginsController < OrbitMemberController
   
   def index
   
diff --git a/app/views/admin/mail_cron_logs/show.html.erb b/app/views/admin/mail_cron_logs/show.html.erb
new file mode 100644
index 0000000..0fd018e
--- /dev/null
+++ b/app/views/admin/mail_cron_logs/show.html.erb
@@ -0,0 +1,31 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
+<% end %>
+
+<h3><%= t(:email_log) %></h3>
+
+<ul>
+  <li>
+    <%= t(:mail_from_app) %>：
+    <%= @mail_cron_log.mail_from_app %>
+  </li>
+  <li>
+    <%= t(:mail_user) %>：
+    <%= @mail_cron_log.mail_user %>
+  </li>
+  <li>
+    <%= t(:sent_date) %>：
+    <%= display_date_time(@mail_cron_log.created_at) %>
+  </li>
+  <li>
+    <%= t(:subject) %>：
+    <%= @mail_cron_log.mail_subject %>
+  </li>
+  <li>
+    <%= t(:mail_to) %>：
+    <p><%= @mail_cron_log.mail_to.gsub(/,/, "<br />").html_safe %></p>
+  </li>
+</ul>
+
+
+<%= link_to t(:close), '#', :class=>"btn", :onclick=>"window.close();" %>
\ No newline at end of file
diff --git a/app/views/admin/mail_crons/show.html.erb b/app/views/admin/mail_crons/show.html.erb
new file mode 100644
index 0000000..f2f3b4b
--- /dev/null
+++ b/app/views/admin/mail_crons/show.html.erb
@@ -0,0 +1,28 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
+<% end %>
+
+<h3><%= t(:email_queue) %></h3>
+
+<ul>
+  <li>
+    <%= t(:mail_from_app) %>：
+    <%= @mail_cron.mail_from_app %>
+  </li>
+  <li>
+    <%= t(:sent_date) %>：
+    <%= display_date_time(@mail_cron.created_at) %>
+  </li>
+  <li>
+    <%= t(:subject) %>：
+    <%= @mail_cron.mail_subject %>
+  </li>
+  <li>
+    <%= t(:mail_to) %>：
+    <p><%= @mail_cron.mail_to.gsub(/,/, "<br />").html_safe %></p>
+  </li>
+</ul>
+
+
+
+<%= link_to t(:close), 'javascript:void(0);', :class=>"btn", :onclick=>"window.close();" %>
\ No newline at end of file
diff --git a/app/views/admin/sites/_mail_cron.html.erb b/app/views/admin/sites/_mail_cron.html.erb
index fb38b01..69e4643 100644
--- a/app/views/admin/sites/_mail_cron.html.erb
+++ b/app/views/admin/sites/_mail_cron.html.erb
@@ -9,13 +9,12 @@
                     <td><%= mail_cron.mail_subject %>
                       <div class="quick-edit">
                         <ul class="nav nav-pills">                          
-                            <%= content_tag(:li, link_to(t(:detail), '#', class: ("detail-row"))) if at_least_module_manager %>
+                            <%= content_tag(:li, link_to(t(:detail), admin_mail_cron_path(mail_cron),:target => '_blank')) if at_least_module_manager %>
                             <%if at_least_module_manager %>
                             <li><%= link_to t(:delete_), admin_mail_cron_path(mail_cron), :class=>"text-error", :confirm => t('sure?'), :method => :delete, :remote => true %></li>
                             <% end -%>
                         </ul>
                       </div>
                     </td>
-                    <td><p><%= mail_cron.mail_to.gsub(/,/, "， ").html_safe %></p></td>
                     <td><%= mail_cron.mail_from_app %></td>
                   </tr>
\ No newline at end of file
diff --git a/app/views/admin/sites/_mail_cron_log.html.erb b/app/views/admin/sites/_mail_cron_log.html.erb
index 47571e0..827f4d4 100644
--- a/app/views/admin/sites/_mail_cron_log.html.erb
+++ b/app/views/admin/sites/_mail_cron_log.html.erb
@@ -9,12 +9,11 @@
                     <td><%= mail_cron_log.mail_subject %>
                       <div class="quick-edit">
                         <ul class="nav nav-pills">
-                            <%= content_tag(:li, link_to(t(:detail), '#', class: ("detail-row"))) if at_least_module_manager %>
+                            <%= content_tag(:li, link_to(t(:detail), admin_mail_cron_log_path(mail_cron_log),:target => '_blank')) if at_least_module_manager %>
                             <%= content_tag(:li, link_to(t(:delete_),admin_mail_cron_log_path(mail_cron_log), :confirm => t(:sure?), :method => :delete, :class=>"text-error", :remote => true)) if at_least_module_manager %>
                         </ul>
                       </div>
                     </td>
-                    <td><p><%= mail_cron_log.mail_to.gsub(/,/, "， ").html_safe %></p> </td>
                     <td><%= mail_cron_log.mail_user %> </td>
                     <td><%= mail_cron_log.mail_from_app %> </td>
                   </tr>
\ No newline at end of file
diff --git a/app/views/admin/sites/system_info.html.erb b/app/views/admin/sites/system_info.html.erb
index 0376bb0..d4a5009 100644
--- a/app/views/admin/sites/system_info.html.erb
+++ b/app/views/admin/sites/system_info.html.erb
@@ -93,7 +93,6 @@
                     </th>
                     <th><%= t(:sent_date) %></th>
                     <th><%= t(:subject) %></th>
-                    <th data-hide="all"><%= t(:mail_to) %></th>
                     <th><%= t(:mail_user) %></th>
                     <th><%= t(:mail_from_app) %></th>
                   </tr>
@@ -120,7 +119,6 @@
                     </th>
                     <th><%= t(:sent_date) %></th>
                     <th><%= t(:subject) %></th>
-                    <th data-hide="all"><%= t(:mail_to) %></th>
                     <th><%= t(:mail_from_app) %></th>
                   </tr>
                 </thead>