From 8ad7f708227350814bd671dcc09466b1ca8bb35c Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Fri, 18 May 2012 10:28:28 +0800
Subject: [PATCH 1/6] Proof i18n_variable for categories

---
 app/controllers/admin/asset_categories_controller.rb            | 1 -
 app/controllers/admin/infos_controller.rb                       | 1 -
 app/controllers/admin/roles_controller.rb                       | 1 -
 .../announcement/back_end/bulletin_categorys_controller.rb      | 1 -
 .../panel/announcement/back_end/bulletins/_bulletin.html.erb    | 2 +-
 .../views/panel/announcement/back_end/bulletins/show.html.erb   | 2 +-
 .../views/panel/announcement/front_end/bulletins/index.html.erb | 2 +-
 .../views/panel/announcement/widget/bulletins/_index.html.erb   | 2 +-
 .../panel/news/back_end/news_bulletin_categorys_controller.rb   | 1 -
 .../panel/news/back_end/news_bulletins/_news_bulletin.html.erb  | 2 +-
 .../app/views/panel/news/back_end/news_bulletins/show.html.erb  | 2 +-
 .../web_resource/back_end/web_link_categorys_controller.rb      | 1 -
 .../panel/web_resource/back_end/web_links/_web_link.html.erb    | 2 +-
 .../views/panel/web_resource/back_end/web_links/show.html.erb   | 2 +-
 .../views/panel/web_resource/front_end/web_links/index.html.erb | 2 +-
 .../views/panel/web_resource/front_end/web_links/show.html.erb  | 2 +-
 .../views/panel/web_resource/widget/web_links/index.html.erb    | 2 +-
 17 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/app/controllers/admin/asset_categories_controller.rb b/app/controllers/admin/asset_categories_controller.rb
index 22efd03f..9ce6bb48 100644
--- a/app/controllers/admin/asset_categories_controller.rb
+++ b/app/controllers/admin/asset_categories_controller.rb
@@ -17,7 +17,6 @@ class Admin::AssetCategoriesController < OrbitBackendController
   
   def edit
     @asset_category = AssetCategory.find(params[:id])
-    @i18n_variable = @asset_category.i18n_variable	
     @url = admin_asset_categories_path(@asset_category)
   end
 
diff --git a/app/controllers/admin/infos_controller.rb b/app/controllers/admin/infos_controller.rb
index bc86b662..21306c6e 100644
--- a/app/controllers/admin/infos_controller.rb
+++ b/app/controllers/admin/infos_controller.rb
@@ -21,7 +21,6 @@ class Admin::InfosController < ApplicationController
   
   def edit
     @attribute = Info.find(params[:id])
-    @i18n_variable = @attribute.i18n_variable
     render :template => 'admin/attributes/edit'
   end
   
diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb
index 65c86f36..d02224a5 100644
--- a/app/controllers/admin/roles_controller.rb
+++ b/app/controllers/admin/roles_controller.rb
@@ -21,7 +21,6 @@ class Admin::RolesController < ApplicationController
   
   def edit
     @attribute = Role.find(params[:id])
-    @i18n_variable = @attribute.i18n_variable
     render :template => 'admin/attributes/edit'
   end
   
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
index b9151125..65359763 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
@@ -55,7 +55,6 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendCo
   # GET /bulletins/1/edit
   def edit
     @bulletin_category = BulletinCategory.find(params[:id])
-    @i18n_variable = @bulletin_category.i18n_variable	
 	
 	@url = panel_announcement_back_end_bulletin_category_path(@bulletin_category)
 
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 b69def3b..423e35ba 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
@@ -28,7 +28,7 @@
 			</div>
 		</div>
 	</td>
-	<td><%= bulletin.bulletin_category.i18n_variable[I18n.locale] %></td>
+	<td><%= bulletin.bulletin_category.i18n_variable[I18n.locale] rescue nil %></td>
 	<td>
 		<%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''%>
 		
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 158e07d0..68634b9a 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
@@ -1,7 +1,7 @@
 <ul>
 	<li>
   <b><%= t('announcement.category') %></b>
-  <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] %>
+  <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] rescue nil %>
 	</li>
 	<li>
   <b><%= t('announcement.postdate') %></b>
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 16ac7d8b..6937a6c3 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
@@ -18,7 +18,7 @@
 
 <% @bulletins.each do |post| %>
   <tr>
-	<td><%= post.bulletin_category.i18n_variable[I18n.locale] %></td>
+	<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) %>
 	<%#= link_to post.title, panel_announcement_back_end_bulletin_path(post) %>
 	</td>
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 c0fe606f..daadc367 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
@@ -12,7 +12,7 @@
 
 <% @bulletins.each do |post| %>
   <tr>
-	<td><%= post.bulletin_category.i18n_variable[I18n.locale] %></td>
+	<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>
diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb
index 956e98dc..e3ac7476 100644
--- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb
+++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb
@@ -56,7 +56,6 @@ class Panel::News::BackEnd::NewsBulletinCategorysController < OrbitBackendContro
   # GET /news_bulletins/1/edit
   def edit
     @news_bulletin_category = NewsBulletinCategory.find(params[:id])
-    @i18n_variable = @news_bulletin_category.i18n_variable	
 	
 	@url = panel_news_back_end_news_bulletin_category_path(@news_bulletin_category)
 
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..bdd19082 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
@@ -28,7 +28,7 @@
 			</div>
 		</div>
 	</td>
-	<td><%= news_bulletin.news_bulletin_category.i18n_variable[I18n.locale] %></td>
+	<td><%= news_bulletin.news_bulletin_category.i18n_variable[I18n.locale] rescue nil %></td>
 	<td>
 		<%= link_to news_bulletin.title[I18n.locale], panel_news_front_end_news_bulletin_path(news_bulletin, :category_id => news_bulletin.news_bulletin_category.id) rescue ''%>
 
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 343d3a94..1868c8fb 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
@@ -1,7 +1,7 @@
 <ul>
 	<li>
   <b><%= t('news.category') %></b>
-  <%= @news_bulletin.news_bulletin_category.i18n_variable[I18n.locale] %>
+  <%= @news_bulletin.news_bulletin_category.i18n_variable[I18n.locale] rescue nil %>
 	</li>
 	<li>
   <b><%= t('news.postdate') %></b>
diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb
index 8c961cba..a7d270a5 100644
--- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb
+++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb
@@ -38,7 +38,6 @@ class Panel::WebResource::BackEnd::WebLinkCategorysController < OrbitBackendCont
   # GET /web_links/1/edit
   def edit
     @web_link_category = WebLinkCategory.find(params[:id])
-    @i18n_variable = @web_link_category.i18n_variable	
 	
 	@url = panel_web_resource_back_end_web_link_category_path(@web_link_category)
 
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb
index f7d70250..7efa3b72 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb
@@ -19,7 +19,7 @@
 			</div>
 		</div>
 	</td>
-	<td><%= web_link.web_link_category.i18n_variable[I18n.locale] %></td>
+	<td><%= web_link.web_link_category.i18n_variable[I18n.locale] rescue nil %></td>
 	<td>
 	<%= link_to web_link.name[I18n.locale], panel_web_resource_back_end_web_link_path(web_link) %>
 	<div class="quick-edit">
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 f02d9156..e3734616 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
@@ -9,7 +9,7 @@
 <ul>
 	<li>
   <b><%= t('announcement.category') %></b>
-  <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] %>
+  <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] rescue nil %>
 	</li>
 	<li>
   <b><%= t('announcement.postdate') %></b>
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb
index 2c32f800..0d1626a5 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb
@@ -15,7 +15,7 @@
 
 	<% @web_links.each do |post| %>
 	  <tr>
-		<td><%= post.web_link_category.i18n_variable[I18n.locale] %></td>
+		<td><%= post.web_link_category.i18n_variable[I18n.locale] rescue nil %></td>
 		<td>
 		<%#= link_to post.name[I18n.locale], panel_web_resource_front_end_web_link_path(post) %>
 		<%= link_to post.name[I18n.locale], post.url, {:target => '_blank', :title => post.name[I18n.locale]} %>
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 755766fe..a3381e5c 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
@@ -9,7 +9,7 @@
 <ul>
 	<li>
   <b><%= t('announcement.category') %></b>
-  <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] %>
+  <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] rescue nil %>
 	</li>
 	<li>
   <b><%= t('announcement.postdate') %></b>
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb
index 8eebc6ac..40d70aaa 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb
@@ -14,7 +14,7 @@
 	  </tr>
 		<% @web_links.each do |post| %>
 		  <tr>
-				<td><%= post.web_link_category.i18n_variable[I18n.locale] %></td>
+				<td><%= post.web_link_category.i18n_variable[I18n.locale] rescue nil %></td>
 				<td>
 					<%= link_to post.name[I18n.locale], post.url, {:target => '_blank', :title => post.name[I18n.locale]} %>
 				</td>

From d9c12ea5a4dc44290f5593312884745217d8ed7c Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Fri, 18 May 2012 10:50:51 +0800
Subject: [PATCH 2/6] Proof authed_users for case when no category

---
 config/mongoid.yml                                            | 4 ++--
 .../panel/announcement/back_end/bulletins_controller.rb       | 2 +-
 .../helpers/panel/announcement/back_end/bulletins_helper.rb   | 2 +-
 .../panel/news/back_end/news_bulletins_controller.rb          | 2 +-
 .../app/helpers/panel/news/back_end/news_bulletins_helper.rb  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/mongoid.yml b/config/mongoid.yml
index 0270b13c..16405831 100644
--- a/config/mongoid.yml
+++ b/config/mongoid.yml
@@ -8,7 +8,7 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: prototype_r4_development
+  database: prototype_r4_ldap0229
 
 test:
   <<: *defaults
@@ -22,4 +22,4 @@ production:
   # password: <%= ENV['MONGOID_PASSWORD'] %>
   # database: <%= ENV['MONGOID_DATABASE'] %>
   <<: *defaults
-  database: prototype_r4_development
\ No newline at end of file
+  database: prototype_r4_ldap0229
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 325f60f7..42b4c8fd 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
@@ -45,7 +45,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 	
     if(!is_admin? || !is_manager?)
       @bulletins.delete_if{ |bulletin|
-              bulletin.is_pending == true && (!bulletin.bulletin_category.authed_users('fact_check').include?(current_user) || bulletin.create_user_id!=current_user.id)
+              bulletin.is_pending == true && ((!bulletin.bulletin_category.authed_users('fact_check').include?(current_user) rescue nil) || bulletin.create_user_id!=current_user.id)
             }
         end
     
diff --git a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb
index 68286c3e..c384bc8f 100644
--- a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb
+++ b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb
@@ -2,7 +2,7 @@ module Panel::Announcement::BackEnd::BulletinsHelper
   
   def show_approval_link(bulletin)
     by_bulletin = (!bulletin.is_expired? and !bulletin.is_checked?)
-    by_user = (bulletin.bulletin_category.authed_users('fact_check').include?(current_user) or is_manager? or is_admin?)
+    by_user = ((bulletin.bulletin_category.authed_users('fact_check').include?(current_user) rescue nil) or is_manager? or is_admin?)
     by_bulletin and  by_user
   end
 
diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb
index e845cbd1..706e7663 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
@@ -43,7 +43,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
     @link_url = panel_news_back_end_news_bulletins_path
 	
     @news_bulletins.delete_if{ |news_bulletin|
-      news_bulletin.is_pending == true && (!news_bulletin.bulletin_category.authed_users('fact_check').include?(current_user) || news_bulletin.create_user_id!=current_user.id)
+      news_bulletin.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
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..aebc8145 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) rescue nil) or is_manager?
     by_news_bulletin and  by_user
   end
 

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 3/6] 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 4/6] 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 5/6] 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 6/6] 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