From 4466e7ae1ce85ee207274d9a0fa4374d75725926 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Mon, 30 Apr 2012 03:14:15 +0800
Subject: [PATCH 01/39] Fix for NCCU 0430 all functions ok with two submanagers
 but different behavors

---
 .../admin/dashboards_controller.rb            |  2 +-
 app/controllers/admin/designs_controller.rb   |  3 +-
 app/controllers/application_controller.rb     | 52 ++++++++++++++++++-
 app/views/admin/dashboards/index.html.erb     |  2 +
 app/views/layouts/_side_bar.html.erb          |  4 ++
 public/static/kernel.js                       |  1 +
 .../back_end/approvals_controller.rb          |  1 +
 .../back_end/bulletin_categorys_controller.rb |  4 +-
 .../back_end/bulletins_controller.rb          | 28 ++++++----
 .../_bulletin_category.html.erb               | 11 ++--
 .../bulletin_categorys/index.html.erb         |  2 +-
 .../back_end/bulletins/_bulletin.html.erb     | 16 ++++--
 .../back_end/bulletins/_sort_headers.html.erb |  6 ++-
 .../back_end/bulletins/index.html.erb         |  2 +
 14 files changed, 109 insertions(+), 25 deletions(-)

diff --git a/app/controllers/admin/dashboards_controller.rb b/app/controllers/admin/dashboards_controller.rb
index 7b7613611..b7f377d3b 100644
--- a/app/controllers/admin/dashboards_controller.rb
+++ b/app/controllers/admin/dashboards_controller.rb
@@ -2,7 +2,7 @@ class Admin::DashboardsController < ApplicationController
   
   layout "new_admin"
   before_filter :authenticate_user!
-  before_filter :is_admin?
+#  before_filter :is_admin?
   
   def index
   end
diff --git a/app/controllers/admin/designs_controller.rb b/app/controllers/admin/designs_controller.rb
index 519b36a59..ff41c0b4d 100644
--- a/app/controllers/admin/designs_controller.rb
+++ b/app/controllers/admin/designs_controller.rb
@@ -5,7 +5,8 @@ class Admin::DesignsController < ApplicationController
 
   layout "new_admin"
   before_filter :authenticate_user!
-  before_filter :is_admin?
+  before_filter :is_admin? 
+  before_filter :for_admin_only
 
   def upload_package
     if !params[:design].nil?
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index fb82774ef..2f6636b9b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -39,9 +39,59 @@ class ApplicationController < ActionController::Base
     @parent_item  = Item.first(:conditions => { :id => BSON::ObjectId(params[:parent_id]) }) rescue nil
   end
   
+  def auth_failed_in_backend
+     redirect_to admin_dashboards_url 
+  end
+  
   # Check if the current_user is admin
   def is_admin?
-    redirect_to root_url unless current_user.admin?
+    
+    auth_failed_in_backend unless current_user.admin?
+  end
+  
+  def is_manager?
+     @module_app.managing_users.include?(current_user) || is_admin?
+  end
+  
+  def for_admin_only
+    if is_admin?
+      true
+    else
+    flash[:notice] = "Access Denied for you are not Admin"
+    auth_failed_in_backend
+    end
+  end
+  
+  def for_app_manager
+    if is_manager?
+      true
+    else
+    flash[:notice] = "Access Denied for you are not Manager for this app"
+    auth_failed_in_backend
+  end
+  end
+  
+  def for_app_sub_manager
+    if (@module_app.sub_managing_users.include?(current_user) || is_manager?)
+      true
+    else
+    flash[:notice] = "Access Denied for you are not SubManager for this app"    
+    auth_failed_in_backend
+  end
+  end
+
+  def for_app_user
+    if (@module_app.app_auth.auth_users.include?(current_user) || for_app_sub_manager )
+      true
+    else
+    flash[:notice] = "Access Denied for you are not User for this app"
+    auth_failed_in_backend
+  end
+  end
+
+  def check_object_premission(obj,title)
+    flash[:notice] = "Access Denied for you don't have permission for this object"
+    auth_failed_in_backend unless (obj.get_object_auth_by_title(title).auth_users.include?(current_user) || is_manager? || is_admin? )
   end
   
   # Render the page
diff --git a/app/views/admin/dashboards/index.html.erb b/app/views/admin/dashboards/index.html.erb
index d038b63d4..1d9cd7100 100644
--- a/app/views/admin/dashboards/index.html.erb
+++ b/app/views/admin/dashboards/index.html.erb
@@ -1,3 +1,5 @@
+<%= flash_messages %>
+
 <div id="isotope">
     <div class="item element">
         <h3><i class="icons-member"></i><a href="">Member</a></h3>
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index 96e0e2a84..431e83991 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -1,6 +1,10 @@
 <%#= content_tag :li, :class => active_for_controllers('purchases') do -%>
 	<%#= link_to content_tag(:i, nil, :class => 'icons-purchase') + t('admin.purchase'), admin_purchases_path %>
 <%# end -%>
+<% content_for :page_specific_javascript do %>
+	<%= javascript_include_tag "/static/kernel.js"  %>
+<% end %>
+<%= flash_messages %>
 
 <%= content_tag :li, :class => active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys','module_apps', 'approvals') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.announcement'), panel_announcement_back_end_bulletins_path %>
diff --git a/public/static/kernel.js b/public/static/kernel.js
index c5b9a8a6a..ba5b81c38 100644
--- a/public/static/kernel.js
+++ b/public/static/kernel.js
@@ -1,4 +1,5 @@
 $(document).ready(function() {
+	$.each($(".notice"),function(k,v){ alert("EMPTY Cate");});
 	
 	$.each($(".dymanic_load"),function(){
 		if($(this).attr("path")==''){$(this).html("App setting Failed");} 
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb
index 2d10dd75f..4338fdd13 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb
@@ -1,5 +1,6 @@
 class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendController
   before_filter :authenticate_user!
+  before_filter :is_admin?
   include AdminHelper
   # layout 'admin'
   
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
index 0e3894b9d..b9151125c 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
@@ -1,5 +1,7 @@
 class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendController
-  
+  before_filter :for_app_manager,:except => [:index] 
+
+
   def index
     @bulletin_categorys = BulletinCategory.all
     @bulletin_category = BulletinCategory.new(:display => 'List')
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index f77e70b71..b5ebd0c07 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -1,8 +1,9 @@
 class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   
   before_filter :authenticate_user!
-  before_filter :is_admin?
-
+#  before_filter :for_admin_only,:only => [:]
+#  before_filter :for_app_manager,:only => [:index,:show,] 
+  before_filter :for_app_sub_manager,:except => [:index,:show,:get_sorted_and_filtered_bulletins]
   def index
     # @bulletins = Bulletin.all
     # @bulletins = Bulletin.desc("postdate desc")
@@ -39,6 +40,10 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     @bulletin_file = BulletinFile.new
     @file_url = panel_announcement_back_end_bulletins_path
 	
+	  @bulletins.delete_if{ |bulletin|
+	    bulletin.is_pending == true && (!bulletin.bulletin_category.authed_users('fact_check').include?(current_user) || bulletin.create_user_id!=current_user.id)
+	    }
+
     respond_to do |format|
       format.html # index.html.erb
       format.js { }
@@ -76,14 +81,17 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     
 	# @bulletin.bulletin_files.build
 	# @bulletin.bulletin_files.new
-	
-	get_categorys
-	get_tags
 
-    respond_to do |format|
-      format.html # new.html.erb
-      format.xml  { render :xml => @bulletin }
-    end
+	if get_categorys.empty?
+	  flash[:notice] = "You dont have any permission for post on cate"
+    redirect_to :action => :index
+  else
+	  get_tags
+      respond_to do |format|
+        format.html # new.html.erb
+        format.xml  { render :xml => @bulletin }
+      end
+  	end
   end
 
   # GET /bulletins/1/edit
@@ -311,7 +319,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     if(is_manager? || is_admin?)
       @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true))
     elsif is_sub_manager?
-      @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new')
+      @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit')
     end
   end
   
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
index a75440e56..8ad4578ea 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
@@ -4,10 +4,13 @@
 			<%= bulletin_category.key %>
 			<div class="quick-edit">
 				<ul class="nav nav-pills hide">
-					<li><%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %></li>
-					<li><%= show_submit_permission_link(bulletin_category) %></li>
-					<li><%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
-					
+					<%if is_manager? || is_admin? %>
+						<li><%= show_submit_permission_link(bulletin_category) %></li>
+					<% end %>
+					<% if is_admin?%>
+						<li><%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %></li>
+						<li><%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
+					<% end %>
 					
 				</ul>
 			</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
index 28d2fde0c..392e50a35 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
@@ -17,7 +17,7 @@
 	</tbody>
 </table>
 
-<div id="form"><%= render :partial => "form" %></div>
+<div id="form"><%= render :partial => "form" if is_manager?%></div>
 
 
 
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
index b8dd663d9..3722fd81e 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
@@ -1,5 +1,8 @@
 <tr id="<%= dom_id bulletin %>" class="with_action">
-	<td><%= check_box_tag 'to_delete[]', bulletin.id, false, :class => "checkbox_in_list" %></td>
+	<td>
+		<% if (bulletin.create_user_id ==  current_user.id) || is_manager? %>
+			<%= check_box_tag 'to_delete[]', bulletin.id, false, :class => "checkbox_in_list" %>
+		<% end -%>
 	<td>
 		<% if bulletin.is_top? %>
 			<span class="label label-success"><%= t(:top) %></span>
@@ -23,8 +26,11 @@
 	<td><%= bulletin.bulletin_category.i18n_variable[I18n.locale] %></td>
 	<td>
 		<%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''%>
+		
 		<div class="quick-edit">
 			<ul class="nav nav-pills hide">
+				<% if (bulletin.create_user_id ==  current_user.id) || is_manager? %>
+				
 				<% if current_user.admin? || (!bulletin.is_rejected? && !bulletin.is_checked?) %>
 					<li><%= link_to t('bulletin.edit'), edit_panel_announcement_back_end_bulletin_path(bulletin) %></li>
 					<li class="dropdown">
@@ -39,11 +45,13 @@
 					</li>
 					<%#= debugger  %>
 					<%#= a=1 %>
-					<% if show_approval_link(bulletin) %>
-					<li><%= link_to t('announcement.bulletin.approval'), edit_panel_announcement_back_end_bulletin_path(bulletin)   %></li><%#= #TODO add ancher so user can quick access into that part %>
-					<% end %>			
+	
 				<% end %>
 				<li class="dropdown"><%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
+				<% end -%>
+				<% if show_approval_link(bulletin) %>
+				<li><%= link_to t('announcement.bulletin.approval'), edit_panel_announcement_back_end_bulletin_path(bulletin)   %></li><%#= #TODO add ancher so user can quick access into that part %>
+				<% end %>
 			</ul>
 		</div>
 	</td>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
index b48cca39c..f53ef5a6c 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
@@ -2,8 +2,10 @@
 	<thead>
 		<tr class="sort-header">
 			<th class="span1 strong">
-				<input id="check_all_bulletins" type="checkbox">
-				<a href='#' class="list-remove"><i class="icon-trash"></i></a>
+				<% if is_manager? %>
+					<input id="check_all_bulletins" type="checkbox">
+					<a href='#' class="list-remove"><i class="icon-trash"></i></a>
+				<% end -%>
 			</th>
 			<th class="sort span1-2 <%= is_sort_active?('status') %>">
 				<%= link_to (t('bulletin.status') + content_tag(:b, nil, :class => is_sort?('status'))).html_safe, panel_announcement_back_end_bulletins_path({:filter => @filter}.merge(sortable('status'))), :class => 'js_history' %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
index 78532f00f..f1a061e62 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
@@ -1,3 +1,5 @@
+
+
 <%= form_for :bulletins, :url => delete_panel_announcement_back_end_bulletins_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil), :html => {:id => 'delete_bulletins'}, :remote => true do %>
 	<%= render 'filter' %>
 	<table id="bulettin_sort_list" class="table main-list">

From fe54c6ae71f932a21c9b5c7ffa7af6fad2025fb6 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 30 Apr 2012 14:23:41 +0800
Subject: [PATCH 02/39] Fix bug when id or single object

---
 app/controllers/orbit_backend_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb
index 7e9fa32a8..15afe9631 100644
--- a/app/controllers/orbit_backend_controller.rb
+++ b/app/controllers/orbit_backend_controller.rb
@@ -150,7 +150,7 @@ class OrbitBackendController< ApplicationController
 
   def get_with_nil(objects, option, sorted_objects)
     tmp = Array.new 
-    objects.each { |object| tmp << [get_string_value_from_object(object), object] if (object.send(option).count == 0) }
+    objects.each { |object| tmp << [get_string_value_from_object(object), object] if (object.send(option).blank? || (object.send(option).size == 0 rescue nil)) }
     sorted = params[:direction].eql?('asc') ? tmp.sort : tmp.sort.reverse!
     sorted_tmp = sorted.collect {|a| a[1] }
     a = params[:direction].eql?('asc') ? (sorted_tmp + sorted_objects) : (sorted_objects + sorted_tmp)

From a8033093806e0a98e43364dfcfca435b744c35df Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Mon, 30 Apr 2012 15:51:22 +0800
Subject: [PATCH 03/39] clean up useless flash msgs. add i18n vars for app auth
 and object auth

---
 app/controllers/application_controller.rb     | 10 ++---
 app/views/admin/dashboards/index.html.erb     |  2 -
 app/views/layouts/_side_bar.html.erb          |  1 -
 config/locales/en.yml                         |  8 ++++
 config/locales/zh_tw.yml                      | 42 +++++++++++--------
 public/static/kernel.js                       |  1 -
 .../back_end/bulletins_controller.rb          |  2 +-
 .../announcement/config/locales/en.yml        |  2 +
 .../announcement/config/locales/zh_tw.yml     |  2 +
 9 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2f6636b9b..8fc3a90ba 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -57,7 +57,7 @@ class ApplicationController < ActionController::Base
     if is_admin?
       true
     else
-    flash[:notice] = "Access Denied for you are not Admin"
+    flash[:error] = t("admin.access.denied.not_admin")
     auth_failed_in_backend
     end
   end
@@ -66,7 +66,7 @@ class ApplicationController < ActionController::Base
     if is_manager?
       true
     else
-    flash[:notice] = "Access Denied for you are not Manager for this app"
+    flash[:error] = t("admin.access.denied.app.not_manager")
     auth_failed_in_backend
   end
   end
@@ -75,7 +75,7 @@ class ApplicationController < ActionController::Base
     if (@module_app.sub_managing_users.include?(current_user) || is_manager?)
       true
     else
-    flash[:notice] = "Access Denied for you are not SubManager for this app"    
+    flash[:error] = t("admin.access.denied.app.not_sub_manager")
     auth_failed_in_backend
   end
   end
@@ -84,13 +84,13 @@ class ApplicationController < ActionController::Base
     if (@module_app.app_auth.auth_users.include?(current_user) || for_app_sub_manager )
       true
     else
-    flash[:notice] = "Access Denied for you are not User for this app"
+    flash[:error] = t("admin.access.denied.app.not_authed_user")
     auth_failed_in_backend
   end
   end
 
   def check_object_premission(obj,title)
-    flash[:notice] = "Access Denied for you don't have permission for this object"
+    flash[:error] = t("admin.access.denied.object")
     auth_failed_in_backend unless (obj.get_object_auth_by_title(title).auth_users.include?(current_user) || is_manager? || is_admin? )
   end
   
diff --git a/app/views/admin/dashboards/index.html.erb b/app/views/admin/dashboards/index.html.erb
index 21bc7ffb1..e22d7dac8 100644
--- a/app/views/admin/dashboards/index.html.erb
+++ b/app/views/admin/dashboards/index.html.erb
@@ -1,5 +1,3 @@
-<%= flash_messages %>
-
 <div id="isotope">
     <div class="item element">
         <h3><i class="icons-content"></i><a href=""><%= t(:content) %></a></h3>
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index f479e6614..dbb065f6e 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -4,7 +4,6 @@
 <% content_for :page_specific_javascript do %>
 	<%= javascript_include_tag "/static/kernel.js"  %>
 <% end %>
-<%= flash_messages %>
 
 <%= content_tag :li, :class => active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys','module_apps', 'approvals') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.announcement'), panel_announcement_back_end_bulletins_path %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8d15763cd..5a807b5a1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -65,6 +65,14 @@ en:
   traffic: Traffic
 
   admin:
+    access:
+      denied:
+        app:
+          not_sub_manager: Access Denied for you are not SubManager for this app
+          not_manager: Access Denied for you are not SubManager for this app
+          not_authed_user: Access Denied for you are not User for this app
+        not_admin: Access Denied for you are not Admin
+        object: "Access Denied for you don't have permission for this object"
     action: Action
     ad_banner: AD Banner
     ad:
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index a30749e01..f0a23dde2 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -8,12 +8,12 @@ zh_tw:
   back: 回上一步
   browse: 選擇檔案
   cancel: 取消
-  create: 創建
+  create: 新增
   delete: 刪除
   desktop: 桌面
   disable: 禁用
   dots: …
-  downloaded: 已經下載
+  downloaded: 已下載
   download: 下載
   edit: 編輯
   email: 電子郵件
@@ -47,7 +47,7 @@ zh_tw:
   file_type: 檔案類型
   hits: 點擊率
   item: 項目
-  member: 成員
+  member: 會員
   module: 模組
   most_visited_page: 熱門頁面
   quantity: 數量
@@ -62,6 +62,14 @@ zh_tw:
   traffic: 流量
 
   admin:
+    access:
+      denied:
+        app:
+          not_sub_manager: 拒絕存取因你不是此應用程式次管理員
+          not_manager: 拒絕存取因你不是此應用程式管理員
+          not_authed_user: 拒絕存取因你不是此應用程式授權使用者
+        not_admin: 拒絕存取因你不是此應用程式次管理員
+        object: 拒絕存取因你不是網站管理者
     action: 操作
     ad_banner: 廣告輪播
     ad:
@@ -81,7 +89,7 @@ zh_tw:
     add_item: 新增項目
     add_language: 新增語言
     add_drop_down_item: ＋增加Orbit選單
-    admin: 管理
+    admin: 網站管理者
     all_articles: 列表
     announcement: 公告管理
     asset: 資產
@@ -94,22 +102,22 @@ zh_tw:
     author: 作者
     calendar: 行事曆
     cant_delete_self: 您不可以刪除自己。
-    cant_revoke_self_admin: 您不可以撤銷自己的管理作用。
+    cant_revoke_self_admin: 您不可以撤銷自己的管理身份。
     choose_file: 請選擇一個文件...
     class: 階級
     content: 內容
-    create_error_link: 創建連接時出錯。
-    create_error_page: 創建頁面時出錯。
-    create_success_home: 首頁已成功創建。
-    create_success_layout: 樣板已成功創建。
-    create_success_link: 連結已成功創建。
-    create_success_page: 頁面已成功創建。
-    create_success_home: 首頁已成功創建。
-    create_success_layout: 佈局已成功創建。
-    create_success_link: 連結已成功創建。
-    create_success_page: 頁面已成功創建。
-    create_success_snippet: 片段已成功創建。
-    create_success_user: 用戶已成功創建。。
+    create_error_link: 新增連接時出錯。
+    create_error_page: 新增頁面時出錯。
+    create_success_home: 首頁已成功新增。
+    create_success_layout: 樣板已成功新增。
+    create_success_link: 連結已成功新增。
+    create_success_page: 頁面已成功新增。
+    create_success_home: 首頁已成功新增。
+    create_success_layout: 佈局已成功新增。
+    create_success_link: 連結已成功新增。
+    create_success_page: 頁面已成功新增。
+    create_success_snippet: 片段已成功新增。
+    create_success_user: 用戶已成功新增。。
     dashboard: 儀表板
     data: 資料數據
     delete_language: 刪除語言
diff --git a/public/static/kernel.js b/public/static/kernel.js
index ba5b81c38..c5b9a8a6a 100644
--- a/public/static/kernel.js
+++ b/public/static/kernel.js
@@ -1,5 +1,4 @@
 $(document).ready(function() {
-	$.each($(".notice"),function(k,v){ alert("EMPTY Cate");});
 	
 	$.each($(".dymanic_load"),function(){
 		if($(this).attr("path")==''){$(this).html("App setting Failed");} 
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index b5ebd0c07..ff262c4d7 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -83,7 +83,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 	# @bulletin.bulletin_files.new
 
 	if get_categorys.empty?
-	  flash[:notice] = "You dont have any permission for post on cate"
+	  flash[:alert] = t("announcement.error.no_avilb_cate_for_posting")
     redirect_to :action => :index
   else
 	  get_tags
diff --git a/vendor/built_in_modules/announcement/config/locales/en.yml b/vendor/built_in_modules/announcement/config/locales/en.yml
index 3e7818231..16353b6ac 100644
--- a/vendor/built_in_modules/announcement/config/locales/en.yml
+++ b/vendor/built_in_modules/announcement/config/locales/en.yml
@@ -58,6 +58,8 @@ en:
   announcement:
     all_articles: List
     add_new: Add
+    error: 
+      no_avilb_cate_for_posting: You need a category to submit your post,please contact admin
     sure?: Sure?
     campus_news: Campus News
     more: more+
diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
index dfe9e55fe..bf0d0be6b 100644
--- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
@@ -37,6 +37,8 @@ zh_tw:
   announcement:
     add_new: 新增
     all_articles: 列表
+    error: 
+      no_avilb_cate_for_posting: 您目前沒有分類可以刊登公告，請聯絡系統管理員為您開通分類
     tags: 標籤
     categories: 分類
     status: 狀態

From 7a5d3ecae3fab4ac0c0ca29462a52c7a721c0f89 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Tue, 1 May 2012 16:05:05 +0800
Subject: [PATCH 04/39] Apply app_auth to ad_banner.   From now,ad_banner can
 only be viewed for at least manager.

---
 app/controllers/admin/ad_banners_controller.rb |  4 ++--
 app/controllers/application_controller.rb      |  3 ++-
 app/helpers/application_helper.rb              |  9 +++++++++
 app/views/layouts/_side_bar.html.erb           | 12 +++++++-----
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/controllers/admin/ad_banners_controller.rb b/app/controllers/admin/ad_banners_controller.rb
index a21693aa6..47d3d3555 100644
--- a/app/controllers/admin/ad_banners_controller.rb
+++ b/app/controllers/admin/ad_banners_controller.rb
@@ -1,7 +1,7 @@
-class Admin::AdBannersController < ApplicationController
+class Admin::AdBannersController < OrbitBackendController
   layout "new_admin"
   before_filter :authenticate_user!
-  before_filter :is_admin?
+  before_filter :for_app_manager
 
   def destroy
     @ad_banner = AdBanner.find(params[:id])
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8fc3a90ba..ab01ea6bd 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -40,7 +40,8 @@ class ApplicationController < ActionController::Base
   end
   
   def auth_failed_in_backend
-     redirect_to admin_dashboards_url 
+     #redirect_to admin_dashboards_url 
+     redirect_to root_path
   end
   
   # Check if the current_user is admin
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 258000be9..6e76b1a27 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -74,6 +74,15 @@ module ApplicationHelper
     end
   end
   
+  def active_sys_call_for_app(controller_name,action_name,app_title)
+    unless active_for_action(controller_name,action_name).nil?
+      app = ModuleApp.find params[:id]
+      app.title == app_title ? 'active' : nil
+    else
+      nil
+    end
+  end
+  
   def active_for_controllers(*controller_names)
     (controller_names.include?(controller.controller_name) || controller_names.include?(request.fullpath)) ? 'active' : nil
   end
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index dbb065f6e..1d2fc8753 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -5,7 +5,7 @@
 	<%= javascript_include_tag "/static/kernel.js"  %>
 <% end %>
 
-<%= content_tag :li, :class => active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys','module_apps', 'approvals') do -%>
+<%= content_tag :li, :class => active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals') ||  active_sys_call_for_app('module_apps','edit','Announcement')  do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.announcement'), panel_announcement_back_end_bulletins_path %>
 	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals')) do -%>
 		<%= content_tag :li, link_to(t('announcement.all_articles'), panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index') %>
@@ -13,7 +13,7 @@
 		<%= content_tag :li, link_to(t('announcement.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %>
 		<%= content_tag :li, link_to(t('announcement.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('/panel/announcement/back_end/tags', 'index') %>
 		<%= content_tag :li, link_to(t('announcement.bulletin.approval_setting'), panel_announcement_back_end_approval_setting_path), :class => active_for_action('approvals', 'setting')  if (is_manager? rescue nil) %>
-		<%= content_tag :li, link_to(t('admin.module.authorization'),edit_admin_module_app_path(ModuleApp.first(conditions: {title: "Announcement"}))), :class => active_for_action('module_apps', 'edit')  if (is_admin? rescue nil) %>
+		<%= content_tag :li, link_to(t('admin.module.authorization'),edit_admin_module_app_path(ModuleApp.first(conditions: {title: "Announcement"}))), :class => active_sys_call_for_app('module_apps','edit','Announcement') if (is_admin? rescue nil) %>
 
 	<% end -%>
 
@@ -34,13 +34,15 @@
 	<%= link_to content_tag(:i, nil, :class => 'icons-window-block') + t('admin.design'), admin_designs_path %>
 <% end -%>
 
-<%= content_tag :li, :class => active_for_controllers('ad_banners', 'ad_images') do -%>
+<%= content_tag :li, :class => active_for_controllers('ad_banners', 'ad_images') || active_sys_call_for_app('module_apps','edit','ad_banners') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.ad_banner'), admin_ad_banners_path %>
-	<%#= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners', 'ad_images')) do -%>
+
+	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners', 'ad_images') ) do -%>
 		<%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
 		<%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
 		<%#= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
-	<%# end %>
+				<%= content_tag :li, link_to(t('admin.module.authorization'),edit_admin_module_app_path(ModuleApp.first(conditions: {title: "ad_banners"}))), :class => active_sys_call_for_app('module_apps','edit','ad_banners')  if (is_admin? rescue nil) %>
+	<% end -%>
 <% end %>
 
 <%= content_tag :li, :class => active_for_controllers('web_links', '/panel/web_resource/back_end/tags', 'web_link_categorys') do -%>

From de457e7dfc785305102eb7d0aed47d651551e1f8 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Tue, 1 May 2012 18:23:42 +0800
Subject: [PATCH 05/39] fix broken ad_banner

---
 app/views/admin/ad_banners/_ad_banner_tab.html.erb | 2 +-
 config/routes.rb                                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/ad_banners/_ad_banner_tab.html.erb b/app/views/admin/ad_banners/_ad_banner_tab.html.erb
index ff27d914f..797624ff1 100644
--- a/app/views/admin/ad_banners/_ad_banner_tab.html.erb
+++ b/app/views/admin/ad_banners/_ad_banner_tab.html.erb
@@ -15,7 +15,7 @@
 		<div class="adbanner-list">
 			<div class="adbanner-action">
 				<%= link_to t("admin.ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
-				<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.title) , :class=>'preview_trigger btn btn-success'%>
+				<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.id) , :class=>'preview_trigger btn btn-success'%>
 			</div>
 			<ul class="clear">
 				<%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab}  %>
diff --git a/config/routes.rb b/config/routes.rb
index e8695f0ab..c90a5ae05 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -25,7 +25,7 @@ Orbit::Application.routes.draw do
     end
 
 
-    match 'ad_banner/:id/preview' => 'ad_banners#realtime_preview',:as => :realtime_preview_ad_banner,:via => :put
+    match 'ad_banners/:id/preview' => 'ad_banners#realtime_preview',:as => :realtime_preview_ad_banner,:via => :put
     resources :ad_banners do 
         collection do
           match 'new_ad_image' => 'ad_images#new',:as => :new_ad_image,:via => :get

From 92a53c1b27c66b8050792b8a07ca4a4096358e6f Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris@rulingcom.com>
Date: Wed, 2 May 2012 16:20:59 +0800
Subject: [PATCH 06/39] Ray's fix

---
 app/assets/javascripts/orbit-1.0.js              |  8 --------
 app/assets/stylesheets/bootstrap.css.erb         |  5 ++++-
 app/assets/stylesheets/list.css                  | 16 +++++++++++-----
 app/views/layouts/new_admin.html.erb             |  4 ++--
 .../back_end/bulletins/index.html.erb            | 11 +++++------
 .../news/back_end/news_bulletins/index.html.erb  | 11 +++++------
 6 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js
index 30e8fbe36..368bf2d0c 100644
--- a/app/assets/javascripts/orbit-1.0.js
+++ b/app/assets/javascripts/orbit-1.0.js
@@ -1,6 +1,5 @@
 var viewportwidth,
 	viewportheight;
-	console.log($(window).height())
 function resize() {
 	viewportheight=$(window).height();
 	viewportwidth=$(window).width();
@@ -17,7 +16,6 @@ $(document).ready(function(){
 	
 	$(document).on('click', '.privacy', function() {
 
-			console.log($(this).val());
 		switch ($(this).val()) {
 			case 'true':
 			$(this).parents('.controls').children('.select-role').slideUp(300);
@@ -53,15 +51,12 @@ $(document).ready(function(){
 		$orbitBar = $('#orbit-bar').height(),
 		$mainSidebar = $('#main-sidebar').width()+5,
 		$formActionPadding = parseInt($('.form-fixed').css("padding-left"))+parseInt($('.form-fixed').css("padding-right"));
-		console.log($orbitBar);
-		console.log("ready"+$(window).height());
 	$('#main-sidebar').css("height", viewportheight-$orbitBar);
 	$('#main-sidebar .viewport').css("height", viewportheight-$orbitBar);
 	$('#post-body').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget);
 	$('.post-title').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget-16);
 	$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft);
 	$('.form-fixed').css("width", viewportwidth-$mainWrapMarginLeft-$formActionPadding);
-	$('#bulletin_pagination').css("width", viewportwidth-$mainSidebar);
 	$('#main-sidebar').tinyscrollbar({size:(viewportheight-$orbitBar-4)});
 	$('.detal-list').tinyscrollbar();
 	mainTablePosition();
@@ -82,14 +77,12 @@ $(window).resize(function(){
 		$orbitBar = $('#orbit-bar').height(),
 		$mainSidebar = $('#main-sidebar').width()+5,
 		$formActionPadding = parseInt($('.form-fixed').css("padding-left"))+parseInt($('.form-fixed').css("padding-right"));
-		console.log(viewportheight);
 	$('#main-sidebar').css("height", viewportheight-$orbitBar);
 	$('#main-sidebar .viewport').css("height", viewportheight-$orbitBar);
 	$('#post-body').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget);
 	$('.post-title').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget-16);
 	$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft);
 	$('.form-fixed').css("width", viewportwidth-$mainWrapMarginLeft-$formActionPadding);
-	$('#bulletin_pagination').css("width", viewportwidth-$mainSidebar);
 	$('#main-sidebar').tinyscrollbar({size:(viewportheight-$orbitBar-4)});
 	mainTablePosition();
 });
@@ -118,5 +111,4 @@ $(window).scroll(function () {
 	$(".table-label").css({left:$winLeft*-1} );
 	//$(".table-label").css({left:$mainWrapMarginLeft+($winLeft*-1)} );
 	//$("#main-wrap > .subnav").css({width:$subnavWidth+($winLeft)} );
-	//console.log($mainWrapMarginLeft+($winLeft*-1)+5);
 });
diff --git a/app/assets/stylesheets/bootstrap.css.erb b/app/assets/stylesheets/bootstrap.css.erb
index 40b3afca2..62a0afe8e 100644
--- a/app/assets/stylesheets/bootstrap.css.erb
+++ b/app/assets/stylesheets/bootstrap.css.erb
@@ -2701,8 +2701,11 @@ button.btn.small, input[type="submit"].btn.small {
 .pagination .current{
   border-left-width: 1px;
 }
+.pagination a {
+  background-color: #FFFFFF;
+}
 .pagination a:hover, .pagination .active a {
-  background-color: #f5f5f5;
+  background-color: #e8e8e8;
 }
 .pagination .active a {
   color: #999999;
diff --git a/app/assets/stylesheets/list.css b/app/assets/stylesheets/list.css
index b77482915..4d7c11b1f 100644
--- a/app/assets/stylesheets/list.css
+++ b/app/assets/stylesheets/list.css
@@ -70,9 +70,8 @@
 }
 .main-list .label-td:hover {
 	height: auto;
-    text-align: center;
     padding: 5px 5px 8px;
-	left: -6px;
+	left: -40px;
 	top: -6px;
 	border: 1px solid rgba(0, 0, 0, 0.2);
 	box-shadow: 0px 5px 10px rgba(0,0,0,0.2);
@@ -82,6 +81,7 @@
 	-webkit-border-radius: 3px;
 	-moz-border-radius: 3px;
 	z-index: 5;
+	width: 200px;
 }
 .qe-edit-div .table-condensed {
 	background-color: #F2F2F2;
@@ -188,10 +188,16 @@ legend {
 }
 .form-fixed {
 	position: fixed;
-	margin-bottom: 0;
+	margin: 0;
+	padding: 10px;
 	bottom: 0;
-	z-index: 10;
+	z-index: 2;
+}
+.form-fixed .btn {
+	margin-top: 4px;
 }
 .paginationFixed {
-	margin-bottom: 25px;
+}
+.paginationFixed .pagination {
+	margin-top: 0 !important;
 }
\ No newline at end of file
diff --git a/app/views/layouts/new_admin.html.erb b/app/views/layouts/new_admin.html.erb
index b6156c5d3..4686545ec 100644
--- a/app/views/layouts/new_admin.html.erb
+++ b/app/views/layouts/new_admin.html.erb
@@ -14,7 +14,7 @@
 </head>
 <body>
 	<%= render 'layouts/orbit_bar' %>
-	<nav id="main-sidebar" class="my_scroll">
+	<div id="main-sidebar" class="my_scroll">
 		<div class="scrollbar">
 			<div class="track">
 				<div class="thumb">
@@ -29,7 +29,7 @@
 				</ul>
 			</div>
 		</div>
-	</nav>
+	</div>
 	<div id="main-wrap">
 		<%= yield %>
 	</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
index 563be1906..875c1eaf9 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
@@ -5,8 +5,11 @@
 	</table>
 <% end %>
 
-<div id="bulletin_pagination" class="paginationFixed">
-	<%= paginate @bulletins, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]} %>
+<div class="form-actions form-fixed pagination-right">
+	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary pull-right' %>
+	<div id="bulletin_pagination" class="paginationFixed">
+		<%= paginate @bulletins, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]} %>
+	</div>
 </div>
 
 <div id="bulletin_link_qe">
@@ -14,10 +17,6 @@
 		<%= render :partial => "bulletin_link_qe" %>
 	</div>
 </div>
-		
-<div class="form-actions form-fixed pagination-right">
-	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %>
-</div>
 
 <% content_for :page_specific_javascript do %>
 	<%= javascript_include_tag "bulletin_form" %>
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
index 78535138b..123b1a916 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
@@ -5,8 +5,11 @@
 	</table>
 <% end %>
 
-<div id="news_bulletin_pagination">
-	<%= paginate @news_bulletins, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]} %>
+<div class="form-actions form-fixed pagination-right">
+	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_news_back_end_news_bulletin_path, :class => 'btn btn-primary' %>
+	<div id="news_bulletin_pagination" class="paginationFixed">
+		<%= paginate @news_bulletins, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]} %>
+	</div>
 </div>
 
 <div id="news_bulletin_link_qe">
@@ -20,10 +23,6 @@
 		<%= render :partial => "news_bulletin_file_qe" %>
 	</div>
 </div>
-		
-<div class="form-actions">
-	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_news_back_end_news_bulletin_path, :class => 'btn btn-primary' %>
-</div>
 
 <% content_for :page_specific_javascript do %>
 	<%= javascript_include_tag "news_bulletin_form" %>

From 2762c2459326155280b613667d1f1ecdfd8d7e26 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Thu, 26 Apr 2012 19:38:16 +0800
Subject: [PATCH 07/39] Fix wrong variable names in translations

---
 app/views/admin/translations/edit.html.erb  | 8 ++++----
 app/views/admin/translations/index.html.erb | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/admin/translations/edit.html.erb b/app/views/admin/translations/edit.html.erb
index 4dd56a010..231c70f5c 100644
--- a/app/views/admin/translations/edit.html.erb
+++ b/app/views/admin/translations/edit.html.erb
@@ -10,23 +10,23 @@
     </fieldset>
   <% end %>
 
-  <% if @user_info_model_i18n_variables.size > 0 %>
+  <% if @info_i18n_variables.size > 0 %>
     <fieldset>
       <legend>
         <%= t('admin.user_info') %>
         <%#= render :partial => 'action_bar' %>
       </legend> 
-      <div><%= render :partial => 'edit_user_attribute_model', :collection => @user_info_model_i18n_variables %></div>
+      <div><%= render :partial => 'edit_user_attribute_model', :collection => @info_i18n_variables %></div>
     </fieldset>
   <% end %>
 
-  <% if @user_role_model_i18n_variables.size > 0 %>
+  <% if @role_i18n_variables.size > 0 %>
     <fieldset>
       <legend>
         <%= t('admin.user_role') %>
         <%#= render :partial => 'action_bar' %>
       </legend> 
-      <div><%= render :partial => 'edit_user_attribute_model', :collection => @user_role_model_i18n_variables %></div>
+      <div><%= render :partial => 'edit_user_attribute_model', :collection => @role_i18n_variables %></div>
     </fieldset>
   <% end %>
   
diff --git a/app/views/admin/translations/index.html.erb b/app/views/admin/translations/index.html.erb
index a47aa52b3..255484d4f 100644
--- a/app/views/admin/translations/index.html.erb
+++ b/app/views/admin/translations/index.html.erb
@@ -46,7 +46,7 @@
   </fieldset>
 <% end %>
 
-<% if @user_info_model_i18n_variables.size > 0 %>
+<% if @info_i18n_variables.size > 0 %>
   <fieldset>
     <legend>
       <%= t('admin.user_info') %>
@@ -56,7 +56,7 @@
   </fieldset>
 <% end %>
 
-<% if @user_role_model_i18n_variables.size > 0 %>
+<% if @role_i18n_variables.size > 0 %>
   <fieldset>
     <legend>
       <%= t('admin.user_role') %>

From 45e21f9569afcc5736738f2fdd905a9b5979399d Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Wed, 2 May 2012 17:55:02 +0800
Subject: [PATCH 08/39] Fix filter category in news

---
 app/controllers/orbit_backend_controller.rb | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb
index 15afe9631..8655e93fb 100644
--- a/app/controllers/orbit_backend_controller.rb
+++ b/app/controllers/orbit_backend_controller.rb
@@ -62,30 +62,23 @@ class OrbitBackendController< ApplicationController
         case key
           when 'status'
             a = Array.new
-            objects.each do |bulletin|
+            objects.each do |object|
               value.each do |v|
-                case v
-                  when 'pending'
-                    a << bulletin if bulletin.is_checked.nil?
-                  when 'rejected'
-                    a << bulletin if bulletin.is_checked.eql?(false)
-                  else
-                    a << bulletin if bulletin[v]
-                end
+                a << object if object[v]
               end
             end
             objects = a.uniq
           when 'categories'
             a = Array.new
-            objects.each do |bulletin|
-              a << bulletin if value.include?(bulletin.bulletin_category.id.to_s)
+            objects.each do |object|
+              a << object if value.include?(object.send("#{object.class.to_s.underscore}_category").id.to_s)
             end
             objects = a.uniq
           when 'tags'
             a = Array.new
-            objects.each do |bulletin|
-              bulletin.tags.each do |tag|
-                a << bulletin if value.include?(tag.id.to_s)
+            objects.each do |object|
+              object.tags.each do |tag|
+                a << object if value.include?(tag.id.to_s)
               end
             end
             objects = a.uniq

From 2a14c8bad496f8e496b5e8b7cc64ba56b5e26eaa Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Thu, 3 May 2012 14:57:10 +0800
Subject: [PATCH 09/39] Announcement preivew

---
 app/controllers/application_controller.rb     |  4 +-
 app/controllers/pages_controller.rb           |  6 +-
 app/helpers/application_helper.rb             |  4 +-
 app/views/admin/ad_banners/index.html.erb     |  2 +-
 app/views/admin/module_apps/edit.html.erb     | 18 ++---
 lib/parsers/parser_front_end.rb               |  7 +-
 .../back_end/approvals_controller.rb          |  7 ++
 .../front_end/bulletins_controller.rb         | 14 +++-
 .../approvals/_modal_approve.html.erb         | 68 +++++++++++++++++++
 .../approvals/preview_and_approve.js.erb      |  5 ++
 .../back_end/bulletins/_bulletin.html.erb     |  2 +-
 .../back_end/bulletins/_form.html.erb         | 22 ------
 .../back_end/bulletins/index.html.erb         |  2 +
 .../announcement/config/locales/en.yml        |  1 +
 .../announcement/config/locales/zh_tw.yml     |  1 +
 .../announcement/config/routes.rb             |  6 +-
 16 files changed, 124 insertions(+), 45 deletions(-)
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/preview_and_approve.js.erb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ab01ea6bd..a57b4d705 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -96,9 +96,9 @@ class ApplicationController < ActionController::Base
   end
   
   # Render the page
-  def render_page(id = nil)
+  def render_page(param)
     if @item
-      render :text => process_page(@item, id), :layout => 'page_layout'
+      render :text => process_page(@item, param[:id],param), :layout => 'page_layout'
     else
       render :text => '404 Not Found'
     end
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 4860ea2e8..fab5b6a03 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -19,7 +19,7 @@ class PagesController < ApplicationController
        if @item && @item.is_published
          case @item._type
            when 'Page'    
-             render_page(params[:id])
+             render_page(params)
            when 'Link'
              redirect_to "http://#{@item[:url]}"
          end
@@ -40,7 +40,9 @@ class PagesController < ApplicationController
    end
    
    def show_from_link
-     redirect_to "/#{@item.full_name}?id=#{params[:id]}"
+     # debugger
+     # a=1
+     redirect_to "/#{@item.full_name}?id=#{params[:id]}&preview=#{params[:preview]}"
    end
    
    def load_orbit_bar
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6e76b1a27..ab8d163f6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -116,8 +116,8 @@ module ApplicationHelper
     ' active' if (@filter[type].include?(id.to_s) rescue nil)
   end
 
-  def process_page(page, id)
-    parse_page_noko(page, id)
+  def process_page(page, id,params)
+    parse_page_noko(page, id,params)
   end
 
   def page_metas(page)
diff --git a/app/views/admin/ad_banners/index.html.erb b/app/views/admin/ad_banners/index.html.erb
index d70afab39..47a9ec4d3 100644
--- a/app/views/admin/ad_banners/index.html.erb
+++ b/app/views/admin/ad_banners/index.html.erb
@@ -1,7 +1,7 @@
 <% content_for :page_specific_css do -%>
 	<%#= stylesheet_link_tag "admin/ad_banner_preview" %>
 <% end -%>
-<% content_for :page_specific_css do -%>
+<% content_for :page_specific_javascript do -%>
 	<%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
 	<%= javascript_include_tag "inc/modal-preview" %>
 <% end -%>
diff --git a/app/views/admin/module_apps/edit.html.erb b/app/views/admin/module_apps/edit.html.erb
index 52142feac..7fb64d170 100644
--- a/app/views/admin/module_apps/edit.html.erb
+++ b/app/views/admin/module_apps/edit.html.erb
@@ -17,17 +17,17 @@
 		</dd>
 	</dl>
 	<dl id="sub_manager">
-		<dt><%= t("admin.user_role.auth.sub_manager") %></ht>
-		<% @module_app.sub_managers.each do |manager| %>
-			<dd><%= manager.user.name %>  <%= get_auth_by(manager) %><%= link_to '[X]',remove_sub_manager_admin_module_app_path(@module_app,manager),:method => :delete if if_permit_to_delete(:sub_manager) && manager.user != current_user %> </dd>
-		<% end %>
+		<dt><%#= t("admin.user_role.auth.sub_manager") %></ht>
+		<%# @module_app.sub_managers.each do |manager| %>
+			<dd><%#= manager.user.name %>  <%#= get_auth_by(manager) %><%#= link_to '[X]',remove_sub_manager_admin_module_app_path(@module_app,manager),:method => :delete if if_permit_to_delete(:sub_manager) && manager.user != current_user %> </dd>
+		<%# end %>
 		<dd>
-			<%= form_tag(assign_sub_manager_admin_module_app_path) do %>
-			<%= collection_select(:sub_manager,:id, User.all, :id, :name, :prompt => true,:disabled  => !if_permit_to_assign(:sub_manager))%>
-				<%= submit_tag t("admin.user_role.auth.add_sub_manager") %>
-			<% end %>
+			<%#= form_tag(assign_sub_manager_admin_module_app_path) do %>
+			<%#= collection_select(:sub_manager,:id, User.all, :id, :name, :prompt => true,:disabled  => !if_permit_to_assign(:sub_manager))%>
+				<%#= submit_tag t("admin.user_role.auth.add_sub_manager") %>
+			<%# end %>
 		</dd>
 	</dl>
 </div>
-<%= render :partial => "admin/components/user_role_management", :locals => { :object => @module_app ,:auth=> @module_app.app_auth ,:submit_url=> admin_module_app_app_auths_path(@module_app),:ploy_route_ary=>['remove',:admin,@module_app,@module_app.app_auth] } %>
+<%#= render :partial => "admin/components/user_role_management", :locals => { :object => @module_app ,:auth=> @module_app.app_auth ,:submit_url=> admin_module_app_app_auths_path(@module_app),:ploy_route_ary=>['remove',:admin,@module_app,@module_app.app_auth] } %>
 
diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb
index dfec0dd9a..ff69a72b9 100644
--- a/lib/parsers/parser_front_end.rb
+++ b/lib/parsers/parser_front_end.rb
@@ -21,10 +21,10 @@ module ParserFrontEnd
 
   require 'nokogiri'
 
-  def parse_page_noko(page, id = nil)
+  def parse_page_noko(page, id = nil,params)
     body = Nokogiri::HTML(page.design.layout.body)
     parse_menu(body, page)
-    public_r_tags = parse_contents(body, page, id)
+    public_r_tags = parse_contents(body, page, id,params[:preview])
     parse_images(body, page)
 
     public_r_tags.each do |tag|
@@ -35,7 +35,7 @@ module ParserFrontEnd
   end
 
   # page_contents
-  def parse_contents(body, page, id)
+  def parse_contents(body, page, id,preview = false)
     public_r_tags = []
     body.css('.page_content').each do |content|
       ret = ''
@@ -44,6 +44,7 @@ module ParserFrontEnd
         ret << "/#{id}" if id
         ret << "?inner=true&page_id=#{page.id}"
         ret << "&category_id=#{page.category}" if page[:category]
+        ret << "&preview=true" if preview
         ret << "'></div>"
       else
         part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb
index 4338fdd13..566b07426 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb
@@ -3,6 +3,13 @@ class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendControlle
   before_filter :is_admin?
   include AdminHelper
   # layout 'admin'
+  def preview_and_approve
+    @bulletin = Bulletin.find params[:bulletin_id]
+  end
+  
+  def approve
+    
+  end
   
   def setting
     @bulletin_categorys = BulletinCategory.all
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
index 8438c8e0f..26739b62b 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
@@ -23,10 +23,20 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
   end
   
   def show
-    @bulletin = Bulletin.can_display.where(_id: params[:id]).first
-    get_categorys
+    if params[:preview] == "true"
+      preview_content
+    else
+      @bulletin = Bulletin.can_display.where(_id: params[:id]).first
+      get_categorys
+    end
+
   end
   
+  def preview_content
+    @bulletin = Bulletin.find params[:id]
+    get_categorys
+    render :show
+  end
   
   protected
   
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb
new file mode 100644
index 000000000..8f65e341c
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb
@@ -0,0 +1,68 @@
+ <% if bulletin -%>
+
+<div class="modal hide fade in banner-preview" id="bulletin-<%=bulletin.id%>">
+  <div class="modal-header">
+    <a class="close" data-dismiss="modal">×</a>
+    <h3><%= t("modal.preview") %></h3>
+  </div>
+  <div class="modal-body">
+    <p class="bulletin_slideshow">
+			<iframe src=<%= panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id ,:preview=>true) %> style="width:1024px;height:300px" >
+
+				</iframe>
+	
+			<%# preview_block_ad_images_helper(bulletin).each do |ad_image| -%>
+				<%#= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => bulletin.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || bulletin.context || " ")) %>
+			<%# end -%>
+    </p>
+  </div>
+  <div class="modal-footer">
+		
+		<%= form_for bulletin, :url => panel_announcement_back_end_bulletin_path(bulletin), :html => {:class => 'clear'} do |f| %>
+		<%= f.label :approval_stat, t('announcement.bulletin.approval_stat') %>
+			<%= content_tag :label,:class => "radio inline" do -%>
+				<%= f.radio_button :is_checked, true , {:class => 'privacy'} %> 
+				<%= t('announcement.bulletin.approval_pass') %>
+			<% end -%>
+			<%= content_tag :label,:class => "radio inline" do -%>
+				<%= f.radio_button :is_checked, false, (!@bulletin.is_checked ? {:checked => true, :class => 'privacy'} : {})%> 
+				<%= t('announcement.bulletin.approval_not_pass') %>
+			<% end -%>
+
+				<%= label :is_checked_false, t('announcement.bulletin.approval_not_pass_reason') %>
+			    <%= f.text_field :not_checked_reason %>
+			<%= f.submit t('announcement.bulletin.submit_approval'),:class=>"btn"%>
+		<% end %>
+
+    <a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
+  </div>
+  <div>
+  	<script type="text/javascript" src="/static/kernel.js"></script>
+		<script type="text/javascript">
+			$(document).ready(function() {
+	
+			// $("#bulletin-<%#=bulletin.title.dehumanize%>").on("show", function () {
+			//   		$("#bulletin-<%#=bulletin.title.dehumanize%>").find(".bulletin_slideshow").cycle({delay: -1000, fx: "<%#= bulletin.ad_fx.nil?? "fade": bulletin.ad_fx %>", timeoutFn: getTimeout });
+			// });
+		$(".modal").on("hidden", function () {
+	  $("#show_preview").remove();
+			});
+			
+			$("iframe").load(function(){
+          // Get the body element
+          var frameBody = $("iframe").contents().find("body");
+
+          // Get all links inside the BODY tag
+          $('a', frameBody).click(function(e){
+                  //Disable all default actions       
+                  e.preventDefault();
+          });
+      });
+		});
+		</script>
+	</div>
+</div>
+
+
+
+<% end -%>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/preview_and_approve.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/preview_and_approve.js.erb
new file mode 100644
index 000000000..d0e4649dd
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/preview_and_approve.js.erb
@@ -0,0 +1,5 @@
+$('#show_preview').html("<%= escape_javascript(render(:partial => 'modal_approve',:locals => {:bulletin => @bulletin})) %>");
+var start_modal_with_id = "bulletin-<%=@bulletin.id%>";
+$("#"+start_modal_with_id).css("width","1050px");
+$("#"+start_modal_with_id).css("height","768px");
+$("#"+start_modal_with_id).css("margin","-270px 0 0 -550px");
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
index 5fb1fcaab..db22e5019 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
@@ -54,7 +54,7 @@
 				<li class="dropdown"><%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
 				<% end -%>
 				<% if show_approval_link(bulletin) %>
-				<li><%= link_to t('announcement.bulletin.approval'), edit_panel_announcement_back_end_bulletin_path(bulletin)   %></li><%#= #TODO add ancher so user can quick access into that part %>
+				<li><%= link_to t('announcement.bulletin.approval'), panel_announcement_back_end_bulletin_approval_preview_path(bulletin),:class => 'preview_trigger' %></li><%#= #TODO add ancher so user can quick access into that part %>
 				<% end %>
 			</ul>
 		</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index df86f2211..d9771e831 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -105,28 +105,6 @@
 				<a class="action"><i title="A" class="icon-exclamation-sign icon-white tip"></i></a>
 			</div>
 			
-			<h3 class="widget-title"><i class="icons-link icons-white"></i>Audit</h3>
-			<div class="widget-content">
-
-				<% if is_manager? || @bulletin.bulletin_category.authed_users('fact_check').include?(current_user) || current_user.admin? %>
-					<div class="controls">
-						<%= f.label :approval_stat, t('announcement.bulletin.approval_stat') %>
-						<%= content_tag :label,:class => "radio inline" do -%>
-							<%= f.radio_button :is_checked, true , {:class => 'privacy'} %> 
-							<%= t('announcement.bulletin.approval_pass') %>
-						<% end -%>
-						<%= content_tag :label,:class => "radio inline" do -%>
-							<%= f.radio_button :is_checked, false, (!@bulletin.is_checked ? {:checked => true, :class => 'privacy'} : {})%> 
-							<%= t('announcement.bulletin.approval_not_pass') %>
-						<% end -%>
-						<div class="select-role">
-							<%= label :is_checked_false, t('announcement.bulletin.approval_not_pass_reason') %>
-						    <%= f.text_field :not_checked_reason %>
-						</div>
-						
-					</div>
-				<% end %>
-			</div>
 		</div>
 		<% elsif current_user.admin? %>
 			<%= f.hidden_field :is_checked,:value => true%>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
index 54c0ab7a9..4220edf45 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
@@ -23,5 +23,7 @@
 
 <% content_for :page_specific_javascript do %>
 	<%= javascript_include_tag "bulletin_form" %>
+	<%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
+	<%= javascript_include_tag "inc/modal-preview" %>
 <% end %>
 
diff --git a/vendor/built_in_modules/announcement/config/locales/en.yml b/vendor/built_in_modules/announcement/config/locales/en.yml
index 16353b6ac..f88490e44 100644
--- a/vendor/built_in_modules/announcement/config/locales/en.yml
+++ b/vendor/built_in_modules/announcement/config/locales/en.yml
@@ -81,6 +81,7 @@ en:
       approval_setting_window_title: 'Unit'
       approval_user_list: 'Approval Users'
       cate_auth: Category Authorization
+      submit_approval: Submit approval
   # admin:
   #     action: Action
   #     add_language: Add language
diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
index bf0d0be6b..d0b6d73ed 100644
--- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
@@ -63,6 +63,7 @@ zh_tw:
       approval_setting_window_title: '單位'
       approval_user_list: '審核者'
       cate_auth: '分類授權'
+      submit_approval: '提交審核'
       
   bulletin:
     last_modified: 最後修改於
diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb
index 0de9877a1..f2c5092f7 100644
--- a/vendor/built_in_modules/announcement/config/routes.rb
+++ b/vendor/built_in_modules/announcement/config/routes.rb
@@ -7,6 +7,8 @@ Rails.application.routes.draw do
         match 'approval_setting' => "approvals#update_setting" ,:as => :approval_setting,:via => :post
         match 'approval_setting' => "approvals#user_list" ,:as => :approval_user_list,:via => :put
         resources :bulletins do
+          match "approve/:bulletin_id"  => "approvals#preview_and_approve",:as => :approval_preview,:via => :put
+          match "approve/:bulletin_id"  => "approvals#approve",:as => :approve,:via => :post
           match "link_quick_add/:bulletin_id" => "bulletins#link_quick_add" ,:as => :link_quick_add
           match "link_quick_edit/:bulletin_id" => "bulletins#link_quick_edit" ,:as => :link_quick_edit
           member do
@@ -32,7 +34,9 @@ Rails.application.routes.draw do
         resources :tags
       end
       namespace :front_end do
-        resources :bulletins
+        resources :bulletins # do
+        #           match "preview" => "bulletins#preview_content",:as => :get_preview_content
+        #         end
       end
       namespace :widget do
         match "bulletins" => "bulletins#index"

From eb81aa6980b35627ccead9c53a61ecce3a72010e Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Thu, 3 May 2012 15:48:42 +0800
Subject: [PATCH 10/39] disable input

---
 .../announcement/back_end/approvals/_modal_approve.html.erb      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb
index 8f65e341c..35049b981 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb
@@ -57,6 +57,7 @@
                   //Disable all default actions       
                   e.preventDefault();
           });
+					$('input', frameBody).attr("disabled", true);
       });
 		});
 		</script>

From b89975b4c4721841ac71d9405599143fec05cf02 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Thu, 3 May 2012 18:27:39 +0800
Subject: [PATCH 11/39] add field called unit_list_for_anc and data from
 nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data.

---
 .../back_end/bulletins_controller.rb          |   1 +
 .../announcement/app/models/bulletin.rb       |   1 +
 .../app/models/unit_list_for_anc.rb           |  12 ++
 .../back_end/bulletins/_form.html.erb         |   3 +
 .../front_end/bulletins/show.html.erb         |   2 +-
 .../data_for_ut_list_for_posting_anc.rake     |  15 ++
 .../lib/ut_list_from_nccu_2012feb.csv         | 186 ++++++++++++++++++
 7 files changed, 219 insertions(+), 1 deletion(-)
 create mode 100644 vendor/built_in_modules/announcement/app/models/unit_list_for_anc.rb
 create mode 100644 vendor/built_in_modules/announcement/lib/tasks/data_for_ut_list_for_posting_anc.rake
 create mode 100644 vendor/built_in_modules/announcement/lib/ut_list_from_nccu_2012feb.csv

diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index ff262c4d7..6a8ad109c 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -316,6 +316,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   
   def get_categorys(id = nil)
     @bulletin_categorys = []
+    @unit_list_for_anc = UnitListForAnc.all
     if(is_manager? || is_admin?)
       @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true))
     elsif is_sub_manager?
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb
index 55d1ec84a..b01de8ea6 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb
@@ -33,6 +33,7 @@ class Bulletin
   mount_uploader :image, ImageUploader
   
   belongs_to :bulletin_category
+  belongs_to :unit_list_for_anc
   
   # embeds_many :bulletin_links, :cascade_callbacks => true
   # embeds_many :bulletin_files, :cascade_callbacks => true
diff --git a/vendor/built_in_modules/announcement/app/models/unit_list_for_anc.rb b/vendor/built_in_modules/announcement/app/models/unit_list_for_anc.rb
new file mode 100644
index 000000000..5261f6a2a
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/models/unit_list_for_anc.rb
@@ -0,0 +1,12 @@
+class UnitListForAnc
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  
+  field :order
+  field :ut_code
+  field :up_ut_code
+    
+  has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true
+  
+
+end
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index d9771e831..015b636a7 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -117,6 +117,9 @@
 
 	<div id="post-body">
 		<div id="post-body-content" class="clear">
+
+			<%= f.label :unit_list_for_anc%>
+			<%= f.select :unit_list_for_anc_id,@unit_list_for_anc.collect{|t| [ t.title[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
 		
 			<%= f.label :category %>
 			<%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
index 2f37df9c1..5c0857cd0 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
@@ -4,7 +4,7 @@
 	<div class="info1">
 		<span class="date"><%= @bulletin.postdate %></span>
 		&nbsp;|&nbsp;
-		<a href="" class="unit"><%= User.find(@bulletin.create_user_id).name %></a>
+		<a href="" class="unit"><%= @bulletin.unit_list_for_anc.title[I18n.locale] rescue '' %></a>
 	</div>
 </div>
 <div class="news_image">
diff --git a/vendor/built_in_modules/announcement/lib/tasks/data_for_ut_list_for_posting_anc.rake b/vendor/built_in_modules/announcement/lib/tasks/data_for_ut_list_for_posting_anc.rake
new file mode 100644
index 000000000..e5bd0be22
--- /dev/null
+++ b/vendor/built_in_modules/announcement/lib/tasks/data_for_ut_list_for_posting_anc.rake
@@ -0,0 +1,15 @@
+# encoding: utf-8 
+
+namespace :nccu_data do
+  desc "load nccu data from csv"
+  task :setup_ut_list => :environment do
+    require 'csv'
+
+    CSV.foreach("vendor/built_in_modules/announcement/lib/ut_list_from_nccu_2012feb.csv") do |row|
+      new_unit = UnitListForAnc.new(:order => row[0], :ut_code => row[1], :up_ut_code => row[2], :created_at => Time.now,:updated_at => Time.now)
+      new_unit.build_title :en => row[4], :zh_tw => row[3]
+      new_unit.save
+    end
+
+  end
+end
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/lib/ut_list_from_nccu_2012feb.csv b/vendor/built_in_modules/announcement/lib/ut_list_from_nccu_2012feb.csv
new file mode 100644
index 000000000..548ad5281
--- /dev/null
+++ b/vendor/built_in_modules/announcement/lib/ut_list_from_nccu_2012feb.csv
@@ -0,0 +1,186 @@
+order,ut_code,up_tu_code,ut_zh_tw,ut_en
+0100,H00,H00,校長室,Office of the President
+0110,H01,H01,副校長室一,Office of the Vice President
+0110,H03,H03,副校長室二,Office of the Vice President
+0200,100,100,文學院,College of Liberal Arts
+0210,101,100,中文系,Dept. of Chinese Literature
+0220,103,100,歷史系,Dept. of History
+0230,104,100,哲學系,Dept. of Philosophy
+0240,155,100,圖檔所,"Graduate Institute of Library, Informati"
+0250,156,100,宗教所,Graduate Institute of Religious Studies
+0260,158,100,台史所,Graduate Institute of Taiwan History
+0270,159,100,台文所,Graduate Institute of Taiwan Literatu
+0280,161,100,華文碩,Master's Program in Teaching Chinese as
+0290,160,100,華文博,Doctor's Program in Teaching Chinese as
+0294,913,100,圖資專班,E-learning Master Program of Library and
+0300,700,700,理學院,College of Science
+0310,701,700,應數系,Dept. of Mathematical Sciences
+0320,702,700,心理系,Dept. of Psychology
+0330,703,700,資科系,Dept. of Computer Science
+0340,754,700,神科所,The Graduate Institute of Neuroscience
+0350,755,700,應物所,Graduate Institute of Applied Physics
+0600,200,200,社科院,College of Social Sciences
+0605,202,200,政治系,Dept. of Political Science
+0610,204,200,社會系,Dept. of Sociology
+0615,205,200,財政系,Dept. of Public Finance
+0620,206,200,公行系,Dept. of Public Administration
+0625,207,200,地政系,Dept. of Land Economics
+0630,208,200,經濟系,Dept. of Economics
+0635,209,200,民族系,Dept. of Ethnology
+0640,261,200,國發所,GIDS
+0645,262,200,勞工所,Graduate Institute of Labor Research
+0650,264,200,社工所,Graduate Institute of Social Work
+0652,265,200,亞太博,International Doctor Program in Asia-Pac
+0700,600,600,法學院,College of Law
+0710,601,600,法律系,Dept. of Law
+0720,652,600,法科所,The Institute of Law and Inter-disciplin
+0800,300,300,商學院,College of Commerce
+0801,301,300,國貿系,Dept. of International Business
+0803,302,300,金融系,Dept. of Money and Banking
+0805,303,300,會計系,Dept. of Accounting
+0807,304,300,統計系,Dept. of Statistics
+0809,305,300,企管系,Dept. of Business Administration
+0811,306,300,資管系,Dept. of Management Information System
+0813,307,300,財管系,Dept. of Finance
+0815,308,300,風管系,Dept. of Risk Management and Insurance
+0817,359,300,科管所,Graduate Institute of Technology and Inn
+0819,361,300,智財所,Graduate Institute of Intellectual Prope
+0821,362,300,管理碩士學程,Advanced Master of Business Administrati
+0823,380,300,商管碩,Advanced Master of Business Administrati
+1100,500,500,外語學院,College of Foreign Languages
+1110,501,500,英文系,Dept. of English
+1120,502,500,阿文系,Dept. of Arabic Language and Literature
+1130,504,500,斯拉夫文系,Dept. of Slavic Languages and Literature
+1140,506,500,日文系,Dept. of Japanese
+1150,507,500,韓文系,Dept. of Korean Language and Cultur
+1160,508,500,土文系,Dept. of Turkish Language and Cultu
+1170,555,500,語言所,Graduate Institute of Linguistics
+1180,509,500,歐洲語文學程,Undergraduate Program in European Langua
+1190,5T1,500,外文中心,Foreign Languages Center
+1200,400,400,傳播學院,College of Communication
+1210,401,400,新聞系,Dept. of Journalism
+1220,402,400,廣告系,Dept. of Advertising
+1230,403,400,廣電系,Dept. of Radio and Television
+1240,461,400,國傳英語碩士學位學程,International Master's Program in Intern
+1250,404,400,傳播學程,College of Communication Undergraduate D
+1260,462,400,數位內容學程,DCT
+1270,781,700,數位內容與科技學士學位學程,數位內容與科技學士學位學程
+1280,4A1,400,實習廣播電台,NCCU Community Radio Station
+1300,800,800,國際事務學院,College of International Affairs
+1310,203,800,外交系,Dept. of Diplomacy
+1320,260,800,東亞所,Graduate Institute of East Asian Studies
+1330,263,800,俄研所,Graduate Institute of Russian Studies
+1340,861,800,日碩研,Master Program in Japan Studies
+1346,862,800,國際研究英語碩士學位學程(籌備處),International Master's Program in Intern
+1600,900,900,教育學院,College of Education
+1610,102,900,教育系,Dept. of Education
+1620,157,900,幼教所,Graduate Institute of Early Childhood Ed
+1630,171,900,教政所,Graduate Institute of Educational Admini
+1640,1T3,900,師培中心,Institute of Teacher Education
+1652,172,900,輔諮碩學程,MPCG
+1660,1T1,900,教研中心,The Teacher In-Service Education Center
+1700,L00,L00,國關中心,The Institute of International Relations
+1710,L01,L00,國關第一所,First Division
+1720,L02,L00,國關第二所,Second Division
+1730,L03,L00,國關第三所,Third Division
+1740,L04,L00,國關第四所,Fourth Division
+1750,L05,L00,國關合交組,The Institute of International Relations
+1760,L06,L00,國關編譯組,The Institute of International Relations
+1770,L07,L00,國關圖資組,The Institute of International Relations
+1780,L08,L00,國關秘書組,The Institute of International Relations
+1800,S00,S00,選研中心,Election Study Center
+1900,Z01,Z01,第三部門研究中心,Center for the Third Sector
+1910,Z02,Z02,創新創造力研究中心,CCIS
+1920,Z03,Z03,中國大陸研究中心,Center for China Studies
+1930,Z04,Z04,台灣研究中心,TSC
+1940,Z08,Z08,心腦學中心,"Reseach Center for Mind, Brain and Learn"
+1950,Z10,Z10,原民中心,Center for Aboriginal Studies
+1960,Z09,Z09,人文中心,Humanities Center
+2000,T00,T00,教務處,Office of Academic Affairs
+2010,T01,T00,教務處註冊組,Registration Section
+2020,T02,T00,教務處課務組,Instruction Resources Section
+2030,T03,T00,教務處綜合業務組,Admission Section
+2040,T04,T00,教務處通識教育中心,Center of General Education
+2100,M00,M00,學務處,Office of Student Affairs
+2110,M01,M00,學務處生僑組,Life Guidance and Overseas Chinese Stude
+2120,M02,M00,學務處課外組,Student Activities Section
+2130,M03,M00,學務處住宿組,Student Housing Service Section
+2150,M11,M00,學務處藝文中心,Art and Culture Center
+2155,M14,M00,學務處身心健康中心,Physical and Mental Health Center
+2160,M13,M00,學務處職涯中心,Center of Career Development
+2170,D00,M00,學務處軍訓室,Military Education Office
+2200,G00,G00,總務處,Office of General Affairs
+2210,G01,G00,總務處文書組,Document  and postal section
+2220,G02,G00,總務處事務組,General Management  Section
+2230,G05,G00,總務處出納組,Cashier Section
+2240,G04,G00,總務處營繕組,Construction and Maintenance Section
+2250,G03,G00,總務處財產組,Property Management SEction
+2260,G06,G00,總務處環保組,Environmental  Protection Section
+2270,G08,G00,總務處規劃組,Campus Planning & Devel opment Section
+2280,G07,G00,總務處駐警隊,Campus Security National  Chengchi Unive
+2300,R00,R00,研發處,Office of Research and Development
+2310,R01,R00,研發處企畫組,Planning Section
+2320,R02,R00,研發處學術推展組,Academic Development Section
+2330,R03,R00,研發處學評組,Academic Evaluation Section
+2400,Z05,Z05,國合處,Office of International Cooperation
+2410,Z06,Z05,國合處合作交流組,CES
+2420,Z07,Z05,國合處教育組,IES
+2430,Z14,Z05,國合處發展策劃組,DPS
+2500,Q00,Q00,秘書處,Secretariat
+2510,Q01,Q00,秘書處第一組,First Section
+2520,Q02,Q00,秘書處第二組,Second Section
+2530,Q03,Q00,秘書處第三組,Third Section
+2600,K00,K00,圖書館,Libraries
+2610,K06,K00,圖書館資訊組,System Information Section
+2620,K07,K00,圖書館採編組,Acquisition & Cataloging Section
+2630,K08,K00,圖書館典閱組,Circulation Section
+2640,K09,K00,圖書館推廣服務組,Reference Services Section
+2650,K10,K00,圖書館數位典藏組,Digital Preservation Section
+2660,K11,K00,圖書館行政組,Administration Section
+2670,K12,K00,圖書館圖書分館,Branch Libraries
+2700,B00,B00,體育室,Physical Education Office
+2710,B01,B00,體育教學組,Physical Education Office
+2720,B02,B00,體育活動組,Sport activities section
+2800,P00,P00,人事室,Personnel Office
+2810,P01,P00,人一組,First Section
+2820,P02,P00,人二組,Second Section
+2830,P03,P00,人三組,Third Section
+2840,P04,P00,人四組,Fourth Section
+2900,A00,A00,會計室,Accounting Office
+2910,A01,A00,會計室第一組,Budgeting Section
+2920,A02,A00,會計室第二組,Accounting Section
+2930,A03,A00,會計室第三組,Auditing Section
+3000,I00,I00,公企中心,Public and Business Administration Educa
+3010,I01,I00,公企諮詢組,Research and Consultation Section
+3020,I02,I00,公企職訓組,Training Section
+3030,I03,I00,公企語訓組,Language Training Section
+3040,I04,I00,公企總務組,General Affairs Section
+3050,I05,I00,公企中心圖資組,Library Resource Section
+3100,O00,O00,公教中心,Civil Service Education Center
+3110,O01,O00,公教教務組,Civil Service Education Center
+3120,O02,O00,公教輔導組,Civil Service Education Center
+3130,O03,O00,公教行政組,Civil Service Education Center
+3200,J00,J00,社資中心,Social Sciences Information Center
+3210,J03,J00,社資資料組,Reference Services Section
+3220,J04,J00,社資研發組,Section of Research & Development
+3300,C00,C00,電算中心,Computer Center
+3310,C01,C00,電算教研組,Teaching and Research Section
+3320,C02,C00,電算系統組,Application System Section
+3330,C03,C00,電算行政組,Administration and Counseling Section
+3340,C04,C00,電算網路組,Networking and Development Section
+3400,T05,T05,教學發展中心,Center for Teaching and Learning Develop
+3410,T06,T05,教發教學組,Teaching and Learning Division
+3420,T07,T05,教發數位組,E-Learning Division
+3430,T08,T05,教發規劃組,Planning and Research Division
+3500,162,162,華語文中心,Chinese Language Center
+3600,Z11,Z11,育成中心,Innovation Incubation Center
+3700,V00,V00,附設實小,The Experimental Elementary School
+3700,V01,V00,附設實小教務處,Office of Academic Affairs
+3700,V02,V00,附設實小學務處,Office of Student Affairs
+3700,V03,V00,附設實小輔導室,The Experimental Elementary School
+3700,V04,V00,附設實小總務處,Office of General Affairs
+3700,V06,V00,附設實小研究處,The Experimental Elementary School
+3710,V05,V00,附設實小幼稚園,The Experimental Elementary School
+3800,W00,W00,附中,The Affiliated High School
+3900,Z13,Z13,政大書院辦公室,Chengchi College Project Office
+4000,Z12,Z12,頂大辦公室,Office of NCCU Top University Program
\ No newline at end of file

From 05ded8de03afda0da8696a9423a78f55ff19fd75 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Mon, 30 Apr 2012 03:14:15 +0800
Subject: [PATCH 12/39] Fix for NCCU 0430 all functions ok with two submanagers
 but different behavors

---
 .../admin/dashboards_controller.rb            |  2 +-
 app/controllers/admin/designs_controller.rb   |  3 +-
 app/controllers/application_controller.rb     | 52 ++++++++++++++++++-
 app/helpers/orbit_backend_helper.rb           |  6 +--
 app/views/admin/dashboards/index.html.erb     |  2 +
 app/views/layouts/_side_bar.html.erb          |  4 ++
 public/static/kernel.js                       |  1 +
 .../back_end/approvals_controller.rb          |  1 +
 .../back_end/bulletin_categorys_controller.rb |  4 +-
 .../back_end/bulletins_controller.rb          | 28 ++++++----
 .../_bulletin_category.html.erb               | 11 ++--
 .../bulletin_categorys/index.html.erb         |  2 +-
 .../back_end/bulletins/_bulletin.html.erb     | 16 ++++--
 .../back_end/bulletins/_sort_headers.html.erb |  2 +-
 14 files changed, 107 insertions(+), 27 deletions(-)

diff --git a/app/controllers/admin/dashboards_controller.rb b/app/controllers/admin/dashboards_controller.rb
index 7b7613611..b7f377d3b 100644
--- a/app/controllers/admin/dashboards_controller.rb
+++ b/app/controllers/admin/dashboards_controller.rb
@@ -2,7 +2,7 @@ class Admin::DashboardsController < ApplicationController
   
   layout "new_admin"
   before_filter :authenticate_user!
-  before_filter :is_admin?
+#  before_filter :is_admin?
   
   def index
   end
diff --git a/app/controllers/admin/designs_controller.rb b/app/controllers/admin/designs_controller.rb
index 519b36a59..ff41c0b4d 100644
--- a/app/controllers/admin/designs_controller.rb
+++ b/app/controllers/admin/designs_controller.rb
@@ -5,7 +5,8 @@ class Admin::DesignsController < ApplicationController
 
   layout "new_admin"
   before_filter :authenticate_user!
-  before_filter :is_admin?
+  before_filter :is_admin? 
+  before_filter :for_admin_only
 
   def upload_package
     if !params[:design].nil?
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index fb82774ef..2f6636b9b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -39,9 +39,59 @@ class ApplicationController < ActionController::Base
     @parent_item  = Item.first(:conditions => { :id => BSON::ObjectId(params[:parent_id]) }) rescue nil
   end
   
+  def auth_failed_in_backend
+     redirect_to admin_dashboards_url 
+  end
+  
   # Check if the current_user is admin
   def is_admin?
-    redirect_to root_url unless current_user.admin?
+    
+    auth_failed_in_backend unless current_user.admin?
+  end
+  
+  def is_manager?
+     @module_app.managing_users.include?(current_user) || is_admin?
+  end
+  
+  def for_admin_only
+    if is_admin?
+      true
+    else
+    flash[:notice] = "Access Denied for you are not Admin"
+    auth_failed_in_backend
+    end
+  end
+  
+  def for_app_manager
+    if is_manager?
+      true
+    else
+    flash[:notice] = "Access Denied for you are not Manager for this app"
+    auth_failed_in_backend
+  end
+  end
+  
+  def for_app_sub_manager
+    if (@module_app.sub_managing_users.include?(current_user) || is_manager?)
+      true
+    else
+    flash[:notice] = "Access Denied for you are not SubManager for this app"    
+    auth_failed_in_backend
+  end
+  end
+
+  def for_app_user
+    if (@module_app.app_auth.auth_users.include?(current_user) || for_app_sub_manager )
+      true
+    else
+    flash[:notice] = "Access Denied for you are not User for this app"
+    auth_failed_in_backend
+  end
+  end
+
+  def check_object_premission(obj,title)
+    flash[:notice] = "Access Denied for you don't have permission for this object"
+    auth_failed_in_backend unless (obj.get_object_auth_by_title(title).auth_users.include?(current_user) || is_manager? || is_admin? )
   end
   
   # Render the page
diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb
index b0da6df6e..55f44d61b 100644
--- a/app/helpers/orbit_backend_helper.rb
+++ b/app/helpers/orbit_backend_helper.rb
@@ -25,9 +25,9 @@ module OrbitBackendHelper
       content_tag :thead do
         content_tag :tr, :class => "sort-header" do
           concat (content_tag :th, :class => "span1 strong" do
-                      concat check_box_tag :check_all
-                      concat link_to content_tag(:i, nil, :class => "icon-trash"), '#', :class => "list-remove"
-                    end) if delete_all
+            concat check_box_tag :check_all
+            concat link_to content_tag(:i, nil, :class => "icon-trash"), '#', :class => "list-remove"
+           end) if delete_all && is_manager?
           titles.each do |title|
             concat render_title(title[0], title[1], title[2], title[3])
           end
diff --git a/app/views/admin/dashboards/index.html.erb b/app/views/admin/dashboards/index.html.erb
index e22d7dac8..21bc7ffb1 100644
--- a/app/views/admin/dashboards/index.html.erb
+++ b/app/views/admin/dashboards/index.html.erb
@@ -1,3 +1,5 @@
+<%= flash_messages %>
+
 <div id="isotope">
     <div class="item element">
         <h3><i class="icons-content"></i><a href=""><%= t(:content) %></a></h3>
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index 3baa80496..1a303a319 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -1,6 +1,10 @@
 <%#= content_tag :li, :class => active_for_controllers('purchases') do -%>
 	<%#= link_to content_tag(:i, nil, :class => 'icons-purchase') + t('admin.purchase'), admin_purchases_path %>
 <%# end -%>
+<% content_for :page_specific_javascript do %>
+	<%= javascript_include_tag "/static/kernel.js"  %>
+<% end %>
+<%= flash_messages %>
 
 <%= content_tag :li, :class => active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys','module_apps', 'approvals') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.announcement'), panel_announcement_back_end_bulletins_path %>
diff --git a/public/static/kernel.js b/public/static/kernel.js
index c5b9a8a6a..ba5b81c38 100644
--- a/public/static/kernel.js
+++ b/public/static/kernel.js
@@ -1,4 +1,5 @@
 $(document).ready(function() {
+	$.each($(".notice"),function(k,v){ alert("EMPTY Cate");});
 	
 	$.each($(".dymanic_load"),function(){
 		if($(this).attr("path")==''){$(this).html("App setting Failed");} 
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb
index 2d10dd75f..4338fdd13 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb
@@ -1,5 +1,6 @@
 class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendController
   before_filter :authenticate_user!
+  before_filter :is_admin?
   include AdminHelper
   # layout 'admin'
   
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
index 0e3894b9d..b9151125c 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
@@ -1,5 +1,7 @@
 class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendController
-  
+  before_filter :for_app_manager,:except => [:index] 
+
+
   def index
     @bulletin_categorys = BulletinCategory.all
     @bulletin_category = BulletinCategory.new(:display => 'List')
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index 62de400d1..6cf11158d 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -1,8 +1,9 @@
 class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   
   before_filter :authenticate_user!
-  before_filter :is_admin?
-
+#  before_filter :for_admin_only,:only => [:]
+#  before_filter :for_app_manager,:only => [:index,:show,] 
+  before_filter :for_app_sub_manager,:except => [:index,:show,:get_sorted_and_filtered_bulletins]
   def index
     # @bulletins = Bulletin.all
     # @bulletins = Bulletin.desc("postdate desc")
@@ -42,6 +43,10 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     @bulletin_file = BulletinFile.new
     @file_url = panel_announcement_back_end_bulletins_path
 	
+	  @bulletins.delete_if{ |bulletin|
+	    bulletin.is_pending == true && (!bulletin.bulletin_category.authed_users('fact_check').include?(current_user) || bulletin.create_user_id!=current_user.id)
+	    }
+
     respond_to do |format|
       format.html # index.html.erb
       format.js { }
@@ -79,14 +84,17 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     
 	# @bulletin.bulletin_files.build
 	# @bulletin.bulletin_files.new
-	
-	get_categorys
-	get_tags
 
-    respond_to do |format|
-      format.html # new.html.erb
-      format.xml  { render :xml => @bulletin }
-    end
+	if get_categorys.empty?
+	  flash[:notice] = "You dont have any permission for post on cate"
+    redirect_to :action => :index
+  else
+	  get_tags
+      respond_to do |format|
+        format.html # new.html.erb
+        format.xml  { render :xml => @bulletin }
+      end
+  	end
   end
 
   # GET /bulletins/1/edit
@@ -314,7 +322,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     if(is_manager? || is_admin?)
       @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true))
     elsif is_sub_manager?
-      @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new')
+      @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit')
     end
   end
   
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
index a75440e56..8ad4578ea 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
@@ -4,10 +4,13 @@
 			<%= bulletin_category.key %>
 			<div class="quick-edit">
 				<ul class="nav nav-pills hide">
-					<li><%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %></li>
-					<li><%= show_submit_permission_link(bulletin_category) %></li>
-					<li><%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
-					
+					<%if is_manager? || is_admin? %>
+						<li><%= show_submit_permission_link(bulletin_category) %></li>
+					<% end %>
+					<% if is_admin?%>
+						<li><%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %></li>
+						<li><%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
+					<% end %>
 					
 				</ul>
 			</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
index 4d31464f1..26a88dab7 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
@@ -35,7 +35,7 @@
 	</tbody>
 </table>
 
-<div id="form"><%= render :partial => "form" %></div>
+<div id="form"><%= render :partial => "form" if is_manager?%></div>
 
 
 
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
index d171e0b3c..5fb1fcaab 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
@@ -1,5 +1,8 @@
 <tr id="<%= dom_id bulletin %>" class="with_action">
-	<td><%= check_box_tag 'to_delete[]', bulletin.id, false, :class => "checkbox_in_list" %></td>
+	<td>
+		<% if (bulletin.create_user_id ==  current_user.id) || is_manager? %>
+			<%= check_box_tag 'to_delete[]', bulletin.id, false, :class => "checkbox_in_list" %>
+		<% end -%>
 	<td>
 		<div class="label-group">
 			<div class="label-td">
@@ -27,8 +30,11 @@
 	<td><%= bulletin.bulletin_category.i18n_variable[I18n.locale] %></td>
 	<td>
 		<%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''%>
+		
 		<div class="quick-edit">
 			<ul class="nav nav-pills hide">
+				<% if (bulletin.create_user_id ==  current_user.id) || is_manager? %>
+				
 				<% if current_user.admin? || (!bulletin.is_rejected? && !bulletin.is_checked?) %>
 					<li><%= link_to t('bulletin.edit'), edit_panel_announcement_back_end_bulletin_path(bulletin) %></li>
 					<li class="dropdown">
@@ -43,11 +49,13 @@
 					</li>
 					<%#= debugger  %>
 					<%#= a=1 %>
-					<% if show_approval_link(bulletin) %>
-					<li><%= link_to t('announcement.bulletin.approval'), edit_panel_announcement_back_end_bulletin_path(bulletin)   %></li><%#= #TODO add ancher so user can quick access into that part %>
-					<% end %>			
+	
 				<% end %>
 				<li class="dropdown"><%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
+				<% end -%>
+				<% if show_approval_link(bulletin) %>
+				<li><%= link_to t('announcement.bulletin.approval'), edit_panel_announcement_back_end_bulletin_path(bulletin)   %></li><%#= #TODO add ancher so user can quick access into that part %>
+				<% end %>
 			</ul>
 		</div>
 	</td>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
index bca2db6a9..f0d41dea1 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
@@ -4,4 +4,4 @@
 													['start_date', 'postdate', 'span1-2', 'bulletin.start_date'],
 													['end_date', 'deadline', 'span1-2', 'bulletin.end_date'],
 													['tags', 'tags', 'span1-2', 'bulletin.tags'],
-													['last_modified', 'update_user_id','span1-3', 'bulletin.last_modified']).html_safe %>
\ No newline at end of file
+													['last_modified', 'update_user_id','span1-3', 'bulletin.last_modified']).html_safe %>

From f427c3803f64b592685227ed73de4d0056f1c769 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Mon, 30 Apr 2012 15:51:22 +0800
Subject: [PATCH 13/39] clean up useless flash msgs. add i18n vars for app auth
 and object auth

---
 app/controllers/application_controller.rb     | 10 ++---
 app/views/admin/dashboards/index.html.erb     |  2 -
 app/views/layouts/_side_bar.html.erb          |  1 -
 config/locales/en.yml                         |  8 ++++
 config/locales/zh_tw.yml                      | 42 +++++++++++--------
 public/static/kernel.js                       |  1 -
 .../back_end/bulletins_controller.rb          |  2 +-
 .../announcement/config/locales/en.yml        |  2 +
 .../announcement/config/locales/zh_tw.yml     |  2 +
 9 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2f6636b9b..8fc3a90ba 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -57,7 +57,7 @@ class ApplicationController < ActionController::Base
     if is_admin?
       true
     else
-    flash[:notice] = "Access Denied for you are not Admin"
+    flash[:error] = t("admin.access.denied.not_admin")
     auth_failed_in_backend
     end
   end
@@ -66,7 +66,7 @@ class ApplicationController < ActionController::Base
     if is_manager?
       true
     else
-    flash[:notice] = "Access Denied for you are not Manager for this app"
+    flash[:error] = t("admin.access.denied.app.not_manager")
     auth_failed_in_backend
   end
   end
@@ -75,7 +75,7 @@ class ApplicationController < ActionController::Base
     if (@module_app.sub_managing_users.include?(current_user) || is_manager?)
       true
     else
-    flash[:notice] = "Access Denied for you are not SubManager for this app"    
+    flash[:error] = t("admin.access.denied.app.not_sub_manager")
     auth_failed_in_backend
   end
   end
@@ -84,13 +84,13 @@ class ApplicationController < ActionController::Base
     if (@module_app.app_auth.auth_users.include?(current_user) || for_app_sub_manager )
       true
     else
-    flash[:notice] = "Access Denied for you are not User for this app"
+    flash[:error] = t("admin.access.denied.app.not_authed_user")
     auth_failed_in_backend
   end
   end
 
   def check_object_premission(obj,title)
-    flash[:notice] = "Access Denied for you don't have permission for this object"
+    flash[:error] = t("admin.access.denied.object")
     auth_failed_in_backend unless (obj.get_object_auth_by_title(title).auth_users.include?(current_user) || is_manager? || is_admin? )
   end
   
diff --git a/app/views/admin/dashboards/index.html.erb b/app/views/admin/dashboards/index.html.erb
index 21bc7ffb1..e22d7dac8 100644
--- a/app/views/admin/dashboards/index.html.erb
+++ b/app/views/admin/dashboards/index.html.erb
@@ -1,5 +1,3 @@
-<%= flash_messages %>
-
 <div id="isotope">
     <div class="item element">
         <h3><i class="icons-content"></i><a href=""><%= t(:content) %></a></h3>
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index 1a303a319..dd8ffa839 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -4,7 +4,6 @@
 <% content_for :page_specific_javascript do %>
 	<%= javascript_include_tag "/static/kernel.js"  %>
 <% end %>
-<%= flash_messages %>
 
 <%= content_tag :li, :class => active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys','module_apps', 'approvals') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.announcement'), panel_announcement_back_end_bulletins_path %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 69491cbcf..4427e8908 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -68,6 +68,14 @@ en:
   traffic: Traffic
 
   admin:
+    access:
+      denied:
+        app:
+          not_sub_manager: Access Denied for you are not SubManager for this app
+          not_manager: Access Denied for you are not SubManager for this app
+          not_authed_user: Access Denied for you are not User for this app
+        not_admin: Access Denied for you are not Admin
+        object: "Access Denied for you don't have permission for this object"
     action: Action
     ad_banner: AD Banner
     ad:
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 19f666c4e..dfbcdf951 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -8,12 +8,12 @@ zh_tw:
   back: 回上一步
   browse: 選擇檔案
   cancel: 取消
-  create: 創建
+  create: 新增
   delete: 刪除
   desktop: 桌面
   disable: 禁用
   dots: …
-  downloaded: 已經下載
+  downloaded: 已下載
   download: 下載
   edit: 編輯
   email: 電子郵件
@@ -47,7 +47,7 @@ zh_tw:
   file_type: 檔案類型
   hits: 點擊率
   item: 項目
-  member: 成員
+  member: 會員
   module: 模組
   most_visited_page: 熱門頁面
   quantity: 數量
@@ -62,6 +62,14 @@ zh_tw:
   traffic: 流量
 
   admin:
+    access:
+      denied:
+        app:
+          not_sub_manager: 拒絕存取因你不是此應用程式次管理員
+          not_manager: 拒絕存取因你不是此應用程式管理員
+          not_authed_user: 拒絕存取因你不是此應用程式授權使用者
+        not_admin: 拒絕存取因你不是此應用程式次管理員
+        object: 拒絕存取因你不是網站管理者
     action: 操作
     ad_banner: 廣告輪播
     ad:
@@ -81,7 +89,7 @@ zh_tw:
     add_item: 新增項目
     add_language: 新增語言
     add_drop_down_item: ＋增加Orbit選單
-    admin: 管理
+    admin: 網站管理者
     all_articles: 列表
     announcement: 公告管理
     asset: 資產
@@ -94,22 +102,22 @@ zh_tw:
     author: 作者
     calendar: 行事曆
     cant_delete_self: 您不可以刪除自己。
-    cant_revoke_self_admin: 您不可以撤銷自己的管理作用。
+    cant_revoke_self_admin: 您不可以撤銷自己的管理身份。
     choose_file: 請選擇一個文件...
     class: 階級
     content: 內容
-    create_error_link: 創建連接時出錯。
-    create_error_page: 創建頁面時出錯。
-    create_success_home: 首頁已成功創建。
-    create_success_layout: 樣板已成功創建。
-    create_success_link: 連結已成功創建。
-    create_success_page: 頁面已成功創建。
-    create_success_home: 首頁已成功創建。
-    create_success_layout: 佈局已成功創建。
-    create_success_link: 連結已成功創建。
-    create_success_page: 頁面已成功創建。
-    create_success_snippet: 片段已成功創建。
-    create_success_user: 用戶已成功創建。。
+    create_error_link: 新增連接時出錯。
+    create_error_page: 新增頁面時出錯。
+    create_success_home: 首頁已成功新增。
+    create_success_layout: 樣板已成功新增。
+    create_success_link: 連結已成功新增。
+    create_success_page: 頁面已成功新增。
+    create_success_home: 首頁已成功新增。
+    create_success_layout: 佈局已成功新增。
+    create_success_link: 連結已成功新增。
+    create_success_page: 頁面已成功新增。
+    create_success_snippet: 片段已成功新增。
+    create_success_user: 用戶已成功新增。。
     dashboard: 儀表板
     data: 資料數據
     delete_language: 刪除語言
diff --git a/public/static/kernel.js b/public/static/kernel.js
index ba5b81c38..c5b9a8a6a 100644
--- a/public/static/kernel.js
+++ b/public/static/kernel.js
@@ -1,5 +1,4 @@
 $(document).ready(function() {
-	$.each($(".notice"),function(k,v){ alert("EMPTY Cate");});
 	
 	$.each($(".dymanic_load"),function(){
 		if($(this).attr("path")==''){$(this).html("App setting Failed");} 
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index 6cf11158d..a1f5227e3 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -86,7 +86,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 	# @bulletin.bulletin_files.new
 
 	if get_categorys.empty?
-	  flash[:notice] = "You dont have any permission for post on cate"
+	  flash[:alert] = t("announcement.error.no_avilb_cate_for_posting")
     redirect_to :action => :index
   else
 	  get_tags
diff --git a/vendor/built_in_modules/announcement/config/locales/en.yml b/vendor/built_in_modules/announcement/config/locales/en.yml
index 5f3193406..cdb0d0c16 100644
--- a/vendor/built_in_modules/announcement/config/locales/en.yml
+++ b/vendor/built_in_modules/announcement/config/locales/en.yml
@@ -59,6 +59,8 @@ en:
     all_articles: List
     add_new: Add
     categories: Categories
+    error: 
+      no_avilb_cate_for_posting: You need a category to submit your post,please contact admin
     sure?: Sure?
     campus_news: Campus News
     more: more+
diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
index 11e79fcca..248d3e92d 100644
--- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
@@ -37,6 +37,8 @@ zh_tw:
   announcement:
     add_new: 新增
     all_articles: 列表
+    error: 
+      no_avilb_cate_for_posting: 您目前沒有分類可以刊登公告，請聯絡系統管理員為您開通分類
     tags: 標籤
     categories: 分類
     status: 狀態

From bff3cefbc79e15a09a8525056db36393ee920319 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Tue, 1 May 2012 16:05:05 +0800
Subject: [PATCH 14/39] Apply app_auth to ad_banner.   From now,ad_banner can
 only be viewed for at least manager.

---
 app/controllers/admin/ad_banners_controller.rb |  4 ++--
 app/controllers/application_controller.rb      |  3 ++-
 app/helpers/application_helper.rb              |  9 +++++++++
 app/views/layouts/_side_bar.html.erb           | 12 +++++++-----
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/controllers/admin/ad_banners_controller.rb b/app/controllers/admin/ad_banners_controller.rb
index a21693aa6..47d3d3555 100644
--- a/app/controllers/admin/ad_banners_controller.rb
+++ b/app/controllers/admin/ad_banners_controller.rb
@@ -1,7 +1,7 @@
-class Admin::AdBannersController < ApplicationController
+class Admin::AdBannersController < OrbitBackendController
   layout "new_admin"
   before_filter :authenticate_user!
-  before_filter :is_admin?
+  before_filter :for_app_manager
 
   def destroy
     @ad_banner = AdBanner.find(params[:id])
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8fc3a90ba..ab01ea6bd 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -40,7 +40,8 @@ class ApplicationController < ActionController::Base
   end
   
   def auth_failed_in_backend
-     redirect_to admin_dashboards_url 
+     #redirect_to admin_dashboards_url 
+     redirect_to root_path
   end
   
   # Check if the current_user is admin
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 682799eb7..1839cf663 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -74,6 +74,15 @@ module ApplicationHelper
     end
   end
   
+  def active_sys_call_for_app(controller_name,action_name,app_title)
+    unless active_for_action(controller_name,action_name).nil?
+      app = ModuleApp.find params[:id]
+      app.title == app_title ? 'active' : nil
+    else
+      nil
+    end
+  end
+  
   def active_for_controllers(*controller_names)
     (controller_names.include?(controller.controller_name) || controller_names.include?(request.fullpath)) ? 'active' : nil
   end
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index dd8ffa839..41416bc4e 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -5,7 +5,7 @@
 	<%= javascript_include_tag "/static/kernel.js"  %>
 <% end %>
 
-<%= content_tag :li, :class => active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys','module_apps', 'approvals') do -%>
+<%= content_tag :li, :class => active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals') ||  active_sys_call_for_app('module_apps','edit','Announcement')  do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.announcement'), panel_announcement_back_end_bulletins_path %>
 	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals')) do -%>
 		<%= content_tag :li, link_to(t('announcement.all_articles'), panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index') %>
@@ -13,7 +13,7 @@
 		<%= content_tag :li, link_to(t('announcement.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %>
 		<%= content_tag :li, link_to(t('announcement.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('/panel/announcement/back_end/tags', 'index') %>
 		<%= content_tag :li, link_to(t('announcement.bulletin.approval_setting'), panel_announcement_back_end_approval_setting_path), :class => active_for_action('approvals', 'setting')  if (is_manager? rescue nil) %>
-		<%= content_tag :li, link_to(t('admin.module.authorization'),edit_admin_module_app_path(ModuleApp.first(conditions: {title: "Announcement"}))), :class => active_for_action('module_apps', 'edit')  if (is_admin? rescue nil) %>
+		<%= content_tag :li, link_to(t('admin.module.authorization'),edit_admin_module_app_path(ModuleApp.first(conditions: {title: "Announcement"}))), :class => active_sys_call_for_app('module_apps','edit','Announcement') if (is_admin? rescue nil) %>
 
 	<% end -%>
 
@@ -46,13 +46,15 @@
 	<%= link_to content_tag(:i, nil, :class => 'icons-window-block') + t('admin.design'), admin_designs_path %>
 <% end -%>
 
-<%= content_tag :li, :class => active_for_controllers('ad_banners', 'ad_images') do -%>
+<%= content_tag :li, :class => active_for_controllers('ad_banners', 'ad_images') || active_sys_call_for_app('module_apps','edit','ad_banners') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.ad_banner'), admin_ad_banners_path %>
-	<%#= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners', 'ad_images')) do -%>
+
+	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners', 'ad_images') ) do -%>
 		<%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
 		<%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
 		<%#= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
-	<%# end %>
+				<%= content_tag :li, link_to(t('admin.module.authorization'),edit_admin_module_app_path(ModuleApp.first(conditions: {title: "ad_banners"}))), :class => active_sys_call_for_app('module_apps','edit','ad_banners')  if (is_admin? rescue nil) %>
+	<% end -%>
 <% end %>
 
 <%= content_tag :li, :class => active_for_controllers('web_links', '/panel/web_resource/back_end/tags', 'web_link_categorys') do -%>

From f6307abfbf1559b0dfb7d5a8c416e7f02e3227b9 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Tue, 1 May 2012 18:23:42 +0800
Subject: [PATCH 15/39] fix broken ad_banner

---
 app/views/admin/ad_banners/_ad_banner_tab.html.erb | 2 +-
 config/routes.rb                                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/ad_banners/_ad_banner_tab.html.erb b/app/views/admin/ad_banners/_ad_banner_tab.html.erb
index ff27d914f..797624ff1 100644
--- a/app/views/admin/ad_banners/_ad_banner_tab.html.erb
+++ b/app/views/admin/ad_banners/_ad_banner_tab.html.erb
@@ -15,7 +15,7 @@
 		<div class="adbanner-list">
 			<div class="adbanner-action">
 				<%= link_to t("admin.ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
-				<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.title) , :class=>'preview_trigger btn btn-success'%>
+				<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.id) , :class=>'preview_trigger btn btn-success'%>
 			</div>
 			<ul class="clear">
 				<%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab}  %>
diff --git a/config/routes.rb b/config/routes.rb
index e8695f0ab..c90a5ae05 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -25,7 +25,7 @@ Orbit::Application.routes.draw do
     end
 
 
-    match 'ad_banner/:id/preview' => 'ad_banners#realtime_preview',:as => :realtime_preview_ad_banner,:via => :put
+    match 'ad_banners/:id/preview' => 'ad_banners#realtime_preview',:as => :realtime_preview_ad_banner,:via => :put
     resources :ad_banners do 
         collection do
           match 'new_ad_image' => 'ad_images#new',:as => :new_ad_image,:via => :get

From 453cb210661f0bbb2a2ba4e7bf76a9233d06c382 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Thu, 3 May 2012 14:57:10 +0800
Subject: [PATCH 16/39] Announcement preivew

---
 app/controllers/application_controller.rb     |  4 +-
 app/controllers/pages_controller.rb           |  6 +-
 app/views/admin/ad_banners/index.html.erb     |  2 +-
 app/views/admin/module_apps/edit.html.erb     | 18 ++---
 lib/parsers/parser_front_end.rb               |  6 +-
 .../back_end/approvals_controller.rb          |  7 ++
 .../front_end/bulletins_controller.rb         | 14 +++-
 .../approvals/_modal_approve.html.erb         | 68 +++++++++++++++++++
 .../approvals/preview_and_approve.js.erb      |  5 ++
 .../back_end/bulletins/_bulletin.html.erb     |  2 +-
 .../back_end/bulletins/_form.html.erb         | 22 ------
 .../back_end/bulletins/index.html.erb         |  2 +
 .../announcement/config/locales/en.yml        |  3 +-
 .../announcement/config/locales/zh_tw.yml     |  1 +
 .../announcement/config/routes.rb             |  6 +-
 15 files changed, 122 insertions(+), 44 deletions(-)
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/preview_and_approve.js.erb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ab01ea6bd..a57b4d705 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -96,9 +96,9 @@ class ApplicationController < ActionController::Base
   end
   
   # Render the page
-  def render_page(id = nil)
+  def render_page(param)
     if @item
-      render :text => process_page(@item, id), :layout => 'page_layout'
+      render :text => process_page(@item, param[:id],param), :layout => 'page_layout'
     else
       render :text => '404 Not Found'
     end
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 8e9f8bb6a..644f02238 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -19,7 +19,7 @@ class PagesController < ApplicationController
        if @item && @item.is_published
          case @item._type
            when 'Page'    
-             render_page(params[:id])
+             render_page(params)
            when 'Link'
              redirect_to "http://#{@item[:url]}"
          end
@@ -40,7 +40,9 @@ class PagesController < ApplicationController
    end
    
    def show_from_link
-     redirect_to "/#{@item.full_name}?id=#{params[:id]}"
+     # debugger
+     # a=1
+     redirect_to "/#{@item.full_name}?id=#{params[:id]}&preview=#{params[:preview]}"
    end
    
    def load_orbit_bar
diff --git a/app/views/admin/ad_banners/index.html.erb b/app/views/admin/ad_banners/index.html.erb
index d70afab39..47a9ec4d3 100644
--- a/app/views/admin/ad_banners/index.html.erb
+++ b/app/views/admin/ad_banners/index.html.erb
@@ -1,7 +1,7 @@
 <% content_for :page_specific_css do -%>
 	<%#= stylesheet_link_tag "admin/ad_banner_preview" %>
 <% end -%>
-<% content_for :page_specific_css do -%>
+<% content_for :page_specific_javascript do -%>
 	<%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
 	<%= javascript_include_tag "inc/modal-preview" %>
 <% end -%>
diff --git a/app/views/admin/module_apps/edit.html.erb b/app/views/admin/module_apps/edit.html.erb
index 52142feac..7fb64d170 100644
--- a/app/views/admin/module_apps/edit.html.erb
+++ b/app/views/admin/module_apps/edit.html.erb
@@ -17,17 +17,17 @@
 		</dd>
 	</dl>
 	<dl id="sub_manager">
-		<dt><%= t("admin.user_role.auth.sub_manager") %></ht>
-		<% @module_app.sub_managers.each do |manager| %>
-			<dd><%= manager.user.name %>  <%= get_auth_by(manager) %><%= link_to '[X]',remove_sub_manager_admin_module_app_path(@module_app,manager),:method => :delete if if_permit_to_delete(:sub_manager) && manager.user != current_user %> </dd>
-		<% end %>
+		<dt><%#= t("admin.user_role.auth.sub_manager") %></ht>
+		<%# @module_app.sub_managers.each do |manager| %>
+			<dd><%#= manager.user.name %>  <%#= get_auth_by(manager) %><%#= link_to '[X]',remove_sub_manager_admin_module_app_path(@module_app,manager),:method => :delete if if_permit_to_delete(:sub_manager) && manager.user != current_user %> </dd>
+		<%# end %>
 		<dd>
-			<%= form_tag(assign_sub_manager_admin_module_app_path) do %>
-			<%= collection_select(:sub_manager,:id, User.all, :id, :name, :prompt => true,:disabled  => !if_permit_to_assign(:sub_manager))%>
-				<%= submit_tag t("admin.user_role.auth.add_sub_manager") %>
-			<% end %>
+			<%#= form_tag(assign_sub_manager_admin_module_app_path) do %>
+			<%#= collection_select(:sub_manager,:id, User.all, :id, :name, :prompt => true,:disabled  => !if_permit_to_assign(:sub_manager))%>
+				<%#= submit_tag t("admin.user_role.auth.add_sub_manager") %>
+			<%# end %>
 		</dd>
 	</dl>
 </div>
-<%= render :partial => "admin/components/user_role_management", :locals => { :object => @module_app ,:auth=> @module_app.app_auth ,:submit_url=> admin_module_app_app_auths_path(@module_app),:ploy_route_ary=>['remove',:admin,@module_app,@module_app.app_auth] } %>
+<%#= render :partial => "admin/components/user_role_management", :locals => { :object => @module_app ,:auth=> @module_app.app_auth ,:submit_url=> admin_module_app_app_auths_path(@module_app),:ploy_route_ary=>['remove',:admin,@module_app,@module_app.app_auth] } %>
 
diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb
index 5eea7f9fd..7056094fd 100644
--- a/lib/parsers/parser_front_end.rb
+++ b/lib/parsers/parser_front_end.rb
@@ -21,10 +21,10 @@ module ParserFrontEnd
 
   require 'nokogiri'
 
-  def parse_page_noko(page, id = nil)
+  def parse_page_noko(page, id = nil,params)
     body = Nokogiri::HTML(page.design.layout.body)
     parse_menu(body, page)
-    public_r_tags = parse_contents(body, page, id)
+    public_r_tags = parse_contents(body, page, id,params[:preview])
     parse_images(body, page)
 
     public_r_tags.each do |tag|
@@ -35,7 +35,7 @@ module ParserFrontEnd
   end
 
   # page_contents
-  def parse_contents(body, page, id)
+  def parse_contents(body, page, id,preview = false)
     public_r_tags = []
     body.css('.page_content').each do |content|
       ret = ''
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb
index 4338fdd13..566b07426 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb
@@ -3,6 +3,13 @@ class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendControlle
   before_filter :is_admin?
   include AdminHelper
   # layout 'admin'
+  def preview_and_approve
+    @bulletin = Bulletin.find params[:bulletin_id]
+  end
+  
+  def approve
+    
+  end
   
   def setting
     @bulletin_categorys = BulletinCategory.all
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
index e8f25163e..d3efc5c6e 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
@@ -25,10 +25,20 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
   end
   
   def show
-    @bulletin = Bulletin.can_display.where(_id: params[:id]).first
-    get_categorys
+    if params[:preview] == "true"
+      preview_content
+    else
+      @bulletin = Bulletin.can_display.where(_id: params[:id]).first
+      get_categorys
+    end
+
   end
   
+  def preview_content
+    @bulletin = Bulletin.find params[:id]
+    get_categorys
+    render :show
+  end
   
   protected
   
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb
new file mode 100644
index 000000000..8f65e341c
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb
@@ -0,0 +1,68 @@
+ <% if bulletin -%>
+
+<div class="modal hide fade in banner-preview" id="bulletin-<%=bulletin.id%>">
+  <div class="modal-header">
+    <a class="close" data-dismiss="modal">×</a>
+    <h3><%= t("modal.preview") %></h3>
+  </div>
+  <div class="modal-body">
+    <p class="bulletin_slideshow">
+			<iframe src=<%= panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id ,:preview=>true) %> style="width:1024px;height:300px" >
+
+				</iframe>
+	
+			<%# preview_block_ad_images_helper(bulletin).each do |ad_image| -%>
+				<%#= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => bulletin.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || bulletin.context || " ")) %>
+			<%# end -%>
+    </p>
+  </div>
+  <div class="modal-footer">
+		
+		<%= form_for bulletin, :url => panel_announcement_back_end_bulletin_path(bulletin), :html => {:class => 'clear'} do |f| %>
+		<%= f.label :approval_stat, t('announcement.bulletin.approval_stat') %>
+			<%= content_tag :label,:class => "radio inline" do -%>
+				<%= f.radio_button :is_checked, true , {:class => 'privacy'} %> 
+				<%= t('announcement.bulletin.approval_pass') %>
+			<% end -%>
+			<%= content_tag :label,:class => "radio inline" do -%>
+				<%= f.radio_button :is_checked, false, (!@bulletin.is_checked ? {:checked => true, :class => 'privacy'} : {})%> 
+				<%= t('announcement.bulletin.approval_not_pass') %>
+			<% end -%>
+
+				<%= label :is_checked_false, t('announcement.bulletin.approval_not_pass_reason') %>
+			    <%= f.text_field :not_checked_reason %>
+			<%= f.submit t('announcement.bulletin.submit_approval'),:class=>"btn"%>
+		<% end %>
+
+    <a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
+  </div>
+  <div>
+  	<script type="text/javascript" src="/static/kernel.js"></script>
+		<script type="text/javascript">
+			$(document).ready(function() {
+	
+			// $("#bulletin-<%#=bulletin.title.dehumanize%>").on("show", function () {
+			//   		$("#bulletin-<%#=bulletin.title.dehumanize%>").find(".bulletin_slideshow").cycle({delay: -1000, fx: "<%#= bulletin.ad_fx.nil?? "fade": bulletin.ad_fx %>", timeoutFn: getTimeout });
+			// });
+		$(".modal").on("hidden", function () {
+	  $("#show_preview").remove();
+			});
+			
+			$("iframe").load(function(){
+          // Get the body element
+          var frameBody = $("iframe").contents().find("body");
+
+          // Get all links inside the BODY tag
+          $('a', frameBody).click(function(e){
+                  //Disable all default actions       
+                  e.preventDefault();
+          });
+      });
+		});
+		</script>
+	</div>
+</div>
+
+
+
+<% end -%>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/preview_and_approve.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/preview_and_approve.js.erb
new file mode 100644
index 000000000..d0e4649dd
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/preview_and_approve.js.erb
@@ -0,0 +1,5 @@
+$('#show_preview').html("<%= escape_javascript(render(:partial => 'modal_approve',:locals => {:bulletin => @bulletin})) %>");
+var start_modal_with_id = "bulletin-<%=@bulletin.id%>";
+$("#"+start_modal_with_id).css("width","1050px");
+$("#"+start_modal_with_id).css("height","768px");
+$("#"+start_modal_with_id).css("margin","-270px 0 0 -550px");
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
index 5fb1fcaab..db22e5019 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
@@ -54,7 +54,7 @@
 				<li class="dropdown"><%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
 				<% end -%>
 				<% if show_approval_link(bulletin) %>
-				<li><%= link_to t('announcement.bulletin.approval'), edit_panel_announcement_back_end_bulletin_path(bulletin)   %></li><%#= #TODO add ancher so user can quick access into that part %>
+				<li><%= link_to t('announcement.bulletin.approval'), panel_announcement_back_end_bulletin_approval_preview_path(bulletin),:class => 'preview_trigger' %></li><%#= #TODO add ancher so user can quick access into that part %>
 				<% end %>
 			</ul>
 		</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index 360cead24..33aacf348 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -105,28 +105,6 @@
 				<a class="action"><i title="A" class="icon-exclamation-sign icon-white tip"></i></a>
 			</div>
 			
-			<h3 class="widget-title"><i class="icons-link icons-white"></i>Audit</h3>
-			<div class="widget-content">
-
-				<% if is_manager? || @bulletin.bulletin_category.authed_users('fact_check').include?(current_user) || current_user.admin? %>
-					<div class="controls">
-						<%= f.label :approval_stat, t('announcement.bulletin.approval_stat') %>
-						<%= content_tag :label,:class => "radio inline" do -%>
-							<%= f.radio_button :is_checked, true , {:class => 'privacy'} %> 
-							<%= t('announcement.bulletin.approval_pass') %>
-						<% end -%>
-						<%= content_tag :label,:class => "radio inline" do -%>
-							<%= f.radio_button :is_checked, false, (!@bulletin.is_checked ? {:checked => true, :class => 'privacy'} : {})%> 
-							<%= t('announcement.bulletin.approval_not_pass') %>
-						<% end -%>
-						<div class="select-role">
-							<%= label :is_checked_false, t('announcement.bulletin.approval_not_pass_reason') %>
-						    <%= f.text_field :not_checked_reason %>
-						</div>
-						
-					</div>
-				<% end %>
-			</div>
 		</div>
 		<% elsif current_user.admin? %>
 			<%= f.hidden_field :is_checked,:value => true%>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
index 875c1eaf9..c64035a56 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
@@ -20,5 +20,7 @@
 
 <% content_for :page_specific_javascript do %>
 	<%= javascript_include_tag "bulletin_form" %>
+	<%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
+	<%= javascript_include_tag "inc/modal-preview" %>
 <% end %>
 
diff --git a/vendor/built_in_modules/announcement/config/locales/en.yml b/vendor/built_in_modules/announcement/config/locales/en.yml
index cdb0d0c16..1c4f51b0a 100644
--- a/vendor/built_in_modules/announcement/config/locales/en.yml
+++ b/vendor/built_in_modules/announcement/config/locales/en.yml
@@ -82,8 +82,9 @@ en:
       approval_setting_window_title: 'Unit'
       approval_user_list: 'Approval Users'
       cate_auth: Category Authorization
+      submit_approval: Submit approval
     tag_cloud: Tag cloud
-
+    
   # admin:
   #     action: Action
   #     add_language: Add language
diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
index 248d3e92d..5cadd8433 100644
--- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
@@ -63,6 +63,7 @@ zh_tw:
       approval_setting_window_title: '單位'
       approval_user_list: '審核者'
       cate_auth: '分類授權'
+      submit_approval: '提交審核'
     tag_cloud: 標籤雲
 
   bulletin:
diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb
index 6e60960fc..396ea8e47 100644
--- a/vendor/built_in_modules/announcement/config/routes.rb
+++ b/vendor/built_in_modules/announcement/config/routes.rb
@@ -7,6 +7,8 @@ Rails.application.routes.draw do
         match 'approval_setting' => "approvals#update_setting" ,:as => :approval_setting,:via => :post
         match 'approval_setting' => "approvals#user_list" ,:as => :approval_user_list,:via => :put
         resources :bulletins do
+          match "approve/:bulletin_id"  => "approvals#preview_and_approve",:as => :approval_preview,:via => :put
+          match "approve/:bulletin_id"  => "approvals#approve",:as => :approve,:via => :post
           match "link_quick_add/:bulletin_id" => "bulletins#link_quick_add" ,:as => :link_quick_add
           match "link_quick_edit/:bulletin_id" => "bulletins#link_quick_edit" ,:as => :link_quick_edit
           member do
@@ -32,7 +34,9 @@ Rails.application.routes.draw do
         resources :tags
       end
       namespace :front_end do
-        resources :bulletins
+        resources :bulletins # do
+        #           match "preview" => "bulletins#preview_content",:as => :get_preview_content
+        #         end
       end
       namespace :widget do
         match "bulletins" => "bulletins#index"

From 048ce4c97e0576574c91bcbcd21dc05245de12bc Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Thu, 3 May 2012 15:48:42 +0800
Subject: [PATCH 17/39] disable input

---
 .../announcement/back_end/approvals/_modal_approve.html.erb      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb
index 8f65e341c..35049b981 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb
@@ -57,6 +57,7 @@
                   //Disable all default actions       
                   e.preventDefault();
           });
+					$('input', frameBody).attr("disabled", true);
       });
 		});
 		</script>

From 119d8ff13a1711d24eb9daef2266a32282978479 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Thu, 3 May 2012 18:27:39 +0800
Subject: [PATCH 18/39] add field called unit_list_for_anc and data from
 nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data.

---
 .../back_end/bulletins_controller.rb          |   1 +
 .../announcement/app/models/bulletin.rb       |   1 +
 .../app/models/unit_list_for_anc.rb           |  12 ++
 .../back_end/bulletins/_form.html.erb         |   3 +
 .../front_end/bulletins/show.html.erb         |   2 +-
 .../data_for_ut_list_for_posting_anc.rake     |  15 ++
 .../lib/ut_list_from_nccu_2012feb.csv         | 186 ++++++++++++++++++
 7 files changed, 219 insertions(+), 1 deletion(-)
 create mode 100644 vendor/built_in_modules/announcement/app/models/unit_list_for_anc.rb
 create mode 100644 vendor/built_in_modules/announcement/lib/tasks/data_for_ut_list_for_posting_anc.rake
 create mode 100644 vendor/built_in_modules/announcement/lib/ut_list_from_nccu_2012feb.csv

diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index a1f5227e3..5f210f3c4 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -319,6 +319,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   
   def get_categorys(id = nil)
     @bulletin_categorys = []
+    @unit_list_for_anc = UnitListForAnc.all
     if(is_manager? || is_admin?)
       @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true))
     elsif is_sub_manager?
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb
index 44882df36..008090f42 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb
@@ -33,6 +33,7 @@ class Bulletin
   mount_uploader :image, ImageUploader
   
   belongs_to :bulletin_category
+  belongs_to :unit_list_for_anc
   
   # embeds_many :bulletin_links, :cascade_callbacks => true
   # embeds_many :bulletin_files, :cascade_callbacks => true
diff --git a/vendor/built_in_modules/announcement/app/models/unit_list_for_anc.rb b/vendor/built_in_modules/announcement/app/models/unit_list_for_anc.rb
new file mode 100644
index 000000000..5261f6a2a
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/models/unit_list_for_anc.rb
@@ -0,0 +1,12 @@
+class UnitListForAnc
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  
+  field :order
+  field :ut_code
+  field :up_ut_code
+    
+  has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true
+  
+
+end
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index 33aacf348..235572066 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -117,6 +117,9 @@
 
 	<div id="post-body">
 		<div id="post-body-content" class="clear">
+
+			<%= f.label :unit_list_for_anc%>
+			<%= f.select :unit_list_for_anc_id,@unit_list_for_anc.collect{|t| [ t.title[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
 		
 			<%= f.label :category %>
 			<%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
index 2f37df9c1..5c0857cd0 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
@@ -4,7 +4,7 @@
 	<div class="info1">
 		<span class="date"><%= @bulletin.postdate %></span>
 		&nbsp;|&nbsp;
-		<a href="" class="unit"><%= User.find(@bulletin.create_user_id).name %></a>
+		<a href="" class="unit"><%= @bulletin.unit_list_for_anc.title[I18n.locale] rescue '' %></a>
 	</div>
 </div>
 <div class="news_image">
diff --git a/vendor/built_in_modules/announcement/lib/tasks/data_for_ut_list_for_posting_anc.rake b/vendor/built_in_modules/announcement/lib/tasks/data_for_ut_list_for_posting_anc.rake
new file mode 100644
index 000000000..e5bd0be22
--- /dev/null
+++ b/vendor/built_in_modules/announcement/lib/tasks/data_for_ut_list_for_posting_anc.rake
@@ -0,0 +1,15 @@
+# encoding: utf-8 
+
+namespace :nccu_data do
+  desc "load nccu data from csv"
+  task :setup_ut_list => :environment do
+    require 'csv'
+
+    CSV.foreach("vendor/built_in_modules/announcement/lib/ut_list_from_nccu_2012feb.csv") do |row|
+      new_unit = UnitListForAnc.new(:order => row[0], :ut_code => row[1], :up_ut_code => row[2], :created_at => Time.now,:updated_at => Time.now)
+      new_unit.build_title :en => row[4], :zh_tw => row[3]
+      new_unit.save
+    end
+
+  end
+end
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/lib/ut_list_from_nccu_2012feb.csv b/vendor/built_in_modules/announcement/lib/ut_list_from_nccu_2012feb.csv
new file mode 100644
index 000000000..548ad5281
--- /dev/null
+++ b/vendor/built_in_modules/announcement/lib/ut_list_from_nccu_2012feb.csv
@@ -0,0 +1,186 @@
+order,ut_code,up_tu_code,ut_zh_tw,ut_en
+0100,H00,H00,校長室,Office of the President
+0110,H01,H01,副校長室一,Office of the Vice President
+0110,H03,H03,副校長室二,Office of the Vice President
+0200,100,100,文學院,College of Liberal Arts
+0210,101,100,中文系,Dept. of Chinese Literature
+0220,103,100,歷史系,Dept. of History
+0230,104,100,哲學系,Dept. of Philosophy
+0240,155,100,圖檔所,"Graduate Institute of Library, Informati"
+0250,156,100,宗教所,Graduate Institute of Religious Studies
+0260,158,100,台史所,Graduate Institute of Taiwan History
+0270,159,100,台文所,Graduate Institute of Taiwan Literatu
+0280,161,100,華文碩,Master's Program in Teaching Chinese as
+0290,160,100,華文博,Doctor's Program in Teaching Chinese as
+0294,913,100,圖資專班,E-learning Master Program of Library and
+0300,700,700,理學院,College of Science
+0310,701,700,應數系,Dept. of Mathematical Sciences
+0320,702,700,心理系,Dept. of Psychology
+0330,703,700,資科系,Dept. of Computer Science
+0340,754,700,神科所,The Graduate Institute of Neuroscience
+0350,755,700,應物所,Graduate Institute of Applied Physics
+0600,200,200,社科院,College of Social Sciences
+0605,202,200,政治系,Dept. of Political Science
+0610,204,200,社會系,Dept. of Sociology
+0615,205,200,財政系,Dept. of Public Finance
+0620,206,200,公行系,Dept. of Public Administration
+0625,207,200,地政系,Dept. of Land Economics
+0630,208,200,經濟系,Dept. of Economics
+0635,209,200,民族系,Dept. of Ethnology
+0640,261,200,國發所,GIDS
+0645,262,200,勞工所,Graduate Institute of Labor Research
+0650,264,200,社工所,Graduate Institute of Social Work
+0652,265,200,亞太博,International Doctor Program in Asia-Pac
+0700,600,600,法學院,College of Law
+0710,601,600,法律系,Dept. of Law
+0720,652,600,法科所,The Institute of Law and Inter-disciplin
+0800,300,300,商學院,College of Commerce
+0801,301,300,國貿系,Dept. of International Business
+0803,302,300,金融系,Dept. of Money and Banking
+0805,303,300,會計系,Dept. of Accounting
+0807,304,300,統計系,Dept. of Statistics
+0809,305,300,企管系,Dept. of Business Administration
+0811,306,300,資管系,Dept. of Management Information System
+0813,307,300,財管系,Dept. of Finance
+0815,308,300,風管系,Dept. of Risk Management and Insurance
+0817,359,300,科管所,Graduate Institute of Technology and Inn
+0819,361,300,智財所,Graduate Institute of Intellectual Prope
+0821,362,300,管理碩士學程,Advanced Master of Business Administrati
+0823,380,300,商管碩,Advanced Master of Business Administrati
+1100,500,500,外語學院,College of Foreign Languages
+1110,501,500,英文系,Dept. of English
+1120,502,500,阿文系,Dept. of Arabic Language and Literature
+1130,504,500,斯拉夫文系,Dept. of Slavic Languages and Literature
+1140,506,500,日文系,Dept. of Japanese
+1150,507,500,韓文系,Dept. of Korean Language and Cultur
+1160,508,500,土文系,Dept. of Turkish Language and Cultu
+1170,555,500,語言所,Graduate Institute of Linguistics
+1180,509,500,歐洲語文學程,Undergraduate Program in European Langua
+1190,5T1,500,外文中心,Foreign Languages Center
+1200,400,400,傳播學院,College of Communication
+1210,401,400,新聞系,Dept. of Journalism
+1220,402,400,廣告系,Dept. of Advertising
+1230,403,400,廣電系,Dept. of Radio and Television
+1240,461,400,國傳英語碩士學位學程,International Master's Program in Intern
+1250,404,400,傳播學程,College of Communication Undergraduate D
+1260,462,400,數位內容學程,DCT
+1270,781,700,數位內容與科技學士學位學程,數位內容與科技學士學位學程
+1280,4A1,400,實習廣播電台,NCCU Community Radio Station
+1300,800,800,國際事務學院,College of International Affairs
+1310,203,800,外交系,Dept. of Diplomacy
+1320,260,800,東亞所,Graduate Institute of East Asian Studies
+1330,263,800,俄研所,Graduate Institute of Russian Studies
+1340,861,800,日碩研,Master Program in Japan Studies
+1346,862,800,國際研究英語碩士學位學程(籌備處),International Master's Program in Intern
+1600,900,900,教育學院,College of Education
+1610,102,900,教育系,Dept. of Education
+1620,157,900,幼教所,Graduate Institute of Early Childhood Ed
+1630,171,900,教政所,Graduate Institute of Educational Admini
+1640,1T3,900,師培中心,Institute of Teacher Education
+1652,172,900,輔諮碩學程,MPCG
+1660,1T1,900,教研中心,The Teacher In-Service Education Center
+1700,L00,L00,國關中心,The Institute of International Relations
+1710,L01,L00,國關第一所,First Division
+1720,L02,L00,國關第二所,Second Division
+1730,L03,L00,國關第三所,Third Division
+1740,L04,L00,國關第四所,Fourth Division
+1750,L05,L00,國關合交組,The Institute of International Relations
+1760,L06,L00,國關編譯組,The Institute of International Relations
+1770,L07,L00,國關圖資組,The Institute of International Relations
+1780,L08,L00,國關秘書組,The Institute of International Relations
+1800,S00,S00,選研中心,Election Study Center
+1900,Z01,Z01,第三部門研究中心,Center for the Third Sector
+1910,Z02,Z02,創新創造力研究中心,CCIS
+1920,Z03,Z03,中國大陸研究中心,Center for China Studies
+1930,Z04,Z04,台灣研究中心,TSC
+1940,Z08,Z08,心腦學中心,"Reseach Center for Mind, Brain and Learn"
+1950,Z10,Z10,原民中心,Center for Aboriginal Studies
+1960,Z09,Z09,人文中心,Humanities Center
+2000,T00,T00,教務處,Office of Academic Affairs
+2010,T01,T00,教務處註冊組,Registration Section
+2020,T02,T00,教務處課務組,Instruction Resources Section
+2030,T03,T00,教務處綜合業務組,Admission Section
+2040,T04,T00,教務處通識教育中心,Center of General Education
+2100,M00,M00,學務處,Office of Student Affairs
+2110,M01,M00,學務處生僑組,Life Guidance and Overseas Chinese Stude
+2120,M02,M00,學務處課外組,Student Activities Section
+2130,M03,M00,學務處住宿組,Student Housing Service Section
+2150,M11,M00,學務處藝文中心,Art and Culture Center
+2155,M14,M00,學務處身心健康中心,Physical and Mental Health Center
+2160,M13,M00,學務處職涯中心,Center of Career Development
+2170,D00,M00,學務處軍訓室,Military Education Office
+2200,G00,G00,總務處,Office of General Affairs
+2210,G01,G00,總務處文書組,Document  and postal section
+2220,G02,G00,總務處事務組,General Management  Section
+2230,G05,G00,總務處出納組,Cashier Section
+2240,G04,G00,總務處營繕組,Construction and Maintenance Section
+2250,G03,G00,總務處財產組,Property Management SEction
+2260,G06,G00,總務處環保組,Environmental  Protection Section
+2270,G08,G00,總務處規劃組,Campus Planning & Devel opment Section
+2280,G07,G00,總務處駐警隊,Campus Security National  Chengchi Unive
+2300,R00,R00,研發處,Office of Research and Development
+2310,R01,R00,研發處企畫組,Planning Section
+2320,R02,R00,研發處學術推展組,Academic Development Section
+2330,R03,R00,研發處學評組,Academic Evaluation Section
+2400,Z05,Z05,國合處,Office of International Cooperation
+2410,Z06,Z05,國合處合作交流組,CES
+2420,Z07,Z05,國合處教育組,IES
+2430,Z14,Z05,國合處發展策劃組,DPS
+2500,Q00,Q00,秘書處,Secretariat
+2510,Q01,Q00,秘書處第一組,First Section
+2520,Q02,Q00,秘書處第二組,Second Section
+2530,Q03,Q00,秘書處第三組,Third Section
+2600,K00,K00,圖書館,Libraries
+2610,K06,K00,圖書館資訊組,System Information Section
+2620,K07,K00,圖書館採編組,Acquisition & Cataloging Section
+2630,K08,K00,圖書館典閱組,Circulation Section
+2640,K09,K00,圖書館推廣服務組,Reference Services Section
+2650,K10,K00,圖書館數位典藏組,Digital Preservation Section
+2660,K11,K00,圖書館行政組,Administration Section
+2670,K12,K00,圖書館圖書分館,Branch Libraries
+2700,B00,B00,體育室,Physical Education Office
+2710,B01,B00,體育教學組,Physical Education Office
+2720,B02,B00,體育活動組,Sport activities section
+2800,P00,P00,人事室,Personnel Office
+2810,P01,P00,人一組,First Section
+2820,P02,P00,人二組,Second Section
+2830,P03,P00,人三組,Third Section
+2840,P04,P00,人四組,Fourth Section
+2900,A00,A00,會計室,Accounting Office
+2910,A01,A00,會計室第一組,Budgeting Section
+2920,A02,A00,會計室第二組,Accounting Section
+2930,A03,A00,會計室第三組,Auditing Section
+3000,I00,I00,公企中心,Public and Business Administration Educa
+3010,I01,I00,公企諮詢組,Research and Consultation Section
+3020,I02,I00,公企職訓組,Training Section
+3030,I03,I00,公企語訓組,Language Training Section
+3040,I04,I00,公企總務組,General Affairs Section
+3050,I05,I00,公企中心圖資組,Library Resource Section
+3100,O00,O00,公教中心,Civil Service Education Center
+3110,O01,O00,公教教務組,Civil Service Education Center
+3120,O02,O00,公教輔導組,Civil Service Education Center
+3130,O03,O00,公教行政組,Civil Service Education Center
+3200,J00,J00,社資中心,Social Sciences Information Center
+3210,J03,J00,社資資料組,Reference Services Section
+3220,J04,J00,社資研發組,Section of Research & Development
+3300,C00,C00,電算中心,Computer Center
+3310,C01,C00,電算教研組,Teaching and Research Section
+3320,C02,C00,電算系統組,Application System Section
+3330,C03,C00,電算行政組,Administration and Counseling Section
+3340,C04,C00,電算網路組,Networking and Development Section
+3400,T05,T05,教學發展中心,Center for Teaching and Learning Develop
+3410,T06,T05,教發教學組,Teaching and Learning Division
+3420,T07,T05,教發數位組,E-Learning Division
+3430,T08,T05,教發規劃組,Planning and Research Division
+3500,162,162,華語文中心,Chinese Language Center
+3600,Z11,Z11,育成中心,Innovation Incubation Center
+3700,V00,V00,附設實小,The Experimental Elementary School
+3700,V01,V00,附設實小教務處,Office of Academic Affairs
+3700,V02,V00,附設實小學務處,Office of Student Affairs
+3700,V03,V00,附設實小輔導室,The Experimental Elementary School
+3700,V04,V00,附設實小總務處,Office of General Affairs
+3700,V06,V00,附設實小研究處,The Experimental Elementary School
+3710,V05,V00,附設實小幼稚園,The Experimental Elementary School
+3800,W00,W00,附中,The Affiliated High School
+3900,Z13,Z13,政大書院辦公室,Chengchi College Project Office
+4000,Z12,Z12,頂大辦公室,Office of NCCU Top University Program
\ No newline at end of file

From 8f1ce78ab48c453e0026d57243d029c15b9dd4e7 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Fri, 4 May 2012 15:08:42 +0800
Subject: [PATCH 19/39] Fix bug when homepage

---
 app/controllers/application_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a57b4d705..0a08ec43a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -96,9 +96,9 @@ class ApplicationController < ActionController::Base
   end
   
   # Render the page
-  def render_page(param)
+  def render_page(param={})
     if @item
-      render :text => process_page(@item, param[:id],param), :layout => 'page_layout'
+      render :text => process_page(@item, param[:id], param), :layout => 'page_layout'
     else
       render :text => '404 Not Found'
     end

From 15bc4d42688b3dbea9b30a06d980bedd0e60468b Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Fri, 4 May 2012 16:12:28 +0800
Subject: [PATCH 20/39] Fix merge error

---
 app/helpers/application_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 1839cf663..45544f11e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -96,8 +96,8 @@ module ApplicationHelper
     ((controller.controller_name.eql?(controller_name) || request.fullpath.eql?(controller_name)) && controller.action_name.eql?(action_name)) ? 'active' : nil
   end
 
-  def process_page(page, id)
-    parse_page_noko(page, id)
+  def process_page(page, id, params)
+    parse_page_noko(page, id, params)
   end
 
   def page_metas(page)

From e9b337a3857f89a69c148812e4bd7ff7e9379002 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Fri, 4 May 2012 18:49:07 +0800
Subject: [PATCH 21/39] Copy changes into news after merge

---
 .../back_end/bulletins/_bulletin.html.erb     | 37 +++++-----
 .../back_end/news_approvals_controller.rb     |  9 +++
 .../news_bulletin_categorys_controller.rb     |  3 +
 .../back_end/news_bulletins_controller.rb     | 30 +++++---
 .../front_end/news_bulletins_controller.rb    | 13 +++-
 .../news_bulletin_categorys_helper.rb         | 14 ++++
 .../news/back_end/news_bulletins_helper.rb    |  9 +++
 .../news/app/models/news_bulletin.rb          |  1 +
 .../news_approvals/_modal_approve.html.erb    | 69 +++++++++++++++++++
 .../news_approvals/preview_and_approve.js.erb |  5 ++
 .../_news_bulletin_category.html.erb          | 10 ++-
 .../news_bulletin_categorys/index.html.erb    |  2 +-
 .../back_end/news_bulletins/_form.html.erb    | 27 ++------
 .../news_bulletins/_news_bulletin.html.erb    | 48 ++++++++-----
 .../back_end/news_bulletins/index.html.erb    |  2 +
 .../front_end/news_bulletins/show.html.erb    |  2 +-
 vendor/built_in_modules/news/config/routes.rb |  6 +-
 17 files changed, 210 insertions(+), 77 deletions(-)
 create mode 100644 vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletin_categorys_helper.rb
 create mode 100644 vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
 create mode 100644 vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/_modal_approve.html.erb
 create mode 100644 vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/preview_and_approve.js.erb

diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
index db22e5019..b69def3b5 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
@@ -3,6 +3,7 @@
 		<% if (bulletin.create_user_id ==  current_user.id) || is_manager? %>
 			<%= check_box_tag 'to_delete[]', bulletin.id, false, :class => "checkbox_in_list" %>
 		<% end -%>
+	</td>
 	<td>
 		<div class="label-group">
 			<div class="label-td">
@@ -35,26 +36,26 @@
 			<ul class="nav nav-pills hide">
 				<% if (bulletin.create_user_id ==  current_user.id) || is_manager? %>
 				
-				<% if current_user.admin? || (!bulletin.is_rejected? && !bulletin.is_checked?) %>
-					<li><%= link_to t('bulletin.edit'), edit_panel_announcement_back_end_bulletin_path(bulletin) %></li>
-					<li class="dropdown">
-						<a href="#" data-toggle="dropdown" class="dropdown-toggle"><%= t(:quick_edit) %><b class="caret"></b></a>
-						<ul class="dropdown-menu" id="menu1">
-							<li><%= link_to t(:basic), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'basic'), :remote => true %></li>
-							<li><%= link_to t(:picture), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'picture'), :remote => true %></li>
-							<li><%= link_to t(:tags), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'tags'), :remote => true %></li>
-							<li><%= link_to t(:link), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'links'), :remote => true %></li>
-							<li><%= link_to t(:file), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'files'), :remote => true %></li>
-						</ul>
-					</li>
-					<%#= debugger  %>
-					<%#= a=1 %>
-	
-				<% end %>
-				<li class="dropdown"><%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
+					<% if current_user.admin? || (!bulletin.is_rejected? && !bulletin.is_checked?) %>
+						<li><%= link_to t('bulletin.edit'), edit_panel_announcement_back_end_bulletin_path(bulletin) %></li>
+						<li class="dropdown">
+							<a href="#" data-toggle="dropdown" class="dropdown-toggle"><%= t(:quick_edit) %><b class="caret"></b></a>
+							<ul class="dropdown-menu" id="menu1">
+								<li><%= link_to t(:basic), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'basic'), :remote => true %></li>
+								<li><%= link_to t(:picture), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'picture'), :remote => true %></li>
+								<li><%= link_to t(:tags), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'tags'), :remote => true %></li>
+								<li><%= link_to t(:link), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'links'), :remote => true %></li>
+								<li><%= link_to t(:file), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'files'), :remote => true %></li>
+							</ul>
+						</li>
+						<%#= debugger  %>
+						<%#= a=1 %>
+
+					<% end %>
+					<li class="dropdown"><%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
 				<% end -%>
 				<% if show_approval_link(bulletin) %>
-				<li><%= link_to t('announcement.bulletin.approval'), panel_announcement_back_end_bulletin_approval_preview_path(bulletin),:class => 'preview_trigger' %></li><%#= #TODO add ancher so user can quick access into that part %>
+					<li><%= link_to t('announcement.bulletin.approval'), panel_announcement_back_end_bulletin_approval_preview_path(bulletin),:class => 'preview_trigger' %></li><%#= #TODO add ancher so user can quick access into that part %>
 				<% end %>
 			</ul>
 		</div>
diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
index c6cb33ea3..c6eda9d04 100644
--- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
+++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
@@ -1,7 +1,16 @@
 class Panel::News::BackEnd::NewsApprovalsController  < OrbitBackendController
   before_filter :authenticate_user!
+  before_filter :is_admin?
   include AdminHelper
   
+  def preview_and_approve
+    @bulletin = NewsBulletin.find params[:bulletin_id]
+  end
+  
+  def approve
+    
+  end
+
   def setting
     @news_bulletin_categorys = NewsBulletinCategory.all
     if params.has_key?(:category_id)
diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb
index 83ca09f83..956e98dca 100644
--- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb
+++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb
@@ -1,5 +1,8 @@
 class Panel::News::BackEnd::NewsBulletinCategorysController < OrbitBackendController
   
+  before_filter :for_app_manager,:except => [:index] 
+
+
   def index
     @news_bulletin_categorys = NewsBulletinCategory.all
     @news_bulletin_category = NewsBulletinCategory.new(:display => 'List')
diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb
index f5c2b5e63..a2a1a8818 100644
--- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb
+++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb
@@ -1,7 +1,10 @@
 class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
   
   before_filter :authenticate_user!
-  before_filter :is_admin?
+
+#  before_filter :for_admin_only,:only => [:]
+#  before_filter :for_app_manager,:only => [:index,:show,] 
+  before_filter :for_app_sub_manager,:except => [:index,:show,:get_sorted_and_filtered_news_bulletins]
 
   def index
     # @news_bulletins = NewsBulletin.all
@@ -39,6 +42,10 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
     @news_bulletin_link = NewsBulletinLink.new
     @link_url = panel_news_back_end_news_bulletins_path
 	
+    @news_bulletins.delete_if{ |news_bulletin|
+      news_bulletin.is_pending == true && (!news_bulletin.bulletin_category.authed_users('fact_check').include?(current_user) || news_bulletin.create_user_id!=current_user.id)
+    }
+
     @news_bulletin_file = NewsBulletinFile.new
     @file_url = panel_news_back_end_news_bulletins_path
 	
@@ -75,17 +82,19 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
   def new
     @news_bulletin = NewsBulletin.new
 	
-	@link_url = panel_news_back_end_news_bulletins_path
+    @link_url = panel_news_back_end_news_bulletins_path
     
 	# @news_bulletin.news_bulletin_files.build
 	# @news_bulletin.news_bulletin_files.new
-	
-	get_categorys
-	get_tags
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.xml  { render :xml => @news_bulletin }
+    if get_categorys.empty?
+      flash[:alert] = t("announcement.error.no_avilb_cate_for_posting")
+      redirect_to :action => :index
+    else
+    get_tags
+      respond_to do |format|
+        format.html # new.html.erb
+        format.xml  { render :xml => @news_bulletin }
+      end
     end
   end
 
@@ -311,10 +320,11 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
   
   def get_categorys(id = nil)
     @news_bulletin_categorys = []
+    @unit_list_for_anc = UnitListForAnc.all
     if(is_manager? || is_admin?)
       @news_bulletin_categorys = (id ? NewsBulletinCategory.find(id).to_a : NewsBulletinCategory.excludes('disabled' => true))
     elsif is_sub_manager?
-      @news_bulletin_categorys = NewsBulletinCategory.authed_for_user(current_user,'submit_new')
+      @news_bulletin_categorys = NewsBulletinCategory.authed_for_user(current_user,'submit')
     end
   end
   
diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb
index 12d0cac69..5c8706046 100644
--- a/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb
+++ b/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb
@@ -24,10 +24,19 @@ class Panel::News::FrontEnd::NewsBulletinsController < OrbitWidgetController
   end
   
   def show
-    @news_bulletin = NewsBulletin.can_display.where(_id: params[:id]).first
-    get_categorys
+    if params[:preview] == "true"
+      preview_content
+    else
+      @news_bulletins = NewsBulletin.can_display.where(_id: params[:id]).first
+      get_categorys
+    end
   end
   
+  def preview_content
+    @news_bulletins = NewsBulletin.find params[:id]
+    get_categorys
+    render :show
+  end
   
   protected
   
diff --git a/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletin_categorys_helper.rb b/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletin_categorys_helper.rb
new file mode 100644
index 000000000..8ad75108e
--- /dev/null
+++ b/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletin_categorys_helper.rb
@@ -0,0 +1,14 @@
+module Panel::News::BackEnd::NewsBulletinCategorysHelper
+include ActionView::Helpers::UrlHelper
+
+  
+  def show_submit_permission_link(news_bulletin_category)
+    oa = news_bulletin_category.get_object_auth_by_title('submit')
+    if oa.nil?
+      news_bulletin_category.object_auths.new(title: 'submit' ).save
+      oa = news_bulletin_category.get_object_auth_by_title('submit')
+    end
+    link_to t('announcement.bulletin.cate_auth'), edit_admin_object_auth_path(oa)
+  end
+
+end
\ No newline at end of file
diff --git a/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb b/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
new file mode 100644
index 000000000..35a3afee2
--- /dev/null
+++ b/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
@@ -0,0 +1,9 @@
+module Panel::News::BackEnd::NewsBulletinsHelper
+  
+  def show_approval_link(news_bulletin)
+    by_news_bulletin = (!news_bulletin.is_expired? and !news_bulletin.is_checked?)
+    by_user = news_bulletin.news_bulletin_category.authed_users('fact_check').include?(current_user) or is_manager?
+    by_news_bulletin and  by_user
+  end
+
+end
\ No newline at end of file
diff --git a/vendor/built_in_modules/news/app/models/news_bulletin.rb b/vendor/built_in_modules/news/app/models/news_bulletin.rb
index 101ed5d2b..538180dcb 100644
--- a/vendor/built_in_modules/news/app/models/news_bulletin.rb
+++ b/vendor/built_in_modules/news/app/models/news_bulletin.rb
@@ -33,6 +33,7 @@ class NewsBulletin
   mount_uploader :image, ImageUploader
   
   belongs_to :news_bulletin_category
+  belongs_to :unit_list_for_anc
   
   # embeds_many :news_bulletin_links, :cascade_callbacks => true
   # embeds_many :news_bulletin_files, :cascade_callbacks => true
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/_modal_approve.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/_modal_approve.html.erb
new file mode 100644
index 000000000..83a7b38f2
--- /dev/null
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/_modal_approve.html.erb
@@ -0,0 +1,69 @@
+ <% if news_bulletin -%>
+
+<div class="modal hide fade in banner-preview" id="news_bulletin-<%=news_bulletin.id%>">
+  <div class="modal-header">
+    <a class="close" data-dismiss="modal">×</a>
+    <h3><%= t("modal.preview") %></h3>
+  </div>
+  <div class="modal-body">
+    <p class="news_bulletin_slideshow">
+			<iframe src=<%= panel_news_front_end_news_bulletin_path(news_bulletin, :category_id => news_bulletin.news_bulletin_category.id ,:preview=>true) %> style="width:1024px;height:300px" >
+
+				</iframe>
+	
+			<%# preview_block_ad_images_helper(news_bulletin).each do |ad_image| -%>
+				<%#= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => news_bulletin.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || news_bulletin.context || " ")) %>
+			<%# end -%>
+    </p>
+  </div>
+  <div class="modal-footer">
+		
+		<%= form_for news_bulletin, :url => panel_news_back_end_news_bulletin_path(news_bulletin), :html => {:class => 'clear'} do |f| %>
+		<%= f.label :approval_stat, t('announcement.bulletin.approval_stat') %>
+			<%= content_tag :label,:class => "radio inline" do -%>
+				<%= f.radio_button :is_checked, true , {:class => 'privacy'} %> 
+				<%= t('announcement.bulletin.approval_pass') %>
+			<% end -%>
+			<%= content_tag :label,:class => "radio inline" do -%>
+				<%= f.radio_button :is_checked, false, (!@news_bulletin.is_checked ? {:checked => true, :class => 'privacy'} : {})%> 
+				<%= t('announcement.bulletin.approval_not_pass') %>
+			<% end -%>
+
+				<%= label :is_checked_false, t('announcement.bulletin.approval_not_pass_reason') %>
+			    <%= f.text_field :not_checked_reason %>
+			<%= f.submit t('announcement.bulletin.submit_approval'),:class=>"btn"%>
+		<% end %>
+
+    <a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
+  </div>
+  <div>
+  	<script type="text/javascript" src="/static/kernel.js"></script>
+		<script type="text/javascript">
+			$(document).ready(function() {
+	
+			// $("#news_bulletin-<%#=news_bulletin.title.dehumanize%>").on("show", function () {
+			//   		$("#news_bulletin-<%#=news_bulletin.title.dehumanize%>").find(".news_bulletin_slideshow").cycle({delay: -1000, fx: "<%#= news_bulletin.ad_fx.nil?? "fade": news_bulletin.ad_fx %>", timeoutFn: getTimeout });
+			// });
+		$(".modal").on("hidden", function () {
+	  $("#show_preview").remove();
+			});
+			
+			$("iframe").load(function(){
+          // Get the body element
+          var frameBody = $("iframe").contents().find("body");
+
+          // Get all links inside the BODY tag
+          $('a', frameBody).click(function(e){
+                  //Disable all default actions       
+                  e.preventDefault();
+          });
+					$('input', frameBody).attr("disabled", true);
+      });
+		});
+		</script>
+	</div>
+</div>
+
+
+
+<% end -%>
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/preview_and_approve.js.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/preview_and_approve.js.erb
new file mode 100644
index 000000000..4191ae04d
--- /dev/null
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/preview_and_approve.js.erb
@@ -0,0 +1,5 @@
+$('#show_preview').html("<%= escape_javascript(render(:partial => 'modal_approve',:locals => {:news_bulletin => @news_bulletin})) %>");
+var start_modal_with_id = "news_bulletin-<%=@news_bulletin.id%>";
+$("#"+start_modal_with_id).css("width","1050px");
+$("#"+start_modal_with_id).css("height","768px");
+$("#"+start_modal_with_id).css("margin","-270px 0 0 -550px");
\ No newline at end of file
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_news_bulletin_category.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_news_bulletin_category.html.erb
index 01d58f986..377091bde 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_news_bulletin_category.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_news_bulletin_category.html.erb
@@ -4,8 +4,14 @@
 			<%= news_bulletin_category.key %>
 			<div class="quick-edit">
 				<ul class="nav nav-pills hide">
-					<li><%= link_to t('news_bulletin_category.edit'), edit_panel_news_back_end_news_bulletin_category_path(news_bulletin_category), :remote => true %></li>
-					<li><%= link_to t('news_bulletin_category.delete'), panel_news_back_end_news_bulletin_category_path(news_bulletin_category), :confirm => t('news.sure?'), :method => :delete, :remote => true %></li>
+					<%if is_manager? || is_admin? %>
+						<li><%= show_submit_permission_link(news_bulletin_category) %></li>
+					<% end %>
+					<% if is_admin?%>
+						<li><%= link_to t('bulletin_category.edit'), edit_panel_news_back_end_news_bulletin_category_path(news_bulletin_category), :remote => true %></li>
+						<li><%= link_to t('bulletin_category.delete'), panel_news_back_end_news_bulletin_category_path(news_bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
+					<% end %>
+
 				</ul>
 			</div>
 		</td>
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/index.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/index.html.erb
index caa4981f9..c876b6c84 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/index.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/index.html.erb
@@ -17,7 +17,7 @@
 	</tbody>
 </table>
 
-<div id="form"><%= render :partial => "form" %></div>
+<div id="form"><%= render :partial => "form" if is_manager? %></div>
 
 
 
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
index c7dfd1558..ce00b63fa 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
@@ -105,28 +105,6 @@
 				<a class="action"><i title="A" class="icon-exclamation-sign icon-white tip"></i></a>
 			</div>
 			
-			<h3 class="widget-title"><i class="icons-link icons-white"></i>Audit</h3>
-			<div class="widget-content">
-
-				<% if is_manager? || @news_bulletin.news_bulletin_category.authed_users('fact_check').include?(current_user) || current_user.admin? %>
-					<div class="controls">
-						<%= f.label :approval_stat, t('news.news_bulletin.approval_stat') %>
-						<%= content_tag :label,:class => "radio inline" do -%>
-							<%= f.radio_button :is_checked, true , {:class => 'privacy'} %> 
-							<%= t('news.news_bulletin.approval_pass') %>
-						<% end -%>
-						<%= content_tag :label,:class => "radio inline" do -%>
-							<%= f.radio_button :is_checked, false, (!@news_bulletin.is_checked ? {:checked => true, :class => 'privacy'} : {})%> 
-							<%= t('news.news_bulletin.approval_not_pass') %>
-						<% end -%>
-						<div class="select-role">
-							<%= label :is_checked_false, t('news.news_bulletin.approval_not_pass_reason') %>
-						    <%= f.text_field :not_checked_reason %>
-						</div>
-						
-					</div>
-				<% end %>
-			</div>
 		</div>
 		<% elsif current_user.admin? %>
 			<%= f.hidden_field :is_checked,:value => true%>
@@ -139,7 +117,10 @@
 
 	<div id="post-body">
 		<div id="post-body-content" class="clear">
-		
+
+			<%= f.label :unit_list_for_anc%>
+			<%= f.select :unit_list_for_anc_id,@unit_list_for_anc.collect{|t| [ t.title[I18n.locale], t.id ]}, {}, :class => "input-medium" %>		
+
 			<%= f.label :category %>
 			<%= f.select :news_bulletin_category_id, @news_bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
 			
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
index c800bf18b..976cab00e 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
@@ -1,5 +1,9 @@
 <tr id="<%= dom_id news_bulletin %>" class="with_action">
-	<td><%= check_box_tag 'to_delete[]', news_bulletin.id, false, :class => "checkbox_in_list" %></td>
+	<td>
+		<% if (news_bulletin.create_user_id ==  current_user.id) || is_manager? %>
+			<%= check_box_tag 'to_delete[]', news_bulletin.id, false, :class => "checkbox_in_list" %>
+		<% end -%>
+	</td>
 	<td>
 		<div class="label-group">
 			<div class="label-td">
@@ -27,27 +31,33 @@
 	<td><%= news_bulletin.news_bulletin_category.i18n_variable[I18n.locale] %></td>
 	<td>
 		<%= link_to news_bulletin.title[I18n.locale], panel_news_front_end_news_bulletin_path(news_bulletin, :category_id => news_bulletin.news_bulletin_category.id) rescue ''%>
+
 		<div class="quick-edit">
 			<ul class="nav nav-pills hide">
-				<% if current_user.admin? || (!news_bulletin.is_rejected? && !news_bulletin.is_checked?) %>
-					<li><%= link_to t('news_bulletin.edit'), edit_panel_news_back_end_news_bulletin_path(news_bulletin) %></li>
-					<li class="dropdown">
-						<a href="#" data-toggle="dropdown" class="dropdown-toggle"><%= t(:quick_edit) %><b class="caret"></b></a>
-						<ul class="dropdown-menu" id="menu1">
-							<li><%= link_to t(:basic), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'basic'), :remote => true %></li>
-							<li><%= link_to t(:picture), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'picture'), :remote => true %></li>
-							<li><%= link_to t(:tags), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'tags'), :remote => true %></li>
-							<li><%= link_to t(:link), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'links'), :remote => true %></li>
-							<li><%= link_to t(:file), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'files'), :remote => true %></li>
-						</ul>
-					</li>
-					<%#= debugger  %>
-					<%#= a=1 %>
-					<% if (news_bulletin.news_bulletin_category.authed_users('fact_check').include?(current_user) or is_manager?) and !news_bulletin.is_expired? %>
-					<li><%= link_to t('news.news_bulletin.approval'), edit_panel_news_back_end_news_bulletin_path(news_bulletin)   %></li><%#= #TODO add ancher so user can quick access into that part %>
-					<% end %>			
+				<% if (news_bulletin.create_user_id ==  current_user.id) || is_manager? %>
+
+					<% if current_user.admin? || (!news_bulletin.is_rejected? && !news_bulletin.is_checked?) %>
+						<li><%= link_to t('news_bulletin.edit'), edit_panel_news_back_end_news_bulletin_path(news_bulletin) %></li>
+						<li class="dropdown">
+							<a href="#" data-toggle="dropdown" class="dropdown-toggle"><%= t(:quick_edit) %><b class="caret"></b></a>
+							<ul class="dropdown-menu" id="menu1">
+								<li><%= link_to t(:basic), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'basic'), :remote => true %></li>
+								<li><%= link_to t(:picture), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'picture'), :remote => true %></li>
+								<li><%= link_to t(:tags), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'tags'), :remote => true %></li>
+								<li><%= link_to t(:link), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'links'), :remote => true %></li>
+								<li><%= link_to t(:file), load_quick_edit_panel_news_back_end_news_bulletin_path(news_bulletin, :type => 'files'), :remote => true %></li>
+							</ul>
+						</li>
+						<%#= debugger  %>
+						<%#= a=1 %>
+
+					<% end %>
+					<li class="dropdown"><%= link_to t('news_bulletin.delete'), panel_news_back_end_news_bulletin_path(news_bulletin), :confirm => t('news.sure?'), :method => :delete, :remote => true %></li>	
 				<% end %>
-				<li class="dropdown"><%= link_to t('news_bulletin.delete'), panel_news_back_end_news_bulletin_path(news_bulletin), :confirm => t('news.sure?'), :method => :delete, :remote => true %></li>
+				<% if show_approval_link(news_bulletin) %>
+					<li><%= link_to t('news.news_bulletin.approval'), panel_news_back_end_news_bulletin_approval_preview_path(news_bulletin)   %></li><%#= #TODO add ancher so user can quick access into that part %>
+				<% end %>		
+				
 			</ul>
 		</div>
 	</td>
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
index 123b1a916..742293fe7 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
@@ -26,5 +26,7 @@
 
 <% content_for :page_specific_javascript do %>
 	<%= javascript_include_tag "news_bulletin_form" %>
+	<%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
+	<%= javascript_include_tag "inc/modal-preview" %>
 <% end %>
 
diff --git a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb
index 37e3e1f33..67bfb396c 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb
@@ -4,7 +4,7 @@
 	<div class="info1">
 		<span class="date"><%= @news_bulletin.postdate %></span>
 		&nbsp;|&nbsp;
-		<a href="" class="unit"><%= User.find(@news_bulletin.create_user_id).name %></a>
+		<a href="" class="unit"><%= @news_bulletin.unit_list_for_anc.title[I18n.locale] rescue '' %></a>
 	</div>
 </div>
 <div class="news_image">
diff --git a/vendor/built_in_modules/news/config/routes.rb b/vendor/built_in_modules/news/config/routes.rb
index aaf688019..b7882d2db 100644
--- a/vendor/built_in_modules/news/config/routes.rb
+++ b/vendor/built_in_modules/news/config/routes.rb
@@ -6,6 +6,8 @@ Rails.application.routes.draw do
         match 'update_setting' => "news_approvals#update_setting" ,:as => :news_approval_update_setting
         
         resources :news_bulletins do
+          match "approve/:news_bulletin_id"  => "approvals#preview_and_approve",:as => :approval_preview,:via => :put
+          match "approve/:news_bulletin_id"  => "approvals#approve",:as => :approve,:via => :post
           match "link_quick_add/:news_bulletin_id" => "news_bulletins#link_quick_add" ,:as => :link_quick_add
           match "link_quick_edit/:news_bulletin_id" => "news_bulletins#link_quick_edit" ,:as => :link_quick_edit
           member do
@@ -31,7 +33,9 @@ Rails.application.routes.draw do
         resources :tags
       end
       namespace :front_end do
-        resources :news_bulletins
+        resources :news_bulletins # do
+        #           match "preview" => "news_bulletins#preview_content",:as => :get_preview_content
+        #         end
       end
       namespace :widget do
         match "news_bulletins" => "news_bulletins#index"

From 8e6fd277c21b1d98fbabe9a5a74bc424511b64a5 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Fri, 4 May 2012 19:02:40 +0800
Subject: [PATCH 22/39] Fix bug: preview was always true

---
 lib/parsers/parser_front_end.rb                                 | 2 +-
 .../panel/news/front_end/news_bulletins_controller.rb           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb
index 1cca99150..c95cac4d1 100644
--- a/lib/parsers/parser_front_end.rb
+++ b/lib/parsers/parser_front_end.rb
@@ -46,7 +46,7 @@ module ParserFrontEnd
         # ret << "&category_id=#{page.category}" if page[:category]
         ret << "&category_id=#{params[:category_id]}" if !params[:category_id].blank?
         ret << "&tag_id=#{params[:tag_id]}" if !params[:tag_id].blank?
-        ret << "&preview=true" if preview
+        ret << "&preview=true" if preview.eql?('true')
         ret << "'></div>"
       else
         part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil
diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb
index 5c8706046..bf51d3086 100644
--- a/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb
+++ b/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb
@@ -27,7 +27,7 @@ class Panel::News::FrontEnd::NewsBulletinsController < OrbitWidgetController
     if params[:preview] == "true"
       preview_content
     else
-      @news_bulletins = NewsBulletin.can_display.where(_id: params[:id]).first
+      @news_bulletin = NewsBulletin.can_display.where(_id: params[:id]).first
       get_categorys
     end
   end

From e0a191162ddc8a2541572c83c5cbe6fc14887af7 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris@rulingcom.com>
Date: Fri, 4 May 2012 19:11:28 +0800
Subject: [PATCH 23/39] Ray's changes

---
 app/assets/images/-sign-in-logo.png           | Bin 0 -> 11789 bytes
 app/assets/images/orbit-bar.png               | Bin 5113 -> 3046 bytes
 app/assets/images/sign-in-logo.png            | Bin 11789 -> 18523 bytes
 app/assets/javascripts/orbit-1.0.js           |   1 +
 app/assets/javascripts/orbit-bar-search.js    |   6 ++++++
 app/assets/javascripts/orbit_bar.js           |   2 +-
 .../inc/permission-checkbox.css.erb           |  15 +++++++++------
 app/assets/stylesheets/style.css.erb          |   9 +++++----
 app/helpers/application_helper.rb             |   2 +-
 app/views/layouts/_orbit_bar.html.erb         |   2 +-
 10 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 app/assets/images/-sign-in-logo.png

diff --git a/app/assets/images/-sign-in-logo.png b/app/assets/images/-sign-in-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..53756c7c332f57f2375f755788d9d224b9fa2987
GIT binary patch
literal 11789
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
SdgR{*ZSXr~>1s*S;Qs|4Bj&9D

literal 0
HcmV?d00001

diff --git a/app/assets/images/orbit-bar.png b/app/assets/images/orbit-bar.png
index 160b9d781962c1af808a87167f605251210ecc11..4b2a558524a5550f94f398ada05a8e1571231ee1 100644
GIT binary patch
literal 3046
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
H(ue#ng}Xis

literal 5113
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
V#tIz%ey0EcTtoj}y}Etue*vLeQ3C(~

diff --git a/app/assets/images/sign-in-logo.png b/app/assets/images/sign-in-logo.png
index 53756c7c332f57f2375f755788d9d224b9fa2987..a3148babd0f73c9a97aee5142388e16ab5b97d6d 100644
GIT binary patch
delta 18050
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
IM6N<$f`RWwg8%>k

delta 11240
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

diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js
index 368bf2d0c..b1ac99937 100644
--- a/app/assets/javascripts/orbit-1.0.js
+++ b/app/assets/javascripts/orbit-1.0.js
@@ -14,6 +14,7 @@ $(document).ready(function(){
 		placement: "left"
 	});
 	
+	
 	$(document).on('click', '.privacy', function() {
 
 		switch ($(this).val()) {
diff --git a/app/assets/javascripts/orbit-bar-search.js b/app/assets/javascripts/orbit-bar-search.js
index 26f44d843..7ef1dd055 100644
--- a/app/assets/javascripts/orbit-bar-search.js
+++ b/app/assets/javascripts/orbit-bar-search.js
@@ -1,3 +1,9 @@
+
+$(document).ready(function(){
+	$('.search').tooltip({
+			placement: "bottom"
+	});
+});
 $(document).on('click', '.orbit-bar-search', function (){
 	if ($(this).parents('.search').hasClass('visible')){
 		$(this).parents('.search').stop().animate({
diff --git a/app/assets/javascripts/orbit_bar.js b/app/assets/javascripts/orbit_bar.js
index 06c3113dc..e9b1b4ea2 100644
--- a/app/assets/javascripts/orbit_bar.js
+++ b/app/assets/javascripts/orbit_bar.js
@@ -4,4 +4,4 @@ $(document).ready(function() {
 		$('body').prepend($(this).html());
 		$(this).remove();
 	});
-});
\ No newline at end of file
+});
diff --git a/app/assets/stylesheets/inc/permission-checkbox.css.erb b/app/assets/stylesheets/inc/permission-checkbox.css.erb
index 9e61df20b..7e3f5bffa 100644
--- a/app/assets/stylesheets/inc/permission-checkbox.css.erb
+++ b/app/assets/stylesheets/inc/permission-checkbox.css.erb
@@ -10,22 +10,25 @@
 }
 .checkbox{
 	padding: 5px;
-	margin: 5px 5px 10px;
+	margin: 0;
 	display: inline-block;
 	color:#777777;
 	text-shadow: 0 1px 0px rgba(255,255,255,.4);
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
 	height: 30px;
 	position: relative;
 	cursor: pointer;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #ededed), color-stop(1, #dfdfdf) );
+	border-style: solid;
+	border-width: 0px 1px 1px 0;
+	border-color: #dfdfdf;
+	/*background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #ededed), color-stop(1, #dfdfdf) );
 	background:-moz-linear-gradient( center top, #ededed 5%, #dfdfdf 100% );
 	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#dfdfdf');
 	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
 	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
 	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;*/
 }
 .checkbox .check-icon {
 	display: none;
@@ -40,7 +43,7 @@
 	cursor: pointer;
 	font-family: helvetica;
 	font-size: 12px;
-	line-height: 30px;
+	line-height: 15px;
 	padding: 0 10px 0 40px;
 	color: #333333;
 	display: inline-block;
diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb
index b1f3d582f..06d56c70d 100644
--- a/app/assets/stylesheets/style.css.erb
+++ b/app/assets/stylesheets/style.css.erb
@@ -10,7 +10,7 @@
 }
 .login-logo {
 	text-indent: -9999px;
-	background: url(<%= asset_path 'sign-in-logo.png' %>) no-repeat center 40px;
+	background: url(<%= asset_path 'sign-in-logo.png' %>) no-repeat center 80px;
 	padding-top: 40px;
 	height: 160px;
 }
@@ -61,8 +61,8 @@
 	margin-right: -20px;
 }
 #orbit-bar .search-query {
-	padding: 4px 9px;
-	height: 12px;
+	padding: 7px 9px 5px;
+	height: 10px;
     margin-top: 3px;
     border: 1px solid #333333;
     font-size: 11px;
@@ -119,7 +119,8 @@
 	background-position: -10px -10px;
 }
 #orbit-bar .nav > li > a.orbit-bar-desktop {
-	background-position: -106px -9px;
+	background-position: -73px -42px;
+	width: 48px;
 }
 #orbit-bar .nav > li > a.orbit-bar-member {
 	background-position: -4px -37px;
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 682799eb7..95e2dc3d9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -126,8 +126,8 @@ module ApplicationHelper
       javascripts << "<script type='text/javascript' src='/assets/jquery.tinyscrollbar.min.js'></script>\n"
       javascripts << "<script type='text/javascript' src='/assets/jquery.isotope.min.js'></script>\n"
       javascripts << "<script type='text/javascript' src='/assets/orbit-bar-member.js'></script>\n"
-      javascripts << "<script type='text/javascript' src='/assets/orbit-bar-search.js'></script>\n"
       javascripts << "<script type='text/javascript' src='/assets/orbit_bar.js'></script>\n"
+      javascripts << "<script type='text/javascript' src='/assets/orbit-bar-search.js'></script>\n"
     end
     javascripts << "<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>\n"
     javascripts << "<script type='text/javascript' src='/static/kernel.js'></script>\n"
diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb
index d8d0ae321..46f2b712f 100644
--- a/app/views/layouts/_orbit_bar.html.erb
+++ b/app/views/layouts/_orbit_bar.html.erb
@@ -27,7 +27,7 @@
           </ul>
         </li>
 
-                <li class="search clear">
+                <li class="search clear" title="<%= t :search_nccu %>">
                     <a class="orbit-bar-search" href="#">search</a>
 					<form class="navbar-search" action="">
 		        		<input class="search-query span3" type="text" placeholder="<%= t(:search_nccu) %>">

From b48099d752fcc0d37b9cec9c88074e3ce5fffc54 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Sat, 5 May 2012 17:40:07 +0800
Subject: [PATCH 24/39] Fix bug in is_admin? Fix bug in helpers for news and
 announcement

---
 app/controllers/application_controller.rb     | 21 +++++++++----------
 .../news/back_end/news_bulletins_helper.rb    |  2 +-
 .../news_bulletins/_news_bulletin.html.erb    |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0a08ec43a..68f49e3bf 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -46,8 +46,7 @@ class ApplicationController < ActionController::Base
   
   # Check if the current_user is admin
   def is_admin?
-    
-    auth_failed_in_backend unless current_user.admin?
+    current_user.admin? ? true : auth_failed_in_backend
   end
   
   def is_manager?
@@ -67,27 +66,27 @@ class ApplicationController < ActionController::Base
     if is_manager?
       true
     else
-    flash[:error] = t("admin.access.denied.app.not_manager")
-    auth_failed_in_backend
-  end
+      flash[:error] = t("admin.access.denied.app.not_manager")
+      auth_failed_in_backend
+    end
   end
   
   def for_app_sub_manager
     if (@module_app.sub_managing_users.include?(current_user) || is_manager?)
       true
     else
-    flash[:error] = t("admin.access.denied.app.not_sub_manager")
-    auth_failed_in_backend
-  end
+      flash[:error] = t("admin.access.denied.app.not_sub_manager")
+      auth_failed_in_backend
+    end
   end
 
   def for_app_user
     if (@module_app.app_auth.auth_users.include?(current_user) || for_app_sub_manager )
       true
     else
-    flash[:error] = t("admin.access.denied.app.not_authed_user")
-    auth_failed_in_backend
-  end
+      flash[:error] = t("admin.access.denied.app.not_authed_user")
+      auth_failed_in_backend
+    end
   end
 
   def check_object_premission(obj,title)
diff --git a/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb b/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
index 35a3afee2..666bcf4ea 100644
--- a/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
+++ b/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
@@ -1,6 +1,6 @@
 module Panel::News::BackEnd::NewsBulletinsHelper
   
-  def show_approval_link(news_bulletin)
+  def news_show_approval_link(news_bulletin)
     by_news_bulletin = (!news_bulletin.is_expired? and !news_bulletin.is_checked?)
     by_user = news_bulletin.news_bulletin_category.authed_users('fact_check').include?(current_user) or is_manager?
     by_news_bulletin and  by_user
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
index 976cab00e..b84e89b9a 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
@@ -54,7 +54,7 @@
 					<% end %>
 					<li class="dropdown"><%= link_to t('news_bulletin.delete'), panel_news_back_end_news_bulletin_path(news_bulletin), :confirm => t('news.sure?'), :method => :delete, :remote => true %></li>	
 				<% end %>
-				<% if show_approval_link(news_bulletin) %>
+				<% if news_show_approval_link(news_bulletin) %>
 					<li><%= link_to t('news.news_bulletin.approval'), panel_news_back_end_news_bulletin_approval_preview_path(news_bulletin)   %></li><%#= #TODO add ancher so user can quick access into that part %>
 				<% end %>		
 				

From f190ce18ee4ac8a99b9508c9289e43d8f8454eaa Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Sat, 5 May 2012 21:20:20 +0800
Subject: [PATCH 25/39] Put sorting in web_link, page_context and design

---
 app/controllers/admin/designs_controller.rb   | 11 ++-
 app/controllers/orbit_backend_controller.rb   |  8 +-
 app/helpers/orbit_backend_helper.rb           |  2 +-
 app/models/design/design.rb                   |  8 +-
 app/views/admin/designs/_design.html.erb      | 14 ++++
 app/views/admin/designs/_designs.html.erb     | 12 +++
 app/views/admin/designs/_filter.html.erb      | 11 +++
 .../admin/designs/_sort_headers.html.erb      |  3 +
 app/views/admin/designs/index.html.erb        | 54 ++----------
 app/views/admin/designs/index.js.erb          |  3 +
 config/routes.rb                              |  1 +
 .../back_end/bulletins_controller.rb          | 82 -------------------
 .../back_end/news_bulletins_controller.rb     | 82 -------------------
 .../back_end/page_contexts_controller.rb      |  3 +-
 .../back_end/page_contexts/_filter.html.erb   | 11 +++
 .../page_contexts/_sort_headers.html.erb      |  4 +
 .../back_end/page_contexts/index.html.erb     | 26 ++----
 .../back_end/page_contexts/index.js.erb       |  3 +
 .../back_end/web_links_controller.rb          |  7 ++
 .../back_end/web_links/_sort_headers.html.erb |  2 +-
 .../back_end/web_links/_web_link.html.erb     |  5 ++
 .../back_end/web_links/index.html.erb         | 31 +++----
 .../web_resource/config/routes.rb             |  6 +-
 23 files changed, 130 insertions(+), 259 deletions(-)
 create mode 100644 app/views/admin/designs/_design.html.erb
 create mode 100644 app/views/admin/designs/_designs.html.erb
 create mode 100644 app/views/admin/designs/_filter.html.erb
 create mode 100644 app/views/admin/designs/_sort_headers.html.erb
 create mode 100644 app/views/admin/designs/index.js.erb
 create mode 100644 vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_filter.html.erb
 create mode 100644 vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_sort_headers.html.erb
 create mode 100644 vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.js.erb

diff --git a/app/controllers/admin/designs_controller.rb b/app/controllers/admin/designs_controller.rb
index ff41c0b4d..84f2b770a 100644
--- a/app/controllers/admin/designs_controller.rb
+++ b/app/controllers/admin/designs_controller.rb
@@ -1,4 +1,4 @@
-class Admin::DesignsController < ApplicationController
+class Admin::DesignsController < OrbitBackendController
   require "net/http"
   require "uri"
   require 'zip/zip'
@@ -25,7 +25,7 @@ class Admin::DesignsController < ApplicationController
   end
 
   def index
-    @designs = Design.all.entries
+    @designs = params[:sort] ? get_sorted_and_filtered("designs") : Design.all
   end
 
   def new
@@ -84,6 +84,13 @@ class Admin::DesignsController < ApplicationController
         render :action => 'new'
       end
   end
+
+  def delete
+    if params[:to_delete]
+      designs = Design.any_in(:_id => params[:to_delete]).delete_all
+    end
+    redirect_to admin_designs_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
+  end
   
   protected
   
diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb
index 8655e93fb..a03a1f6c0 100644
--- a/app/controllers/orbit_backend_controller.rb
+++ b/app/controllers/orbit_backend_controller.rb
@@ -27,9 +27,13 @@ class OrbitBackendController< ApplicationController
     end
   end
 
-  def get_sorted_and_filtered(object_class)
+  def get_sorted_and_filtered(object_class, query=nil)
     object_class = object_class.classify.constantize
-    objects = object_class.all
+    if query
+      objects = object_class.all.where(query)
+    else
+      objects = object_class.all
+    end
 
     if !params[:sort].blank?
       options = params[:sort_options]
diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb
index 55f44d61b..5d47e414a 100644
--- a/app/helpers/orbit_backend_helper.rb
+++ b/app/helpers/orbit_backend_helper.rb
@@ -27,7 +27,7 @@ module OrbitBackendHelper
           concat (content_tag :th, :class => "span1 strong" do
             concat check_box_tag :check_all
             concat link_to content_tag(:i, nil, :class => "icon-trash"), '#', :class => "list-remove"
-           end) if delete_all && is_manager?
+           end) if (delete_all && (is_admin? || (is_manager? rescue nil)))
           titles.each do |title|
             concat render_title(title[0], title[1], title[2], title[3])
           end
diff --git a/app/models/design/design.rb b/app/models/design/design.rb
index 2a25dd110..58f95bd48 100644
--- a/app/models/design/design.rb
+++ b/app/models/design/design.rb
@@ -3,10 +3,10 @@ class Design
   include Mongoid::Timestamps
   include ParserLayout
 
-  field :title
-  field :author
-  field :intro
-  field :version
+  field :title, :type => String
+  field :author, :type => String
+  field :intro, :type => String
+  field :version, :type => String
 
   has_many :pages
   
diff --git a/app/views/admin/designs/_design.html.erb b/app/views/admin/designs/_design.html.erb
new file mode 100644
index 000000000..e7aec0ba1
--- /dev/null
+++ b/app/views/admin/designs/_design.html.erb
@@ -0,0 +1,14 @@
+<tr class="with_action">
+	<td><%= check_box_tag 'to_delete[]', design.id, false, :class => "checkbox_in_list" %></td>
+	<td>
+		<%= design.title %>
+		<div class="quick-edit">
+			<ul class="nav nav-pills hide">
+				<li><%= link_to t(:edit), edit_admin_design_path(design), :class => 'edit'  %></li>
+				<li class="dropdown"><%= link_to t(:delete), admin_design_path(design), :confirm => t('sure?'), :method => :delete, :class => 'delete' %></li>
+			</ul>
+		</div>
+	</td>
+  <td><%= design.author %></td>
+  <td><%= design.intro %></td>
+</tr>
\ No newline at end of file
diff --git a/app/views/admin/designs/_designs.html.erb b/app/views/admin/designs/_designs.html.erb
new file mode 100644
index 000000000..838057f22
--- /dev/null
+++ b/app/views/admin/designs/_designs.html.erb
@@ -0,0 +1,12 @@
+<thead>
+	<tr>
+		<th class="span1 strong"></th>
+		<th class="span7"></th>
+		<th class="span2"></th>
+		<th class="span2"></th>
+	</tr>
+</thead>
+<tbody>
+<tbody id="tbody_designs" class="sort-holder">
+	<%= render :partial => 'design', :collection => @designs %>
+</tbody>
\ No newline at end of file
diff --git a/app/views/admin/designs/_filter.html.erb b/app/views/admin/designs/_filter.html.erb
new file mode 100644
index 000000000..02ba839b1
--- /dev/null
+++ b/app/views/admin/designs/_filter.html.erb
@@ -0,0 +1,11 @@
+<div id='filter' class="subnav">
+	<div class="filters">
+		<div id="sort_headers" class="table-label">
+			<%= render 'sort_headers' %> 
+		</div>
+	</div>
+</div>
+
+<% content_for :page_specific_javascript do %>
+	<%= javascript_include_tag "sort_header" %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/designs/_sort_headers.html.erb b/app/views/admin/designs/_sort_headers.html.erb
new file mode 100644
index 000000000..15f5481f6
--- /dev/null
+++ b/app/views/admin/designs/_sort_headers.html.erb
@@ -0,0 +1,3 @@
+<%= render_sort_bar(true, ['title', 'title','span7', 'admin.title'],
+													['author', 'author', 'span2', 'admin.author'],
+													['intro', 'intro', 'span2', 'admin.intro']).html_safe %>
diff --git a/app/views/admin/designs/index.html.erb b/app/views/admin/designs/index.html.erb
index 13837003b..8c4608d85 100644
--- a/app/views/admin/designs/index.html.erb
+++ b/app/views/admin/designs/index.html.erb
@@ -1,52 +1,10 @@
-<%= flash_messages %>
-<div id="filter" class="subnav">
-	<div class="filters">
-		<div id="sort_headers" class="table-label">
-			<table class="table main-list">	
-				<thead>
-					<tr>
-						<th class="span1 strong">
-							<input type="checkbox">
-							<a href class="list-remove"><i class="icon-trash"></i></a>
-						</th>
-						<th class="span7"><%= t('admin.title') %></th>
-						<th class="span2"><%= t('admin.author') %></th>
-						<th class="span2"><%= t('admin.intro') %></th>
-					</tr>
-				</thead>
-			</table>
-		</div>
-	</div>
-</div>
+<%= form_for :news_bulletins, :url => delete_admin_designs_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), :html => {:id => 'delete_all'}, :remote => true do %>
+	<%= render 'filter' %>
+	<table class="table main-list">
+		<%= render 'designs' %>
+	</table>
+<% end %>
 
-<table class="table main-list">
-	<thead>
-		<tr>
-			<th class="span1 strong"></th>
-			<th class="span7"></th>
-			<th class="span2"></th>
-			<th class="span2"></th>
-		</tr>
-	</thead>
-	<tbody>
-		<% @designs.each do |design| %>
-			<tr class="with_action">
-				<td><input type="checkbox"></td>
-				<td>
-					<%= design.title %>
-					<div class="quick-edit">
-						<ul class="nav nav-pills hide">
-							<li><%= link_to t(:edit), edit_admin_design_path(design), :class => 'edit'  %></li>
-							<li class="dropdown"><%= link_to t(:delete), admin_design_path(design), :confirm => t('sure?'), :method => :delete, :class => 'delete' %></li>
-						</ul>
-					</div>
-				</td>
-		    <td><%= design.author %></td>
-		    <td><%= design.intro %></td>
-			</tr>
-		<% end %>
-	</tbody>
-</table>
 <div class="form-actions form-fixed pagination-right">
 	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_admin_design_path, :class => 'btn btn-primary' %>
 </div>
\ No newline at end of file
diff --git a/app/views/admin/designs/index.js.erb b/app/views/admin/designs/index.js.erb
new file mode 100644
index 000000000..5c61066b7
--- /dev/null
+++ b/app/views/admin/designs/index.js.erb
@@ -0,0 +1,3 @@
+$("#delete_all").attr("action", "<%= delete_admin_designs_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) %>");
+$("#sort_headers").html("<%= j render 'sort_headers' %>");
+$("#tbody_designs").html("<%= j render :partial => 'design', :collection => @designs %>");
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index c90a5ae05..6ded5149a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -37,6 +37,7 @@ Orbit::Application.routes.draw do
     resources :designs do
       collection do
         get 'upload_package'
+        post 'delete'
         post 'upload_package'
       end
       member do
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index 5f210f3c4..8700283ab 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -331,87 +331,5 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   	module_app = ModuleApp.first(:conditions => {:key => 'announcement'})
   	@tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc)
   end
-
-  def get_sorted_and_filtered_bulletins
-    bulletins = Bulletin.all
-    case params[:sort]
-      when 'postdate', 'deadline'
-        bulletins = bulletins.order_by([params[:sort], params[:direction]])
-      when 'category'
-        category_ids = bulletins.distinct(:bulletin_category_id)
-        categories = BulletinCategory.find(category_ids) rescue nil
-        if categories
-          h = Hash.new 
-          categories.each { |category| h[category.i18n_variable[I18n.locale]] = category.id }
-          sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse!
-          sorted_categorys = sorted.collect {|a| bulletins.where(:bulletin_category_id => a[1]).entries }
-          bulletins = sorted_categorys.flatten!
-        end
-      when 'title'
-        h = Array.new 
-        bulletins.each { |bulletin| h << [bulletin.title[I18n.locale].downcase, bulletin] }
-        sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse!
-        bulletins = sorted.collect {|a| a[1] }
-      when 'status'
-        bulletins = bulletins.order_by(:is_top, params[:direction]).order_by(:is_hot, params[:direction]).order_by(:is_hidden, params[:direction]).order_by(:is_pending, params[:direction]).order_by(:is_checked, params[:direction]).order_by(:is_rejected, params[:direction])
-      when 'update_user_id'
-        user_ids = bulletins.distinct(:update_user_id)
-        users = User.find(user_ids) rescue nil
-        if users
-          h = Array.new 
-          users.each { |user| h << [user.name, user.id] }
-          sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse!
-          sorted_users = sorted.collect {|a| bulletins.where(:update_user_id => a[1]).entries }
-          bulletins = sorted_users.flatten
-        end
-      when 'tags'
-        a = Array.new
-        AnnouncementTag.all.order_by(I18n.locale, params[:direction]).each { |tag| a << tag.bulletins }
-        a.flatten!
-        a.uniq!
-        tmp = Array.new 
-        bulletins.where(:tag_ids => []).each { |bulletin| tmp << [bulletin.title[I18n.locale].downcase, bulletin] }
-        sorted = params[:direction].eql?('asc') ? tmp.sort : tmp.sort.reverse!
-        sorted_titles = sorted.collect {|a| a[1] }
-        a = params[:direction].eql?('asc') ? (sorted_titles + a) : (a + sorted_titles)
-        bulletins = a.flatten
-    end
-    if @filter
-      @filter.each do |key, value|
-        case key
-          when 'status'
-            a = Array.new
-            bulletins.each do |bulletin|
-              value.each do |v|
-                case v
-                  when 'pending'
-                    a << bulletin if bulletin.is_checked.nil?
-                  when 'rejected'
-                    a << bulletin if bulletin.is_checked.eql?(false)
-                  else
-                    a << bulletin if bulletin[v]
-                end
-              end
-            end
-            bulletins = a.uniq
-          when 'categories'
-            a = Array.new
-            bulletins.each do |bulletin|
-              a << bulletin if value.include?(bulletin.bulletin_category.id.to_s)
-            end
-            bulletins = a.uniq
-          when 'tags'
-            a = Array.new
-            bulletins.each do |bulletin|
-              bulletin.tags.each do |tag|
-                a << bulletin if value.include?(tag.id.to_s)
-              end
-            end
-            bulletins = a.uniq
-        end if value.size > 0
-      end
-    end
-    Kaminari.paginate_array(bulletins).page(params[:page]).per(10)
-  end
   
 end
diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb
index a2a1a8818..e845cbd14 100644
--- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb
+++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb
@@ -333,86 +333,4 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
   	@tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc)
   end
 
-  def get_sorted_and_filtered_news_bulletins
-    news_bulletins = NewsBulletin.all
-    case params[:sort]
-      when 'postdate', 'deadline'
-        news_bulletins = news_bulletins.order_by([params[:sort], params[:direction]])
-      when 'category'
-        category_ids = news_bulletins.distinct(:news_bulletin_category_id)
-        categories = NewsBulletinCategory.find(category_ids) rescue nil
-        if categories
-          h = Hash.new 
-          categories.each { |category| h[category.i18n_variable[I18n.locale]] = category.id }
-          sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse!
-          sorted_categorys = sorted.collect {|a| news_bulletins.where(:news_bulletin_category_id => a[1]).entries }
-          news_bulletins = sorted_categorys.flatten!
-        end
-      when 'title'
-        h = Array.new 
-        news_bulletins.each { |news_bulletin| h << [news_bulletin.title[I18n.locale].downcase, news_bulletin] }
-        sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse!
-        news_bulletins = sorted.collect {|a| a[1] }
-      when 'status'
-        news_bulletins = news_bulletins.order_by(:is_top, params[:direction]).order_by(:is_hot, params[:direction]).order_by(:is_hidden, params[:direction]).order_by(:is_pending, params[:direction]).order_by(:is_checked, params[:direction]).order_by(:is_rejected, params[:direction])
-      when 'update_user_id'
-        user_ids = news_bulletins.distinct(:update_user_id)
-        users = User.find(user_ids) rescue nil
-        if users
-          h = Array.new 
-          users.each { |user| h << [user.name, user.id] }
-          sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse!
-          sorted_users = sorted.collect {|a| news_bulletins.where(:update_user_id => a[1]).entries }
-          news_bulletins = sorted_users.flatten
-        end
-      when 'tags'
-        a = Array.new
-        NewsTag.all.order_by(I18n.locale, params[:direction]).each { |tag| a << tag.news_bulletins }
-        a.flatten!
-        a.uniq!
-        tmp = Array.new 
-        news_bulletins.where(:tag_ids => []).each { |news_bulletin| tmp << [news_bulletin.title[I18n.locale].downcase, news_bulletin] }
-        sorted = params[:direction].eql?('asc') ? tmp.sort : tmp.sort.reverse!
-        sorted_titles = sorted.collect {|a| a[1] }
-        a = params[:direction].eql?('asc') ? (sorted_titles + a) : (a + sorted_titles)
-        news_bulletins = a.flatten
-    end
-    if @filter
-      @filter.each do |key, value|
-        case key
-          when 'status'
-            a = Array.new
-            news_bulletins.each do |news_bulletin|
-              value.each do |v|
-                case v
-                  when 'pending'
-                    a << news_bulletin if news_bulletin.is_checked.nil?
-                  when 'rejected'
-                    a << news_bulletin if news_bulletin.is_checked.eql?(false)
-                  else
-                    a << news_bulletin if news_bulletin[v]
-                end
-              end
-            end
-            news_bulletins = a.uniq
-          when 'categories'
-            a = Array.new
-            news_bulletins.each do |news_bulletin|
-              a << news_bulletin if value.include?(news_bulletin.news_bulletin_category.id.to_s)
-            end
-            news_bulletins = a.uniq
-          when 'tags'
-            a = Array.new
-            news_bulletins.each do |news_bulletin|
-              news_bulletin.tags.each do |tag|
-                a << news_bulletin if value.include?(tag.id.to_s)
-              end
-            end
-            news_bulletins = a.uniq
-        end if value.size > 0
-      end
-    end
-    Kaminari.paginate_array(news_bulletins).page(params[:page]).per(10)
-  end
-  
 end
diff --git a/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb b/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
index 87f3447c2..6ae315fbf 100644
--- a/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
+++ b/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
@@ -5,11 +5,12 @@ class Panel::PageContent::BackEnd::PageContextsController < OrbitBackendControll
 
   def index
 	
-	@page_contexts = PageContext.where(:archived => false).desc(:updated_at).page(params[:page]).per(10)
+	@page_contexts = params[:sort] ? get_sorted_and_filtered("page_contexts", {:archived => false}) : PageContext.where(:archived => false).page(params[:page]).per(10)
 
     respond_to do |format|
       format.html # index.html.erb
       format.xml  { render :xml => @page_contexts }
+      format.js {}
     end
   end
   
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_filter.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_filter.html.erb
new file mode 100644
index 000000000..02ba839b1
--- /dev/null
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_filter.html.erb
@@ -0,0 +1,11 @@
+<div id='filter' class="subnav">
+	<div class="filters">
+		<div id="sort_headers" class="table-label">
+			<%= render 'sort_headers' %> 
+		</div>
+	</div>
+</div>
+
+<% content_for :page_specific_javascript do %>
+	<%= javascript_include_tag "sort_header" %>
+<% end %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_sort_headers.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_sort_headers.html.erb
new file mode 100644
index 000000000..7a37d4a76
--- /dev/null
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_sort_headers.html.erb
@@ -0,0 +1,4 @@
+<%= render_sort_bar(false, ['name', 'page','span7', 'page_context.name'],
+													['version', 'version', 'span2', 'page_context.version'],
+													['update_time', 'updated_at', 'span2', 'page_context.update_time'],
+													['last_modified', 'update_user_id', 'span2', 'page_context.last_modified']).html_safe %>
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
index a71c45ebc..1ab0f27ae 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
@@ -1,22 +1,6 @@
 
 <%= flash_messages %>
-
-<div id="filter" class="subnav">
-	<div class="filters">
-		<div id="sort_headers" class="table-label">
-			<table class="table main-list">
-				<thead>
-					<tr>
-						<th class="span7"><%= t('page_context.name') %></th>
-						<th class="span2"><%= t('page_context.version') %></th>
-						<th class="span2"><%= t('page_context.update_time') %></th>
-						<th class="span2"><%= t('page_context.last_modified') %></th>
-					</tr>
-				</thead>
-			</table>
-		</div>
-	</div>
-</div>
+<%= render 'filter' %>
 
 <table class="table main-list">
 	<thead>
@@ -27,13 +11,13 @@
 			<th class="span2"></th>
 		</tr>
 	</thead>
-	<tbody>
+	<tbody id="tbody_page_contexts" class="sort-holder">
 	  
 		<%= render :partial => 'page_context', :collection => @page_contexts %>
 
 	</tbody>
 </table>
 
-<%= paginate @page_contexts %>
-
-
+<div id="page_context_pagination" class="paginationFixed">
+	<%= paginate @page_contexts, :params => {:direction => params[:direction], :sort => params[:sort]} %>
+</div>
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.js.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.js.erb
new file mode 100644
index 000000000..aba5dd93d
--- /dev/null
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.js.erb
@@ -0,0 +1,3 @@
+$("#sort_headers").html("<%= j render 'sort_headers' %>");
+$("#tbody_page_contexts").html("<%= j render :partial => 'page_context', :collection => @page_contexts %>");
+$("#page_context_pagination").html("<%= j paginate @page_contexts, :params => {:direction => params[:direction], :sort => params[:sort]} %>");
\ No newline at end of file
diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
index 25c41606c..69aa8c1af 100644
--- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
+++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
@@ -122,6 +122,13 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController
       format.js
     end
   end
+
+  def delete
+    if params[:to_delete]
+      web_links = WebLink.any_in(:_id => params[:to_delete]).delete_all
+    end
+    redirect_to panel_web_resource_back_end_web_links_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
+  end
   
   protected
   
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_sort_headers.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_sort_headers.html.erb
index e405811c5..8873ed20c 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_sort_headers.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_sort_headers.html.erb
@@ -1,4 +1,4 @@
-<%= render_sort_bar(false, ['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1', 'bulletin.status'],
+<%= render_sort_bar(true, ['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1', 'bulletin.status'],
 													['category', 'bulletin_category', 'span2', 'bulletin.category'],
 													['name', 'name','span3', 'bulletin.title'],
 													['tags', 'tags', 'span2', 'bulletin.tags']).html_safe %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb
index ad8f5adec..457a05a86 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb
@@ -1,4 +1,9 @@
 <tr id="<%= dom_id web_link %>" class="with_action">
+	<td>
+		<% if (web_link.create_user_id ==  current_user.id) || is_manager? %>
+			<%= check_box_tag 'to_delete[]', web_link.id, false, :class => "checkbox_in_list" %>
+		<% end -%>
+	</td>
 	<td>
 		<div class="label-group">
 			<div class="label-td">
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
index aa8670347..da1e287b9 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
@@ -1,17 +1,20 @@
-<%= render 'filter' %>
-<table class="table main-list">
-	<thead>
-		<tr>
-			<th class="span1"></th>
-			<th class="span2"></th>
-			<th class="span3"></th>
-			<th class="span2"></th>
-		</tr>
-	</thead>
-	<tbody id="tbody_web_links" class="sort-holder">
-		<%= render :partial => 'web_link', :collection => @web_links %>
-	</tbody>
-</table>
+<%= form_for :news_bulletins, :url => delete_panel_web_resource_back_end_web_links_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), :html => {:id => 'delete_all'}, :remote => true do %>
+	<%= render 'filter' %>
+	<table class="table main-list">
+		<thead>
+			<tr>
+				<th class="span1"></th>
+				<th class="span1"></th>
+				<th class="span2"></th>
+				<th class="span3"></th>
+				<th class="span2"></th>
+			</tr>
+		</thead>
+		<tbody id="tbody_web_links" class="sort-holder">
+			<%= render :partial => 'web_link', :collection => @web_links %>
+		</tbody>
+	</table>
+<% end %>
 
 <div id="web_link_pagination" class="paginationFixed">
 	<%= paginate @web_links, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
diff --git a/vendor/built_in_modules/web_resource/config/routes.rb b/vendor/built_in_modules/web_resource/config/routes.rb
index ca0c5d0db..ac98d4da6 100644
--- a/vendor/built_in_modules/web_resource/config/routes.rb
+++ b/vendor/built_in_modules/web_resource/config/routes.rb
@@ -4,7 +4,11 @@ Rails.application.routes.draw do
     namespace :web_resource do
       namespace :back_end do
         root :to => "web_links#index"
-        resources :web_links
+        resources :web_links do
+          collection do
+            post 'delete'
+          end
+        end
 		resources :web_link_categorys
         resources :tags
       end

From ce1fecaf9318875a538f801adccc771d24d9999c Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Sun, 6 May 2012 00:35:13 +0800
Subject: [PATCH 26/39] Add position ordering and hiding page for i18n

---
 app/controllers/pages_controller.rb  |  2 +-
 app/helpers/admin/item_helper.rb     |  5 ++++-
 app/models/item.rb                   | 16 ++++++++++++++++
 app/views/admin/pages/_form.html.erb | 12 ++++++++++--
 lib/parsers/parser_common.rb         |  8 ++++----
 5 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 644f02238..c4e00aa25 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -16,7 +16,7 @@ class PagesController < ApplicationController
   def show  
      #begin  
        @item = Item.first(:conditions => {:full_name => params[:page_name]})
-       if @item && @item.is_published
+       if @item && @item.is_published && (@item.enabled_for.nil? ? true : @item.enabled_for.include?(I18n.locale.to_s))
          case @item._type
            when 'Page'    
              render_page(params)
diff --git a/app/helpers/admin/item_helper.rb b/app/helpers/admin/item_helper.rb
index d1025c559..8af4db341 100644
--- a/app/helpers/admin/item_helper.rb
+++ b/app/helpers/admin/item_helper.rb
@@ -28,12 +28,15 @@ module Admin::ItemHelper
   end
   
   def render_children(parent)
-    if children = parent.children
+    children = parent.ordered_children
+    if !children.entries.blank?
       ret = ''
       children.each do |child|
         ret << render_node_and_children(child)
       end
       ret
+    else
+      ''
     end
   end
   
diff --git a/app/models/item.rb b/app/models/item.rb
index 44c6762d6..8cd8bec03 100644
--- a/app/models/item.rb
+++ b/app/models/item.rb
@@ -7,6 +7,7 @@ class Item
   field :full_name, :index => true
   field :position, :type => Integer
   field :is_published, :type => Boolean, :default => false, :index => true
+  field :enabled_for, :type => Array, :default => nil 
  
   validates_format_of :name, :with => /^[0-9a-zA-Z\-_]+$/
   validates :name, :exclusion => { :in => LIST[:forbidden_item_names] }
@@ -35,6 +36,21 @@ class Item
     urls = ancestors.map{ |a| a.name } << self.name
     urls.join("/")
   end
+
+  def ordered_children
+    self.children.asc(:position)
+  end
+
+  def ordered_and_visible_children
+    objects = ordered_children
+    a = []
+    if objects
+      objects.each do |object|
+        a << object if object.enabled_for.nil? ? true : object.enabled_for.include?(I18n.locale.to_s)
+      end
+    end
+    a
+  end
   
   protected
   
diff --git a/app/views/admin/pages/_form.html.erb b/app/views/admin/pages/_form.html.erb
index 5271af8f5..460bbce35 100644
--- a/app/views/admin/pages/_form.html.erb
+++ b/app/views/admin/pages/_form.html.erb
@@ -30,7 +30,15 @@
 	<span id="app_page_category"><%= select('page','category', @categories.collect{|category| [category.i18n_variable[I18n.locale], category.id]}, :selected => @item[:category], :include_blank => true ) rescue ''%> </span>
 </p>
 <p>
-<%= f.label :is_published, "#{t('admin.is_published')} ?" %>
-<%= f.radio_button :is_published, true %>Yes <%= f.radio_button :is_published, false %> No
+	<%= f.label :is_published, "#{t('admin.is_published')} ?" %>
+	<%= f.radio_button :is_published, true %>Yes <%= f.radio_button :is_published, false %> No
+</p>
+<p>
+	<%= f.label :enabled_for, "#{t('admin.enabled_for')} ?" %>
+	<% @site_valid_locales.each do |valid_locale| %>
+		<%= check_box_tag 'page[enabled_for][]', valid_locale, (@item.enabled_for.nil? ? true : @item.enabled_for.include?(valid_locale)) %>
+		<%= I18nVariable.from_locale(valid_locale) %>
+	<% end %>
+	<%= hidden_field_tag 'page[enabled_for][]', '' %>
 </p>
 
diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb
index 6e7fea47f..66491232c 100644
--- a/lib/parsers/parser_common.rb
+++ b/lib/parsers/parser_common.rb
@@ -12,7 +12,7 @@ module ParserCommon
           res << "<ul class='ini_list'>"
           i = nil
           i = 1 if menu.values["li_incremental_#{current}"]
-          page.children.each do |child|
+          page.ordered_and_visible_children.each do |child|
             res << menu_li(child, current, menu, i, edit)
             i += 1 if i
           end
@@ -23,7 +23,7 @@ module ParserCommon
       else
         res << '<ul>'
         res << "<li>" + "<a href='#{edit ? admin_page_path(page.id) : page.full_name}' class='dm_ctrl'>#{page.i18n_variable[I18n.locale]}</a>" + "</li>"
-        page.children.each do |child|
+        page.ordered_and_visible_children.each do |child|
           res << "<li>" + menu_level(child, current + 1, menu, edit) + "</li>"
         end
         res << '</ul>'
@@ -37,7 +37,7 @@ module ParserCommon
     res << menu.values["li_class_#{current}"]
     res << "_#{i}" if i
     res << ">"
-    if page.children.size > 0 
+    if page.ordered_and_visible_children.size > 0 
       res << menu_level(page, current + 1, menu, edit)
     else
       res << "<a href='#{edit ? admin_page_path(page.id) : page.full_name}' class='nav dm_ctrl'>#{page.i18n_variable[I18n.locale]}</a>"
@@ -114,7 +114,7 @@ module ParserCommon
       res << "<div class='category_list'>"
       res << "<h3 class='h3'>#{page.i18n_variable[I18n.locale]}</h3>"
       res << "<ul class='list'>"
-      page.children.each do |child|
+      page.ordered_and_visible_children.each do |child|
         res << "<li>"
         res << "<a href='#{child.full_name}'>#{child.i18n_variable[I18n.locale]}</a>"
         res << "</li>"

From 51f87e72120d0d1eaa09ddf5eb607a39c7dfa160 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Sun, 6 May 2012 03:36:01 +0800
Subject: [PATCH 27/39] Add missing translation for enabled_for

---
 app/views/admin/pages/_form.html.erb | 2 +-
 config/locales/en.yml                | 1 +
 config/locales/zh_tw.yml             | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/admin/pages/_form.html.erb b/app/views/admin/pages/_form.html.erb
index 460bbce35..e06afbc98 100644
--- a/app/views/admin/pages/_form.html.erb
+++ b/app/views/admin/pages/_form.html.erb
@@ -34,7 +34,7 @@
 	<%= f.radio_button :is_published, true %>Yes <%= f.radio_button :is_published, false %> No
 </p>
 <p>
-	<%= f.label :enabled_for, "#{t('admin.enabled_for')} ?" %>
+	<%= f.label :enabled_for, "#{t('admin.enabled_for')}:" %>
 	<% @site_valid_locales.each do |valid_locale| %>
 		<%= check_box_tag 'page[enabled_for][]', valid_locale, (@item.enabled_for.nil? ? true : @item.enabled_for.include?(valid_locale)) %>
 		<%= I18nVariable.from_locale(valid_locale) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4427e8908..eeb5e63ad 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -136,6 +136,7 @@ en:
     editing_role: Editing user role
     email: Email
     enable_language: Enable language
+    enabled_for: Enabled for
     file_name: Filename
     file_size: File size
     format: Format
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index dfbcdf951..661253c4d 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -133,6 +133,7 @@ zh_tw:
     editing_role: 編輯用戶身份
     email: Email
     enable_language: 啟用語言
+    enabled_for: 啟用
     file_name: 檔名
     file_size: 檔案大小
     format: 格式

From 48f8fbde7ff6c6e060f67b67fd44f4ef228c8a39 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 7 May 2012 00:53:52 +0800
Subject: [PATCH 28/39] Fix site_locale_default_head and active for current
 locale

---
 app/controllers/application_controller.rb          | 14 ++++++++++++--
 app/helpers/admin/ad_images_helper.rb              |  4 ----
 app/helpers/application_helper.rb                  | 10 ++++------
 app/views/admin/ad_images/_form.html.erb           |  8 ++++----
 .../announcement/back_end/bulletins/_form.html.erb |  4 ++--
 .../news/back_end/news_bulletins/_form.html.erb    |  4 ++--
 6 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 68f49e3bf..494b497ea 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -128,8 +128,8 @@ class ApplicationController < ActionController::Base
     # set site if exist or create site
     @site = Site.first || Site.create({:valid_locales => [], :in_use_locales => []})
     session[:site] = @site.id
-    @site_in_use_locales = @site.in_use_locales
-    @site_valid_locales = @site.valid_locales
+    @site_in_use_locales = site_locales_default_head(@site.in_use_locales)
+    @site_valid_locales = site_locales_default_head(@site.valid_locales)
   end
   
   def set_current_item
@@ -164,4 +164,14 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def site_locales_default_head(locales)
+    if locales[0].eql? I18n.locale.to_s
+      locales
+    else
+      a = Array.new(locales)
+      shift_out = a.delete(I18n.locale.to_s)
+      [shift_out] + a
+    end
+  end
+
 end
diff --git a/app/helpers/admin/ad_images_helper.rb b/app/helpers/admin/ad_images_helper.rb
index 1f2422fc0..b09bd2633 100644
--- a/app/helpers/admin/ad_images_helper.rb
+++ b/app/helpers/admin/ad_images_helper.rb
@@ -1,7 +1,3 @@
 module Admin::AdImagesHelper
 
-  def active_when_default_locale_eq locale
-    locale.to_sym == I18n.default_locale ? 'active': ''
-  end
-
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c36a420f7..c59f16c3f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2,12 +2,6 @@ module ApplicationHelper
 
   FLASH_NOTICE_KEYS = [:error, :notice, :warning]
   
-  def site_valid_locales_default_head
-    index = @site_valid_locales.rindex I18n.default_locale.to_s
-    shift_out = @site_valid_locales.shift(index)
-    @site_valid_locales += shift_out
-  end
-  
   def colorize_in_use_locale(locale)
     @site_in_use_locales.include?(locale)? 'green' : 'red'
   end
@@ -147,4 +141,8 @@ module ApplicationHelper
     javascripts
   end
 
+  def active_when_current_locale_eq(locale)
+    locale.to_sym == I18n.locale ? 'active': ''
+  end
+
 end
diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb
index cd04b4fe5..be5f2b477 100644
--- a/app/views/admin/ad_images/_form.html.erb
+++ b/app/views/admin/ad_images/_form.html.erb
@@ -130,14 +130,14 @@
 			<div id="post-body">
 				<div id="post-body-content" class="clear">
 					<ul class="nav nav-tabs">
-						<% site_valid_locales_default_head.each do |locale|%>
-							<%= content_tag :li,link_to(I18nVariable.from_locale(locale),"##{locale}",:data=>{:toggle => "tab"}),:class=> (active_when_default_locale_eq locale)  %>
+						<% @site_valid_locales.each do |locale|%>
+							<%= content_tag :li,link_to(I18nVariable.from_locale(locale),"##{locale}",:data=>{:toggle => "tab"}),:class=> (active_when_current_locale_eq locale)  %>
 						<% end %>
 					</ul>
 					<div class="tab-content">
 						<%= select_tag 'ad_banner[id]',options_from_collection_for_select(AdBanner.all, "id", "title",params[:ad_banner_id]) , :class=>"input-medium",   %>
-						<% site_valid_locales_default_head.each do |locale|%>
-							<%= content_tag :div,:class	=> "tab-pane #{active_when_default_locale_eq locale}",:id=>"#{locale}" do%>
+						<% @site_valid_locales.each do |locale|%>
+							<%= content_tag :div,:class	=> "tab-pane #{active_when_current_locale_eq locale}",:id=>"#{locale}" do%>
 								<div class="title">
 									<%= f.fields_for :title,@ad_image.title do |f| %>
 										<%= f.text_field locale,:class=>"ad_image-title post-title",:placeholder => "輸入標題"%>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index 235572066..59cfa5385 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -126,7 +126,7 @@
 			
 			<ul class="nav nav-tabs">
 				<%# @site_valid_locales.each_with_index do |locale, i| %>
-				<% site_valid_locales_default_head.each_with_index do |locale, i| %>
+				<% @site_valid_locales.each_with_index do |locale, i| %>
 			    <li <%= ( i == 0 ) ? " class='active'" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
 				<% end %>
 			</ul>
@@ -134,7 +134,7 @@
 			<div class="tab-content">
 			
 				<%# @site_valid_locales.each_with_index do |locale, i| %>
-				<% site_valid_locales_default_head.each_with_index do |locale, i| %>
+				<% @site_valid_locales.each_with_index do |locale, i| %>
 				
 				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
index ce00b63fa..38c2db316 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
@@ -126,7 +126,7 @@
 			
 			<ul class="nav nav-tabs">
 				<%# @site_valid_locales.each_with_index do |locale, i| %>
-				<% site_valid_locales_default_head.each_with_index do |locale, i| %>
+				<% @site_valid_locales.each_with_index do |locale, i| %>
 			    <li <%= ( i == 0 ) ? " class='active'" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
 				<% end %>
 			</ul>
@@ -134,7 +134,7 @@
 			<div class="tab-content">
 			
 				<%# @site_valid_locales.each_with_index do |locale, i| %>
-				<% site_valid_locales_default_head.each_with_index do |locale, i| %>
+				<% @site_valid_locales.each_with_index do |locale, i| %>
 				
 				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 

From 1fb6c20b8691091add56722b9454042289cfc733 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 7 May 2012 00:54:18 +0800
Subject: [PATCH 29/39] Add site_info

---
 app/controllers/admin/sites_controller.rb   | 46 +++++++++++++++++----
 app/helpers/application_helper.rb           | 14 +++++--
 app/models/meta.rb                          | 15 -------
 app/models/meta/meta.rb                     |  8 ++++
 app/models/site.rb                          | 30 ++++++++++++++
 app/views/admin/sites/language.html.erb     |  1 +
 app/views/admin/sites/mail_setting.html.erb |  1 +
 app/views/admin/sites/site_info.html.erb    | 36 ++++++++++++++++
 app/views/admin/sites/system_info.html.erb  |  1 +
 app/views/admin/sites/ui_theme.html.erb     |  1 +
 app/views/layouts/_side_bar.html.erb        | 17 +++++---
 app/views/layouts/page_layout.html.erb      |  1 -
 config/routes.rb                            |  8 +++-
 13 files changed, 147 insertions(+), 32 deletions(-)
 delete mode 100644 app/models/meta.rb
 create mode 100644 app/views/admin/sites/language.html.erb
 create mode 100644 app/views/admin/sites/mail_setting.html.erb
 create mode 100644 app/views/admin/sites/site_info.html.erb
 create mode 100644 app/views/admin/sites/system_info.html.erb
 create mode 100644 app/views/admin/sites/ui_theme.html.erb

diff --git a/app/controllers/admin/sites_controller.rb b/app/controllers/admin/sites_controller.rb
index 9475e7084..1a19aebd9 100644
--- a/app/controllers/admin/sites_controller.rb
+++ b/app/controllers/admin/sites_controller.rb
@@ -1,16 +1,48 @@
 class Admin::SitesController < ApplicationController
   
-  layout "admin"
+  layout "new_admin"
   before_filter :authenticate_user!
   before_filter :is_admin?
+  before_filter :get_site
   
-  def index
-    @site = Site.first
-    redirect_to :action => :new unless @site
+  # def index
+  #   @site = Site.first
+  #   # redirect_to :action => :new unless @site
+  # end
+  
+  # def new
+  #   @site = Site.new
+  # end
+
+  def update
+    @site.update_attributes(params[:site])
+    redirect_to :back
   end
-  
-  def new
-    @site = Site.new
+
+  def site_info
+    
+  end
+
+  def system_info
+    
+  end
+
+  def language
+    
+  end
+
+  def mail_setting
+    
+  end
+
+  def ui_theme
+    
+  end
+
+  private
+
+  def get_site
+    @site ||= Site.first
   end
   
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c59f16c3f..8829dfef2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -95,12 +95,20 @@ module ApplicationHelper
   end
 
   def page_metas(page)
+    tmp_meta = {}
     metas = ''
-    @site.page_metas.each do |meta|
+    @site.site_metas.each do |meta|
       name, content = meta.get_name_content
-      metas << "<meta name=#{name} content=#{content} />\n"
+      tmp_meta.merge!(name => content)
     end rescue nil
-    return metas
+    page.page_metas.each do |meta|
+      name, content = meta.get_name_content
+      tmp_meta.merge!(name => content)
+    end rescue nil
+    tmp_meta.each_pair{|name, content|
+      metas << "<meta name='#{name}' content='#{content}' />\n"
+    } if !tmp_meta.blank?
+    metas
   end
 
   def page_title(page)
diff --git a/app/models/meta.rb b/app/models/meta.rb
deleted file mode 100644
index dbeac167f..000000000
--- a/app/models/meta.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class Meta
-  
-  include Mongoid::Document
-  include Mongoid::Timestamps
-    
-  field :key
-  field :value, :default => nil
-
-  has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
-
-  def get_name_content
-  	[self.key, self.value ? self.value : self.i18n_variable[I18n.locale]]
-  end
-  
-end
diff --git a/app/models/meta/meta.rb b/app/models/meta/meta.rb
index 411a4f0c5..cd713d83f 100644
--- a/app/models/meta/meta.rb
+++ b/app/models/meta/meta.rb
@@ -7,5 +7,13 @@ class Meta
   field :value, :default => nil
 
   has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
+
+  def get_name_content
+  	[self.key, get_content]
+  end
+
+  def get_content
+  	self.value ? self.value : self.i18n_variable[I18n.locale]
+  end
   
 end
diff --git a/app/models/site.rb b/app/models/site.rb
index 8f367c0a2..4a4c05e83 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -1,5 +1,7 @@
 class Site
   
+  METAS = ['description', 'keywords']
+
   include Mongoid::Document
   include Mongoid::Timestamps
   
@@ -13,8 +15,11 @@ class Site
   field :school
   field :department
 
+  has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
   has_many :site_metas, :autosave => true, :dependent => :destroy
   
+  before_save :set_key
+
   def generate_keys
     private_key = OpenSSL::PKey::RSA.generate(2048)
     self.public_key = private_key.public_key.to_s
@@ -30,5 +35,30 @@ class Site
     res = res.split('rails_3_1').pop.gsub('(', '').gsub(')','').strip rescue nil
     res.eql?('local out of date') ? false : true
   end
+
+  def title
+    @title ||= I18nVariable.first(:conditions => {:key => 'title', :language_value_id => self.id, :language_value_type => self.class}) rescue nil
+  end
+
+  METAS.each do |meta|
+    define_method meta do
+      fetch_meta = self.site_metas.where(key: meta).limit(1)
+      fetch_meta.blank? ? nil : fetch_meta[0].i18n_variable
+    end
+    define_method "#{meta}=" do |values|
+      if a = self.send(meta)
+        a.update_attributes(values)
+      else
+        a = self.site_metas.build(key: meta)
+        a.build_i18n_variable(values)
+      end
+    end
+  end
+
+  protected
+  
+  def set_key
+    title.key = 'title' if title
+  end
   
 end
diff --git a/app/views/admin/sites/language.html.erb b/app/views/admin/sites/language.html.erb
new file mode 100644
index 000000000..ceb9b0124
--- /dev/null
+++ b/app/views/admin/sites/language.html.erb
@@ -0,0 +1 @@
+language.html.erb
\ No newline at end of file
diff --git a/app/views/admin/sites/mail_setting.html.erb b/app/views/admin/sites/mail_setting.html.erb
new file mode 100644
index 000000000..3a52ede2b
--- /dev/null
+++ b/app/views/admin/sites/mail_setting.html.erb
@@ -0,0 +1 @@
+mail_setting.html.erb
\ No newline at end of file
diff --git a/app/views/admin/sites/site_info.html.erb b/app/views/admin/sites/site_info.html.erb
new file mode 100644
index 000000000..5fce63310
--- /dev/null
+++ b/app/views/admin/sites/site_info.html.erb
@@ -0,0 +1,36 @@
+<%= form_for @site, :url => admin_site_path(@site) do |f| %>
+	<div id="post-body">
+		<div id="post-body-content" class="clear">
+			<ul class="nav nav-tabs">
+				<% @site_valid_locales.each do |locale|%>
+				<%#= raise @site_valid_locales.inspect %>
+					<%= content_tag :li, link_to(I18nVariable.from_locale(locale), "##{locale}", :data => {:toggle => "tab"}), :class => (active_when_current_locale_eq locale)  %>
+				<% end %>
+				<li>
+					<%= f.submit t("submit"), :class => "btn btn-primary" %>
+					<%= f.submit t("cancel"), :class => "btn ", :type => 'reset' %>
+				</li>
+			</ul>
+			<div class="tab-content">
+				<% @site_valid_locales.each do |locale|%>
+					<%= content_tag :div, :class	=> "tab-pane #{active_when_current_locale_eq locale}", :id => "#{locale}" do %>
+						<%= t :title %>
+						<%= f.fields_for :title, @site.title do |f| %>
+							<%= f.text_field locale %>
+						<% end %>
+						<%= t :keywords %>
+						<%= f.fields_for :keywords, @site.keywords do |f| %>
+							<%= f.text_field locale %>
+						<% end %>
+						<%= t :description %>
+						<%= f.fields_for :description, @site.description do |f| %>
+							<%= f.text_field locale %>
+						<% end %>
+					<% end %>
+				<% end %>
+				</div>
+				
+			</div>
+		</div>
+	</div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/sites/system_info.html.erb b/app/views/admin/sites/system_info.html.erb
new file mode 100644
index 000000000..45535dacf
--- /dev/null
+++ b/app/views/admin/sites/system_info.html.erb
@@ -0,0 +1 @@
+system_info.html.erb
\ No newline at end of file
diff --git a/app/views/admin/sites/ui_theme.html.erb b/app/views/admin/sites/ui_theme.html.erb
new file mode 100644
index 000000000..222f59695
--- /dev/null
+++ b/app/views/admin/sites/ui_theme.html.erb
@@ -0,0 +1 @@
+ui_theme.html.erb
\ No newline at end of file
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index 41416bc4e..f127a73c0 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -7,7 +7,7 @@
 
 <%= content_tag :li, :class => active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals') ||  active_sys_call_for_app('module_apps','edit','Announcement')  do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.announcement'), panel_announcement_back_end_bulletins_path %>
-	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals')) do -%>
+	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals')) do -%>
 		<%= content_tag :li, link_to(t('announcement.all_articles'), panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index') %>
 		<%= content_tag :li, link_to(t('announcement.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %>
 		<%= content_tag :li, link_to(t('announcement.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %>
@@ -21,7 +21,7 @@
 
 <%= content_tag :li, :class => active_for_controllers('news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.news'), panel_news_back_end_news_bulletins_path %>
-	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals')) do -%>
+	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals')) do -%>
 		<%= content_tag :li, link_to(t('announcement.all_articles'), panel_news_back_end_news_bulletins_path), :class => active_for_action('news_bulletins', 'index') %>
 		<%= content_tag :li, link_to(t('announcement.add_new'), new_panel_news_back_end_news_bulletin_path), :class => active_for_action('news_bulletins', 'new') %>
 		<%= content_tag :li, link_to(t('announcement.categories'), panel_news_back_end_news_bulletin_categorys_path), :class => active_for_action('news_bulletin_categorys', 'index') %>
@@ -59,7 +59,7 @@
 
 <%= content_tag :li, :class => active_for_controllers('web_links', '/panel/web_resource/back_end/tags', 'web_link_categorys') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), panel_web_resource_back_end_web_links_path %>
-	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('web_links', '/panel/web_resource/back_end/tags', 'web_link_categorys')) do -%>
+	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('web_links', '/panel/web_resource/back_end/tags', 'web_link_categorys')) do -%>
 		<%= content_tag :li, link_to(t('admin.all_articles'), panel_web_resource_back_end_web_links_path), :class => active_for_action('web_links', 'index') %>
 		<%= content_tag :li, link_to(t('announcement.add_new'), new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_links', 'new') %>
 		<%= content_tag :li, link_to(t('announcement.categories'), panel_web_resource_back_end_web_link_categorys_path), :class => active_for_action('web_link_categorys', 'index') %>
@@ -67,6 +67,13 @@
 	<% end -%>
 <% end -%>
 
-<%= content_tag :li, :class => active_for_controllers(nil) do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), nil %>
+<%= content_tag :li, :class => active_for_controllers('sites') do -%>
+	<%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), admin_site_site_info_path(@site) %>
+	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('sites')) do -%>
+		<%= content_tag :li, link_to(t('admin.site_info'), admin_site_site_info_path(@site)), :class => active_for_action('sites', 'site_info') %>
+		<%= content_tag :li, link_to(t('admin.system_info'), admin_site_system_info_path(@site)), :class => active_for_action('sites', 'system_info') %>
+		<%= content_tag :li, link_to(t('admin.language'), admin_site_language_path(@site)), :class => active_for_action('sites', 'language') %>
+		<%= content_tag :li, link_to(t('admin.mail_setting'), admin_site_mail_setting_path(@site)), :class => active_for_action('sites', 'mail_setting') %>
+		<%= content_tag :li, link_to(t('admin.ui_theme'), admin_site_ui_theme_path(@site)), :class => active_for_action('sites', 'ui_theme') %>
+	<% end -%>
 <% end -%>
diff --git a/app/views/layouts/page_layout.html.erb b/app/views/layouts/page_layout.html.erb
index 8fb884b07..dd9aa94ad 100644
--- a/app/views/layouts/page_layout.html.erb
+++ b/app/views/layouts/page_layout.html.erb
@@ -4,7 +4,6 @@
 <meta charset="utf-8">
 	<%= page_title(@item).html_safe %>
 	<%= page_metas(@item).html_safe %>
-	<%= @metas %>
 	<!--[if lt IE 9]>
 	   <%= javascript_include_tag "html5" %>
 	<![endif]-->
diff --git a/config/routes.rb b/config/routes.rb
index 6ded5149a..1b98bcc25 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -93,7 +93,13 @@ Orbit::Application.routes.draw do
       get 'add_sub_role'
       get 'add_attribute_field'
     end
-    resources :sites
+    resources :sites do
+      get 'site_info'
+      get 'system_info'
+      get 'language'
+      get 'mail_setting'
+      get 'ui_theme'
+    end
     resources :snippets
     resources :tags
     resources :translations

From 0246341aef2b79f217592dcff18decba50dfbf09 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 7 May 2012 11:25:33 +0800
Subject: [PATCH 30/39] Add footer to site_info

---
 app/models/site.rb                       |  8 +++++-
 app/views/admin/sites/site_info.html.erb | 36 ++++++++++++++++--------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/app/models/site.rb b/app/models/site.rb
index 4a4c05e83..ce689200e 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -16,6 +16,7 @@ class Site
   field :department
 
   has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
+  has_one :footer, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
   has_many :site_metas, :autosave => true, :dependent => :destroy
   
   before_save :set_key
@@ -40,6 +41,10 @@ class Site
     @title ||= I18nVariable.first(:conditions => {:key => 'title', :language_value_id => self.id, :language_value_type => self.class}) rescue nil
   end
 
+  def footer
+    @footer ||= I18nVariable.first(:conditions => {:key => 'footer', :language_value_id => self.id, :language_value_type => self.class}) rescue nil
+  end
+
   METAS.each do |meta|
     define_method meta do
       fetch_meta = self.site_metas.where(key: meta).limit(1)
@@ -58,7 +63,8 @@ class Site
   protected
   
   def set_key
-    title.key = 'title' if title
+    title.key = 'title' if title && (title.key.blank? rescue true)
+    footer.key = 'footer' if footer && (footer.key.blank? rescue true)
   end
   
 end
diff --git a/app/views/admin/sites/site_info.html.erb b/app/views/admin/sites/site_info.html.erb
index 5fce63310..93e1a3583 100644
--- a/app/views/admin/sites/site_info.html.erb
+++ b/app/views/admin/sites/site_info.html.erb
@@ -14,18 +14,30 @@
 			<div class="tab-content">
 				<% @site_valid_locales.each do |locale|%>
 					<%= content_tag :div, :class	=> "tab-pane #{active_when_current_locale_eq locale}", :id => "#{locale}" do %>
-						<%= t :title %>
-						<%= f.fields_for :title, @site.title do |f| %>
-							<%= f.text_field locale %>
-						<% end %>
-						<%= t :keywords %>
-						<%= f.fields_for :keywords, @site.keywords do |f| %>
-							<%= f.text_field locale %>
-						<% end %>
-						<%= t :description %>
-						<%= f.fields_for :description, @site.description do |f| %>
-							<%= f.text_field locale %>
-						<% end %>
+						<div>
+							<%= t :title %>
+							<%= f.fields_for :title, @site.title do |f| %>
+								<%= f.text_field locale %>
+							<% end %>
+						</div>
+						<div>
+							<%= t :keywords %>
+							<%= f.fields_for :keywords, @site.keywords do |f| %>
+								<%= f.text_field locale %>
+							<% end %>
+						</div>
+						<div>
+							<%= t :description %>
+							<%= f.fields_for :description, @site.description do |f| %>
+								<%= f.text_field locale %>
+							<% end %>
+						</div>
+						<div>
+							<%= t :footer %>
+							<%= f.fields_for :footer, @site.footer do |f| %>
+								<%= f.text_area locale, :class => "tinymce_textarea" %>
+							<% end %>
+						</div>
 					<% end %>
 				<% end %>
 				</div>

From e52119e25808dbf1c628e7781b62aa75ec7ec21c Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 7 May 2012 13:33:29 +0800
Subject: [PATCH 31/39] Add footer parser

---
 lib/parsers/parser_back_end.rb  |  1 +
 lib/parsers/parser_common.rb    | 13 ++++++++++++-
 lib/parsers/parser_front_end.rb |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/parsers/parser_back_end.rb b/lib/parsers/parser_back_end.rb
index 24b6c59f4..0ebaf90be 100644
--- a/lib/parsers/parser_back_end.rb
+++ b/lib/parsers/parser_back_end.rb
@@ -28,6 +28,7 @@ module ParserBackEnd
     parse_menu(body, page, true)
     public_r_tags = parse_content_edits(body, page, id)
     parse_images(body, page)
+    parse_footer(body, page, true)
 
     public_r_tags.each do |tag|
       send("parse_#{tag}s", body, page,id)
diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb
index 66491232c..04fe2e6c6 100644
--- a/lib/parsers/parser_common.rb
+++ b/lib/parsers/parser_common.rb
@@ -1,5 +1,6 @@
 module ParserCommon
- 
+ include ActionView::Helpers::TagHelper
+
   def menu_level(page, current, menu, edit = false)
     res = ''
     if menu.levels > 0 && current <= menu.levels
@@ -127,4 +128,14 @@ module ParserCommon
     end
   end
 
+  # page_menu
+  def parse_footer(body, page, edit=nil)
+    page_footer = body.css('.page_footer').first
+    res = "<div, id='footer', class='footer'>"
+    res << @site.footer[I18n.locale]
+    res << "</div>"
+    fragment = Nokogiri::HTML::DocumentFragment.new(body ,res)
+    page_footer.swap(fragment)
+  end
+
 end
diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb
index c95cac4d1..d37eba303 100644
--- a/lib/parsers/parser_front_end.rb
+++ b/lib/parsers/parser_front_end.rb
@@ -26,6 +26,7 @@ module ParserFrontEnd
     parse_menu(body, page)
     public_r_tags = parse_contents(body, page, id,params[:preview])
     parse_images(body, page)
+    parse_footer(body, page, true)
 
     public_r_tags.each do |tag|
       send("parse_#{tag}s", body, page,id)

From 8b61314cc41eb2ff4e6e103b802a8e3e15440340 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 7 May 2012 15:11:43 +0800
Subject: [PATCH 32/39] Add i18n for site_info. Add always display site title.
 Changes for menu in front-end

---
 app/helpers/application_helper.rb        | 12 +++++-
 app/models/site.rb                       |  1 +
 app/views/admin/sites/site_info.html.erb |  9 ++--
 config/locales/en.yml                    |  5 +++
 config/locales/zh_tw.yml                 |  5 +++
 lib/parsers/parser_common.rb             | 52 +++++++++---------------
 6 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8829dfef2..4f9128bb4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -112,7 +112,16 @@ module ApplicationHelper
   end
 
   def page_title(page)
-    "<title>#{page.title ? page.title[I18n.locale] : page.i18n_variable[I18n.locale]}</title>\n"
+    res = "<title>"
+    page_title = page.title ? page.title[I18n.locale] : page.i18n_variable[I18n.locale]
+    if page.is_home? && @site.title
+      res << @site.title[I18n.locale]
+    elsif @site.title && @site.title_always_on
+      res << @site.title[I18n.locale] + ' - ' + page_title
+    else
+      res << page_title
+    end
+    res << "</title>\n"
   end  
 
   def page_stylesheets(page, edit=nil)
@@ -123,6 +132,7 @@ module ApplicationHelper
       stylesheets << "<link href='/assets/style.css' rel='stylesheet' type='text/css' />\n"
     end
     stylesheets << "<link href='#{page.design.reset_css.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.reset_css
+    # stylesheets << "<link href='/assets/menu.css' rel='stylesheet' type='text/css' />\n" 
     stylesheets << "<link href='#{page.design.default_css.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.default_css
     theme = page.design.themes.detect{ |d| d.id == page.theme_id }
     stylesheets << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />\n" if theme
diff --git a/app/models/site.rb b/app/models/site.rb
index ce689200e..a3e0513d3 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -11,6 +11,7 @@ class Site
   field :roaming_id
   field :private_key, :type => Binary
   field :public_key, :type => Binary
+  field :title_always_on, :type => Boolean, :default => false
   
   field :school
   field :department
diff --git a/app/views/admin/sites/site_info.html.erb b/app/views/admin/sites/site_info.html.erb
index 93e1a3583..a3ca39353 100644
--- a/app/views/admin/sites/site_info.html.erb
+++ b/app/views/admin/sites/site_info.html.erb
@@ -12,28 +12,29 @@
 				</li>
 			</ul>
 			<div class="tab-content">
+				<%= f.check_box :title_always_on %> <%= t 'admin.always_display_title' %>
 				<% @site_valid_locales.each do |locale|%>
 					<%= content_tag :div, :class	=> "tab-pane #{active_when_current_locale_eq locale}", :id => "#{locale}" do %>
 						<div>
-							<%= t :title %>
+							<%= t 'admin.site_title' %>
 							<%= f.fields_for :title, @site.title do |f| %>
 								<%= f.text_field locale %>
 							<% end %>
 						</div>
 						<div>
-							<%= t :keywords %>
+							<%= t 'admin.keywords' %>
 							<%= f.fields_for :keywords, @site.keywords do |f| %>
 								<%= f.text_field locale %>
 							<% end %>
 						</div>
 						<div>
-							<%= t :description %>
+							<%= t 'admin.site_description' %>
 							<%= f.fields_for :description, @site.description do |f| %>
 								<%= f.text_field locale %>
 							<% end %>
 						</div>
 						<div>
-							<%= t :footer %>
+							<%= t 'admin.site_footer' %>
 							<%= f.fields_for :footer, @site.footer do |f| %>
 								<%= f.text_area locale, :class => "tinymce_textarea" %>
 							<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index eeb5e63ad..862ccf136 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -98,6 +98,7 @@ en:
     admin: Admin
     action: Action
     all_articles: List
+    always_display_title: Always displayed in the title bar
     announcement: Announcement
     asset: Asset
     assets:
@@ -147,6 +148,7 @@ en:
     is_published: Is published
     item: Item
     key: Key
+    keywords: Keywords
     language: Language
     layout: Layout
     layout_name: Layout name
@@ -199,7 +201,10 @@ en:
     setup_translations: Translations setup
     setup_designs: Designs setup
     site: Site
+    site_description: Site description
+    site_footer: Site footer
     site_settings: Site Setting
+    site_title: Site title
     super_pages: Super pages
     structure: Structure
     title: Title
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 661253c4d..27f4a2f63 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -91,6 +91,7 @@ zh_tw:
     add_drop_down_item: ＋增加Orbit選單
     admin: 網站管理者
     all_articles: 列表
+    always_display_title: 永遠顯示於標題列
     announcement: 公告管理
     asset: 資產
     assets:
@@ -144,6 +145,7 @@ zh_tw:
     is_published: 被出版
     item: 網站架構
     key: 關鍵
+    keywords: 關鍵字
     language: 語言
     layout: 佈局
     layout_name: 佈局名字
@@ -189,7 +191,10 @@ zh_tw:
     purchase: 購買
     role: 身份
     roles: 身份
+    site_description: 網站描述
+    site_footer: 網站頁尾
     site_settings: 基本設定
+    site_title: 網站標題
     setup_member: 成員設置
     setup_translations: 語系設定
     setup_designs: 版型設定
diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb
index 04fe2e6c6..6ee096561 100644
--- a/lib/parsers/parser_common.rb
+++ b/lib/parsers/parser_common.rb
@@ -3,46 +3,34 @@ module ParserCommon
 
   def menu_level(page, current, menu, edit = false)
     res = ''
-    if menu.levels > 0 && current <= menu.levels
-      if current != 0
-        res << "<div class='rc_dm'>"
-        item = rand(100000)
-        res << "<a href='#{edit ? admin_page_path(page.id) : page.full_name}' class='dm_ctrl' rel='#{item}'>#{page.i18n_variable[I18n.locale]}<span class='down'></span></a>"
-        if page.children.size > 0
-          res << "<div id='#{item}' class='dm_list #{menu.values['class_#{current}']}'>"
-          res << "<ul class='ini_list'>"
-          i = nil
-          i = 1 if menu.values["li_incremental_#{current}"]
-          page.ordered_and_visible_children.each do |child|
-            res << menu_li(child, current, menu, i, edit)
-            i += 1 if i
-          end
-          res << "</ul>"
-        res << "</div>"
-        end
-        res << "</div>"
-      else
-        res << '<ul>'
-        res << "<li>" + "<a href='#{edit ? admin_page_path(page.id) : page.full_name}' class='dm_ctrl'>#{page.i18n_variable[I18n.locale]}</a>" + "</li>"
-        page.ordered_and_visible_children.each do |child|
-          res << "<li>" + menu_level(child, current + 1, menu, edit) + "</li>"
-        end
-        res << '</ul>'
+    if page.children.size > 0
+      res << "<ul class='"
+      res << menu.values["class_#{current}"] rescue nil
+      res << "'>"
+      i = nil
+      i = 1 if menu.values["li_incremental_#{current}"]
+      if menu.values['home'] && current == 1
+        res << menu_li(page, current, menu, i, edit)
       end
+      page.ordered_and_visible_children.each do |child|
+        res << menu_li(child, current, menu, i, edit)
+        i += 1 if i
+      end
+      res << "</ul>"
     end
     res
   end
   
   def menu_li(page, current, menu, i, edit)
     res = "<li class="
-    res << menu.values["li_class_#{current}"]
+    res << menu.values["li_class_#{current}"] rescue nil
     res << "_#{i}" if i
     res << ">"
-    if page.ordered_and_visible_children.size > 0 
+    res << "<a href='#{edit ? admin_page_path(page.id) : page.full_name}'><span>#{page.i18n_variable[I18n.locale]}</span></a>"
+    if page.ordered_and_visible_children.size > 0 && current <= menu.levels
+      res << "<span class='dot'></span>"
       res << menu_level(page, current + 1, menu, edit)
-    else
-      res << "<a href='#{edit ? admin_page_path(page.id) : page.full_name}' class='nav dm_ctrl'>#{page.i18n_variable[I18n.locale]}</a>"
-    end
+    end unless (page.is_home? rescue nil)
     res << "</li>"
   end
 
@@ -104,7 +92,7 @@ module ParserCommon
     page_menu = body.css('.page_menu').first
     home = get_homepage
     menu = page.design.layout.menu
-    fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 0, menu, edit))
+    fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 1, menu, edit))
     page_menu.swap(fragment)
   end
 
@@ -135,7 +123,7 @@ module ParserCommon
     res << @site.footer[I18n.locale]
     res << "</div>"
     fragment = Nokogiri::HTML::DocumentFragment.new(body ,res)
-    page_footer.swap(fragment)
+    page_footer.swap(fragment) rescue nil
   end
 
 end

From 8a3f0b9bdc84d8a62f8de1ad01ccda6e74ac0021 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 7 May 2012 15:47:14 +0800
Subject: [PATCH 33/39] Add menu_enabled_for: the page can be shown even if
 there's no link in the menu

---
 app/models/item.rb                   | 3 ++-
 app/views/admin/pages/_form.html.erb | 8 ++++++++
 config/locales/en.yml                | 1 +
 config/locales/zh_tw.yml             | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/models/item.rb b/app/models/item.rb
index 8cd8bec03..c8b7812c6 100644
--- a/app/models/item.rb
+++ b/app/models/item.rb
@@ -8,6 +8,7 @@ class Item
   field :position, :type => Integer
   field :is_published, :type => Boolean, :default => false, :index => true
   field :enabled_for, :type => Array, :default => nil 
+  field :menu_enabled_for, :type => Array, :default => nil 
  
   validates_format_of :name, :with => /^[0-9a-zA-Z\-_]+$/
   validates :name, :exclusion => { :in => LIST[:forbidden_item_names] }
@@ -46,7 +47,7 @@ class Item
     a = []
     if objects
       objects.each do |object|
-        a << object if object.enabled_for.nil? ? true : object.enabled_for.include?(I18n.locale.to_s)
+        a << object if object.menu_enabled_for.nil? ? true : object.menu_enabled_for.include?(I18n.locale.to_s)
       end
     end
     a
diff --git a/app/views/admin/pages/_form.html.erb b/app/views/admin/pages/_form.html.erb
index e06afbc98..7aae7c008 100644
--- a/app/views/admin/pages/_form.html.erb
+++ b/app/views/admin/pages/_form.html.erb
@@ -33,6 +33,14 @@
 	<%= f.label :is_published, "#{t('admin.is_published')} ?" %>
 	<%= f.radio_button :is_published, true %>Yes <%= f.radio_button :is_published, false %> No
 </p>
+<p>
+	<%= f.label :menu_enabled_for, "#{t('admin.menu_enabled_for')}:" %>
+	<% @site_valid_locales.each do |valid_locale| %>
+		<%= check_box_tag 'page[menu_enabled_for][]', valid_locale, (@item.menu_enabled_for.nil? ? true : @item.menu_enabled_for.include?(valid_locale)) %>
+		<%= I18nVariable.from_locale(valid_locale) %>
+	<% end %>
+	<%= hidden_field_tag 'page[menu_enabled_for][]', '' %>
+</p>
 <p>
 	<%= f.label :enabled_for, "#{t('admin.enabled_for')}:" %>
 	<% @site_valid_locales.each do |valid_locale| %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 862ccf136..4713415f7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -163,6 +163,7 @@ en:
     list_infos: User information list
     list_roles: User roles list
     member: Member
+    menu_enabled_for: Menu enabled for
     module:
       authorization: Module Authorization
     move_down: Move down
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 27f4a2f63..8e454ec62 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -160,6 +160,7 @@ zh_tw:
     list_infos: 用戶資料列表
     list_roles: 用戶身份列表
     member: 會員
+    menu_enabled_for: 選單啟用
     module:
       authorization: 模組授權
     move_down: 往下移

From f534e6ca7b30f8e639b59e78ea85926c1441b450 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris@rulingcom.com>
Date: Mon, 7 May 2012 15:55:45 +0800
Subject: [PATCH 34/39] Ray's changes for site_info

---
 app/assets/stylesheets/style.css.erb     | 16 ++++++
 app/helpers/application_helper.rb        |  2 +-
 app/views/admin/sites/site_info.html.erb | 71 ++++++++++++++----------
 3 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb
index 06d56c70d..b4410a47f 100644
--- a/app/assets/stylesheets/style.css.erb
+++ b/app/assets/stylesheets/style.css.erb
@@ -636,6 +636,22 @@
 .adbanner-action {
 	margin-bottom: 20px;
 }
+.textarea-height-s {
+	resize: none;
+	max-height: 150px;
+}
+.textarea-height-m {
+	resize: none;
+	max-height: 250px;
+}
+.textarea-height-l {
+	resize: none;
+	max-height: 350px;
+}
+.textarea-height-xl {
+	resize: none;
+	max-height: 500px;
+}
 [class^="icons-"] {
 	display: inline-block;
 	width: 16px;
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8829dfef2..ffb0d8570 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -150,7 +150,7 @@ module ApplicationHelper
   end
 
   def active_when_current_locale_eq(locale)
-    locale.to_sym == I18n.locale ? 'active': ''
+    locale.to_sym == I18n.locale ? 'active in': ''
   end
 
 end
diff --git a/app/views/admin/sites/site_info.html.erb b/app/views/admin/sites/site_info.html.erb
index 93e1a3583..a29eccb3d 100644
--- a/app/views/admin/sites/site_info.html.erb
+++ b/app/views/admin/sites/site_info.html.erb
@@ -1,4 +1,5 @@
-<%= form_for @site, :url => admin_site_path(@site) do |f| %>
+<div id="poststuff">
+<%= form_for @site, :url => admin_site_path(@site), :html => {:class => "clear"} do |f| %>
 	<div id="post-body">
 		<div id="post-body-content" class="clear">
 			<ul class="nav nav-tabs">
@@ -6,43 +7,53 @@
 				<%#= raise @site_valid_locales.inspect %>
 					<%= content_tag :li, link_to(I18nVariable.from_locale(locale), "##{locale}", :data => {:toggle => "tab"}), :class => (active_when_current_locale_eq locale)  %>
 				<% end %>
-				<li>
-					<%= f.submit t("submit"), :class => "btn btn-primary" %>
-					<%= f.submit t("cancel"), :class => "btn ", :type => 'reset' %>
-				</li>
 			</ul>
-			<div class="tab-content">
+			<div class="tab-content form-horizontal">
 				<% @site_valid_locales.each do |locale|%>
-					<%= content_tag :div, :class	=> "tab-pane #{active_when_current_locale_eq locale}", :id => "#{locale}" do %>
-						<div>
-							<%= t :title %>
-							<%= f.fields_for :title, @site.title do |f| %>
-								<%= f.text_field locale %>
-							<% end %>
+					<%= content_tag :div, :class	=> "tab-pane fade #{active_when_current_locale_eq locale}", :id => "#{locale}" do %>
+						<div class="control-group">
+							<label class="control-label"><%= t :title %></label>
+							<div class="controls">
+								<%= f.fields_for :title, @site.title do |f| %>
+									<%= f.text_field locale, :class => "input-xxlarge" %>
+								<% end %>
+								<p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p>
+							</div>
 						</div>
-						<div>
-							<%= t :keywords %>
-							<%= f.fields_for :keywords, @site.keywords do |f| %>
-								<%= f.text_field locale %>
-							<% end %>
+						<div class="control-group">
+							<label class="control-label"><%= t :keywords %></label>
+							<div class="controls">
+								<%= f.fields_for :keywords, @site.keywords do |f| %>
+									<%= f.text_area locale, :class => "input-xxlarge textarea-height-s" %>
+								<% end %>
+								<p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p>
+							</div>
 						</div>
-						<div>
-							<%= t :description %>
-							<%= f.fields_for :description, @site.description do |f| %>
-								<%= f.text_field locale %>
-							<% end %>
+						<div class="control-group">
+							<label class="control-label"><%= t :description %></label>
+							<div class="controls">
+								<%= f.fields_for :description, @site.description do |f| %>
+									<%= f.text_area locale, :class => "input-xxlarge textarea-height-s" %>
+								<% end %>
+								<p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p>
+							</div>
 						</div>
-						<div>
-							<%= t :footer %>
-							<%= f.fields_for :footer, @site.footer do |f| %>
-								<%= f.text_area locale, :class => "tinymce_textarea" %>
-							<% end %>
+						<div class="control-group">
+							<label class="control-label"><%= t :footer %></label>
+							<div class="controls">
+								<%= f.fields_for :footer, @site.footer do |f| %>
+									<%= f.text_area locale, :class => "tinymce_textarea input-xxlarge" %>
+								<% end %>
+							</div>
 						</div>
 					<% end %>
 				<% end %>
-				</div>
-				
 			</div>
 		</div>
 	</div>
-<% end %>
\ No newline at end of file
+	<div class="form-actions">
+		<%= f.submit t("submit"), :class => "btn btn-primary" %>
+		<%= f.submit t("cancel"), :class => "btn ", :type => 'reset' %>
+	</div>
+<% end %>
+</div>
\ No newline at end of file

From 4c7a3842d6a021dad03d9eee8c0b561bd8ee73b9 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 7 May 2012 15:58:52 +0800
Subject: [PATCH 35/39] Add drop_down to news_bulletin widget index for
 categories

---
 .../news/widget/news_bulletins/index.html.erb     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/index.html.erb b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/index.html.erb
index 756d71023..0c050e13d 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/index.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/index.html.erb
@@ -2,7 +2,20 @@
 
 <% if @news_bulletins and !@news_bulletins.nil? %>
 	<h2 class="topic_title"><%= t('news.campus_news')%></h2>
-	<%= link_to t('news.more'),panel_news_front_end_news_bulletins_path(), :class => "topic_note" %>
+	<%#= link_to t('news.more'),panel_news_front_end_news_bulletins_path(), :class => "topic_note" %>
+	<div class="btn-group">
+	  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+	    <%= t('news.more') %>
+	    <span class="caret"></span>
+	  </a>
+	  <ul class="dropdown-menu">
+	    <% @news_bulletin_categorys.each do |category| %>
+	    	<li>
+	    		<%= link_to category.i18n_variable[I18n.locale], panel_news_front_end_news_bulletins_path(:category_id => category.id) %>
+	    	</li>
+	    <% end %>
+	  </ul>
+	</div>
 	<div class="topic_prev">previous page</div>
 	<div class="topic_next">next page</div>
 	<ul id="topic_list">

From 469f5c826762641ebaa12f251ddb74826eebbb7e Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 7 May 2012 16:29:32 +0800
Subject: [PATCH 36/39] Add always_display checkbox for title in site_info
 independent of i18n

---
 app/views/admin/sites/site_info.html.erb | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/views/admin/sites/site_info.html.erb b/app/views/admin/sites/site_info.html.erb
index 49b15f649..64916d4da 100644
--- a/app/views/admin/sites/site_info.html.erb
+++ b/app/views/admin/sites/site_info.html.erb
@@ -5,15 +5,19 @@
 			<ul class="nav nav-tabs">
 				<% @site_valid_locales.each do |locale|%>
 				<%#= raise @site_valid_locales.inspect %>
-					<%= content_tag :li, link_to(I18nVariable.from_locale(locale), "##{locale}", :data => {:toggle => "tab"}), :class => (active_when_current_locale_eq locale)  %>
+					<%= content_tag :li, link_to(I18nVariable.from_locale(locale), ".#{locale}", :data => {:toggle => "tab"}), :class => (active_when_current_locale_eq locale)  %>
 				<% end %>
 			</ul>
 			<div class="tab-content form-horizontal">
-				<%= f.check_box :title_always_on %> <%= t 'admin.always_display_title' %>
+				<div class="control-group">
+					<label class="control-label"><%= t 'admin.site_title' %></label>
+					<div class="controls">
+						<%= f.check_box :title_always_on %> <%= t 'admin.always_display_title' %>
+					</div>
+				</div>
 				<% @site_valid_locales.each do |locale|%>
-					<%= content_tag :div, :class	=> "tab-pane fade #{active_when_current_locale_eq locale}", :id => "#{locale}" do %>
+					<%= content_tag :div, :class	=> "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
 						<div class="control-group">
-							<label class="control-label"><%= t 'admin.site_title' %></label>
 							<div class="controls">
 								<%= f.fields_for :title, @site.title do |f| %>
 									<%= f.text_field locale, :class => "input-xxlarge" %>
@@ -21,6 +25,10 @@
 								<p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p>
 							</div>
 						</div>
+					<% end %>
+				<% end %>
+				<% @site_valid_locales.each do |locale|%>
+					<%= content_tag :div, :class	=> "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
 						<div class="control-group">
 							<label class="control-label"><%= t 'admin.keywords' %></label>
 							<div class="controls">

From ca88d0e01b29f985e0ee1cf184b7a06822b6e5d6 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 7 May 2012 17:29:56 +0800
Subject: [PATCH 37/39] Fix bug that was never displaying preview

---
 .../app/helpers/panel/announcement/back_end/bulletins_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb
index 5dcf39d3a..8e6b9bff9 100644
--- a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb
+++ b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb
@@ -2,7 +2,7 @@ module Panel::Announcement::BackEnd::BulletinsHelper
   
   def show_approval_link(bulletin)
     by_bulletin = (!bulletin.is_expired? and !bulletin.is_checked?)
-    by_user = bulletin.bulletin_category.authed_users('fact_check').include?(current_user) or is_manager?
+    by_user = (bulletin.bulletin_category.authed_users('fact_check').include?(current_user) or is_manager?)
     by_bulletin and  by_user
   end
 

From 2aaff21000036998ca63c2195e75b3496bd34455 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 7 May 2012 23:23:17 +0800
Subject: [PATCH 38/39] Add missing class in widget news_bulletin/index

---
 .../app/views/panel/news/widget/news_bulletins/index.html.erb   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/index.html.erb b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/index.html.erb
index 0c050e13d..2103f997c 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/index.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/index.html.erb
@@ -3,7 +3,7 @@
 <% if @news_bulletins and !@news_bulletins.nil? %>
 	<h2 class="topic_title"><%= t('news.campus_news')%></h2>
 	<%#= link_to t('news.more'),panel_news_front_end_news_bulletins_path(), :class => "topic_note" %>
-	<div class="btn-group">
+	<div class="btn-group topic_note">
 	  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
 	    <%= t('news.more') %>
 	    <span class="caret"></span>

From ba4385e3fd682887c7d20d81f28f1fa3b0940996 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Tue, 8 May 2012 10:50:09 +0800
Subject: [PATCH 39/39] Add module authorization for news Add files and links
 to announcement and news Change page.children into
 page.ordered_and_visible_children in parser_commom

---
 app/views/layouts/_side_bar.html.erb          |  1 +
 lib/parsers/parser_common.rb                  |  2 +-
 .../front_end/bulletins/show.html.erb         | 64 ++++---------------
 .../front_end/news_bulletins/show.html.erb    | 64 ++++---------------
 4 files changed, 26 insertions(+), 105 deletions(-)

diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index f127a73c0..c38388271 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -27,6 +27,7 @@
 		<%= content_tag :li, link_to(t('announcement.categories'), panel_news_back_end_news_bulletin_categorys_path), :class => active_for_action('news_bulletin_categorys', 'index') %>
 		<%= content_tag :li, link_to(t('announcement.tags'), panel_news_back_end_tags_path), :class => active_for_action('/panel/news/back_end/tags', 'index') %>
 		<%= content_tag :li, link_to(t('announcement.news_bulletin.approval_setting'), panel_news_back_end_news_approval_setting_path), :class => active_for_action('news_approvals', 'setting')  if (is_manager? rescue nil) %>
+		<%= content_tag :li, link_to(t('admin.module.authorization'),edit_admin_module_app_path(ModuleApp.first(conditions: {key: "news"}))), :class => active_sys_call_for_app('module_apps','edit','news') if (is_admin? rescue nil) %>
 	<% end -%>
 
 <% end -%>
diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb
index 6ee096561..41d57cbb6 100644
--- a/lib/parsers/parser_common.rb
+++ b/lib/parsers/parser_common.rb
@@ -3,7 +3,7 @@ module ParserCommon
 
   def menu_level(page, current, menu, edit = false)
     res = ''
-    if page.children.size > 0
+    if page.ordered_and_visible_children.size > 0
       res << "<ul class='"
       res << menu.values["class_#{current}"] rescue nil
       res << "'>"
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
index 5c0857cd0..c6d0c06d2 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
@@ -14,58 +14,18 @@
 <div class="news_paragraph">
 	<%= @bulletin.text[I18n.locale].html_safe %>
 </div>
+
+<b><%= t('announcement.link') %></b>
+<% @bulletin.bulletin_links.each do | blink | %>
+  <%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %>
+<% end %>
+</li>
+<li>
+<b><%= t('announcement.file') %></b>
+<% @bulletin.bulletin_files.each do | bfile | %>
+<%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
+<% end %>
+
 <div class="fb">
 	<iframe src="//www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.nccu.edu.tw&amp;send=false&amp;layout=standard&amp;width=450&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font&amp;height=35&amp;appId=263319013700607" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:450px; height:35px;" allowTransparency="true"></iframe>
 </div>
-<!--
-<p id="notice"><%= flash_messages %></p>
-
-<ul>
-	<li>
-  <b><%= t('announcement.category') %></b>
-  <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] %>
-	</li>
-	<li>
-  <b><%= t('announcement.postdate') %></b>
-  <%= @bulletin.postdate %>
-	</li>
-	<li>
-  <b><%= t('announcement.title') %></b>
-  <%= @bulletin.title[I18n.locale] %>
-	</li>
-	<li>
-  <%#= image_tag(@bulletin.image.url, :size => "320x240") if @bulletin.image.file %>
-  <%= link_to image_tag(@bulletin.image.url, :size => "320x240"), @bulletin.image.url, {:target => '_blank', :title => @bulletin.image_identifier} if @bulletin.image.file %>
-	</li>
-	<li>
-  <b><%= t('announcement.subtitle') %></b>
-  <%= @bulletin.subtitle[I18n.locale].html_safe %>
-	</li>
-	<li>
-  <b><%= t('announcement.text') %></b>
-  <%= @bulletin.text[I18n.locale].html_safe %>
-	</li>
-	<li>
-	<li>
-	<b><%= t('announcement.link') %></b>
-	<% @bulletin.bulletin_links.each do | blink | %>
-    <%= link_to blink.name, blink.url, :target => '_blank' %>
-	<% end %>
-	</li>
-	<li>
-	<b><%= t('announcement.file') %></b>
-	<% @bulletin.bulletin_files.each do | bfile | %>
-	<%= link_to bfile.filetitle, bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
-	<% end %>
-	</li>
-	<li>
-  <b><%= t('announcement.張貼者') %></b>
-  <%= User.find(@bulletin.create_user_id).name %>
-	</li>
-	<li>
-  <b><%= t('announcement.最後修改時間') %></b>
-  <%= @bulletin.updated_at.strftime("%Y-%m-%d %H:%I:%S") %>
-	</li>
--->
-
-<%#= link_back %>
diff --git a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb
index 67bfb396c..14659c077 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb
@@ -14,58 +14,18 @@
 <div class="news_paragraph">
 	<%= @news_bulletin.text[I18n.locale].html_safe %>
 </div>
+
+<b><%= t('announcement.link') %></b>
+<% @news_bulletin.bulletin_links.each do | blink | %>
+  <%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %>
+<% end %>
+</li>
+<li>
+<b><%= t('announcement.file') %></b>
+<% @news_bulletin.bulletin_files.each do | bfile | %>
+<%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
+<% end %>
+
 <div class="fb">
 	<iframe src="//www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.nccu.edu.tw&amp;send=false&amp;layout=standard&amp;width=450&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font&amp;height=35&amp;appId=263319013700607" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:450px; height:35px;" allowTransparency="true"></iframe>
 </div>
-<!--
-<p id="notice"><%= flash_messages %></p>
-
-<ul>
-	<li>
-  <b><%= t('news.category') %></b>
-  <%= @news_bulletin.news_bulletin_category.i18n_variable[I18n.locale] %>
-	</li>
-	<li>
-  <b><%= t('news.postdate') %></b>
-  <%= @news_bulletin.postdate %>
-	</li>
-	<li>
-  <b><%= t('news.title') %></b>
-  <%= @news_bulletin.title[I18n.locale] %>
-	</li>
-	<li>
-  <%#= image_tag(@news_bulletin.image.url, :size => "320x240") if @news_bulletin.image.file %>
-  <%= link_to image_tag(@news_bulletin.image.url, :size => "320x240"), @news_bulletin.image.url, {:target => '_blank', :title => @news_bulletin.image_identifier} if @news_bulletin.image.file %>
-	</li>
-	<li>
-  <b><%= t('news.subtitle') %></b>
-  <%= @news_bulletin.subtitle[I18n.locale].html_safe %>
-	</li>
-	<li>
-  <b><%= t('news.text') %></b>
-  <%= @news_bulletin.text[I18n.locale].html_safe %>
-	</li>
-	<li>
-	<li>
-	<b><%= t('news.link') %></b>
-	<% @news_bulletin.news_bulletin_links.each do | blink | %>
-    <%= link_to blink.name, blink.url, :target => '_blank' %>
-	<% end %>
-	</li>
-	<li>
-	<b><%= t('news.file') %></b>
-	<% @news_bulletin.news_bulletin_files.each do | bfile | %>
-	<%= link_to bfile.filetitle, bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
-	<% end %>
-	</li>
-	<li>
-  <b><%= t('news.張貼者') %></b>
-  <%= User.find(@news_bulletin.create_user_id).name %>
-	</li>
-	<li>
-  <b><%= t('news.最後修改時間') %></b>
-  <%= @news_bulletin.updated_at.strftime("%Y-%m-%d %H:%I:%S") %>
-	</li>
--->
-
-<%#= link_back %>