From 1569acc4cae1ded38b02d75464d9dac4b235bb63 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Thu, 5 Jan 2017 14:56:05 +0800
Subject: [PATCH] added json feed link

---
 app/controllers/admin/announcements_controller.rb | 2 +-
 app/views/admin/announcements/_feed.html.erb      | 5 ++++-
 config/locales/en.yml                             | 3 ++-
 config/locales/zh_tw.yml                          | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/announcements_controller.rb b/app/controllers/admin/announcements_controller.rb
index 24a3478..3afef4c 100644
--- a/app/controllers/admin/announcements_controller.rb
+++ b/app/controllers/admin/announcements_controller.rb
@@ -32,7 +32,7 @@ class Admin::AnnouncementsController < OrbitAdminController
   end
 
   def feed
-    @table_feed_fields = ["announcement.feed_name", :tags, "announcement.rssfeed"]
+    @table_feed_fields = ["announcement.feed_name", :tags, "announcement.rssfeed", "announcement.jsonfeed"]
     @feeds = BulletinFeed.all.asc(:created_at)
     
   end
diff --git a/app/views/admin/announcements/_feed.html.erb b/app/views/admin/announcements/_feed.html.erb
index f55d48d..5db5f4b 100644
--- a/app/views/admin/announcements/_feed.html.erb
+++ b/app/views/admin/announcements/_feed.html.erb
@@ -43,6 +43,9 @@
       </div>
   </td>
   <td>
-    <a href="/xhr/announcements/rssfeed/<%= feed.uid %>.rss" target="_blank">Rss Feed</a>
+    <a href="/xhr/announcements/rssfeed/<%= feed.uid %>.rss" target="_blank">RSS Feed</a>
+  </td>
+  <td>
+    <a href="/xhr/announcements/feed/<%= feed.uid %>.json" target="_blank">JSON Feed</a>
   </td>
 </tr>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b9d87bc..fe51863 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -13,7 +13,8 @@ en:
       view_count: View Count
     add_new: Add New
     feed_name: Feed Name
-    rssfeed: Rss Feed Link
+    rssfeed: RSS Feed Link
+    jsonfeed: JSON Feed Link
     feed_list: Feed List
     approve: Approve
     all_articles: All Articles
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 6a3dbe8..0bb4229 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -16,7 +16,8 @@ zh_tw:
     feed_name: Feed 標題
     settings: Settings
     import: Import
-    rssfeed: Rss Feed Link
+    rssfeed: RSS Feed Link
+    jsonfeed: JSON Feed Link
     feed_list: 訂閱清單
     all_articles: 文章列表
     announcement: 公告