From d5e85823fe951d4c16e03da73560d220e4c9710f Mon Sep 17 00:00:00 2001
From: JiangRu <jiang@rulingcom.com>
Date: Mon, 16 Mar 2015 16:56:53 +0800
Subject: [PATCH] Fix PostDate && View Count Title

---
 app/controllers/announcements_controller.rb  |  1 +
 app/views/admin/announcements/_form.html.erb | 12 ++++++++++++
 config/locales/en.yml                        |  1 +
 config/locales/zh_tw.yml                     |  1 +
 4 files changed, 15 insertions(+)

diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb
index e780526..3bd040b 100644
--- a/app/controllers/announcements_controller.rb
+++ b/app/controllers/announcements_controller.rb
@@ -51,6 +51,7 @@ class AnnouncementsController < ApplicationController
         "category-head" => t('announcement.table.category'),
         "link-head" => t('announcement.table.link'),
         "file-head" => t('announcement.table.file'),
+        "view-count-head" => t('announcement.table.view_count'),
         "display" => display
       },
       "total_pages" => announcements.total_pages
diff --git a/app/views/admin/announcements/_form.html.erb b/app/views/admin/announcements/_form.html.erb
index 38ead79..b52b3a7 100644
--- a/app/views/admin/announcements/_form.html.erb
+++ b/app/views/admin/announcements/_form.html.erb
@@ -320,7 +320,19 @@
 
 <% content_for :page_specific_javascript do %>
   <script>
+    function Appendzero(obj)
+    {
+      if(obj<10) return "0" +""+ obj;
+      else return obj;  
+    }
+    
     $(function() {
+      if (location.pathname.substr(-3)=='new'){
+        var getDate = new Date();
+        var toDay = getDate.getFullYear()+"/"+ (Appendzero(getDate.getMonth()+1))+"/"+Appendzero(getDate.getDate())+" "+Appendzero(getDate.getHours())+":"+Appendzero(getDate.getMinutes());
+        $('input[name="bulletin[postdate]"]').val(toDay);
+      }
+
       $("#main-wrap").after("");
 
       $(document).on('click', '#add_link', function(){
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 43b5268..f1e14c3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -10,6 +10,7 @@ en:
       author: Author
       link: Link
       File: File
+      view_count: View Count
     add_new: Add New
     approve: Approve
     all_articles: All Articles
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 450a257..97104bf 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -10,6 +10,7 @@ zh_tw:
       author: 張貼人
       link: 超連結
       file: 檔案下載
+      view_count: 瀏覽人次
     add_new: 新建
     approve: 通過
     all_articles: 文章列表