fix announment page count and page link

Author: Casear

controllers/announcement.js

@@ -58,7 +58,8 @@ exports.index = function (req, res, next) {
       tops: tops,
       no_reply_topics: no_reply_topics,
       pages: pages,
-      keyword: keyword
+      keyword: keyword,
+      base:req.path
     });
   };
 
@@ -125,7 +126,7 @@ exports.index = function (req, res, next) {
   });
 
   // 計算頁數
-  topic_ctrl.get_count_by_query(query, function (err, all_topics_count) {
+  topic_ctrl.get_announcements_count_by_query(query, function (err, all_topics_count) {
     if (err) {
       return proxy.emit('error', err);
     }

controllers/site.js

@@ -66,7 +66,8 @@ exports.index = function (req, res, next) {
       no_reply_topics: no_reply_topics,
       pages: pages,
       announcement: announcements[0],
-      keyword: keyword
+      keyword: keyword,
+      base:req.path
     });
   };
 

views/index.html

@@ -26,7 +26,7 @@
 			topics: topics,
 			pages: pages,
 			current_pages: current_page,
-			base: keyword ? ('/?q=' + keyword) : '/' 
+			base: keyword ? ( base +'?q=' + keyword ) : base 
 		}) %>
 		<% } else { %>
 		<div class='inner'>