From f4635502ef1f1c2df8b4ff79fece3c385931f558 Mon Sep 17 00:00:00 2001
From: manson <manson@rulingcom.com>
Date: Wed, 3 Sep 2014 15:00:51 +0800
Subject: [PATCH] fix announcement template index page-title

---
 app/helpers/orbit_backend_helper.rb                    | 10 ++++++++++
 .../modules/announcement/index.html.erb                |  2 +-
 .../modules/announcement/index1.html.erb               |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb
index e2cb266..74bcb79 100644
--- a/app/helpers/orbit_backend_helper.rb
+++ b/app/helpers/orbit_backend_helper.rb
@@ -156,6 +156,16 @@ module OrbitBackendHelper
   def need_access_right
     render_401 if !has_access?
   end
+
+  def get_referer_url
+    referer_path = Rails.application.routes.recognize_path(request.referer)
+    if referer_path[:controller]!="pages" or (referer_path[:controller]==params[:controller] and referer_path[:action]!="index")
+      referer_url = '/'+params[:controller]
+    else
+      referer_url = request.referer
+    end
+    referer_url
+  end
   
 end
 
diff --git a/app/templates/orbit_bootstrap/modules/announcement/index.html.erb b/app/templates/orbit_bootstrap/modules/announcement/index.html.erb
index e374d1d..72a1e9f 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/index.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/index.html.erb
@@ -1,6 +1,6 @@
 <div class="index-announcement index1">
   <h3 class="index-title">
-    <span>{{widget-title}}</span>
+    <span>{{page-title}}</span>
   </h3>
   <div class="row" data-level="0" data-list="announcements">
     <div class="index-content col-sm-6">
diff --git a/app/templates/orbit_bootstrap/modules/announcement/index1.html.erb b/app/templates/orbit_bootstrap/modules/announcement/index1.html.erb
index e374d1d..72a1e9f 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/index1.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/index1.html.erb
@@ -1,6 +1,6 @@
 <div class="index-announcement index1">
   <h3 class="index-title">
-    <span>{{widget-title}}</span>
+    <span>{{page-title}}</span>
   </h3>
   <div class="row" data-level="0" data-list="announcements">
     <div class="index-content col-sm-6">