From 0306277c3d901fe0a77f37695380aaad39a52bb0 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Fri, 18 May 2012 10:50:53 +0800
Subject: [PATCH 01/27] fix view for different_user for ad_banner. add field
 'best size' for ad_banner within form

---
 app/controllers/admin/ad_banners_controller.rb        |  2 +-
 app/controllers/admin/ad_images_controller.rb         |  6 +++---
 app/views/admin/ad_banners/_ad_banner_tab.html.erb    |  4 ++++
 .../admin/ad_banners/_modal_ad_banner_form.html.erb   |  7 +++++++
 app/views/admin/ad_banners/index.html.erb             | 11 ++++++++---
 app/views/admin/ad_images/_form.html.erb              |  5 ++++-
 config/locales/en.yml                                 |  1 +
 config/locales/zh_tw.yml                              |  1 +
 8 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/app/controllers/admin/ad_banners_controller.rb b/app/controllers/admin/ad_banners_controller.rb
index cd436a12..f43c19e5 100644
--- a/app/controllers/admin/ad_banners_controller.rb
+++ b/app/controllers/admin/ad_banners_controller.rb
@@ -1,7 +1,7 @@
 class Admin::AdBannersController < OrbitBackendController
   layout "new_admin"
   before_filter :authenticate_user!
-  before_filter :for_app_manager,:except => [:index,:show] 
+  before_filter :for_app_manager,:except => [:index,:show,:update,:realtime_preview] 
   before_filter :for_app_sub_manager
 
   def rename
diff --git a/app/controllers/admin/ad_images_controller.rb b/app/controllers/admin/ad_images_controller.rb
index 945629ed..e3cef303 100644
--- a/app/controllers/admin/ad_images_controller.rb
+++ b/app/controllers/admin/ad_images_controller.rb
@@ -1,8 +1,8 @@
-class Admin::AdImagesController < ApplicationController
+class Admin::AdImagesController < OrbitBackendController
   layout 'new_admin'
   before_filter :authenticate_user!
-  before_filter :is_admin?
-  
+  before_filter :for_app_sub_manager
+
   def edit
     @ad_banner = AdBanner.find params[:ad_banner_id]
     @ad_image = @ad_banner.ad_images.find params[:id]
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 ca98e42e..d65a17e0 100644
--- a/app/views/admin/ad_banners/_ad_banner_tab.html.erb
+++ b/app/views/admin/ad_banners/_ad_banner_tab.html.erb
@@ -7,6 +7,10 @@
 			<%= f.select :ad_fx ,AdBanner::FX_TYPES %>
 			<%= f.label :transition_sec, t('admin.ad.transition_sec') %>
 			<%= f.text_field :transition_sec,:placeholder=>t('admin.ad.sec_place_holder'),:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %>
+			<%if  at_least_module_manager%>
+				<%= f.label :best_size, t('admin.ad.best_size') %>
+				<%= f.text_field :best_size %> Ex: 500px x 300px
+			<% end -%>
 			<br>
 			<%= f.submit t("admin.ad.update_banner"), :class => 'btn' %>
 			<%= f.submit t("cancel"),:type=>'reset', :class => 'btn'  %>
diff --git a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
index cbc4de8e..68e0a9c6 100644
--- a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
+++ b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
@@ -21,6 +21,13 @@
 				<%= f.text_field :transition_sec %> <%= t("admin.ad.trans_unit_sec") %>
 			</div>
 		</div>
+
+		<div class="control-group">
+			<%= f.label :best_size, t('admin.ad.best_size'),:class => "control-label" %>
+			<div class="controls">
+				<%= f.text_field :best_size %> Ex: 500px x 300px
+			</div>
+		</div>
 		
 		<div class="control-group">
 			<%= f.label :ad_fx, t('admin.ad.ab_fx') %>
diff --git a/app/views/admin/ad_banners/index.html.erb b/app/views/admin/ad_banners/index.html.erb
index b4be090f..92c78f5b 100644
--- a/app/views/admin/ad_banners/index.html.erb
+++ b/app/views/admin/ad_banners/index.html.erb
@@ -13,11 +13,16 @@
 	<ul id="banner_tab" class="nav nav-tabs">
 		<% @ad_banners.each do |ab| %>
 			<%= content_tag :li ,:class => (ab ==  @active ? 'active' : nil) do %>
-				<i class="icons-pencil"></i>
-				<%= link_to(ab.title,"##{ab.title.dehumanize}",:contenteditable=>"false",:data=>{:toggle=>"tab" ,'edit-url' =>(admin_rename_ad_banner_path ab) } )%>
+				<%if  at_least_module_manager%>	
+					<i class="icons-pencil"></i>
+					<%= link_to(ab.title,"##{ab.title.dehumanize}",:contenteditable=>"false",:data=>{:toggle=>"tab" ,'edit-url' =>(admin_rename_ad_banner_path ab) } )%>
+				<% else %>
+					<%= link_to(ab.title,"##{ab.title.dehumanize}",:data=>{:toggle=>"tab" } )%>
+				<% end -%>
 			<% end -%>
 		<% end -%>
-		<%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"modal"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) %>
+		
+		<%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"modal"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) if  at_least_module_manager%>
 		
 	</ul>
 	
diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb
index 1513fa05..edbb2563 100644
--- a/app/views/admin/ad_images/_form.html.erb
+++ b/app/views/admin/ad_images/_form.html.erb
@@ -80,7 +80,10 @@
               <!--請程式務必將圖片尺寸加入到行內裡-->
               <%= image_tag @ad_image.file rescue ''%>
             </div>
-            <span class="alert widgetInfo"><%= t("admin.ad.widget_info_for_ad_image_size",:best_size=> @ad_image.ad_banner.best_size) if !@ad_image.ad_banner.best_size.empty?%></span>
+            <% if !@ad_image.ad_banner.best_size.empty?%>
+              <span class="alert widgetInfo"><%= t("admin.ad.widget_info_for_ad_image_size",:best_size=> @ad_image.ad_banner.best_size) %>
+              </span>
+              <% end -%>
             <div class="controls file-upload input-prepend">
               <label class="control-label add-on btn" for="input-upload">
 								<%= t(:browse) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 15598a8e..2b4fac5d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -91,6 +91,7 @@ en:
       ab_fx: FX
       all_banners: AdBanner list
       banner_best_size: Banner Best Size
+      best_size: Best size
       new_banner: New banner
       new_image: New image
       showing: Showing
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 72140d35..e9de6f11 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -85,6 +85,7 @@ zh_tw:
       ab_fx: 轉場特效
       all_banners: 輪播清單
       banner_best_size: Banner 尺寸
+      best_size: 最佳尺寸
       cate_auth: 分類授權
       delete_banner: 刪除整組輪播
       new_banner: 新增輪播

From 7c6b8071709a3f4149cfa9afbaee866e613450e6 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Fri, 18 May 2012 14:13:11 +0800
Subject: [PATCH 02/27] Change impression count to exclude when :referrer is
 nil

---
 app/controllers/admin/dashboards_controller.rb         |  4 ++--
 app/helpers/application_helper.rb                      |  2 +-
 config/mongoid.yml                                     |  4 ++--
 .../lib/impressionist/models/mongoid/impression.rb     | 10 ++++++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/controllers/admin/dashboards_controller.rb b/app/controllers/admin/dashboards_controller.rb
index 50bbd1aa..991f19af 100644
--- a/app/controllers/admin/dashboards_controller.rb
+++ b/app/controllers/admin/dashboards_controller.rb
@@ -30,7 +30,7 @@ class Admin::DashboardsController < ApplicationController
   		module_app_class = module_app.classify.constantize
   		objects = module_app_class.order_by(:updated_at, :desc).limit(10)
   		objects.each do |object|
-  			a.merge!(object => object.updated_at)
+  			a.merge!(object => object.updated_at) unless (object.archived rescue nil)
   		end
   	end
   	sorted_objects = a.sort {|a,b| b[1]<=>a[1]}
@@ -43,7 +43,7 @@ class Admin::DashboardsController < ApplicationController
       module_app_class = module_app.classify.constantize
       objects = module_app_class.order_by(:view_count, :desc).limit(10)
       objects.each do |object|
-        a.merge!(object => object.view_count) if object.view_count > 0
+        a.merge!(object => object.view_count) if object.view_count > 0 && (!object.archived rescue true)
       end
     end
     sorted_objects = a.sort {|a,b| b[1]<=>a[1]}
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index fc93c29a..8f651392 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -181,7 +181,7 @@ module ApplicationHelper
   end
 
   def display_visitors(options={})
-    Impression.where(options).distinct(:session_hash).count
+    Impression.where(options).and(:referrer.ne => nil).distinct(:session_hash).count
   end
 
   def display_visitors_today
diff --git a/config/mongoid.yml b/config/mongoid.yml
index 16405831..ecc3648d 100644
--- a/config/mongoid.yml
+++ b/config/mongoid.yml
@@ -8,7 +8,7 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: prototype_r4_ldap0229
+  database: bob
 
 test:
   <<: *defaults
@@ -22,4 +22,4 @@ production:
   # password: <%= ENV['MONGOID_PASSWORD'] %>
   # database: <%= ENV['MONGOID_DATABASE'] %>
   <<: *defaults
-  database: prototype_r4_ldap0229
+  database: prototype_r4_development
diff --git a/vendor/impressionist/lib/impressionist/models/mongoid/impression.rb b/vendor/impressionist/lib/impressionist/models/mongoid/impression.rb
index 5edc2edd..9a2d958c 100644
--- a/vendor/impressionist/lib/impressionist/models/mongoid/impression.rb
+++ b/vendor/impressionist/lib/impressionist/models/mongoid/impression.rb
@@ -27,11 +27,13 @@ class Impression
   private
 
   def update_impressions_counter_cache
-    impressionable_class = self.impressionable_type.constantize
+    if self.referrer
+      impressionable_class = self.impressionable_type.constantize
 
-    if impressionable_class.impressionist_counter_cache_options
-      resouce = impressionable_class.find(self.impressionable_id)
-      resouce.try(:update_impressionist_counter_cache)
+      if impressionable_class.impressionist_counter_cache_options
+        resouce = impressionable_class.find(self.impressionable_id)
+        resouce.try(:update_impressionist_counter_cache)
+      end
     end
   end
 end

From 5f6696a358ce6b2e4aca1a41523809d2362c6239 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Fri, 18 May 2012 10:50:53 +0800
Subject: [PATCH 03/27] fix view for different_user for ad_banner. add field
 'best size' for ad_banner within form

---
 app/controllers/admin/ad_banners_controller.rb        |  2 +-
 app/controllers/admin/ad_images_controller.rb         |  6 +++---
 app/views/admin/ad_banners/_ad_banner_tab.html.erb    |  4 ++++
 .../admin/ad_banners/_modal_ad_banner_form.html.erb   |  7 +++++++
 app/views/admin/ad_banners/index.html.erb             | 11 ++++++++---
 app/views/admin/ad_images/_form.html.erb              |  5 ++++-
 config/locales/en.yml                                 |  1 +
 config/locales/zh_tw.yml                              |  1 +
 8 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/app/controllers/admin/ad_banners_controller.rb b/app/controllers/admin/ad_banners_controller.rb
index cd436a12..f43c19e5 100644
--- a/app/controllers/admin/ad_banners_controller.rb
+++ b/app/controllers/admin/ad_banners_controller.rb
@@ -1,7 +1,7 @@
 class Admin::AdBannersController < OrbitBackendController
   layout "new_admin"
   before_filter :authenticate_user!
-  before_filter :for_app_manager,:except => [:index,:show] 
+  before_filter :for_app_manager,:except => [:index,:show,:update,:realtime_preview] 
   before_filter :for_app_sub_manager
 
   def rename
diff --git a/app/controllers/admin/ad_images_controller.rb b/app/controllers/admin/ad_images_controller.rb
index 945629ed..e3cef303 100644
--- a/app/controllers/admin/ad_images_controller.rb
+++ b/app/controllers/admin/ad_images_controller.rb
@@ -1,8 +1,8 @@
-class Admin::AdImagesController < ApplicationController
+class Admin::AdImagesController < OrbitBackendController
   layout 'new_admin'
   before_filter :authenticate_user!
-  before_filter :is_admin?
-  
+  before_filter :for_app_sub_manager
+
   def edit
     @ad_banner = AdBanner.find params[:ad_banner_id]
     @ad_image = @ad_banner.ad_images.find params[:id]
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 ca98e42e..d65a17e0 100644
--- a/app/views/admin/ad_banners/_ad_banner_tab.html.erb
+++ b/app/views/admin/ad_banners/_ad_banner_tab.html.erb
@@ -7,6 +7,10 @@
 			<%= f.select :ad_fx ,AdBanner::FX_TYPES %>
 			<%= f.label :transition_sec, t('admin.ad.transition_sec') %>
 			<%= f.text_field :transition_sec,:placeholder=>t('admin.ad.sec_place_holder'),:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %>
+			<%if  at_least_module_manager%>
+				<%= f.label :best_size, t('admin.ad.best_size') %>
+				<%= f.text_field :best_size %> Ex: 500px x 300px
+			<% end -%>
 			<br>
 			<%= f.submit t("admin.ad.update_banner"), :class => 'btn' %>
 			<%= f.submit t("cancel"),:type=>'reset', :class => 'btn'  %>
diff --git a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
index cbc4de8e..68e0a9c6 100644
--- a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
+++ b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
@@ -21,6 +21,13 @@
 				<%= f.text_field :transition_sec %> <%= t("admin.ad.trans_unit_sec") %>
 			</div>
 		</div>
+
+		<div class="control-group">
+			<%= f.label :best_size, t('admin.ad.best_size'),:class => "control-label" %>
+			<div class="controls">
+				<%= f.text_field :best_size %> Ex: 500px x 300px
+			</div>
+		</div>
 		
 		<div class="control-group">
 			<%= f.label :ad_fx, t('admin.ad.ab_fx') %>
diff --git a/app/views/admin/ad_banners/index.html.erb b/app/views/admin/ad_banners/index.html.erb
index b4be090f..92c78f5b 100644
--- a/app/views/admin/ad_banners/index.html.erb
+++ b/app/views/admin/ad_banners/index.html.erb
@@ -13,11 +13,16 @@
 	<ul id="banner_tab" class="nav nav-tabs">
 		<% @ad_banners.each do |ab| %>
 			<%= content_tag :li ,:class => (ab ==  @active ? 'active' : nil) do %>
-				<i class="icons-pencil"></i>
-				<%= link_to(ab.title,"##{ab.title.dehumanize}",:contenteditable=>"false",:data=>{:toggle=>"tab" ,'edit-url' =>(admin_rename_ad_banner_path ab) } )%>
+				<%if  at_least_module_manager%>	
+					<i class="icons-pencil"></i>
+					<%= link_to(ab.title,"##{ab.title.dehumanize}",:contenteditable=>"false",:data=>{:toggle=>"tab" ,'edit-url' =>(admin_rename_ad_banner_path ab) } )%>
+				<% else %>
+					<%= link_to(ab.title,"##{ab.title.dehumanize}",:data=>{:toggle=>"tab" } )%>
+				<% end -%>
 			<% end -%>
 		<% end -%>
-		<%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"modal"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) %>
+		
+		<%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"modal"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) if  at_least_module_manager%>
 		
 	</ul>
 	
diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb
index 1513fa05..edbb2563 100644
--- a/app/views/admin/ad_images/_form.html.erb
+++ b/app/views/admin/ad_images/_form.html.erb
@@ -80,7 +80,10 @@
               <!--請程式務必將圖片尺寸加入到行內裡-->
               <%= image_tag @ad_image.file rescue ''%>
             </div>
-            <span class="alert widgetInfo"><%= t("admin.ad.widget_info_for_ad_image_size",:best_size=> @ad_image.ad_banner.best_size) if !@ad_image.ad_banner.best_size.empty?%></span>
+            <% if !@ad_image.ad_banner.best_size.empty?%>
+              <span class="alert widgetInfo"><%= t("admin.ad.widget_info_for_ad_image_size",:best_size=> @ad_image.ad_banner.best_size) %>
+              </span>
+              <% end -%>
             <div class="controls file-upload input-prepend">
               <label class="control-label add-on btn" for="input-upload">
 								<%= t(:browse) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 15598a8e..2b4fac5d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -91,6 +91,7 @@ en:
       ab_fx: FX
       all_banners: AdBanner list
       banner_best_size: Banner Best Size
+      best_size: Best size
       new_banner: New banner
       new_image: New image
       showing: Showing
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 72140d35..e9de6f11 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -85,6 +85,7 @@ zh_tw:
       ab_fx: 轉場特效
       all_banners: 輪播清單
       banner_best_size: Banner 尺寸
+      best_size: 最佳尺寸
       cate_auth: 分類授權
       delete_banner: 刪除整組輪播
       new_banner: 新增輪播

From e1bd5d8c8d8b3e9c8f5613f0f7529b99c2d7c01e Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Fri, 18 May 2012 16:46:47 +0800
Subject: [PATCH 04/27] Put back db prototype_r4_development

---
 config/mongoid.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mongoid.yml b/config/mongoid.yml
index ecc3648d..f333e2e6 100644
--- a/config/mongoid.yml
+++ b/config/mongoid.yml
@@ -8,7 +8,7 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: bob
+  database: prototype_r4_development
 
 test:
   <<: *defaults

From 6ce6577e83702ce375d4f869f7c3d1bb96a145f3 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Fri, 18 May 2012 18:47:18 +0800
Subject: [PATCH 05/27] fix news approve and preview

---
 app/views/layouts/_side_bar.html.erb          |  2 +-
 .../back_end/approvals_controller.rb          |  4 +-
 .../front_end/bulletins_controller.rb         |  1 -
 .../back_end/approvals/setting.html.erb       |  2 -
 .../back_end/news_approvals_controller.rb     | 21 ++++++++-
 .../front_end/news_bulletins_controller.rb    |  3 +-
 .../news/back_end/news_bulletins_helper.rb    |  2 +-
 .../news_approvals/_modal_list.html.erb       | 44 +++++++++++++++++++
 .../news_approvals/_privilege_user.html.erb   |  2 +-
 .../back_end/news_approvals/setting.html.erb  | 14 +++---
 .../news_approvals/update_setting.js.erb      |  1 +
 .../back_end/news_approvals/user_list.js.erb  |  2 +
 .../news_bulletins/_news_bulletin.html.erb    |  2 +-
 vendor/built_in_modules/news/config/routes.rb | 11 ++---
 14 files changed, 87 insertions(+), 24 deletions(-)
 create mode 100644 vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/_modal_list.html.erb
 create mode 100644 vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/update_setting.js.erb
 create mode 100644 vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/user_list.js.erb

diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index ab5981a8..8518688a 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -26,7 +26,7 @@
 		<%= 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') || active_for_ob_auths_object("NewsBulletinCategory") %>
 		<%= 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.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('announcement.bulletin.approval_setting'), panel_news_back_end_approval_setting_path), :class => active_for_action('news_approvals', 'setting')  if (is_manager? rescue nil) %>
 		<%= content_tag :li, link_to(t('admin.module.authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "news"}))), :class => active_for_app_auth('news') if (is_admin? rescue nil) %>
 	<% end -%>
 
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 e5c92023..0177cd12 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
@@ -31,9 +31,9 @@ class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendControlle
   def update_setting
     object_auth = update_setting_by_params
     if object_auth.save!
-      flash[:notice] = "Update Done"
+      flash[:notice] = t("admin.object_auth.update_done")
     else
-      flash[:notice] = "Update Failed"
+      flash[:notice] = t("admin.object_auth.update_failed")
     end
   end
   
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 f21c1a38..9fd97b9b 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
@@ -38,7 +38,6 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
   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/setting.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/setting.html.erb
index 9e6c7225..57d3105b 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/setting.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/setting.html.erb
@@ -16,11 +16,9 @@
                 <%= select "category",'id',@options_from_collection_for_select_bulletin_categorys %>
 								<%= search_field_tag 'user_filter' %>
             </div>
-
         </li>
     </ul>
 		<%= link_to t("announcement.bulletin.approval_user_list"), panel_announcement_back_end_approval_user_list_path , :class=>'preview_trigger btn btn-success pull-right'%>	
-
 </div>
 <%#= label_tag :role, t("admin.roles") %>
 <div class="clear">
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 80838ec5..20a3d3eb 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
@@ -4,7 +4,7 @@ class Panel::News::BackEnd::NewsApprovalsController  < OrbitBackendController
   include AdminHelper
   
   def preview_and_approve
-    @bulletin = NewsBulletin.find params[:bulletin_id]
+    @news_bulletin = NewsBulletin.find params[:news_bulletin_id]
   end
   
   def approve
@@ -35,10 +35,27 @@ class Panel::News::BackEnd::NewsApprovalsController  < OrbitBackendController
   end
   
   def update_setting
-    
+    object_auth = update_setting_by_params
+    if object_auth.save!
+      flash[:notice] = t("admin.object_auth.update_done")
+    else
+      flash[:notice] = t("admin.object_auth.update_failed")
+    end
+  end
+
+  def user_list
+    @news_bulletin_category = NewsBulletinCategory.find params[:category_id]
   end
 
   protected
+  def update_setting_by_params
+    category = NewsBulletinCategory.find params[:category_id]
+    privilege_users = params[:users].collect{|key,value| User.find key }  rescue []
+    object_auth_ary = category.object_auths.where(title: 'fact_check') || (category.object_auths.create :title=> 'fact_check')
+    object_auth = object_auth_ary.first
+    object_auth.privilege_users = privilege_users
+    object_auth
+  end
 
   def get_categorys(id = nil)
     @news_bulletin_categorys = []
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 50b9c266..b4f5fc82 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
@@ -36,9 +36,8 @@ class Panel::News::FrontEnd::NewsBulletinsController < OrbitWidgetController
   end
   
   def preview_content
-    @news_bulletins = NewsBulletin.find params[:id]
+    @news_bulletin = 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_bulletins_helper.rb b/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
index 666bcf4e..8bf47a3d 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
@@ -2,7 +2,7 @@ module Panel::News::BackEnd::NewsBulletinsHelper
   
   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_user = (news_bulletin.news_bulletin_category.authed_users('fact_check').include?(current_user) or is_manager? or is_admin?)
     by_news_bulletin and  by_user
   end
 
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/_modal_list.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/_modal_list.html.erb
new file mode 100644
index 00000000..9c999830
--- /dev/null
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/_modal_list.html.erb
@@ -0,0 +1,44 @@
+<% if news_bulletin_category -%>
+
+<div class="modal hide fade in" id="news_bulletin_category-<%=news_bulletin_category.id%>">
+  <div class="modal-header">
+    <a class="close" data-dismiss="modal">×</a>
+    <h3><%= t("announcement.bulletin.approval_user_list") %></h3>
+  </div>
+  <div class="modal-body">
+    <div class="clear">
+      <% news_bulletin_category.get_object_auth_by_title('fact_check').auth_users.each do |user| %>
+      <div class="checkbox clear checked">
+          <div class='member-avatar'>
+            <% if user.avatar? %>
+              <%= image_tag(user.avatar.thumb.url,:class => "member-img") %>
+            <% else %>
+              <%= image_tag "person.png",:class => "member-img" %>
+            <% end %> 
+          </div>
+          <%= label_tag "lab-user-#{user.id}", (user.name rescue ''),:class=>"member-name",:id=>nil -%>
+      </div>
+      <% end -%>
+    <divl>
+  </div>
+  <div class="modal-footer">
+    <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_category-<%=news_bulletin_category.id%>").on("show", function () {
+      });
+    $(".modal").on("hidden", function () {
+    $("#show_preview").remove();
+      });
+    });
+    </script>
+  </div>
+</div>
+
+
+
+<% end -%>
\ No newline at end of file
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/_privilege_user.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/_privilege_user.html.erb
index d48bb850..60c5a782 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/_privilege_user.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/_privilege_user.html.erb
@@ -6,7 +6,7 @@
 				<% user.sub_roles.each do |sr| %>
 					<div class="for_unit" style="display:none;"> <%= sr.key %></div>
 				<% end %>
-				<%= content_tag :div,:data=>{'original-title'=>t('news.news_bulletin.approval_setting_window_title'),:content => "#{user.sub_roles.collect{|sr| sr.key}.join(',')}"},:class=>"checkbox clear" do %>
+				<%= content_tag :div,:data=>{'original-title'=>t('news.news_bulletin.approval_setting_window_title'),:content => "#{user.sub_roles.collect{|sr| sr.i18n_variable[I18n.locale]}.join(',')}"},:class=>"checkbox clear" do %>
 					<div class="check-icon">
 					</div>
 					<div class='member-avatar'>
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb
index aca35fd0..f611154d 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb
@@ -4,11 +4,12 @@
 <% content_for :page_specific_javascript do %>
 	<%= javascript_include_tag "inc/permission-checkbox"  %>
 	<%= javascript_include_tag "inc/search"  %>
+      <%= javascript_include_tag "inc/modal-preview"  %>
 <% end %>
 <%#= label_tag :fact_check_setting, t("news.news_bulletin.fact_check_setting") %>
-<%= form_tag('', :remote => true)  %>
-<div class="subnav">
-    <ul class="nav nav-pills filter">
+<%= form_tag('', :remote => true,:class => "prevent_enter_submit_form")  %>
+<div class="subnav clear">
+    <ul class="nav nav-pills filter pull-left">
         <li class="accordion-group">
             <div class="form-search" style="margin: 5px 10px;">
                 <%= label_tag :category, t("news.news_bulletin.category") %>
@@ -17,14 +18,15 @@
             </div>
         </li>
     </ul>
+        <%= link_to t("announcement.bulletin.approval_user_list"), panel_news_back_end_approval_user_list_path , :class=>'preview_trigger btn btn-success pull-right'%> 
 </div>
 <%#= label_tag :role, t("admin.roles") %>
 <div class="clear">
 <%= content_tag :div do -%>
-	<% form_tag :action => "update_setting"  do %>
+	<% form_tag panel_news_back_end_approval_setting_path  do %>
 		<%= render :partial => "privilege_user", :locals => {:users => @users_array} %>
-	<div class="form-actions pagination-centered">
-	<%= submit_tag "Update", :class => 'btn' %>
+	<div class="form-actions form-fixed pagination-right">
+	<%= submit_tag "Update", :class => 'btn btn-primary' %>
 	</div>
 	<% end -%>
 <% end -%>
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/update_setting.js.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/update_setting.js.erb
new file mode 100644
index 00000000..7486000a
--- /dev/null
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/update_setting.js.erb
@@ -0,0 +1 @@
+alert( "<% flash.each do |key, msg| %><%= msg %><% end%>");
\ No newline at end of file
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/user_list.js.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/user_list.js.erb
new file mode 100644
index 00000000..8bc104ff
--- /dev/null
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/user_list.js.erb
@@ -0,0 +1,2 @@
+$('#show_preview').html("<%= escape_javascript(render(:partial => 'modal_list',:locals => {:news_bulletin_category => @news_bulletin_category})) %>");
+var start_modal_with_id = "news_bulletin_category-<%=@news_bulletin_category.id%>"
\ No newline at end of file
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 b84e89b9..4274ecab 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
@@ -55,7 +55,7 @@
 					<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 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 %>
+					<li><%= link_to t('news.news_bulletin.approval'), panel_news_back_end_news_bulletin_approval_preview_path(news_bulletin),:class => 'preview_trigger'   %></li><%#= #TODO add ancher so user can quick access into that part %>
 				<% end %>		
 				
 			</ul>
diff --git a/vendor/built_in_modules/news/config/routes.rb b/vendor/built_in_modules/news/config/routes.rb
index 5aa7118f..244b1d03 100644
--- a/vendor/built_in_modules/news/config/routes.rb
+++ b/vendor/built_in_modules/news/config/routes.rb
@@ -2,12 +2,13 @@ Rails.application.routes.draw do
   namespace :panel do
     namespace :news do
       namespace :back_end do
-        match 'news_approval_setting' => "news_approvals#setting" ,:as => :news_approval_setting
-        match 'update_setting' => "news_approvals#update_setting" ,:as => :news_approval_update_setting
-        
+        match 'public' => "news#public",:as => :public
+        match 'approval_setting' => "news_approvals#setting" ,:as => :approval_setting,:via => :get
+        match 'approval_setting' => "news_approvals#update_setting" ,:as => :approval_setting,:via => :post
+        match 'approval_setting' => "news_approvals#user_list" ,:as => :approval_user_list,:via => :put        
         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 "approve/:news_bulletin_id"  => "news_approvals#preview_and_approve",:as => :approval_preview,:via => :put
+          match "approve/:news_bulletin_id"  => "news_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

From 4d33c7a56d69eae00edf51a13a3cb25d115fd8ce Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Fri, 18 May 2012 19:42:36 +0800
Subject: [PATCH 06/27] Changes for dat and time format Impression bug when
 some i18n missing in impressionable object JS bug in ad_banner edit title

---
 app/assets/javascripts/lib/contenteditable.js.erb        | 4 ++--
 app/helpers/application_helper.rb                        | 8 ++++++++
 app/models/asset.rb                                      | 4 ++--
 .../built_in_modules/announcement/app/models/bulletin.rb | 6 +++---
 .../announcement/app/models/bulletin_file.rb             | 4 ++--
 .../announcement/back_end/bulletins/_bulletin.html.erb   | 4 ++--
 .../panel/announcement/back_end/bulletins/show.html.erb  | 4 ++--
 .../announcement/front_end/bulletins/index.html.erb      | 2 +-
 .../panel/announcement/front_end/bulletins/show.html.erb | 9 +++++----
 .../panel/announcement/widget/bulletins/_index.html.erb  | 2 +-
 vendor/built_in_modules/news/app/models/news_bulletin.rb | 6 +++---
 .../news/app/models/news_bulletin_file.rb                | 4 ++--
 .../news/back_end/news_bulletins/_news_bulletin.html.erb | 4 ++--
 .../panel/news/back_end/news_bulletins/show.html.erb     | 4 ++--
 .../panel/news/front_end/news_bulletins/index.html.erb   | 2 +-
 .../panel/news/front_end/news_bulletins/show.html.erb    | 7 ++++---
 .../panel/news/widget/news_bulletins/_index.html.erb     | 2 +-
 .../back_end/page_contexts/_page_context.html.erb        | 2 +-
 .../back_end/page_contexts/_view_page_context.html.erb   | 2 +-
 .../page_content/back_end/page_contexts/show.html.erb    | 2 +-
 .../built_in_modules/web_resource/app/models/web_link.rb | 4 ++--
 .../panel/web_resource/back_end/web_links/show.html.erb  | 4 ++--
 .../panel/web_resource/front_end/web_links/show.html.erb | 4 ++--
 .../app/models/impressionist/impressionable.rb           | 9 +++++----
 24 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/app/assets/javascripts/lib/contenteditable.js.erb b/app/assets/javascripts/lib/contenteditable.js.erb
index 515be3e6..40c19dd3 100644
--- a/app/assets/javascripts/lib/contenteditable.js.erb
+++ b/app/assets/javascripts/lib/contenteditable.js.erb
@@ -40,11 +40,11 @@ $(".nav-tabs").find(".icons-pencil").click(function(){
         data: { body: content_holder.html() },
         success: function(json) {
           $(selector).attr("contenteditable",false)
-          alert("<%= I18n.t("admin.contenteditable.update_done") %>");
+          alert("<%= I18n.t('admin.contenteditable.update_done') %>");
           //content_holder.effect('highlight', {'color': '#0f0'}, 3000);
         },
         error: function() {
-          alert("<%= I18n.t("admin.contenteditable.update_failed") %>");
+          alert("<%= I18n.t('admin.contenteditable.update_failed') %>");
           //content_holder.effect('highlight', {'color': '#f00'}, 3000);
           content_holder.html(content);
         }
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8f651392..26dbddc4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -204,4 +204,12 @@ module ApplicationHelper
     is_manager? || is_admin? 
   end
 
+  def display_date_time(object)
+    object.strftime("%Y-%m-%d %H:%M:%S")
+  end
+
+  def display_date(object)
+    object.strftime("%Y-%m-%d")
+  end
+
 end
diff --git a/app/models/asset.rb b/app/models/asset.rb
index 22c4ae2d..e20fcb9e 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -34,10 +34,10 @@ class Asset
   protected
   
   def set_key
-    if title.new_record?
+    if title && title.new_record?
       title.key = 'title'
     end
-    if description.new_record?
+    if description && description.new_record?
       description.key = 'description'
     end
   end
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb
index 0bf7de64..589da320 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb
@@ -160,13 +160,13 @@ class Bulletin
   protected
   
   def set_key
-    if title.new_record?
+    if title && title.new_record?
       title.key = 'title'
     end
-    if subtitle.new_record?
+    if subtitle && subtitle.new_record?
       subtitle.key = 'subtitle'
     end
-    if text.new_record?
+    if text && text.new_record?
       text.key = 'text'
     end
   end
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb
index c4d60b9b..a30ec131 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb
@@ -29,10 +29,10 @@ class BulletinFile
   protected
   
   def set_key
-    if filetitle.new_record?
+    if filetitle && filetitle.new_record?
       filetitle.key = 'filetitle'
     end
-    if description.new_record?
+    if description && description.new_record?
       description.key = 'description'
     end
   end  
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 423e35ba..8f879e79 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
@@ -60,8 +60,8 @@
 			</ul>
 		</div>
 	</td>
-	<td><%= bulletin.postdate %></td>
-	<td><%= (bulletin.deadline) ? bulletin.deadline : t('bulletin.no_deadline') %></td>
+	<td><%= display_date_time(bulletin.postdate) %></td>
+	<td><%= (bulletin.deadline) ? display_date_time(bulletin.deadline ): t('bulletin.no_deadline') %></td>
 	<td>
 		<div class="label-group">
 			<div class="label-td">
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
index 68634b9a..d8921677 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
@@ -5,7 +5,7 @@
 	</li>
 	<li>
   <b><%= t('announcement.postdate') %></b>
-  <%= @bulletin.postdate %>
+  <%= display_date_time(@bulletin.postdate) %>
 	</li>
 	<li>
   <b><%= t('announcement.title') %></b>
@@ -42,7 +42,7 @@
 	</li>
 	<li>
   <b><%= t('announcement.最後修改時間') %></b>
-  <%= @bulletin.updated_at %>
+  <%= display_date(@bulletin.updated_at) %>
 	</li>
 
 
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
index 6937a6c3..4ba18b51 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
@@ -22,7 +22,7 @@
 	<td><%= link_to post.title[I18n.locale], panel_announcement_front_end_bulletin_path(post, :category_id => post.bulletin_category_id) %>
 	<%#= link_to post.title, panel_announcement_back_end_bulletin_path(post) %>
 	</td>
-	<td><%= post.postdate %></td>
+	<td><%= display_date_time(post.postdate) %></td>
   </tr>
   
 <% end %>
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 37373ae9..2ece4b02 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
@@ -2,10 +2,11 @@
 <h1 class="h1"><%= @bulletin.title[I18n.locale] %></h1>
 <div class="info">
 	<div class="info1">
-		<span class="date"><%= @bulletin.postdate %></span>
-		&nbsp;|&nbsp;
-		<a href="" class="unit"><%= User.find(@bulletin.create_user_id).sub_roles.collect{|t| t.key}.join(" ") rescue '' %></a>
-		<span><%= dislpay_view_count(@bulletin) %></span>
+		<span class="pull-right"><%= dislpay_view_count(@bulletin) %></span>
+		<span class="date"><%= display_date_time(@bulletin.postdate) %></span>
+		<% unit = User.find(@bulletin.create_user_id).sub_roles.collect{|t| t.key}.join(" ") rescue nil %>
+		<%= " | " if unit %>
+		<a href="" class="unit"><%= unit %></a>
 	</div>
 </div>
 <div class="news_image">
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
index daadc367..450e7617 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
@@ -15,7 +15,7 @@
 	<td><%= post.bulletin_category.i18n_variable[I18n.locale] rescue nil %></td>
 	<td><%= link_to post.title[I18n.locale], panel_announcement_front_end_bulletin_path(post, :category_id => post.bulletin_category_id) %>
 	</td>
-	<td><%= post.postdate %></td>
+	<td><%= display_date_time(post.postdate) %></td>
   </tr>
   
 <% end %>
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 83bb784b..f9d2ca0e 100644
--- a/vendor/built_in_modules/news/app/models/news_bulletin.rb
+++ b/vendor/built_in_modules/news/app/models/news_bulletin.rb
@@ -160,13 +160,13 @@ class NewsBulletin
   protected
   
   def set_key
-    if title.new_record?
+    if title && title.new_record?
       title.key = 'title'
     end
-    if subtitle.new_record?
+    if subtitle && subtitle.new_record?
       subtitle.key = 'subtitle'
     end
-    if text.new_record?
+    if text && text.new_record?
       text.key = 'text'
     end
   end
diff --git a/vendor/built_in_modules/news/app/models/news_bulletin_file.rb b/vendor/built_in_modules/news/app/models/news_bulletin_file.rb
index a75dc01f..40495cb4 100644
--- a/vendor/built_in_modules/news/app/models/news_bulletin_file.rb
+++ b/vendor/built_in_modules/news/app/models/news_bulletin_file.rb
@@ -29,10 +29,10 @@ class NewsBulletinFile
   protected
   
   def set_key
-    if filetitle.new_record?
+    if filetitle && filetitle.new_record?
       filetitle.key = 'filetitle'
     end
-    if description.new_record?
+    if description && description.new_record?
       description.key = 'description'
     end
   end  
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 bdd19082..2313f35f 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
@@ -61,8 +61,8 @@
 			</ul>
 		</div>
 	</td>
-	<td><%= news_bulletin.postdate %></td>
-	<td><%= (news_bulletin.deadline) ? news_bulletin.deadline : t('news_bulletin.no_deadline') %></td>
+	<td><%= display_date(news_bulletin.postdate) %></td>
+	<td><%= (news_bulletin.deadline) ? display_date(news_bulletin.deadline) : t('news_bulletin.no_deadline') %></td>
 	<td>
 		<div class="label-group">
 			<div class="label-td">
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/show.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/show.html.erb
index 1868c8fb..ce64e41f 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/show.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/show.html.erb
@@ -5,7 +5,7 @@
 	</li>
 	<li>
   <b><%= t('news.postdate') %></b>
-  <%= @news_bulletin.postdate %>
+  <%= display_date(@news_bulletin.postdate) %>
 	</li>
 	<li>
   <b><%= t('news.title') %></b>
@@ -42,7 +42,7 @@
 	</li>
 	<li>
   <b><%= t('news.最後修改時間') %></b>
-  <%= @news_bulletin.updated_at %>
+  <%= display_date(@news_bulletin.updated_at) %>
 	</li>
 
 
diff --git a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
index 4c2292a6..322b64c0 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
@@ -22,7 +22,7 @@
 				<%= link_to post.title[I18n.locale], panel_news_front_end_news_bulletin_path(post), :class => 'news_title' %>
 				<%= post.subtitle[I18n.locale].html_safe %>
 			</td>
-			<td><%= post.postdate %></td>
+			<td><%= display_date(post.postdate) %></td>
 		</tr>
 		<% end %> 
 	</tbody>
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 e1c07e3b..df391c54 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
@@ -3,9 +3,10 @@
 <div class="info">
 	<div class="info1">
 		<span class="pull-right"><%= dislpay_view_count(@news_bulletin) %></span>
-		<span class="date"><%= @news_bulletin.postdate %></span>
-		&nbsp;|&nbsp;
-		<a href="" class="unit"><%= @news_bulletin.unit_list_for_anc.title[I18n.locale] rescue '' %></a>
+		<span class="date"><%= display_date(@news_bulletin.postdate) %></span>
+		<% unit = @news_bulletin.unit_list_for_anc.title[I18n.locale] rescue nil %>
+		<%= " | " if unit %>
+		<a href="" class="unit"><%= unit %></a>
 	</div>
 </div>
 <div class="news_image">
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 d345f037..4eab719a 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
@@ -18,7 +18,7 @@
 				<%= link_to post.title[I18n.locale], panel_news_front_end_news_bulletin_path(post), :class => 'news_title' %>
 				<%= post.subtitle[I18n.locale].html_safe %>
 			</td>
-			<td><%= post.postdate %></td>
+			<td><%= display_date(post.postdate) %></td>
 		</tr>
 		<% end %> 
 	</tbody>
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
index 036cb6e0..ea8303c2 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
@@ -18,6 +18,6 @@
 			<%= link_to page_context.version, panel_page_content_back_end_view_path(page_context.page_id) %>
 		<%end -%>
 	</td>
-	<td><%= page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %></td>
+	<td><%= display_date_time(page_context) %></td>
 	<td><%= User.find(page_context.create_user_id).name %></td>
 </tr>
\ No newline at end of file
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_view_page_context.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_view_page_context.html.erb
index 7035a700..38d83b29 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_view_page_context.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_view_page_context.html.erb
@@ -10,6 +10,6 @@
 					</div>
 				</td>
 				<td><%= view_page_context.version %></td>
-				<td><%= view_page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %></td>
+				<td><%= display_date(view_page_context.updated_at) %></td>
 				<td><%= User.find(view_page_context.create_user_id).name %></td>
 			</tr>
\ No newline at end of file
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/show.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/show.html.erb
index a75bcc8c..0c681faf 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/show.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/show.html.erb
@@ -21,7 +21,7 @@
 	</li>
 	<li>
 		<b><%= t('page_content.最後修改時間') %></b>
-		<%= @page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %>
+		<%= display_date(@page_context.updated_at) %>
 	</li>
 
 
diff --git a/vendor/built_in_modules/web_resource/app/models/web_link.rb b/vendor/built_in_modules/web_resource/app/models/web_link.rb
index 9bd06f05..4143c38b 100644
--- a/vendor/built_in_modules/web_resource/app/models/web_link.rb
+++ b/vendor/built_in_modules/web_resource/app/models/web_link.rb
@@ -69,10 +69,10 @@ class WebLink
   protected
   
   def set_key
-    if name.new_record?
+    if name && name.new_record?
       name.key = 'name'
     end
-    if context.new_record?
+    if context && context.new_record?
       context.key = 'context'
     end
   end
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/show.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/show.html.erb
index e3734616..1eba0646 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/show.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/show.html.erb
@@ -13,7 +13,7 @@
 	</li>
 	<li>
   <b><%= t('announcement.postdate') %></b>
-  <%= @bulletin.postdate %>
+  <%= display_date(@bulletin.postdate) %>
 	</li>
 	<li>
   <b><%= t('announcement.title') %></b>
@@ -50,7 +50,7 @@
 	</li>
 	<li>
   <b><%= t('announcement.最後修改時間') %></b>
-  <%= @bulletin.updated_at %>
+  <%= display_date(@bulletin.updated_at) %>
 	</li>
 
 
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/show.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/show.html.erb
index a3381e5c..7e7f2c95 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/show.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/show.html.erb
@@ -13,7 +13,7 @@
 	</li>
 	<li>
   <b><%= t('announcement.postdate') %></b>
-  <%= @bulletin.postdate %>
+  <%= display_date(@bulletin.postdate) %>
 	</li>
 	<li>
   <b><%= t('announcement.title') %></b>
@@ -50,7 +50,7 @@
 	</li>
 	<li>
   <b><%= t('announcement.最後修改時間') %></b>
-  <%= @bulletin.updated_at.strftime("%Y-%m-%d %H:%I:%S") %>
+  <%= display_date_time(@bulletin.updated_at) %>
 	</li>
 
 
diff --git a/vendor/impressionist/app/models/impressionist/impressionable.rb b/vendor/impressionist/app/models/impressionist/impressionable.rb
index f5cbd3b0..60d2a62a 100644
--- a/vendor/impressionist/app/models/impressionist/impressionable.rb
+++ b/vendor/impressionist/app/models/impressionist/impressionable.rb
@@ -38,10 +38,11 @@ module Impressionist
     end
 
     def update_impressionist_counter_cache
-      cache_options = self.class.impressionist_counter_cache_options
-      column_name = cache_options[:column_name].to_sym
-      count = cache_options[:unique] ? impressionist_count(:filter => :ip_address) : impressionist_count
-      update_attribute(column_name, count)
+      # cache_options = self.class.impressionist_counter_cache_options
+      # column_name = cache_options[:column_name].to_sym
+      # count = cache_options[:unique] ? impressionist_count(:filter => :ip_address) : impressionist_count
+      # update_attribute(column_name, count)
+      update_attribute(column_name, self.send(cache_options[:column_name]) + 1)
     end
 
     # OLD METHODS - DEPRECATE IN V0.5

From dc4116bc3decce9dee405b684b70d36afffff731 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Sat, 19 May 2012 01:59:17 +0800
Subject: [PATCH 07/27] Fix page hits count

---
 vendor/impressionist/app/models/impressionist/impressionable.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vendor/impressionist/app/models/impressionist/impressionable.rb b/vendor/impressionist/app/models/impressionist/impressionable.rb
index 60d2a62a..1df2f1c3 100644
--- a/vendor/impressionist/app/models/impressionist/impressionable.rb
+++ b/vendor/impressionist/app/models/impressionist/impressionable.rb
@@ -42,6 +42,8 @@ module Impressionist
       # column_name = cache_options[:column_name].to_sym
       # count = cache_options[:unique] ? impressionist_count(:filter => :ip_address) : impressionist_count
       # update_attribute(column_name, count)
+      cache_options = self.class.impressionist_counter_cache_options
+      column_name = cache_options[:column_name].to_sym
       update_attribute(column_name, self.send(cache_options[:column_name]) + 1)
     end
 

From 815e6a836132b2d98537e8b8b349cb388b863a87 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Sat, 19 May 2012 03:19:55 +0800
Subject: [PATCH 08/27] Fix matt's code and add it to filters

---
 app/controllers/orbit_backend_controller.rb   | 30 ++++++++++++++-----
 .../back_end/bulletins_controller.rb          |  8 +----
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb
index 98882ec3..1584f512 100644
--- a/app/controllers/orbit_backend_controller.rb
+++ b/app/controllers/orbit_backend_controller.rb
@@ -32,13 +32,7 @@ class OrbitBackendController< ApplicationController
   end
 
   def get_sorted_and_filtered(object_class, query=nil)
-    object_class = object_class.classify.constantize
-    if query
-      objects = object_class.all.where(query)
-    else
-      objects = object_class.all
-    end
-
+    objects = get_objects(object_class, query)
     if !params[:sort].blank?
       options = params[:sort_options]
       options = [options] if !options.class.eql?(Array)
@@ -157,5 +151,27 @@ class OrbitBackendController< ApplicationController
     a = params[:direction].eql?('asc') ? (sorted_tmp + sorted_objects) : (sorted_objects + sorted_tmp)
     a.flatten
   end
+
+
+  def get_viewable(object_class)
+    objects = get_objects(object_class)
+    Kaminari.paginate_array(objects).page(params[:page]).per(10)
+  end
+
+  def get_objects(object_class, query=nil)
+
+    object_class = object_class.classify.constantize
+    if query
+      objects = object_class.all.where(query).entries
+    else
+      objects = object_class.all.entries
+    end
+    if(!is_admin? || !is_manager?)
+      objects.delete_if{ |object|
+        (object.is_pending == true) && ((!object.send("#{object.class.to_s.underscore}_category").authed_users('fact_check').include?(current_user) rescue nil) || object.create_user_id!=current_user.id)
+      }
+    end
+    objects
+  end
   
 end
\ No newline at end of file
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 42b4c8fd..b6566b7e 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
@@ -34,7 +34,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
 
     # @bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered_bulletins : Bulletin.all.page(params[:page]).per(10)
-    @bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered("bulletin") : Bulletin.all.page(params[:page]).per(10)
+    @bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered("bulletin") : get_viewable("bulletin")
   	@bulletin_categories = BulletinCategory.all
 
     @bulletin_link = BulletinLink.new
@@ -42,12 +42,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 	
     @bulletin_file = BulletinFile.new
     @file_url = panel_announcement_back_end_bulletins_path
-	
-    if(!is_admin? || !is_manager?)
-      @bulletins.delete_if{ |bulletin|
-              bulletin.is_pending == true && ((!bulletin.bulletin_category.authed_users('fact_check').include?(current_user) rescue nil) || bulletin.create_user_id!=current_user.id)
-            }
-        end
     
     respond_to do |format|
       format.html # index.html.erb

From c4d70790595a8d8127732224ea9bd5097d392998 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris@rulingcom.com>
Date: Mon, 21 May 2012 18:10:03 +0800
Subject: [PATCH 09/27] Fix's Matt code for not showing bulletins in index

---
 app/controllers/orbit_backend_controller.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb
index 1584f512..12ba78e4 100644
--- a/app/controllers/orbit_backend_controller.rb
+++ b/app/controllers/orbit_backend_controller.rb
@@ -168,7 +168,15 @@ class OrbitBackendController< ApplicationController
     end
     if(!is_admin? || !is_manager?)
       objects.delete_if{ |object|
-        (object.is_pending == true) && ((!object.send("#{object.class.to_s.underscore}_category").authed_users('fact_check').include?(current_user) rescue nil) || object.create_user_id!=current_user.id)
+        if object.is_pending == true
+          if check_permission(:manager)
+            object.create_user_id != current_user.id
+          else
+            !object.send("#{object.class.to_s.underscore}_category").authed_users('fact_check').include?(current_user) rescue false
+          end
+        else
+          false
+        end 
       }
     end
     objects

From aa114568c48e03d302f82c34536fa2e88f789b26 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 21 May 2012 18:20:39 +0800
Subject: [PATCH 10/27] Move design to site_settings side_bar

---
 app/views/admin/designs/edit.html.erb           | 4 ++++
 app/views/admin/designs/index.html.erb          | 4 ++++
 app/views/admin/designs/new.html.erb            | 4 ++++
 app/views/admin/designs/upload_package.html.erb | 4 ++++
 app/views/admin/sites/_side_bar.html.erb        | 4 ++++
 app/views/layouts/_side_bar.html.erb            | 4 ----
 6 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/views/admin/designs/edit.html.erb b/app/views/admin/designs/edit.html.erb
index 16ec7d4c..56adc075 100644
--- a/app/views/admin/designs/edit.html.erb
+++ b/app/views/admin/designs/edit.html.erb
@@ -1,3 +1,7 @@
+<% content_for :side_bar do %>
+	<%= render 'admin/sites/side_bar' %>
+<% end %>
+
 <h1><%= t('admin.editing_design') %></h1>
 
 <%= form_for @design, :url => admin_design_path(@design),:html => {:multipart => true} do |f| %>
diff --git a/app/views/admin/designs/index.html.erb b/app/views/admin/designs/index.html.erb
index 8c4608d8..968b1914 100644
--- a/app/views/admin/designs/index.html.erb
+++ b/app/views/admin/designs/index.html.erb
@@ -1,3 +1,7 @@
+<% content_for :side_bar do %>
+	<%= render 'admin/sites/side_bar' %>
+<% end %>
+
 <%= 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">
diff --git a/app/views/admin/designs/new.html.erb b/app/views/admin/designs/new.html.erb
index 2b67b2e9..61c6868a 100644
--- a/app/views/admin/designs/new.html.erb
+++ b/app/views/admin/designs/new.html.erb
@@ -1,3 +1,7 @@
+<% content_for :side_bar do %>
+	<%= render 'admin/sites/side_bar' %>
+<% end %>
+
 <h1><%= t('admin.new_design') %></h1>
 
 <%= form_for :design, :url => admin_designs_path, :html => {:multipart => true} do |f| %>
diff --git a/app/views/admin/designs/upload_package.html.erb b/app/views/admin/designs/upload_package.html.erb
index 0c07de1e..9dc0efa9 100644
--- a/app/views/admin/designs/upload_package.html.erb
+++ b/app/views/admin/designs/upload_package.html.erb
@@ -1,3 +1,7 @@
+<% content_for :side_bar do %>
+	<%= render 'admin/sites/side_bar' %>
+<% end %>
+
 <div class="main2">
 	<%= form_tag '',:multipart => true,:action=>"post" do |f| %>
 
diff --git a/app/views/admin/sites/_side_bar.html.erb b/app/views/admin/sites/_side_bar.html.erb
index 1ad8ae43..1b6b8ba4 100644
--- a/app/views/admin/sites/_side_bar.html.erb
+++ b/app/views/admin/sites/_side_bar.html.erb
@@ -10,3 +10,7 @@
 	<% end -%>
 
 <% end -%>
+
+<%= content_tag :li, :class => active_for_controllers('designs') do -%>
+	<%= link_to content_tag(:i, nil, :class => 'icons-window-block') + t('admin.design'), admin_designs_path %>
+<% end -%>
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index 8518688a..c5719fce 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -45,10 +45,6 @@
 
 <% end -%>
 
-<%= content_tag :li, :class => active_for_controllers('designs') do -%>
-	<%= 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') ||active_for_ob_auths_object("AdBanner") ||active_for_app_auth('ad_banners') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.ad_banner'), admin_ad_banners_path %>
 

From e05cf2a2d697ee88399514f05ccb7bbe17669a18 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Tue, 22 May 2012 11:17:50 +0800
Subject: [PATCH 11/27] fix orbit core to adopt current user behavior

---
 lib/orbit_core_lib.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/orbit_core_lib.rb b/lib/orbit_core_lib.rb
index ad4f6756..fcabad78 100644
--- a/lib/orbit_core_lib.rb
+++ b/lib/orbit_core_lib.rb
@@ -32,7 +32,11 @@ module  OrbitCoreLib
     end
     
     def get_object_auth_by_title(title)
-      self.object_auths.where({title: title }).first
+      oa = self.object_auths.where({title: title }).first
+       if oa.nil? && (self.class::ObjectAuthTitlesOptions.include? title)
+        oa =  self.object_auths.build title: title
+      end
+      oa
     end
     
     def authed_users(title=nil)

From ae006cc29f5b6b21572fccbdc2b349ba484af308 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Tue, 22 May 2012 13:22:24 +0800
Subject: [PATCH 12/27] js for preventing user do stupid things durning ajax

---
 app/assets/images/ajax-loader.gif             | Bin 0 -> 8238 bytes
 app/assets/javascripts/inc/ajax_setting.js    |  14 ++++++++++
 app/views/layouts/new_admin.html.erb          |   1 +
 .../back_end/approvals_controller.rb          |   2 +-
 .../back_end/news_approvals_controller.rb     |  22 ++++++----------
 .../back_end/news_approvals/setting.html.erb  |  24 +++++++++++++-----
 .../back_end/news_approvals/setting.js.erb    |   3 ++-
 7 files changed, 44 insertions(+), 22 deletions(-)
 create mode 100644 app/assets/images/ajax-loader.gif
 create mode 100644 app/assets/javascripts/inc/ajax_setting.js

diff --git a/app/assets/images/ajax-loader.gif b/app/assets/images/ajax-loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5f117fd81853bdfae799bef5cfedbec34ba407fb
GIT binary patch
literal 8238
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

literal 0
HcmV?d00001

diff --git a/app/assets/javascripts/inc/ajax_setting.js b/app/assets/javascripts/inc/ajax_setting.js
new file mode 100644
index 00000000..18d0da33
--- /dev/null
+++ b/app/assets/javascripts/inc/ajax_setting.js
@@ -0,0 +1,14 @@
+// $.ready(function(){
+//   $('body').bind("ajaxSend", function(){
+//      $('<div class="modal-backdrop fade in"></div>').appendTo('body');
+//     }).bind("ajaxComplete", function(){
+//       $('body > div.modal-backdrop').hide().remove();
+//   });  
+// });
+jQuery(document).ajaxStart(function(){
+  $('<div class="modal-backdrop fade in" id="sys_modal"><img src="/assets/ajax-loader.gif" style="margin-top: 25%;margin-left: 50%;"></div>').appendTo('body');
+});
+
+jQuery(document).ajaxComplete(function(){
+  $("#sys_modal").hide().remove();
+});
diff --git a/app/views/layouts/new_admin.html.erb b/app/views/layouts/new_admin.html.erb
index 3a493a9d..873b9f14 100644
--- a/app/views/layouts/new_admin.html.erb
+++ b/app/views/layouts/new_admin.html.erb
@@ -9,6 +9,7 @@
 	<![endif]-->
 	<%= stylesheet_link_tag "new_admin" %>
 	<%= javascript_include_tag "new_admin" %>
+	<%= javascript_include_tag "inc/ajax_setting"  %>
 	<%= yield :page_specific_css %>
 	<%= yield :page_specific_javascript %>
 	<%= csrf_meta_tag %>
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 0177cd12..cf966b24 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
@@ -20,7 +20,7 @@ class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendControlle
     else
       @bulletin_category =  @bulletin_categorys.first
     end
-    preload_object_auth = @bulletin_category.object_auths.where(title: 'fact_check').empty?? (@bulletin_category.object_auths.create! :title=> 'fact_check') : @bulletin_category.object_auths.where(title: 'fact_check')
+    preload_object_auth = @bulletin_category.get_object_auth_by_title('fact_check')
     @users_array =  preload_object_auth.first.privilege_users rescue []
     respond_to do |format|
       format.html
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 20a3d3eb..e9552141 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
@@ -4,7 +4,7 @@ class Panel::News::BackEnd::NewsApprovalsController  < OrbitBackendController
   include AdminHelper
   
   def preview_and_approve
-    @news_bulletin = NewsBulletin.find params[:news_bulletin_id]
+    @news_bulletin = NewsBulletin.find params[:news_category][:id]
   end
   
   def approve
@@ -14,19 +14,13 @@ class Panel::News::BackEnd::NewsApprovalsController  < OrbitBackendController
   def setting
     @sys_users = User.all(conditions: {admin: false})
     @news_bulletin_categorys = NewsBulletinCategory.all
-    if params.has_key?(:category_id)
-      first_category = NewsBulletinCategory.find params[:category_id]
-      if params[:commit] == 'Update'
-        privilege_users = params[:users].collect{|key,value| User.find key }  rescue []
-        preload_object_auth_ary = first_category.object_auths.where(title: 'fact_check') || (first_category.object_auths.create :title=> 'fact_check')
-        preload_object_auth = preload_object_auth_ary.first
-        preload_object_auth.privilege_users = privilege_users
-        preload_object_auth.save!
-      end
+    @options_from_collection_for_select_news_bulletin_categorys = @news_bulletin_categorys.collect{|bc| [bc.i18n_variable[I18n.locale],bc.id] }
+    if params.has_key? :news_category
+      @news_bulletin_categorys = NewsBulletinCategory.find params[:news_category][:id]
     else
-      first_category =  @news_bulletin_categorys.first
+      @news_bulletin_categorys =  @news_bulletin_categorys.first
     end  
-    preload_object_auth = first_category.object_auths.where(title: 'fact_check').empty?? (first_category.object_auths.create! :title=> 'fact_check') : first_category.object_auths.where(title: 'fact_check')
+    preload_object_auth = @news_bulletin_categorys.get_object_auth_by_title('fact_check')
     @users_array =  preload_object_auth.first.privilege_users rescue []
     respond_to do |format|
       format.html
@@ -44,12 +38,12 @@ class Panel::News::BackEnd::NewsApprovalsController  < OrbitBackendController
   end
 
   def user_list
-    @news_bulletin_category = NewsBulletinCategory.find params[:category_id]
+    @news_bulletin_category = NewsBulletinCategory.find params[:news_category][:id]
   end
 
   protected
   def update_setting_by_params
-    category = NewsBulletinCategory.find params[:category_id]
+    category = NewsBulletinCategory.find params[:news_category][:id]
     privilege_users = params[:users].collect{|key,value| User.find key }  rescue []
     object_auth_ary = category.object_auths.where(title: 'fact_check') || (category.object_auths.create :title=> 'fact_check')
     object_auth = object_auth_ary.first
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb
index f611154d..7b8211b4 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb
@@ -13,7 +13,7 @@
         <li class="accordion-group">
             <div class="form-search" style="margin: 5px 10px;">
                 <%= label_tag :category, t("news.news_bulletin.category") %>
-                <%= select_tag "category_id", options_from_collection_for_select(@news_bulletin_categorys, "id", "key") %>
+                <%= select "news_category",'id', @options_from_collection_for_select_news_bulletin_categorys %>
 								<%= search_field_tag 'user_filter' %>
             </div>
         </li>
@@ -34,9 +34,21 @@
 
 <script type="text/javascript" charset="utf-8">
 var availableTags = [];
-$(function() {
-
-	$('#category_id').change(function() {
-	  $(this).parents('form').submit();
-	});
+$(document).ready(function() {
+  
+  $(".prevent_enter_submit_form").bind("keypress", function(e) {
+    if (e.keyCode == 13) {
+      return false;
+    }
+  });
+   
+  $('#news_category_id').change(function() {
+    $.ajax({
+      type: 'GET',
+      dataType: "script",
+      url:$(this).parents("from").attr("href"),
+      data:$(this).parents("form").serialize()
+    });//.ajaxStart(function(){$('body').append('<div class="modal-backdrop fade in" id="modal_layer"></div>')});//.ajaxStop(function(){"#modal_layer"}).remove();
+  });
+});
 </script>
\ No newline at end of file
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.js.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.js.erb
index a01c9d6a..0ca148da 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.js.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.js.erb
@@ -1 +1,2 @@
-$("#users_checkbox_ary").replaceWith('<%= (render :partial => 'privilege_user', :locals => {:users => @users_array}).html_safe%>');
\ No newline at end of file
+$("#users_checkbox_ary").replaceWith('<%= escape_javascript(render :partial => "privilege_user", :locals => {:users => @users_array})%>');
+permissionCheckbox();
\ No newline at end of file

From 7f3b090bb7e66845012bfecab840554f89e5c63b Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Tue, 22 May 2012 13:23:26 +0800
Subject: [PATCH 13/27] clean up unless code

---
 app/assets/javascripts/inc/ajax_setting.js                 | 7 -------
 .../panel/news/back_end/news_approvals/setting.html.erb    | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/assets/javascripts/inc/ajax_setting.js b/app/assets/javascripts/inc/ajax_setting.js
index 18d0da33..c23a73bf 100644
--- a/app/assets/javascripts/inc/ajax_setting.js
+++ b/app/assets/javascripts/inc/ajax_setting.js
@@ -1,10 +1,3 @@
-// $.ready(function(){
-//   $('body').bind("ajaxSend", function(){
-//      $('<div class="modal-backdrop fade in"></div>').appendTo('body');
-//     }).bind("ajaxComplete", function(){
-//       $('body > div.modal-backdrop').hide().remove();
-//   });  
-// });
 jQuery(document).ajaxStart(function(){
   $('<div class="modal-backdrop fade in" id="sys_modal"><img src="/assets/ajax-loader.gif" style="margin-top: 25%;margin-left: 50%;"></div>').appendTo('body');
 });
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb
index 7b8211b4..298e21eb 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb
@@ -48,7 +48,7 @@ $(document).ready(function() {
       dataType: "script",
       url:$(this).parents("from").attr("href"),
       data:$(this).parents("form").serialize()
-    });//.ajaxStart(function(){$('body').append('<div class="modal-backdrop fade in" id="modal_layer"></div>')});//.ajaxStop(function(){"#modal_layer"}).remove();
+    });
   });
 });
 </script>
\ No newline at end of file

From 27cf99462edffc445006f9e0a04d82b5f4e30b53 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris@rulingcom.com>
Date: Tue, 22 May 2012 14:42:19 +0800
Subject: [PATCH 14/27] Fix bug in page and news

---
 .../panel/news/back_end/news_bulletins_controller.rb          | 4 ----
 .../back_end/page_contexts/_page_context.html.erb             | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

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 706e7663..46bd2f02 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
@@ -41,10 +41,6 @@ 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) rescue nil) || news_bulletin.create_user_id!=current_user.id)
-    }
 
     @news_bulletin_file = NewsBulletinFile.new
     @file_url = panel_news_back_end_news_bulletins_path
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
index ea8303c2..7e056432 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
@@ -18,6 +18,6 @@
 			<%= link_to page_context.version, panel_page_content_back_end_view_path(page_context.page_id) %>
 		<%end -%>
 	</td>
-	<td><%= display_date_time(page_context) %></td>
+	<td><%= display_date_time(page_context.updated_at) %></td>
 	<td><%= User.find(page_context.create_user_id).name %></td>
 </tr>
\ No newline at end of file

From 5e9836f371eb1fd7a6ef5374cbeb93c1efbc2354 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Tue, 22 May 2012 14:45:49 +0800
Subject: [PATCH 15/27] Changes for structure

---
 app/assets/javascripts/side_bar_history.js         | 11 +----------
 app/assets/stylesheets/sidebar.css.erb             | 10 ++++++++--
 app/controllers/admin/links_controller.rb          |  4 +++-
 app/controllers/admin/pages_controller.rb          |  8 +++++---
 app/controllers/application_controller.rb          |  2 +-
 app/helpers/admin/item_helper.rb                   | 14 +++++++-------
 app/views/admin/items/_site_map_left_bar.html.erb  |  4 +++-
 app/views/admin/items/index.js.erb                 | 12 +++++-------
 app/views/admin/links/delete.js.erb                |  4 +++-
 app/views/admin/pages/_new.html.erb                |  2 +-
 app/views/admin/pages/delete.js.erb                |  4 +++-
 app/views/layouts/site_editor.html.erb             |  4 +---
 .../back_end/page_contexts/_page_context.html.erb  |  2 +-
 13 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/app/assets/javascripts/side_bar_history.js b/app/assets/javascripts/side_bar_history.js
index ad29b497..f23fd6cc 100644
--- a/app/assets/javascripts/side_bar_history.js
+++ b/app/assets/javascripts/side_bar_history.js
@@ -1,14 +1,5 @@
 var history_edited = false; 
 
-$('#back_sidebar a, #back_main a.nav').live('click',  
-  function () {  
-    $.getScript(this.href);
-		history.pushState(null, document.title, this.href);
-		history_edited = true;
-    return false;
-  }  
-);
-
 $('#back_main a.reload').live('click',
   function () { 
     $.getScript(this.href);
@@ -18,7 +9,7 @@ $('#back_main a.reload').live('click',
   }
 );
 
-$('#back_main .form').live('submit', function () { 
+$('#back_main form').live('submit', function () { 
   $.post(this.action, $(this).serialize(), null, 'script');
 	history_edited = true;
   return false;
diff --git a/app/assets/stylesheets/sidebar.css.erb b/app/assets/stylesheets/sidebar.css.erb
index 1e4b4010..76d1e4e9 100644
--- a/app/assets/stylesheets/sidebar.css.erb
+++ b/app/assets/stylesheets/sidebar.css.erb
@@ -18,6 +18,9 @@
 	padding: 3px 0px;
 	display: block;
 }
+.nav-list>li>ol {
+	margin-left: 0;
+}
 /*
 #back_sidebar h1 {
     background: url(<%= asset_path "h1_bg.png" %>) repeat-x scroll left top transparent;
@@ -126,7 +129,7 @@
     background: none repeat scroll 0 0 #FFFFFF;
     border: 1px solid #DDDDDD;
     border-radius: 5px 5px 5px 5px;
-    margin: 0 0 0 3px;
+    margin: 0 0 0 20px;
     padding: 0;
     z-index:1;
 	position: absolute;
@@ -155,7 +158,7 @@ ol.nav>li>.icons-moves {
 }
 .sortable i {
 	position: absolute;
-	left: -20px;
+	left: 0px;
 	top: 6px;
 	margin-right: 0;
 	opacity: 0.3;
@@ -166,6 +169,9 @@ ol.nav>li>.icons-moves {
 	opacity: 0.7;
 	filter: alpha(opacity=70);
 }
+.with_action {
+	padding-left: 20px;
+}
 .placeholder {
 	background-color: rgba(0,136,204,.6);
 	border-radius: 3px;
diff --git a/app/controllers/admin/links_controller.rb b/app/controllers/admin/links_controller.rb
index 533ff829..c233c18f 100644
--- a/app/controllers/admin/links_controller.rb
+++ b/app/controllers/admin/links_controller.rb
@@ -65,9 +65,11 @@ class Admin::LinksController < ApplicationController
   end
   
   def delete
+    @item = Link.find(params[:id])
+    @item.destroy
     respond_to do |format|
       format.html {}
-      format.js  { destroy }
+      format.js  { @item = @item.parent }
     end
   end
   
diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb
index 44bda4aa..5fc6cb77 100644
--- a/app/controllers/admin/pages_controller.rb
+++ b/app/controllers/admin/pages_controller.rb
@@ -51,7 +51,7 @@ class Admin::PagesController < ApplicationController
   def create
     @item = Page.new(params[:page])
 	
-	if @item.module_app.key == 'page_content'
+	if @item.module_app && @item.module_app.key == 'page_content'
 	  @item.page_contexts.build(:create_user_id => current_user.id, :update_user_id => current_user.id )
 	end
 	
@@ -99,14 +99,16 @@ class Admin::PagesController < ApplicationController
       format.html { 
         redirect_to admin_items_url( :parent_id => @item.parent_id )
       }
-      format.js  {}
+      format.js  { redirect_to admin_items_url }
     end
   end
   
   def delete
+    @item = Page.find(params[:id])
+    @item.destroy
     respond_to do |format|
       format.html {}
-      format.js  { destroy }
+      format.js  { @item = @item.parent }
     end
   end
   
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1455619a..5fd9de5c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -157,7 +157,7 @@ class ApplicationController < ActionController::Base
   end
   
   def get_homepage
-    Item.first(:conditions => {:parent_id => nil})
+    Page.root
   end
 
   def layout_by_resource
diff --git a/app/helpers/admin/item_helper.rb b/app/helpers/admin/item_helper.rb
index b5ab255e..78e911b9 100644
--- a/app/helpers/admin/item_helper.rb
+++ b/app/helpers/admin/item_helper.rb
@@ -11,14 +11,14 @@ module Admin::ItemHelper
           no_nested = 'no-nest'
       end
       ret << "<li id='#{node.id}' class='#{no_nested}'>"
-      ret << "<i class='icons-moves'></i>"
-      ret << "<div class='with_action'>"
-      ret << (link_to node.i18n_variable[I18n.locale], dest)
+      # ret << "<i class='icons-moves'></i>"
+      ret << "<div class='with_action'><i class='icons-moves'></i>"
+      ret << (link_to node.i18n_variable[I18n.locale], dest, :class => 'js_history')
       ret << "<div class='quick-edit hide'>"
-      ret << (link_to t('admin.edit'), eval("edit_admin_#{node._type.downcase}_path(node)")) if node._type.eql?('Page')
-      ret << (link_to t('admin.new_page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page') if node._type.eql?('Page')
-      ret << (link_to t('admin.new_link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link') if node._type.eql?('Page')
-      ret << (link_to t(:delete), eval("delete_admin_#{node._type.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete')
+      ret << (link_to t('admin.edit'), eval("edit_admin_#{node._type.downcase}_path(node)"), :class => 'js_history') if node._type.eql?('Page')
+      ret << (link_to t('admin.new_page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page js_history') if node._type.eql?('Page')
+      ret << (link_to t('admin.new_link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link js_history') if node._type.eql?('Page')
+      ret << (link_to t(:delete), eval("delete_admin_#{node._type.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete js_history')
       ret << "</div>"
       ret << "</div>"
       ret << render_children(node)
diff --git a/app/views/admin/items/_site_map_left_bar.html.erb b/app/views/admin/items/_site_map_left_bar.html.erb
index 8d32365f..a9cf2d91 100644
--- a/app/views/admin/items/_site_map_left_bar.html.erb
+++ b/app/views/admin/items/_site_map_left_bar.html.erb
@@ -1 +1,3 @@
-<%= render_node_and_children(Item.first(:conditions => {:parent_id => nil})) %>
+<ol class="nav nav-list">
+	<%= render_node_and_children(Item.first(:conditions => {:parent_id => nil})) %>
+</ol>
diff --git a/app/views/admin/items/index.js.erb b/app/views/admin/items/index.js.erb
index 8dc86088..1ff6abb5 100644
--- a/app/views/admin/items/index.js.erb
+++ b/app/views/admin/items/index.js.erb
@@ -1,9 +1,7 @@
 $('#back_main').empty();
-switch ("<%= escape_javascript(@item._type)%>") {
-	case 'Link': 
-		$('#back_main').append("<%= escape_javascript(render(:partial => 'admin/links/show')) %>");
-		break;
-  case 'Page': 
+<% case @item._type %>
+	<% when 'Page' %>
 		$('#back_main').append("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
-   	break;
-};
\ No newline at end of file
+	<% when 'Link' %>
+		$('#back_main').append("<%= escape_javascript(render(:partial => 'admin/links/show')) %>");
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/links/delete.js.erb b/app/views/admin/links/delete.js.erb
index b1739526..8ea2a642 100644
--- a/app/views/admin/links/delete.js.erb
+++ b/app/views/admin/links/delete.js.erb
@@ -1 +1,3 @@
-$('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
\ No newline at end of file
+$('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
+$('#back_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
+history.pushState(null, document.title, "<%= escape_javascript(admin_items_url) %>");
\ No newline at end of file
diff --git a/app/views/admin/pages/_new.html.erb b/app/views/admin/pages/_new.html.erb
index ecbda3de..bba5ad50 100644
--- a/app/views/admin/pages/_new.html.erb
+++ b/app/views/admin/pages/_new.html.erb
@@ -4,7 +4,7 @@
 	<%= form_for @item, :url => admin_pages_path, :html => { :class => 'form-horizontal edit_page' }  do |f| %>
 		<%= render :partial => "form", :locals => { :f => f } %>
 		<div class="form-actions">
-			<%= f.submit t('update'), :class => 'btn btn-primary' %>
+			<%= f.submit t('create'), :class => 'btn btn-primary' %>
 			<%= link_to t('cancel'), get_go_back, :class=>"btn" %>
 		</div>
 	<% end %>
diff --git a/app/views/admin/pages/delete.js.erb b/app/views/admin/pages/delete.js.erb
index b1739526..8ea2a642 100644
--- a/app/views/admin/pages/delete.js.erb
+++ b/app/views/admin/pages/delete.js.erb
@@ -1 +1,3 @@
-$('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
\ No newline at end of file
+$('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
+$('#back_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
+history.pushState(null, document.title, "<%= escape_javascript(admin_items_url) %>");
\ No newline at end of file
diff --git a/app/views/layouts/site_editor.html.erb b/app/views/layouts/site_editor.html.erb
index da6efd26..1f66aecc 100644
--- a/app/views/layouts/site_editor.html.erb
+++ b/app/views/layouts/site_editor.html.erb
@@ -23,9 +23,7 @@
 		</div>
 		<div class="viewport">
 			<div id='back_sidebar' class="overview">
-				<ol class="nav nav-list">
-					<%= yield :sidebar %>
-				</ol>
+				<%= yield :sidebar %>
 			</div>
 		</div>
 	</nav>
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
index ea8303c2..7e056432 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
@@ -18,6 +18,6 @@
 			<%= link_to page_context.version, panel_page_content_back_end_view_path(page_context.page_id) %>
 		<%end -%>
 	</td>
-	<td><%= display_date_time(page_context) %></td>
+	<td><%= display_date_time(page_context.updated_at) %></td>
 	<td><%= User.find(page_context.create_user_id).name %></td>
 </tr>
\ No newline at end of file

From 361722f2524fb420f79a354ab96c5bf0a71887d1 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Tue, 22 May 2012 11:17:50 +0800
Subject: [PATCH 16/27] fix orbit core to adopt current user behavior

---
 lib/orbit_core_lib.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/orbit_core_lib.rb b/lib/orbit_core_lib.rb
index ad4f6756..fcabad78 100644
--- a/lib/orbit_core_lib.rb
+++ b/lib/orbit_core_lib.rb
@@ -32,7 +32,11 @@ module  OrbitCoreLib
     end
     
     def get_object_auth_by_title(title)
-      self.object_auths.where({title: title }).first
+      oa = self.object_auths.where({title: title }).first
+       if oa.nil? && (self.class::ObjectAuthTitlesOptions.include? title)
+        oa =  self.object_auths.build title: title
+      end
+      oa
     end
     
     def authed_users(title=nil)

From 79f67208fae40f75a4c040790306d64c532fae84 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Tue, 22 May 2012 13:22:24 +0800
Subject: [PATCH 17/27] js for preventing user do stupid things durning ajax

---
 app/assets/images/ajax-loader.gif             | Bin 0 -> 8238 bytes
 app/assets/javascripts/inc/ajax_setting.js    |  14 ++++++++++
 app/views/layouts/new_admin.html.erb          |   1 +
 .../back_end/approvals_controller.rb          |   2 +-
 .../back_end/news_approvals_controller.rb     |  22 ++++++----------
 .../back_end/news_approvals/setting.html.erb  |  24 +++++++++++++-----
 .../back_end/news_approvals/setting.js.erb    |   3 ++-
 7 files changed, 44 insertions(+), 22 deletions(-)
 create mode 100644 app/assets/images/ajax-loader.gif
 create mode 100644 app/assets/javascripts/inc/ajax_setting.js

diff --git a/app/assets/images/ajax-loader.gif b/app/assets/images/ajax-loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5f117fd81853bdfae799bef5cfedbec34ba407fb
GIT binary patch
literal 8238
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

literal 0
HcmV?d00001

diff --git a/app/assets/javascripts/inc/ajax_setting.js b/app/assets/javascripts/inc/ajax_setting.js
new file mode 100644
index 00000000..18d0da33
--- /dev/null
+++ b/app/assets/javascripts/inc/ajax_setting.js
@@ -0,0 +1,14 @@
+// $.ready(function(){
+//   $('body').bind("ajaxSend", function(){
+//      $('<div class="modal-backdrop fade in"></div>').appendTo('body');
+//     }).bind("ajaxComplete", function(){
+//       $('body > div.modal-backdrop').hide().remove();
+//   });  
+// });
+jQuery(document).ajaxStart(function(){
+  $('<div class="modal-backdrop fade in" id="sys_modal"><img src="/assets/ajax-loader.gif" style="margin-top: 25%;margin-left: 50%;"></div>').appendTo('body');
+});
+
+jQuery(document).ajaxComplete(function(){
+  $("#sys_modal").hide().remove();
+});
diff --git a/app/views/layouts/new_admin.html.erb b/app/views/layouts/new_admin.html.erb
index 3a493a9d..873b9f14 100644
--- a/app/views/layouts/new_admin.html.erb
+++ b/app/views/layouts/new_admin.html.erb
@@ -9,6 +9,7 @@
 	<![endif]-->
 	<%= stylesheet_link_tag "new_admin" %>
 	<%= javascript_include_tag "new_admin" %>
+	<%= javascript_include_tag "inc/ajax_setting"  %>
 	<%= yield :page_specific_css %>
 	<%= yield :page_specific_javascript %>
 	<%= csrf_meta_tag %>
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 0177cd12..cf966b24 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
@@ -20,7 +20,7 @@ class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendControlle
     else
       @bulletin_category =  @bulletin_categorys.first
     end
-    preload_object_auth = @bulletin_category.object_auths.where(title: 'fact_check').empty?? (@bulletin_category.object_auths.create! :title=> 'fact_check') : @bulletin_category.object_auths.where(title: 'fact_check')
+    preload_object_auth = @bulletin_category.get_object_auth_by_title('fact_check')
     @users_array =  preload_object_auth.first.privilege_users rescue []
     respond_to do |format|
       format.html
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 20a3d3eb..e9552141 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
@@ -4,7 +4,7 @@ class Panel::News::BackEnd::NewsApprovalsController  < OrbitBackendController
   include AdminHelper
   
   def preview_and_approve
-    @news_bulletin = NewsBulletin.find params[:news_bulletin_id]
+    @news_bulletin = NewsBulletin.find params[:news_category][:id]
   end
   
   def approve
@@ -14,19 +14,13 @@ class Panel::News::BackEnd::NewsApprovalsController  < OrbitBackendController
   def setting
     @sys_users = User.all(conditions: {admin: false})
     @news_bulletin_categorys = NewsBulletinCategory.all
-    if params.has_key?(:category_id)
-      first_category = NewsBulletinCategory.find params[:category_id]
-      if params[:commit] == 'Update'
-        privilege_users = params[:users].collect{|key,value| User.find key }  rescue []
-        preload_object_auth_ary = first_category.object_auths.where(title: 'fact_check') || (first_category.object_auths.create :title=> 'fact_check')
-        preload_object_auth = preload_object_auth_ary.first
-        preload_object_auth.privilege_users = privilege_users
-        preload_object_auth.save!
-      end
+    @options_from_collection_for_select_news_bulletin_categorys = @news_bulletin_categorys.collect{|bc| [bc.i18n_variable[I18n.locale],bc.id] }
+    if params.has_key? :news_category
+      @news_bulletin_categorys = NewsBulletinCategory.find params[:news_category][:id]
     else
-      first_category =  @news_bulletin_categorys.first
+      @news_bulletin_categorys =  @news_bulletin_categorys.first
     end  
-    preload_object_auth = first_category.object_auths.where(title: 'fact_check').empty?? (first_category.object_auths.create! :title=> 'fact_check') : first_category.object_auths.where(title: 'fact_check')
+    preload_object_auth = @news_bulletin_categorys.get_object_auth_by_title('fact_check')
     @users_array =  preload_object_auth.first.privilege_users rescue []
     respond_to do |format|
       format.html
@@ -44,12 +38,12 @@ class Panel::News::BackEnd::NewsApprovalsController  < OrbitBackendController
   end
 
   def user_list
-    @news_bulletin_category = NewsBulletinCategory.find params[:category_id]
+    @news_bulletin_category = NewsBulletinCategory.find params[:news_category][:id]
   end
 
   protected
   def update_setting_by_params
-    category = NewsBulletinCategory.find params[:category_id]
+    category = NewsBulletinCategory.find params[:news_category][:id]
     privilege_users = params[:users].collect{|key,value| User.find key }  rescue []
     object_auth_ary = category.object_auths.where(title: 'fact_check') || (category.object_auths.create :title=> 'fact_check')
     object_auth = object_auth_ary.first
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb
index f611154d..7b8211b4 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb
@@ -13,7 +13,7 @@
         <li class="accordion-group">
             <div class="form-search" style="margin: 5px 10px;">
                 <%= label_tag :category, t("news.news_bulletin.category") %>
-                <%= select_tag "category_id", options_from_collection_for_select(@news_bulletin_categorys, "id", "key") %>
+                <%= select "news_category",'id', @options_from_collection_for_select_news_bulletin_categorys %>
 								<%= search_field_tag 'user_filter' %>
             </div>
         </li>
@@ -34,9 +34,21 @@
 
 <script type="text/javascript" charset="utf-8">
 var availableTags = [];
-$(function() {
-
-	$('#category_id').change(function() {
-	  $(this).parents('form').submit();
-	});
+$(document).ready(function() {
+  
+  $(".prevent_enter_submit_form").bind("keypress", function(e) {
+    if (e.keyCode == 13) {
+      return false;
+    }
+  });
+   
+  $('#news_category_id').change(function() {
+    $.ajax({
+      type: 'GET',
+      dataType: "script",
+      url:$(this).parents("from").attr("href"),
+      data:$(this).parents("form").serialize()
+    });//.ajaxStart(function(){$('body').append('<div class="modal-backdrop fade in" id="modal_layer"></div>')});//.ajaxStop(function(){"#modal_layer"}).remove();
+  });
+});
 </script>
\ No newline at end of file
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.js.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.js.erb
index a01c9d6a..0ca148da 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.js.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.js.erb
@@ -1 +1,2 @@
-$("#users_checkbox_ary").replaceWith('<%= (render :partial => 'privilege_user', :locals => {:users => @users_array}).html_safe%>');
\ No newline at end of file
+$("#users_checkbox_ary").replaceWith('<%= escape_javascript(render :partial => "privilege_user", :locals => {:users => @users_array})%>');
+permissionCheckbox();
\ No newline at end of file

From 99bcdf6e1e89f7daa8baf4acfad4eecdfe90be51 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Tue, 22 May 2012 13:23:26 +0800
Subject: [PATCH 18/27] clean up unless code

---
 app/assets/javascripts/inc/ajax_setting.js                 | 7 -------
 .../panel/news/back_end/news_approvals/setting.html.erb    | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/assets/javascripts/inc/ajax_setting.js b/app/assets/javascripts/inc/ajax_setting.js
index 18d0da33..c23a73bf 100644
--- a/app/assets/javascripts/inc/ajax_setting.js
+++ b/app/assets/javascripts/inc/ajax_setting.js
@@ -1,10 +1,3 @@
-// $.ready(function(){
-//   $('body').bind("ajaxSend", function(){
-//      $('<div class="modal-backdrop fade in"></div>').appendTo('body');
-//     }).bind("ajaxComplete", function(){
-//       $('body > div.modal-backdrop').hide().remove();
-//   });  
-// });
 jQuery(document).ajaxStart(function(){
   $('<div class="modal-backdrop fade in" id="sys_modal"><img src="/assets/ajax-loader.gif" style="margin-top: 25%;margin-left: 50%;"></div>').appendTo('body');
 });
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb
index 7b8211b4..298e21eb 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb
@@ -48,7 +48,7 @@ $(document).ready(function() {
       dataType: "script",
       url:$(this).parents("from").attr("href"),
       data:$(this).parents("form").serialize()
-    });//.ajaxStart(function(){$('body').append('<div class="modal-backdrop fade in" id="modal_layer"></div>')});//.ajaxStop(function(){"#modal_layer"}).remove();
+    });
   });
 });
 </script>
\ No newline at end of file

From 1bbf89a3546463f2b8cc00a5e28e082810ea7705 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Tue, 22 May 2012 15:54:46 +0800
Subject: [PATCH 19/27] fix code

---
 .../panel/announcement/back_end/approvals_controller.rb         | 2 +-
 .../panel/news/back_end/news_approvals_controller.rb            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 cf966b24..22c3a6dd 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
@@ -21,7 +21,7 @@ class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendControlle
       @bulletin_category =  @bulletin_categorys.first
     end
     preload_object_auth = @bulletin_category.get_object_auth_by_title('fact_check')
-    @users_array =  preload_object_auth.first.privilege_users rescue []
+    @users_array =  preload_object_auth.privilege_users rescue []
     respond_to do |format|
       format.html
       format.js
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 e9552141..3eb3e9c0 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
@@ -21,7 +21,7 @@ class Panel::News::BackEnd::NewsApprovalsController  < OrbitBackendController
       @news_bulletin_categorys =  @news_bulletin_categorys.first
     end  
     preload_object_auth = @news_bulletin_categorys.get_object_auth_by_title('fact_check')
-    @users_array =  preload_object_auth.first.privilege_users rescue []
+    @users_array =  preload_object_auth.privilege_users rescue []
     respond_to do |format|
       format.html
       format.js

From d0b030c47dc10186d13414033d1318f104061ce2 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Tue, 22 May 2012 16:11:00 +0800
Subject: [PATCH 20/27] Put inc/ajax_setting in new_admin Fix callback for link
 on save

---
 app/assets/javascripts/new_admin.js  | 1 +
 app/models/link.rb                   | 2 +-
 app/views/layouts/new_admin.html.erb | 1 -
 config/locales/en.yml                | 4 ++++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/new_admin.js b/app/assets/javascripts/new_admin.js
index f5fed368..949753a9 100644
--- a/app/assets/javascripts/new_admin.js
+++ b/app/assets/javascripts/new_admin.js
@@ -17,3 +17,4 @@
 //= require side_bar_history
 //= require rss
 //= require ajax_form
+//= require inc/ajax_setting
diff --git a/app/models/link.rb b/app/models/link.rb
index 5b8c15a6..ccd79c89 100644
--- a/app/models/link.rb
+++ b/app/models/link.rb
@@ -13,7 +13,7 @@ class Link < Item
   protected
 
 	def add_http
-	  unless self.url[/^http?s:\/\//]
+	  unless self.url[/^http:\/\//] || self.url[/^https:\/\//]
 	    self.url = 'http://' + self.url
 	  end
 	end
diff --git a/app/views/layouts/new_admin.html.erb b/app/views/layouts/new_admin.html.erb
index 873b9f14..3a493a9d 100644
--- a/app/views/layouts/new_admin.html.erb
+++ b/app/views/layouts/new_admin.html.erb
@@ -9,7 +9,6 @@
 	<![endif]-->
 	<%= stylesheet_link_tag "new_admin" %>
 	<%= javascript_include_tag "new_admin" %>
-	<%= javascript_include_tag "inc/ajax_setting"  %>
 	<%= yield :page_specific_css %>
 	<%= yield :page_specific_javascript %>
 	<%= csrf_meta_tag %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2b4fac5d..cb638475 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -217,6 +217,10 @@ en:
     options: Options
     orig_upload_file: Original filename
     page: Page
+    page_context:
+      edit: Edit
+      ob_auth:
+        edit: Category authorization
     page_part_kinds:
       text: Text Area
       public_r_tag: System Widget

From e0260542d3e2e492a50686a7daee7441d07c7891 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Tue, 22 May 2012 15:54:46 +0800
Subject: [PATCH 21/27] fix code

---
 .../panel/announcement/back_end/approvals_controller.rb         | 2 +-
 .../panel/news/back_end/news_approvals_controller.rb            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 cf966b24..22c3a6dd 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
@@ -21,7 +21,7 @@ class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendControlle
       @bulletin_category =  @bulletin_categorys.first
     end
     preload_object_auth = @bulletin_category.get_object_auth_by_title('fact_check')
-    @users_array =  preload_object_auth.first.privilege_users rescue []
+    @users_array =  preload_object_auth.privilege_users rescue []
     respond_to do |format|
       format.html
       format.js
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 e9552141..3eb3e9c0 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
@@ -21,7 +21,7 @@ class Panel::News::BackEnd::NewsApprovalsController  < OrbitBackendController
       @news_bulletin_categorys =  @news_bulletin_categorys.first
     end  
     preload_object_auth = @news_bulletin_categorys.get_object_auth_by_title('fact_check')
-    @users_array =  preload_object_auth.first.privilege_users rescue []
+    @users_array =  preload_object_auth.privilege_users rescue []
     respond_to do |format|
       format.html
       format.js

From 874a89d99b6457ec0c3526eb4f41b936c22458a8 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris@rulingcom.com>
Date: Tue, 22 May 2012 16:48:57 +0800
Subject: [PATCH 22/27] Ray's fix for structure side_bar

---
 app/assets/stylesheets/sidebar.css.erb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/assets/stylesheets/sidebar.css.erb b/app/assets/stylesheets/sidebar.css.erb
index 76d1e4e9..1a77e0e7 100644
--- a/app/assets/stylesheets/sidebar.css.erb
+++ b/app/assets/stylesheets/sidebar.css.erb
@@ -21,6 +21,15 @@
 .nav-list>li>ol {
 	margin-left: 0;
 }
+.nav-list>li>.with_action {
+	padding-left: 0;
+}
+.nav-list>li>.with_action>.quick-edit {
+	margin: 0 0 0 3px !important;
+}
+.nav-list>li>.with_action>i {
+	display: none;
+}
 /*
 #back_sidebar h1 {
     background: url(<%= asset_path "h1_bg.png" %>) repeat-x scroll left top transparent;

From dd4c1697cd2970a33b8f9277859d7d4aeacdd6d6 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Tue, 22 May 2012 16:52:12 +0800
Subject: [PATCH 23/27] Fix bug when object_auth was only built but not created

---
 lib/orbit_core_lib.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/orbit_core_lib.rb b/lib/orbit_core_lib.rb
index fcabad78..f3cd2cd5 100644
--- a/lib/orbit_core_lib.rb
+++ b/lib/orbit_core_lib.rb
@@ -34,7 +34,7 @@ module  OrbitCoreLib
     def get_object_auth_by_title(title)
       oa = self.object_auths.where({title: title }).first
        if oa.nil? && (self.class::ObjectAuthTitlesOptions.include? title)
-        oa =  self.object_auths.build title: title
+        oa =  self.object_auths.create title: title
       end
       oa
     end

From 541aa5831e1ffefa61adfd06304b92592c357692 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Tue, 22 May 2012 17:37:15 +0800
Subject: [PATCH 24/27] JS changes to load drag and drop

---
 app/assets/javascripts/page_edit.js.erb           | 6 +++++-
 app/views/admin/items/_site_map_left_bar.html.erb | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/page_edit.js.erb b/app/assets/javascripts/page_edit.js.erb
index 7c0f6923..d7aaccd0 100644
--- a/app/assets/javascripts/page_edit.js.erb
+++ b/app/assets/javascripts/page_edit.js.erb
@@ -34,6 +34,10 @@ $('.part_kind').live('click', function() {
 });
 
 $(document).ready(function(){
+	bindTreeDragHandle();
+});
+
+var bindTreeDragHandle = function(){
 	$('ol.sortable').nestedSortable({
 		disableNesting: 'no-nest',
 		forcePlaceholderSize: true,
@@ -52,4 +56,4 @@ $(document).ready(function(){
 			$.post("<%= Rails.application.routes.url_helpers.admin_update_position_path %>", { id: ui.item.attr('id'), parent_id: ui.item.parent().closest('li').attr('id'), position: ui.item.index() } );
   	}
 	});
-});
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/views/admin/items/_site_map_left_bar.html.erb b/app/views/admin/items/_site_map_left_bar.html.erb
index a9cf2d91..6307e5aa 100644
--- a/app/views/admin/items/_site_map_left_bar.html.erb
+++ b/app/views/admin/items/_site_map_left_bar.html.erb
@@ -1,3 +1,6 @@
 <ol class="nav nav-list">
 	<%= render_node_and_children(Item.first(:conditions => {:parent_id => nil})) %>
 </ol>
+<script type="text/javascript">
+	bindTreeDragHandle();
+</script>
\ No newline at end of file

From 11a371cbb96a36784e4cbd2d16a52ca3e1d8315d Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Tue, 22 May 2012 17:55:45 +0800
Subject: [PATCH 25/27] Fix destroy in structure Fix sorting

---
 app/controllers/orbit_backend_controller.rb | 12 ++++++++----
 app/models/item.rb                          |  6 ++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb
index 12ba78e4..9648f327 100644
--- a/app/controllers/orbit_backend_controller.rb
+++ b/app/controllers/orbit_backend_controller.rb
@@ -33,6 +33,7 @@ class OrbitBackendController< ApplicationController
 
   def get_sorted_and_filtered(object_class, query=nil)
     objects = get_objects(object_class, query)
+    object_class = object_class.classify.constantize
     if !params[:sort].blank?
       options = params[:sort_options]
       options = [options] if !options.class.eql?(Array)
@@ -87,7 +88,7 @@ class OrbitBackendController< ApplicationController
           end if value.size > 0
       end
     end
-    Kaminari.paginate_array(objects).page(params[:page]).per(10)
+    Kaminari.paginate_array(filter_authorized_objects(objects)).page(params[:page]).per(10)
   end
 
   def get_string_value_from_object(object)
@@ -159,13 +160,16 @@ class OrbitBackendController< ApplicationController
   end
 
   def get_objects(object_class, query=nil)
-
     object_class = object_class.classify.constantize
     if query
-      objects = object_class.all.where(query).entries
+      objects = object_class.all.where(query)
     else
-      objects = object_class.all.entries
+      objects = object_class.all
     end
+    objects
+  end
+
+  def filter_authorized_objects(objects)
     if(!is_admin? || !is_manager?)
       objects.delete_if{ |object|
         if object.is_pending == true
diff --git a/app/models/item.rb b/app/models/item.rb
index cdf0f2fb..8dd5c0b4 100644
--- a/app/models/item.rb
+++ b/app/models/item.rb
@@ -10,16 +10,18 @@ class Item
   field :is_published, :type => Boolean, :default => false
   field :enabled_for, :type => Array, :default => nil
   field :menu_enabled_for, :type => Array, :default => nil
+
+  has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
  
   validates_format_of :name, :with => /^[0-9a-zA-Z\-_]+$/
   validates :name, :exclusion => { :in => LIST[:forbidden_item_names] }
   validates_uniqueness_of :name, :scope => :parent_id
   validates_presence_of :name
-
   validates_associated :parent, :children
+  
+  before_destroy :destroy_children
   after_rearrange :rebuild_path
   
-  has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
   
   def self.find_by_name(item_name)
     Item.first(:conditions => { :name => item_name, :is_published => true })

From d6b92fc604387b8252ff278682c2aa3ed6f41fff Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris@rulingcom.com>
Date: Tue, 22 May 2012 20:00:07 +0800
Subject: [PATCH 26/27] Fixed bugs for nccu

---
 app/controllers/orbit_backend_controller.rb                 | 6 +++---
 app/views/kaminari/_gap.html.erb                            | 2 +-
 .../panel/news/front_end/news_bulletins/index.html.erb      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb
index 9648f327..339f7ede 100644
--- a/app/controllers/orbit_backend_controller.rb
+++ b/app/controllers/orbit_backend_controller.rb
@@ -74,7 +74,7 @@ class OrbitBackendController< ApplicationController
           when 'categories'
             a = Array.new
             objects.each do |object|
-              a << object if value.include?(object.send("#{object.class.to_s.underscore}_category").id.to_s)
+              a << object if (value.include?(object.send("#{object.class.to_s.underscore}_category").id.to_s) rescue nil)
             end
             objects = a.uniq
           when 'tags'
@@ -99,9 +99,9 @@ class OrbitBackendController< ApplicationController
     if s
       case s.class.to_s
         when "String"
-          s.downcase
+          s.downcase rescue ''
         when "I18nVariable"
-          s[I18n.locale].downcase
+          s[I18n.locale].downcase rescue ''
         else
           nil
         end
diff --git a/app/views/kaminari/_gap.html.erb b/app/views/kaminari/_gap.html.erb
index 8807aafe..c680799d 100644
--- a/app/views/kaminari/_gap.html.erb
+++ b/app/views/kaminari/_gap.html.erb
@@ -5,4 +5,4 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="page gap"><%= raw(t 'views.pagination.truncate') %></li>
+<!-- <li class="page gap"><%= raw(t 'views.pagination.truncate') %></li> -->
diff --git a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
index 322b64c0..6968a482 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
@@ -17,7 +17,7 @@
 		</tr>
 		<% @news_bulletins.each do |post| %>
 		<tr>
-			<td><%= image_tag post.image %></td>
+			<td><%= image_tag post.image rescue nil %></td>
 			<td>
 				<%= link_to post.title[I18n.locale], panel_news_front_end_news_bulletin_path(post), :class => 'news_title' %>
 				<%= post.subtitle[I18n.locale].html_safe %>

From eab82269c11b986937508930b28f67ff6269cfbd Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Tue, 22 May 2012 20:19:04 +0800
Subject: [PATCH 27/27] Remove seconds from date display

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 26dbddc4..e5d5e374 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -205,7 +205,7 @@ module ApplicationHelper
   end
 
   def display_date_time(object)
-    object.strftime("%Y-%m-%d %H:%M:%S")
+    object.strftime("%Y-%m-%d %H:%M")
   end
 
   def display_date(object)