NKUT footer displaying number of visitors and last update time

app/assets/javascripts/kernel.js

@@ -38,6 +38,8 @@ $(document).ready(function() {
 			}
 		}
 	})
+
+	$('.page_footer').append($('#last_update_date')[0]);
 });
 //    Ad Banner FX code [end]
 

app/assets/javascripts/lib/modal-preview.js

@@ -1,13 +1,20 @@
 $(function() {
 	$(".post_preview").click(function(){
 		$("#main-wrap").after("<span id='show_preview'></span>");
+		
+		var  preview_url = $(this).attr('url');
 
-		$.post($(this).attr('url'), $(".previewable").serialize() ,function(data){
-			$('#show_preview .modal').modal();
+		$("form.previewable").ajaxSubmit({
+			beforeSubmit: function(a,f,o){
+			o.dataType = 'script';
+			o.url = preview_url;
+			o.type =  'post';
+		},success: function(msg) {
+			$('#show_preview .modal').modal()
 			$('#show_preview .modal').height(function() {
 				return $(window).height() * 0.7;
 			});
-		},'script');
+		}});
 	});
 	$(".preview_trigger").click(function(){
 		$("#main-wrap").after("<span id='show_preview'></span>");
@@ -38,10 +45,10 @@ $(function() {
 	// 			o.url = url.nodeValue;
 	// 			o.type =  'post';
 	// 		},success: function(msg) {
-				// $('#show_preview .modal').modal()
-				// $('#show_preview .modal').height(function() {
-				// 	return $(window).height() * 0.7;
-				// });
+	// 			$('#show_preview .modal').modal()
+	// 			$('#show_preview .modal').height(function() {
+	// 				return $(window).height() * 0.7;
+	// 			});
 	// 		}
 
 	// 		});

app/assets/stylesheets/mobile/orbit-mobile.css.erb.css

@@ -179,6 +179,7 @@ div[data-role="page"] {
 }
 .content .orbit-cycle-slideshow {
 	height: 300px;
+	overflow: hidden;
 }
 .content .orbit-cycle-slideshow img {
 	width: 100%;
@@ -325,13 +326,22 @@ div[id^="dialog"] .content {
 	margin-bottom: 5px;
 }
 @media(min-width:320px){
+	.content .orbit-cycle-slideshow {
+		height: 130px;
+	}
 }
 @media(min-width: 480px){
+	.content .orbit-cycle-slideshow {
+		height: 170px;
+	}
 	.content .newitem {
 		width: 440px;
 	}
 }
 @media(min-width:600px) {
+	.content .orbit-cycle-slideshow {
+		height: 200px;
+	}
 	.main-menu ul {
 		width: 420px;
 	}
@@ -340,6 +350,9 @@ div[id^="dialog"] .content {
 	}
 }
 @media(min-width:768px) {
+	.content .orbit-cycle-slideshow {
+		height: 250px;
+	}
 	.main-menu ul {
 		width: 480px;
 	}
@@ -351,6 +364,9 @@ div[id^="dialog"] .content {
 	}
 }
 @media(min-width:800px) {
+	.content .orbit-cycle-slideshow {
+		height: 330px;
+	}
 	.main-menu ul {
 		width: 480px;
 	}
@@ -359,6 +375,9 @@ div[id^="dialog"] .content {
 	}
 }
 @media(min-width:961px) {
+	.content .orbit-cycle-slideshow {
+		height: 380px;
+	}
 	.main-menu ul {
 		width: 480px;
 	}

app/controllers/admin/pages_controller.rb

@@ -36,6 +36,26 @@ class Admin::PagesController < Admin::ItemsController
       @item.page_contexts.build(:create_user_id => current_user.id, :update_user_id => current_user.id )
     end
     if @item.update_attributes(params[:page])
+      unless params[:page]['frontend_field'].nil?
+        frontend_class = []
+        frontend_field_name = []
+        frontend_sat_to_link = []
+
+        params[:page]['frontend_field'].each do |field|
+          frontend_class << field['class']
+          frontend_field_name << field['field_name']
+          frontend_sat_to_link << field['sat_to_link']
+        end
+
+        @item['frontend_class'] = frontend_class
+        @item['frontend_field_name'] = frontend_field_name
+        @item['frontend_sat_to_link'] = frontend_sat_to_link
+      end
+      
+      @item['tag'] = params[:page]['tag'] == nil ?  [] : params[:page]['tag']
+
+      @item.save
+
       render 'admin/items/reload_items'
     else
       @error = error_messages_for(@item)

app/controllers/admin/sites_controller.rb

@@ -72,7 +72,10 @@ class Admin::SitesController < OrbitBackendController
   end
 
   def system_info
-    
+    @disk_free = `df -h /`.gsub("\n","<br/>").html_safe
+    @nginx_version = %x[/opt/nginx/sbin/nginx -v 2>&1].gsub("\n","<br/>              ").html_safe
+    @mongo_version = `mongod --version`.split("\n")[0].html_safe
+    @linux_version = `lsb_release -d`.split(":")[1].html_safe
   end
 
   def search_engine

app/controllers/admin/template_store_controller.rb

@@ -1,22 +1,95 @@
+require 'net/http'
+require 'uri'
+require 'fileutils'
+require 'zip/zip'
 class Admin::TemplateStoreController < OrbitBackendController
   
  
   @@store_domain = STORE_CONFIG[:store_settings]["url"] 
   def index
     @store = @@store_domain
+    @design_ids = Design.all.map{|d| d.template_store_id}
     @templates = JSON.parse(get_templates)
   end
 
   def show
      @store = @@store_domain
+     @design_ids = Design.all.map{|d| d.template_store_id}
     @template = JSON.parse(get_template(params[:id])) rescue nil
   end
 
  def download_theme
-    render :json => {"success"=>true}.to_json
+  url = @@store_domain + params["url"]
+  url_base = url.split('/')[2]
+  url_path = '/'+url.split('/')[3..-1].join('/')
+  Net::HTTP.start(url_base) do |http|
+    open("public/#{params['slug']}.zip", "wb") do |file|
+      http.get(url_path) do |str|
+        file.write(str)
+      end
+    end
+  end
+    upload_package("#{params['slug']}.zip", params["id"])
+    File.delete("public/#{params['slug']}.zip")
+    render :json => {"success"=>true,"url"=>@@store_domain + params["url"]}.to_json
   end
   protected
 
+  def upload_package(package_name,template_store_id)
+
+    temp_file = Tempfile.new("temp_file")
+    original_file = File.open("#{Rails.root}/public/#{package_name}")
+    temp_file.write(original_file.read.force_encoding('UTF-8'))
+    temp_file.rewind
+    filename = File.basename(original_file,".zip")
+    unzip_design(temp_file, filename, template_store_id)
+    temp_file.close
+
+  end
+
+  def unzip_design(file, zip_name, template_store_id)
+    Zip::ZipFile.open(file) { |zip_file|
+      design = Design.new.from_json(zip_file.read("#{zip_name}/info.json"))
+      design.template_store_id = template_store_id
+      Dir.mktmpdir('f_path') { |dir|
+        themes_entries = []
+        javascripts_entries = []
+        images_entries = []
+
+        zip_file.entries.each do |entry|
+          case (path = entry.to_s)
+            when /\A(#{zip_name})\/(default\.css)\z/    #for default css
+              design.build_css_default(:file => get_temp_file(zip_file, dir, entry))
+            when /\A(#{zip_name})\/(reset\.css)\z/    #for reset css
+              design.build_css_reset(:file => get_temp_file(zip_file, dir, entry))
+            when /\A(#{zip_name})\/(layout\.html)\z/    #for layout html
+              design.build_layout(:file => get_temp_file(zip_file, dir, entry))
+            when /\A(#{zip_name})\/(themes)\/.*(\.css)\z/   #for themes css
+              themes_entries << entry
+            when /\A(#{zip_name})\/(javascripts)\/.*(\.js)\z/   #for js
+              javascripts_entries << entry
+            when /\A(#{zip_name})\/(images)\/.*((\.jpg)|(\.png)|(\.gif))\z/   #for img
+              images_entries << entry
+          end
+        end
+
+        ['themes', 'javascripts', 'images'].each do |type|
+          eval("#{type}_entries").each do |entry|
+            eval("design.#{type}").build(:file => get_temp_file(zip_file, dir, entry))
+          end
+        end
+      }
+      design.save
+    }
+  end
+
+  def get_temp_file(zip_file, dir, entry)
+    filename = File.basename(entry.to_s)
+    temp_file = File.new(dir + '/' + filename, 'w+') 
+    temp_file.write (zip_file.read entry ).force_encoding('UTF-8')
+    temp_file
+  end
+
   def get_template(id)
     uri = URI.parse("#{@@store_domain}/api/templates/#{id}")
     http = Net::HTTP.new(uri.host, uri.port)

app/controllers/pages_controller.rb

@@ -2,6 +2,7 @@ class PagesController < ApplicationController
   include ApplicationHelper
   before_filter :get_item, :only => [:index_from_link, :show_from_link]
   before_filter :check_frontend_open, :only => [:index,:show]
+  before_filter :get_last_update_date, :only => [:index,:show]
   # caches_page :index
 
   def index
@@ -226,4 +227,8 @@ class PagesController < ApplicationController
       return false
     end
   end
+
+  def get_last_update_date
+    @last_update_date = t(:total_visitors)+' : '+ Impression.count.to_s+' | '+t(:update_at)+' : '+Bulletin.order_by(:updated_at.desc).limit(1).first[:updated_at].to_s
+  end
 end

app/helpers/orbit_backend_helper.rb

@@ -321,7 +321,17 @@ module OrbitBackendHelper
         content_tag :li, link_to(t(quick[:translation] || :rejected_reason) + ' ' + truncate(object.not_checked_reason, :length => 10), '#', rel: "tooltip", 'data-original-title' => (wrap_string_with(object.not_checked_reason, :line_width => 24)), class: "reject_info #{quick[:class]}")
       end
     else
-      content_tag :li, link_to(t(quick[:translation]), eval("#{quick[:link]}('#{object.id}')"), class: quick[:class])
+      if quick[:define_link]
+        if quick[:condition_option]
+          if eval("#{quick[:condition_option]}")
+            content_tag :li, link_to(t(quick[:translation]), eval("#{quick[:define_link]}"), class: quick[:class])
+          end 
+        else
+          content_tag :li, link_to(t(quick[:translation]), eval("#{quick[:define_link]}"), class: quick[:class])
+        end
+      else
+        content_tag :li, link_to(t(quick[:translation]), eval("#{quick[:link]}('#{object.id}')"), class: quick[:class])
+      end
     end
   end
 
@@ -433,6 +443,10 @@ module OrbitBackendHelper
           res << "<li class='active'>#{t(:search_engine)}</li>"
         when 'site_info'
           res << "<li class='active'>#{t(:site_info)}</li>"
+        when 'update_manager'
+          res << "<li class='active'>#{t(:update_manager)}</li>"
+        when 'system_info'
+          res << "<li class='active'>#{t("site.system_preference")}</li>"
         end
       when 'items'
         res << "<li class='active'>#{t(:structure)}</li>"

app/mailer/cron_mail.rb

@@ -2,28 +2,30 @@ class CronMail < ActionMailer::Base
   default :from => "orbit_test@rulingcom.com"
   
   def get_settings
-  	  	# @@smtp_settings = {
-   #    :address => "smtp.gmail.com",
-   #    :port => '587',
-   #    :domain => "smtp.gmail.com",
-   #    :authentication => "plain",
-   #    :user_name => "redmine@rulingcom.com",
-   #    :password => "rulingredmine",
-   #    :tls => true,
-			# :enable_starttls_auto => true
-   #   }
-  	@@smtp_settings = {
-      :address => @site['mail_settings']['address'],
-      :port => @site['mail_settings']['port'],
-      :domain => @site['mail_settings']['domain'],
-      :authentication => @site['mail_settings']['authentication'],
-      :user_name => @site['mail_settings']['user_name'],
-      :password => @site['mail_settings']['password'],
-      :tls => @site['mail_settings']['tls'],
-			:enable_starttls_auto => @site['mail_settings']['enable_starttls_auto']
+    @site = Site.first
+    @@smtp_settings = {
+      :enable_starttls_auto => @site['site_settings']['enable_starttls_auto'],
+      :address => @site['site_settings']['address'],
+      :port => @site['site_settings']['port'],
+      :domain => @site['site_settings']['domain'],
+      :authentication => @site['site_settings']['authentication'],
+      :user_name => @site['site_settings']['user_name'],
+      :password => @site['site_settings']['password']
     }
   end
 
+  def self.smtp_settings
+    @site = Site.first
+    @@smtp_settings = {
+      :enable_starttls_auto => @site['site_settings']['enable_starttls_auto'],
+      :address => @site['site_settings']['address'],
+      :port => @site['site_settings']['port'],
+      :domain => @site['site_settings']['domain'],
+      :authentication => @site['site_settings']['authentication'],
+      :user_name => @site['site_settings']['user_name'],
+      :password => @site['site_settings']['password']
+    }
+  end
 
   def time_check(msg)
   	get_settings

app/models/design/design.rb

@@ -7,6 +7,7 @@ class Design
   field :intro, :type => String
   field :title, :type => String
   field :version, :type => String
+  field :template_store_id, :type => String
 
   mount_uploader :zip_file, AssetUploader
 

app/views/admin/items/_site_bar.html.erb

@@ -22,8 +22,8 @@
 
 				<li title="<%= t('update_manager') %>"><%= link_to admin_site_update_manager_path(@site), :class => active_for_action('sites', 'update_manager') do %><span><i class="icon-refresh"></i></span><%end%></li>
 
-<!-- 				<li title="System Info"><a href="/orbit_4.0.1/admin/system_info/index.shtml?sidebarNavList=8&amp;subNavBlockList=0"><span><i class="icons-info-2"></i></span></a></li>
- -->			</ul>
+				<li title="<%= t("site.system_preference") %>"><%= link_to admin_site_system_info_path(@site), :class => active_for_action('sites', 'system_info') do %><span><i class="icons-info-2"></i></span><%end%></li>
+			</ul>
 		</div>
 		<div class="sub-nav-arrow"></div>
 	</div>

app/views/admin/sites/_side_bar.html.erb

@@ -22,8 +22,8 @@
 
 				<li title="<%= t('update_manager') %>"><%= link_to admin_site_update_manager_path(@site), :class => active_for_action('sites', 'update_manager') do %><span><i class="icon-refresh"></i></span><%end%></li>
 
-<!-- 				<li title="System Info"><a href="/orbit_4.0.1/admin/system_info/index.shtml?sidebarNavList=8&amp;subNavBlockList=0"><span><i class="icons-info-2"></i></span></a></li>
- -->			</ul>
+				<li title="<%= t("site.system_preference") %>"><%= link_to admin_site_system_info_path(@site), :class => active_for_action('sites', 'system_info') do %><span><i class="icons-info-2"></i></span><%end%></li>
+			</ul>
 		</div>
 		<div class="sub-nav-arrow"></div>
 	</div>

app/views/admin/sites/preference.html.erb

@@ -65,7 +65,7 @@
                   <div class="control-group">
                     <label class="control-label muted"><%= t 'mail.domain' %></label>
                     <div class="controls">
-						<%= f.text_field :port, :value => (@site['site_settings']['port'] rescue nil), :class=>"input-large", :placeholder=>"Domain" %>
+						<%= f.text_field :domain, :value => (@site['site_settings']['domain'] rescue nil), :class=>"input-large", :placeholder=>"Domain" %>
                     </div>
                   </div>
                   <div class="control-group">
@@ -83,7 +83,7 @@
                   <div class="control-group">
                     <label class="control-label muted"><%= t 'mail.password' %></label>
                     <div class="controls">
-                      <%= f.text_field :password, :value => (@site['site_settings']['password'] rescue nil), :class=>"input-large", :placeholder=>"Password" %>
+                      <%= f.password_field :password, :value => (@site['site_settings']['password'] rescue nil), :class=>"input-large", :placeholder=>"Password" %>
                     </div>
                   </div>
                   <div class="control-group">

app/views/admin/sites/show_system_preference.html.erb

@@ -1,47 +0,0 @@
-<h1><%= I18n.t("site.system_preference") %></h1>
-<ul class="nav nav-tabs" id="myTab">
-  <li class="active"><a href="#summary"  data-toggle="tab"><%= I18n.t("site.system_preference_.tab_summary") %></a></li>
-  <li><a href="#commits" data-toggle="tab"><%= I18n.t("site.system_preference_.tab_commits") %></a></li>
-  <li><a href="#backups"  data-toggle="tab"><%= I18n.t("site.system_preference_.tab_backups") %></a></li>
-  <li><a href="#resque_logs"  data-toggle="tab"><%= I18n.t("site.system_preference_.tab_logs") %></a></li>
-</ul>
- 
-<div class="tab-content">
-  <div class="tab-pane  active in" id="summary">
-        <h2><%= I18n.t("site.system_preference_.summary.disk_space") %>:</h2>
-         <%= content_tag :p,@site.disk_space.gsub(/\n/,"<br />").html_safe if @site.disk_space %>
-        <h2><%= I18n.t("site.system_preference_.summary.code_update_at") %>: </h2>
-        <% @site.system_package_info.each do |index,value| %>
-          <h2><%= index.titleize %> <%= I18n.t("site.system_preference_.summary.version") %>:</h2>       
-          <%= content_tag :p,value %>
-        <% end %>
-        <h2><%= I18n.t("site.system_preference_.summary.weekness_report") %>:<%= '' %></h2>
-  </div>
-  <div class="tab-pane" id="commits">
-    <% if @git_commit_list_file %>
-      <% @git_commit_list_file.lines do |line|%>
-        <%= line %><br/>
-      <% end%>
-      <% else %>
-      <div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>
-    <% end %>
-  </div>
-  <div class="tab-pane" id="backups">
-    <%if @db_backup_list_file %>
-      <% @db_backup_list_file.lines do |line|%>
-        <%=line %><br/>
-      <% end %>
-      <% else %>
-        <div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>
-    <% end %>
-  </div>
-  <div class="tab-pane" id="resque_logs">
-  <%if @db_backup_list_file %>
-    <% @resque_logs_file.lines do |line|%>
-      <%=line %><br/>
-    <% end if @resque_logs_file%>
-    <%else %>
-          <div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>
-    <% end %>
-  </div>
-</div>

app/views/admin/sites/system_info.html.erb

@@ -1,5 +1,159 @@
+<%= stylesheet_link_tag "lib/wrap-nav" %>
+<%= stylesheet_link_tag "lib/main-list" %>
+<%= stylesheet_link_tag "lib/main-forms" %>
+<%= stylesheet_link_tag "lib/fileupload.css" %>
+<%= stylesheet_link_tag "lib/togglebox.css" %>
+<%= stylesheet_link_tag "lib/list-check.css" %>
+
+<%= javascript_include_tag "lib/site_set" %>
+<%= javascript_include_tag "lib/list-check" %>
+
 <% 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 %>
 
-system_info.html.erb
+<form class="form-horizontal main-forms">
+  <fieldset>
+    <div class="input-area">
+      <div class="nav-name"><strong><%= t("preferences.classification") %></strong></div>
+      <ul class="nav nav-pills language-nav">
+        <li class="active"><a href="#overview" data-toggle="tab"><%= t("site.system_preference_.tab_summary") %></a></li>
+        <li><a href="#mail-cron-logs" data-toggle="tab"><%= t("site.system_preference_.tab_send_reminders_log") %></a></li>
+      </ul>
+       
+      <div class="tab-content">
+        <!-- Overview -->
+        <div id="overview" class="tab-pane fade in active">
+          <h3 class="muted"><%= t("site.system_preference_.summary.disk_space") %></h3>
+          <blockquote>
+            <p>
+              <%= @disk_free %>
+            </p>
+          </blockquote>
+          <h3 class="muted">Nginx <%= t("site.system_preference_.summary.version") %></h3>
+          <blockquote>
+            <p>
+              <%= @nginx_version  %>
+            </p>
+          </blockquote>
+          </span>
+          <h3 class="muted">MongoDB <%= t("site.system_preference_.summary.version") %></h3>
+          <blockquote>
+            <p>
+              <%= @mongo_version  %>
+            </p>
+          </blockquote>
+          <h3 class="muted">Linux <%= t("site.system_preference_.summary.version") %></h3>
+          <blockquote>
+            <p>
+              <%= @linux_version  %>
+            </p>
+          </blockquote>
+          </span>   
+        </div>
+
+        <!-- Email Log -->
+        <div id="mail-cron-logs" class="tab-pane fade">
+          <ul class="nav nav-pills">
+            <li class="active">
+              <a href="#send-log" data-toggle="tab"><%= t(:email_log) %></a>
+            </li>
+            <li>
+              <a href="#waiting-sent" data-toggle="tab"><%= t(:email_queue) %></a>
+            </li>
+          </ul>
+          <div class="tab-content">
+            <div class="tab-pane fade in active" id="send-log">
+              <p class="">
+                <a href="#" class="btn list-active-btn disabled" data-check-action="list-be-remove" rel="/panel/announcement/back_end/bulletins/delete"><i class="icons-trash"></i></a>
+              </p>
+              <table class="table main-list table-striped">
+                <thead>
+                  <tr>
+                    <th>
+                      <input type="checkbox" class="list-check" name="to_delete[]" value="b" />
+                    </th>
+                    <th><%= t(:sent_date) %></th>
+                    <th><%= t(:subject) %></th>
+                    <th><%= t(:mail_to) %></th>
+                    <th><%= t(:mail_user) %></th>
+                    <th><%= t(:mail_from_app) %></th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr>
+                    <td>
+                      <input type="checkbox" class="list-check" name="to_delete[]" value="b" />
+                    </td>
+                    <td>2014-01-16 17:57</td>
+                    <td>【轉知】國家教育研究院辦理普通高級中學語文及社會領域課綱微調分區公聽會
+                      <div class="quick-edit">
+                        <ul class="nav nav-pills">
+                          <li><a href="#" class="text-error"><%= t(:delete_) %></a></li>
+                        </ul>
+                      </div>
+                    </td>
+                    <td>alluser@tea.ntue.edu.tw</td>
+                    <td>蔣 欣潔</td>
+                    <td>er_email</td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+            <div class="tab-pane fade in" id="waiting-sent">
+              <p class="">
+                <a href="#" class="btn list-active-btn disabled" data-check-action="list-be-remove" rel="/panel/announcement/back_end/bulletins/delete"><i class="icons-trash"></i></a>
+              </p>
+              <table class="table main-list table-striped">
+                <thead>
+                  <tr>
+                    <th>
+                      <input type="checkbox" class="list-check" name="to_delete[]" value="b" />
+                    </th>
+                    <th>Sentdate</th>
+                    <th>Subject</th>
+                    <th>Mail To</th>
+                    <th>Mail User</th>
+                    <th>Mail From App</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr>
+                    <td>
+                      <input type="checkbox" class="list-check" name="to_delete[]" value="b" />
+                    </td>
+                    <td>2014-01-16 17:57</td>
+                    <td>【轉知】國家教育研究院辦理普通高級中學語文及社會領域課綱微調分區公聽會
+                      <div class="quick-edit">
+                        <ul class="nav nav-pills">
+                          <li><a href="#" class="text-error"><%= t(:delete_) %></a></li>
+                        </ul>
+                      </div>
+                    </td>
+                    <td>alluser@tea.ntue.edu.tw</td>
+                    <td>蔣 欣潔</td>
+                    <td>er_email</td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </fieldset>
+</form>
+
+<div id="dialog" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="Delete item" aria-hidden="true">
+  <div class="modal-header">
+    <a class="close" data-dismiss="modal">×</a>
+    <h3><%= t(:sure?) %></h3>
+  </div>
+  <div class="modal-body">
+    <span class="text-warning text-center"><%= t(:this_action_can_not_be_restore) %></span>
+  </div>
+  <div class="modal-footer">
+    <button class="btn" data-dismiss="modal" aria-hidden="true"><%= t(:close) %></button>
+    <button class="delete-item btn btn-danger"><%= t(:delete_) %></button>
+  </div>
+</div>

app/views/admin/template_store/index.html.erb

@@ -60,7 +60,11 @@
                 <span class="item-price">Free</span>
               </span>
             </a>
-            <%= link_to "Download", "javascript:void(0);", "data-url" => template['template']['template']['url'], :class=> 'btn btn-primary download-link' %>
+            <% if @design_ids.include?(template["_id"]["$oid"]) %>
+              <%= link_to "Installed", "javascript:void(0);", "data-url" => template['template']['template']['url'], :class=> 'btn btn-success download-link', "disabled"=>"disabled", "data-name"=>template['title'], "data-slug"=>template["_slugs"][0], "data-id"=>template["_id"]["$oid"] %>
+            <% else %>
+              <%= link_to "Download", "javascript:void(0);", "data-url" => template['template']['template']['url'], :class=> 'btn btn-primary download-link', "data-name"=>template['title'], "data-slug"=>template["_slugs"][0], "data-id"=>template["_id"]["$oid"] %>
+            <% end %>
           </li>
         <% end %>
 
@@ -71,20 +75,20 @@
 <script type="text/javascript">
   (function(){
     $("a.download-link").on(clickEvent,function(){
-      var el = $(this),
-          downloadurl = $(this).data("url");
-
+      if($(this).attr("disabled") == "disabled")return false;
+      var el = $(this);
       el.removeClass("btn-primary").addClass("btn-info").text("Installing").attr('disabled',"disabled");
       $.ajax({
         url : "<%= admin_template_store_download_theme_path %>",
-        data : {"url" : downloadurl},
+        data : el.data(),
         dataType : "json",
-        type : "post",
-        success : function(data){
-          if(data.success){
+        type : "post"
+      }).done(function(data){
+         if(data.success){
             el.removeClass('btn-info').addClass('btn-success').text("Installed");
           }
-        }
+      }).fail(function(){
+          el.removeClass('btn-info').addClass('btn-danger').text("Error, please try again.").removeAttr('disabled');
       })
     })
   })()

app/views/admin/template_store/show.html.erb

@@ -8,7 +8,11 @@
         <div id="item-info">
           <%= image_tag "#{@store}#{@template['preview']['preview']['thumb']['url']}", :class => "item-thumb" %>
           <h2 class="item-name"><%= @template['title'] %></h2>
-           <%= link_to "Download", "javascript:void(0);", "data-url" => @template['template']['template']['url'], :class=> 'btn btn-primary download-link' %>
+           <% if @design_ids.include?(@template["_id"]["$oid"]) %>
+              <%= link_to "Installed", "javascript:void(0);", "data-url" => @template['template']['template']['url'], :class=> 'btn btn-success download-link', "disabled"=>"disabled", "data-name"=>@template['title'], "data-slug"=>@template["_slugs"][0], "data-id"=>@template["_id"]["$oid"] %>
+            <% else %>
+              <%= link_to "Download", "javascript:void(0);", "data-url" => @template['template']['template']['url'], :class=> 'btn btn-primary download-link', "data-name"=>@template['title'], "data-slug"=>@template["_slugs"][0], "data-id"=>@template["_id"]["$oid"] %>
+           <% end %>
           <ul class="item-extra-info">
             <li><span class="title">views</span><span class="count"><%= Random.new.rand(10..100) %></span></li>
             <!-- <li><span class="title">color</span><span class="color-tag green"></span></li> -->
@@ -64,21 +68,22 @@
 <script type="text/javascript">
   (function(){
     $("a.download-link").on(clickEvent,function(){
-      var el = $(this),
-          downloadurl = $(this).data("url");
-
+      if($(this).attr("disabled") == "disabled")return false;
+      var el = $(this);
       el.removeClass("btn-primary").addClass("btn-info").text("Installing").attr('disabled',"disabled");
       $.ajax({
         url : "<%= admin_template_store_download_theme_path %>",
-        data : {"url" : downloadurl},
+        data : el.data(),
         dataType : "json",
-        type : "post",
-        success : function(data){
-          if(data.success){
+        type : "post"
+      }).done(function(data){
+         if(data.success){
             el.removeClass('btn-info').addClass('btn-success').text("Installed");
           }
-        }
+      }).fail(function(){
+          el.removeClass('btn-info').addClass('btn-danger').text("Error, please try again.").removeAttr('disabled');
       })
     })
   })()
 </script>
+

app/views/layouts/page_layout.html.erb

@@ -41,5 +41,6 @@
       }
     </style>
   <% end %>
+  <div id='last_update_date_wrap' style='display:none;'><div id='last_update_date'><%= @last_update_date %></div></div>
 </body>
 </html>

app/views/shared/preview/_modal_preview.html.erb

@@ -41,7 +41,7 @@
 
       function InsertPreviewImage(){
         if($("iframe").contents().find('.news_image').length){
-          $("iframe").contents().find('.news_image').append("<a href='' target='_blank'><img src='"+preview_img+"' width='320' height='240' /></a>");
+          $("iframe").contents().find('.news_image').append("<a href='' target='_blank'><img src='"+preview_img+"' width='320' /></a>");
         }else{
           setTimeout(InsertPreviewImage,1000);
         }

config/environments/production.rb

@@ -63,15 +63,5 @@ Orbit::Application.configure do
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.perform_deliveries = true
   config.action_mailer.raise_delivery_errors = true
-  config.action_mailer.smtp_settings = {
-    :enable_starttls_auto => true,
-    :openssl_verify_mode => 'none',
-    :address => 'smtp.sendgrid.net',
-    :port => '587',
-    :domain => "new.tp.rulingcom.com",
-    :authentication => "plain",
-    :user_name => "rulingcom",
-    :password => "bjo4xjp6"
-  }
 
 end

config/locales/en.yml

@@ -192,6 +192,8 @@ en:
     link: Editing link
     page: Editing page
   email: Email
+  email_log: Email Log
+  email_queue: Waiting to be sent
   enable: Enable
   enabled_for: Enabled for
   end: End
@@ -274,6 +276,9 @@ en:
     setting: Mail settings
     tls: TLS
     user_name: User Name
+  mail_from_app: Mail From App
+  mail_to: Mail To
+  mail_user: Mail User
   manager: Manager
   markup: Markup
   markup_options: Markup options
@@ -424,6 +429,7 @@ en:
     index: Index
     summary: Summary
     thumbnail: Thumbnail
+  sent_date: Sent Date
   settings: Site Setting
   site:
     backend_openness_on: Backend Openness 
@@ -454,6 +460,7 @@ en:
       tab_commits: Commits      
       tab_summary: Summary
       tab_logs: Logs
+      tab_send_reminders_log: Send reminders log
       summary:
         code_update_at: Code Update histroy
         disk_space: Disk Free
@@ -483,6 +490,7 @@ en:
   sub_role: Sub Role
   sub_role_field: Sub Role Field
   sub_role_info: " Sub Role Info."
+  subject: Subject
   subtitle: Subtitle
   submit: Submit
   submit_approval: Submit approval
@@ -506,6 +514,7 @@ en:
   text: Text
   theme: Theme
   themes: Themes
+  this_action_can_not_be_restore: This action can not be restored, are you sure you want to delete?
   title: Title
   to_search: Set as Search Key
   to_show: Display in frontend

config/locales/zh_tw.yml

@@ -192,6 +192,8 @@ zh_tw:
     link: 編輯連結
     page: 編輯頁面
   email: 電子郵件
+  email_log: 寄送紀錄
+  email_queue: 待寄送郵件
   enable: 開啟
   enabled_for: 啟用
   end: 結束
@@ -276,6 +278,9 @@ zh_tw:
     setting: 電子郵件設定
     tls: 電子郵件TLS
     user_name: 電子郵件帳號
+  mail_from_app: 寄送模組
+  mail_to: 收件者
+  mail_user: 寄件者
   manager: 管理者
   markup: 輸入模式
   markup_options: 標註選項
@@ -426,6 +431,7 @@ zh_tw:
     index: 檢索
     summary: 摘要
     thumbnail: 縮圖
+  sent_date: 寄送日期
   settings: 基本設定
   site:
     frontend_closed: 前台關閉？
@@ -456,6 +462,7 @@ zh_tw:
       tab_commits: 程式版本
       tab_summary: 總覽
       tab_logs: 排程工作日誌
+      tab_send_reminders_log: 寄送提醒紀錄
       summary:
         code_update_at:  程式更新紀錄
         disk_space: 硬碟空間
@@ -485,6 +492,7 @@ zh_tw:
   sub_role: 子身份
   sub_role_field: 子身份欄位
   sub_role_info: 子身份資料
+  subject: 主題
   subtitle: 副標題
   submit: 送出
   submit_approval: 送出已核准
@@ -508,6 +516,7 @@ zh_tw:
   text: 內文
   theme: 套用頁面樣式
   themes: 主題
+  this_action_can_not_be_restore: 刪除後將無法還原，您確定要刪除嗎？
   title: 標題
   to_search: 加入搜尋條件
   to_show: 是否顯示於前台

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb

@@ -10,6 +10,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   end
 
   def preview
+    params['bulletin']['image'] = nil
     bulletin = Bulletin.new params
     @preview_obj = bulletin.to_preview
     @preview_obj.save