From ebf3a2eae451ec7e38fcfd1e21533322f90999f3 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Thu, 1 Mar 2012 10:57:13 +0800
Subject: [PATCH 01/20] Fix extra loaded js: the widgets only need to render
 layout when they need js.

---
 app/controllers/obit_frontend_component_controller.rb           | 2 +-
 .../panel/announcement/widget/bulletins_controller.rb           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/obit_frontend_component_controller.rb b/app/controllers/obit_frontend_component_controller.rb
index d0be3a25..2c44b60c 100644
--- a/app/controllers/obit_frontend_component_controller.rb
+++ b/app/controllers/obit_frontend_component_controller.rb
@@ -1,7 +1,7 @@
 class ObitFrontendComponentController< ApplicationController
   before_filter :setup_vars
   before_filter {|c| c.front_end_available(@app_title)}
-  layout 'module_widget'
+  layout :false
   
   def setup_vars
     @app_title = request.fullpath.split('/')[2]
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
index 6695156a..333f88e7 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
@@ -28,6 +28,7 @@ class Panel::Announcement::Widget::BulletinsController < ObitWidgetController
     @selected_tag = AnnouncementTag.find(params[:id]) rescue @tags[0]
     @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(5) rescue nil
     @web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(5) rescue nil
+    render :layout => 'module_widget'
   end
   
   def reload_bulletins

From 9ae140204f62bae987fddd1fb3eb393e1880bd89 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Thu, 1 Mar 2012 10:58:31 +0800
Subject: [PATCH 02/20] Fix announcement pagination in front-end

---
 app/controllers/pages_controller.rb                         | 6 +++++-
 lib/parsers/parser_back_end.rb                              | 2 +-
 lib/parsers/parser_front_end.rb                             | 2 +-
 .../panel/announcement/front_end/bulletins_controller.rb    | 6 +++---
 .../panel/announcement/front_end/bulletins/index.html.erb   | 4 ++--
 vendor/built_in_modules/announcement/config/routes.rb       | 1 -
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index aa66238d..8ea35391 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -30,7 +30,11 @@ class PagesController < ApplicationController
    end
    
    def index_from_link
-     redirect_to "/#{@item.full_name}"
+      if params[:page]
+        redirect_to "/#{@item.full_name}?page=#{params[:page]}"
+      else
+        redirect_to "/#{@item.full_name}"
+      end
    end
    
    def show_from_link
diff --git a/lib/parsers/parser_back_end.rb b/lib/parsers/parser_back_end.rb
index dea65b6a..37c22ed1 100644
--- a/lib/parsers/parser_back_end.rb
+++ b/lib/parsers/parser_back_end.rb
@@ -100,7 +100,7 @@ module ParserBackEnd
         ret = ''
         if (tag.attributes["main"] == "true" && !page.module_app.nil?)
           ret << "<div id='appfrontend' class='dymanic_load' path='/panel/#{page.module_app.key}/front_end/#{page.app_frontend_url}?inner=true&page_id=#{page.id}"
-          ret << "&bulletin_category_id=#{page.category}" if page[:category]
+          ret << "&category_id=#{page.category}" if page[:category]
           ret << "'></div>"
         else
           part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s }
diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb
index 305596ed..17468e54 100644
--- a/lib/parsers/parser_front_end.rb
+++ b/lib/parsers/parser_front_end.rb
@@ -127,7 +127,7 @@ module ParserFrontEnd
           ret << "<div id='appfrontend' class='dymanic_load' path='/panel/#{page.module_app.key}/front_end/#{page.app_frontend_url}"
           ret << "/#{id}" if id
           ret << "?inner=true&page_id=#{page.id}"
-          ret << "&bulletin_category_id=#{page.category}" if page[:category]
+          ret << "&category_id=#{page.category}" if page[:category]
           ret << "'></div>"
         else
           part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil
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 b71a4609..e840d65f 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
@@ -11,15 +11,15 @@ class Panel::Announcement::FrontEnd::BulletinsController < ObitWidgetController
   def index
   
     date_now = Time.now
-    if params[:bulletin_category_id]
-      @bulletins = Bulletin.where(:bulletin_category_id => params[:bulletin_category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
+    if params[:category_id]
+      @bulletins = Bulletin.where(:bulletin_category_id => params[:category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
     else
       @bulletins = Bulletin.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
     end
 
 	  get_categorys
 	  
-	  @current_category = BulletinCategory.from_id(params[:bulletin_category_id]) rescue nil
+	  @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil
   end
   
   def show
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 d4335e9a..086794b9 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
@@ -28,6 +28,6 @@
 <% end %>
 
 </table>
-	
-<%= paginate @bulletins %>
+
+<%= paginate @bulletins, :params => {:inner => 'false'} %>
 
diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb
index c3a60f74..a604da85 100644
--- a/vendor/built_in_modules/announcement/config/routes.rb
+++ b/vendor/built_in_modules/announcement/config/routes.rb
@@ -10,7 +10,6 @@ Rails.application.routes.draw do
         resources :tags
       end
       namespace :front_end do
-        root :to => "bulletins#index"
         resources :bulletins
       end
       namespace :widget do

From 826a5a5f20f158237dc49b36e3692183111f31d5 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Thu, 1 Mar 2012 14:12:47 +0800
Subject: [PATCH 03/20] Fix link in widget

---
 .../panel/announcement/widget/bulletins/_web_links.html.erb     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb
index 3a6982dc..2b65417d 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb
@@ -1,6 +1,6 @@
 <% @web_links.each do |web_link| %>
 	<li>
-		<a><%= web_link.name[I18n.locale] %></a>
+		<%= link_to web_link.name[I18n.locale], web_link.url %>
 	</li>
 <% end %>
 

From 900855724c4e06984b3291fe4bdae46399f94b24 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Wed, 7 Mar 2012 11:37:00 +0800
Subject: [PATCH 04/20] Add bootstrap-orbit.css in front-end

---
 lib/parsers/parser_front_end.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb
index 17468e54..99353cc1 100644
--- a/lib/parsers/parser_front_end.rb
+++ b/lib/parsers/parser_front_end.rb
@@ -62,6 +62,7 @@ module ParserFrontEnd
       c.define_tag 'stylesheets' do |tag|
         res = ''
         res << "<link href='/assets/bootstrap.css.erb' rel='stylesheet' type='text/css'/>"
+        res << "<link href='/assets/bootstrap-orbit.css' rel='stylesheet' type='text/css'/>"
         res << "<link href='/assets/style.css.erb' rel='stylesheet' type='text/css'/>"
         res << "<link href='#{page.design.reset_css.file.url}' rel='stylesheet' type='text/css' />" if page.design.reset_css
         res << "<link href='#{page.design.default_css.file.url}' rel='stylesheet' type='text/css' /> " if page.design.default_css

From 0b1f83c042edae823005eb22f0cf9e677d78d01a Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Thu, 1 Mar 2012 10:57:13 +0800
Subject: [PATCH 05/20] Fix extra loaded js: the widgets only need to render
 layout when they need js.

---
 app/controllers/orbit_frontend_component_controller.rb          | 2 +-
 .../panel/announcement/widget/bulletins_controller.rb           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/orbit_frontend_component_controller.rb b/app/controllers/orbit_frontend_component_controller.rb
index 12695040..185dbce6 100644
--- a/app/controllers/orbit_frontend_component_controller.rb
+++ b/app/controllers/orbit_frontend_component_controller.rb
@@ -1,7 +1,7 @@
 class OrbitFrontendComponentController< ApplicationController
   before_filter :setup_vars
   before_filter {|c| c.front_end_available(@app_title)}
-  layout 'module_widget'
+  layout :false
   
   def setup_vars
     @app_title = request.fullpath.split('/')[2]
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
index 6695156a..333f88e7 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
@@ -28,6 +28,7 @@ class Panel::Announcement::Widget::BulletinsController < ObitWidgetController
     @selected_tag = AnnouncementTag.find(params[:id]) rescue @tags[0]
     @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(5) rescue nil
     @web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(5) rescue nil
+    render :layout => 'module_widget'
   end
   
   def reload_bulletins

From 4dd9b7ffa43b873db2cdba66163dceb0b24f14f4 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Thu, 1 Mar 2012 10:58:31 +0800
Subject: [PATCH 06/20] Fix announcement pagination in front-end

---
 app/controllers/pages_controller.rb                         | 6 +++++-
 lib/parsers/parser_back_end.rb                              | 2 +-
 lib/parsers/parser_front_end.rb                             | 2 +-
 .../panel/announcement/front_end/bulletins_controller.rb    | 6 +++---
 .../panel/announcement/front_end/bulletins/index.html.erb   | 4 ++--
 vendor/built_in_modules/announcement/config/routes.rb       | 1 -
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index aa66238d..8ea35391 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -30,7 +30,11 @@ class PagesController < ApplicationController
    end
    
    def index_from_link
-     redirect_to "/#{@item.full_name}"
+      if params[:page]
+        redirect_to "/#{@item.full_name}?page=#{params[:page]}"
+      else
+        redirect_to "/#{@item.full_name}"
+      end
    end
    
    def show_from_link
diff --git a/lib/parsers/parser_back_end.rb b/lib/parsers/parser_back_end.rb
index dea65b6a..37c22ed1 100644
--- a/lib/parsers/parser_back_end.rb
+++ b/lib/parsers/parser_back_end.rb
@@ -100,7 +100,7 @@ module ParserBackEnd
         ret = ''
         if (tag.attributes["main"] == "true" && !page.module_app.nil?)
           ret << "<div id='appfrontend' class='dymanic_load' path='/panel/#{page.module_app.key}/front_end/#{page.app_frontend_url}?inner=true&page_id=#{page.id}"
-          ret << "&bulletin_category_id=#{page.category}" if page[:category]
+          ret << "&category_id=#{page.category}" if page[:category]
           ret << "'></div>"
         else
           part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s }
diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb
index 305596ed..17468e54 100644
--- a/lib/parsers/parser_front_end.rb
+++ b/lib/parsers/parser_front_end.rb
@@ -127,7 +127,7 @@ module ParserFrontEnd
           ret << "<div id='appfrontend' class='dymanic_load' path='/panel/#{page.module_app.key}/front_end/#{page.app_frontend_url}"
           ret << "/#{id}" if id
           ret << "?inner=true&page_id=#{page.id}"
-          ret << "&bulletin_category_id=#{page.category}" if page[:category]
+          ret << "&category_id=#{page.category}" if page[:category]
           ret << "'></div>"
         else
           part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil
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 b71a4609..e840d65f 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
@@ -11,15 +11,15 @@ class Panel::Announcement::FrontEnd::BulletinsController < ObitWidgetController
   def index
   
     date_now = Time.now
-    if params[:bulletin_category_id]
-      @bulletins = Bulletin.where(:bulletin_category_id => params[:bulletin_category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
+    if params[:category_id]
+      @bulletins = Bulletin.where(:bulletin_category_id => params[:category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
     else
       @bulletins = Bulletin.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
     end
 
 	  get_categorys
 	  
-	  @current_category = BulletinCategory.from_id(params[:bulletin_category_id]) rescue nil
+	  @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil
   end
   
   def show
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 d4335e9a..086794b9 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
@@ -28,6 +28,6 @@
 <% end %>
 
 </table>
-	
-<%= paginate @bulletins %>
+
+<%= paginate @bulletins, :params => {:inner => 'false'} %>
 
diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb
index 78425f33..cb39d253 100644
--- a/vendor/built_in_modules/announcement/config/routes.rb
+++ b/vendor/built_in_modules/announcement/config/routes.rb
@@ -13,7 +13,6 @@ Rails.application.routes.draw do
         resources :tags
       end
       namespace :front_end do
-        root :to => "bulletins#index"
         resources :bulletins
       end
       namespace :widget do

From 79c8b3861b3e92aef8493da22858aa7b340429e9 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Thu, 1 Mar 2012 14:12:47 +0800
Subject: [PATCH 07/20] Fix link in widget

---
 .../panel/announcement/widget/bulletins/_web_links.html.erb     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb
index 3a6982dc..2b65417d 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb
@@ -1,6 +1,6 @@
 <% @web_links.each do |web_link| %>
 	<li>
-		<a><%= web_link.name[I18n.locale] %></a>
+		<%= link_to web_link.name[I18n.locale], web_link.url %>
 	</li>
 <% end %>
 

From 3e22c6e61b79bf379deca7fff08190ee083cdf54 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Wed, 7 Mar 2012 11:37:00 +0800
Subject: [PATCH 08/20] Add bootstrap-orbit.css in front-end

---
 lib/parsers/parser_front_end.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb
index 17468e54..99353cc1 100644
--- a/lib/parsers/parser_front_end.rb
+++ b/lib/parsers/parser_front_end.rb
@@ -62,6 +62,7 @@ module ParserFrontEnd
       c.define_tag 'stylesheets' do |tag|
         res = ''
         res << "<link href='/assets/bootstrap.css.erb' rel='stylesheet' type='text/css'/>"
+        res << "<link href='/assets/bootstrap-orbit.css' rel='stylesheet' type='text/css'/>"
         res << "<link href='/assets/style.css.erb' rel='stylesheet' type='text/css'/>"
         res << "<link href='#{page.design.reset_css.file.url}' rel='stylesheet' type='text/css' />" if page.design.reset_css
         res << "<link href='#{page.design.default_css.file.url}' rel='stylesheet' type='text/css' /> " if page.design.default_css

From 00ab7739426678983bc6cc529e7cf12cbc18a0f1 Mon Sep 17 00:00:00 2001
From: unknown <Spen@Spen-VAIO.(none)>
Date: Wed, 14 Mar 2012 20:05:03 +0800
Subject: [PATCH 09/20] fix dashboard & announcement

---
 app/assets/javascripts/bulletin_form.js.erb   |   3 +-
 app/views/layouts/_side_bar.html.erb          |  15 +-
 .../back_end/bulletins_controller.rb          |  51 +-
 .../announcement/app/models/bulletin.rb       |  26 +-
 .../announcement/app/models/bulletin_file.rb  |  22 +-
 .../announcement/app/models/bulletin_link.rb  |   8 +-
 .../_bulletin_category.html.erb               |  28 +-
 .../bulletin_categorys/_form.html.erb         |  54 +-
 .../bulletin_categorys/_quick_edit.html.erb   |  13 +
 .../_quick_edit_qe.html.erb                   |  28 +
 .../bulletin_categorys/index.html.erb         |  46 +-
 .../bulletins/_bulletin_file.html.erb         |  16 +-
 .../bulletins/_bulletin_link.html - 複製.erb  |  27 +
 .../bulletins/_bulletin_link.html.erb         |  10 +-
 .../bulletins/_bulletin_link2.html - 複製.erb |  16 +
 .../bulletins/_bulletin_link2.html.erb        |  17 +
 .../bulletins/_bulletin_link_qe.html.erb      |  41 +
 .../back_end/bulletins/_form.html.erb         | 720 ++++++------------
 .../bulletins/_quick_edit_links.html.erb      |  34 +-
 .../bulletins/_quick_edit_picture.html.erb    |  13 +-
 .../back_end/bulletins/index.html - 複製.erb  |   9 +
 .../back_end/bulletins/link_quick_edit.js.erb |   2 +
 .../back_end/bulletins/show.html.erb          |  10 +-
 .../widget/bulletins/index.html.erb           |   2 +-
 .../announcement/config/routes.rb             |   5 +-
 .../back_end/page_contexts/_form.html.erb     |  51 +-
 .../page_contexts/_page_context.html.erb      |  22 +-
 .../page_contexts/_view_page_context.html.erb |  23 +-
 .../back_end/page_contexts/edit.html.erb      |  10 +-
 .../back_end/page_contexts/index.html.erb     |  42 +-
 .../back_end/page_contexts/view.html.erb      |  41 +-
 .../back_end/web_link_categorys_controller.rb |   2 +-
 .../back_end/web_links_controller.rb          |   2 +-
 .../web_link_categorys/_form.html.erb         |  38 +-
 .../_web_link_category.html.erb               |  26 +-
 .../web_link_categorys/index.html.erb         |  46 +-
 .../back_end/web_links/_form.html.erb         | 145 ++--
 .../back_end/web_links/_web_links.html.erb    |  17 +-
 .../back_end/web_links/index.html.erb         |  59 +-
 39 files changed, 845 insertions(+), 895 deletions(-)
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit.html.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - 複製.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - 複製.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 複製.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb

diff --git a/app/assets/javascripts/bulletin_form.js.erb b/app/assets/javascripts/bulletin_form.js.erb
index 5002cfae..17f86060 100644
--- a/app/assets/javascripts/bulletin_form.js.erb
+++ b/app/assets/javascripts/bulletin_form.js.erb
@@ -1,4 +1,4 @@
-$('.bulletin_urls_block a.delete').live('click', function(){
+$('.bulletin_links_block a.delete').live('click', function(){
   $(this).parents('.list_item').remove();
 });
 
@@ -9,4 +9,5 @@ $('.bulletin_files_block a.delete').live('click', function(){
 $('.action a.remove_existing_record').live('click', function(){
   $(this).next('.should_destroy').attr('value', 1);
   $("#bulletin_" + $(this).prev().attr('value')).hide();
+  $("tr#bulletin_" + $(this).prev().attr('value')).hide();
 });
\ No newline at end of file
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index 15948578..61e2c4d8 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -16,16 +16,25 @@
 	<%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), panel_web_resource_back_end_web_links_path %>
 <% end -%>
 
-<%= content_tag :li, :class => active_for_controllers(nil) do -%>
+<%= content_tag :li, :class => active_for_controllers('page_contexts') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-page') + t('admin.page'), panel_page_content_back_end_page_contexts_path %>
+	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('page_contexts')) do -%>
+		<%= content_tag :li, link_to(t('admin.all_articles'), panel_page_content_back_end_page_contexts_path), :class => active_for_action('page_context', 'index') %>
+	<% 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 -%>
 
-<%= content_tag :li, :class => active_for_controllers(nil) do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), nil %>
+<%= content_tag :li, :class => active_for_controllers('web_links', 'tags', 'web_link_categorys') do -%>
+	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), panel_web_resource_back_end_web_links_path %>
+	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('web_links', 'tags', 'web_link_categorys')) do -%>
+		<%= content_tag :li, link_to(t('admin.all_articles'), panel_web_resource_back_end_web_links_path), :class => active_for_action('web_link', 'index') %>
+		<%= content_tag :li, link_to(t('admin.add_new'), new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_link', 'new') %>
+		<%= content_tag :li, link_to(t('admin.categories'), panel_web_resource_back_end_web_link_categorys_path), :class => active_for_action('web_link_categorys', 'index') %>
+		<%= content_tag :li, link_to(t('admin.tags'), panel_web_resource_back_end_tags_path), :class => active_for_action('tags', 'index') %>
+	<% end -%>
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers(nil) do -%>
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index 48b9ac88..09e94c2d 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
@@ -9,6 +9,7 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
     # @bulletins = Bulletin.all
     # @bulletins = Bulletin.desc("postdate desc")
 	  get_categorys(params[:bulletin_category_id])
+	  get_tags
 	
     # @bulletins = Bulletin.where("bulletin_category_id" => params[:bulletin_category_id]).desc("postdate") if params[:bulletin_category_id]
     
@@ -16,9 +17,6 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
     # @bulletins = Bulletin.all.order_by([params[:sort], params[:direction]])
     @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all
   	@bulletin_categories = BulletinCategory.all
-  	
-  	module_app = ModuleApp.first(:conditions => {:key => 'announcement'})
-  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -31,6 +29,7 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
   # GET /bulletins/1.xml
   def show
     @bulletin = Bulletin.find(params[:id])
+	get_tags
 	# get_categorys
 	
     # @bulletin_categorys = BulletinCategory.where("_id" => params[:id])
@@ -51,11 +50,14 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
   # GET /bulletins/new.xml
   def new
     @bulletin = Bulletin.new
+	
+	@link_url = panel_announcement_back_end_bulletins_path
     
 	# @bulletin.bulletin_files.build
 	# @bulletin.bulletin_files.new
 	
 	get_categorys
+	get_tags
 
     respond_to do |format|
       format.html # new.html.erb
@@ -67,7 +69,11 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
   def edit
     @bulletin = Bulletin.find(params[:id])
     # @summary_variable = @bulletin.summary_variable
+	
+	@link_url = panel_announcement_back_end_bulletin_path(@bulletin)
+	
 	get_categorys
+	get_tags
   end
 
   # POST /bulletins
@@ -90,6 +96,32 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
     end
   end
 
+  def link_quick_add
+	# debugger
+	
+    @bulletin = Bulletin.find(params[:bulletin_id])
+	
+	@link_url = panel_announcement_back_end_bulletins_path
+	
+    respond_to do |format|
+      format.js
+    end
+	
+  end
+
+  def link_quick_edit
+	# debugger
+	
+    @bulletin = Bulletin.find(params[:bulletin_id])
+	
+	@link_url = panel_announcement_back_end_bulletin_path(@bulletin)
+	
+    respond_to do |format|
+      format.js
+    end
+	
+  end
+
   # PUT /bulletins/1
   # PUT /bulletins/1.xml
   def update
@@ -98,11 +130,11 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
     @bulletin.update_user_id = current_user.id
 	
 	# @bulletin.image.clear if params[:bulletin][:image_del] == '1'
-	if params[:bulletin][:image_del] == '1' 
-		@bulletin.remove_image!
+	# if params[:bulletin][:image_del] == '1' 
+		# @bulletin.remove_image!
 		# @bulletin.image_del = nil
-		params[:bulletin][:image_del] = nil
-	end
+		# params[:bulletin][:image_del] = nil
+	# end
 
     respond_to do |format|
       if @bulletin.update_attributes(params[:bulletin])
@@ -147,6 +179,11 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
   def get_categorys(id = nil)
     @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true))
   end
+  
+  def get_tags
+  	module_app = ModuleApp.first(:conditions => {:key => 'announcement'})
+  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc)
+  end
 
   def get_sorted_bulletins
     bulletins = Bulletin.all
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb
index 7c258f23..a1141b41 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb
@@ -26,10 +26,11 @@ class Bulletin
   
   belongs_to :bulletin_category
   
-  embeds_many :bulletin_links, :cascade_callbacks => true
-  embeds_many :bulletin_files, :cascade_callbacks => true
+  # embeds_many :bulletin_links, :cascade_callbacks => true
+  # embeds_many :bulletin_files, :cascade_callbacks => true
 
-  # has_many :bulletin_files, :autosave => true, :dependent => :destroy
+  has_many :bulletin_links, :autosave => true, :dependent => :destroy
+  has_many :bulletin_files, :autosave => true, :dependent => :destroy
   
   accepts_nested_attributes_for :bulletin_files, :allow_destroy => true
   accepts_nested_attributes_for :bulletin_links, :allow_destroy => true
@@ -38,6 +39,9 @@ class Bulletin
   
   before_save :set_key
   
+  after_save :save_bulletin_links
+  after_save :save_bulletin_files
+  
 
   def self.search( search = nil, category_id = nil )
   
@@ -94,6 +98,22 @@ class Bulletin
     self.is_hidden
   end
   
+  def save_bulletin_links
+	self.bulletin_links.each do |t|
+	  if t.should_destroy
+		t.destroy
+	  end
+    end
+  end
+  
+  def save_bulletin_files
+	self.bulletin_files.each do |t|
+	  if t.should_destroy
+		t.destroy
+	  end
+    end
+  end
+  
   
   def title
     @title ||= I18nVariable.first(:conditions => {:key => 'title', :language_value_id => self.id, :language_value_type => self.class}) rescue nil
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 28062d40..05894515 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb
@@ -5,13 +5,27 @@ class BulletinFile
 
   mount_uploader :file, AssetUploader
   
-  field :filetitle
-  field :description
+  # field :filetitle
+  # field :description
+  has_one :filetitle, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
+  has_one :description, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
   
   # field :to_save, :type => Boolean
   field :should_destroy, :type => Boolean
   
-  # belongs_to :bulletin
-  embedded_in :bulletin
+  belongs_to :bulletin
+  # embedded_in :bulletin
+  
+  
+  protected
+  
+  def set_key
+    if filetitle.new_record?
+      filetitle.key = 'filetitle'
+    end
+    if description.new_record?
+      description.key = 'description'
+    end
+  end  
 
 end
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_link.rb b/vendor/built_in_modules/announcement/app/models/bulletin_link.rb
index a999d45d..30363182 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin_link.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin_link.rb
@@ -4,10 +4,12 @@ class BulletinLink
   include Mongoid::Timestamps
   
   field :url
-  field :name
+  # field :name
+  
+  has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
   
   field :should_destroy, :type => Boolean
   
-  embedded_in :bulletin
-
+  # embedded_in :bulletin
+  belongs_to :bulletin
 end
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
index 57998770..546356fe 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
@@ -1,13 +1,17 @@
 
-<tr id="<%= dom_id bulletin_category %>">
-	<td><%= bulletin_category.key %></td>
-	<% @site_valid_locales.each do |locale| %>
-	<td><%= bulletin_category.i18n_variable[locale] rescue nil %></td>
-	<% end %>
-	<td><%= bulletin_category.display %></td>
-	<td>
-	<%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %> |
-	<%= link_to t('bulletin_category.quick_edit'), panel_announcement_back_end_bulletin_category_quick_edit_path(bulletin_category), :remote => true %> |
-	<%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
-	</td>
-</tr>
\ No newline at end of file
+	<tr id="<%= dom_id bulletin_category %>" class="with_action">
+		<td>
+			<%= bulletin_category.key %>
+			<div class="quick-edit">
+				<ul class="nav nav-pills hide">
+					<li><%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %></li>
+					<li><%= link_to t('bulletin_category.quick_edit'), panel_announcement_back_end_bulletin_category_quick_edit_path(bulletin_category), :remote => true %></li>
+					<li><%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
+				</ul>
+			</div>
+		</td>
+		<% @site_valid_locales.each do |locale| %>
+		<td><%= bulletin_category.i18n_variable[locale] rescue nil %></td>
+		<% end %>
+		<td><%= bulletin_category.display %></td>
+	</tr>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb
index d7bfac7b..1ce7f629 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb
@@ -1,36 +1,36 @@
 <% # encoding: utf-8 %>
 
 <%= form_for(@bulletin_category, :remote => true, :url => @url) do |f| %>
-<%#= form_for(@bulletin_category, :remote => true, :url => panel_announcement_back_end_bulletin_category_path(@bulletin_category)) do |f| %>
 
-  <div class="field">
-    <%= f.label :key %><br />
-    <%= f.text_field :key %>
-  </div>
-  
-  <div class="field">
-    <%= f.label :name %><br />
-	<%= f.fields_for :i18n_variable, (@bulletin_category.new_record? ? @bulletin_category.build_i18n_variable : @bulletin_category.i18n_variable) do |f| %>
-	  <% @site_valid_locales.each do |locale| %>
-		<%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
-		<%= f.text_field locale, :style => "width:130px" %>
-	  <% end %>
-	<% end %>
-  </div>
-  
-  <div class="field">
-	<%= f.label :display %> <br />
-	<%#= f.select :display, BulletinCategory::PAYMENT_TYPES, :prompt => 'Select a display method' %>
+	<h2><%= (@bulletin_category.new_record? ? 'Add' : 'Edit') %></h2>
 
-	<%= f.radio_button :display, "List" %>List
-	<%#= f.label :display, 'list', :value => '1', :checked => @a %> 
-	<%= f.radio_button :display, "Picture" %>Picture
-	<%#= f.label :display, 'picture', :value => '2', :checked => @b %> 
-	<br />憿舐內��孵����航身摰���典����圈����Ｘ��嚗�鞈�閮���������曄��璅�撘�
-  </div>
+	<div id="widget-title">
+		<%= f.label :key %>
+		<%= f.text_field :key %>
+	</div>
+	
+	<div id="widget-title">
+		<%= f.fields_for :i18n_variable, (@bulletin_category.new_record? ? @bulletin_category.build_i18n_variable : @bulletin_category.i18n_variable) do |f| %>
+		  <% @site_valid_locales.each do |locale| %>
+				<div class="control-group">
+					<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
+					<div class="controls">
+						<%= f.text_field locale, :class => 'input-xxlarge' %>
+					</div>
+				</div>
+		  <% end %>
+		<% end %>
+	</div>
+	
+	<div id="widget-title">
+		<%= f.label :display %>
+		<%= f.radio_button :display, "List" %>List
+		<%= f.radio_button :display, "Picture" %>Picture
+		<br />憿舐內��孵����航身摰���典����圈����Ｘ��嚗�鞈�閮���������曄��璅�撘�
+	</div>
   
-  <div class="actions">
-    <%= f.submit %>
+  <div class="form-actions">
+    <%= f.submit 'Submit/������', :class=>'btn btn-primary' %>
   </div>
   
 <% end %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit.html.erb
new file mode 100644
index 00000000..14a72951
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit.html.erb
@@ -0,0 +1,13 @@
+<!-- <tr class="qe-block hide"> -->
+<tr class="qe-block hide">
+	<td colspan="8">
+		<legend><%= t(:quick_edit) %></legend>
+		<%= form_for bulletin_category, :url => panel_announcement_back_end_bulletin_category_path(bulletin_category), :html => {:class => 'form-horizontal'} do |f| %>
+			<%= render :partial => "quick_edit_qe", :locals => { :f => f, :bulletin_category => bulletin_category } %>
+			<div class="form-actions">
+				<%= f.submit t(:submit), :class => 'btn btn-primary' %>
+				<%= f.submit t(:cancel), :class => 'btn', :type => 'reset' %>
+			</div>
+		<% end %>
+	</td>
+</tr>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb
new file mode 100644
index 00000000..cb32d861
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb
@@ -0,0 +1,28 @@
+<% # encoding: utf-8 %>
+
+<div id="qe-basic" class="qe-edit-div">
+	
+	<div id="widget-title">
+		<%= f.label :key %>
+		<%= f.text_field :key %>
+	</div>
+	<div id="widget-title">
+		<%= f.fields_for :i18n_variable, bulletin_category.i18n_variable  do |f| %>
+		  <% @site_valid_locales.each do |locale| %>
+				<div class="control-group">
+					<%= label_tag "title-#{locale}", "Title-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
+					<div class="controls">
+						<%= f.text_field locale, :class => 'input-xxlarge' %>
+					</div>
+				</div>
+		  <% end %>
+		<% end %>
+	</div>
+	
+	<div id="widget-title">
+		<%= f.label :display %>
+		<%= f.radio_button :display, "List" %>List
+		<%= f.radio_button :display, "Picture" %>Picture
+		<br />憿舐內��孵����航身摰���典����圈����Ｘ��嚗�鞈�閮���������曄��璅�撘�
+	</div>
+</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
index 87a2993c..0a6e7f83 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
@@ -1,43 +1,23 @@
-<% content_for :secondary do %>
-<br />
-<br />
-<br />
-<br />
-<br />
-  <ul class="list">
-	  <li><%#= link_to t('bulletin_category.new_announcement_class'), new_panel_announcement_back_end_bulletin_category_path, :class => 'seclink1' %></li>
-  </ul>
-<% end -%>
 
 <%= flash_messages %>
 
-<h1><%= t('bulletin_category.list_announcement_class') %></h1>
-<br />
-<br />
-<br />
-<br />
-<br />
-<table id="bulletin_categorys">
-  <tr>
-    <th><%= t('bulletin_category.key') %></th>
-	<% @site_valid_locales.each do |locale| %>
-	<th><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
-	<% end %>
-    <th><%= t('bulletin_category.display') %></th>
-    <th><%= t('bulletin.action') %></th>
-  </tr>
+<table id="bulletin_categorys" class="table main-list">
+	<thead>
+		<tr>
+			<th class="span1-2"><%= t('bulletin_category.key') %></th>
+			<% @site_valid_locales.each do |locale| %>
+			<th class="span1-2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
+			<% end %>
+			<th class="span1-2"><%= t('bulletin_category.display') %></th>
+		</tr>
+	</thead>
+	<tbody>
 
-<%# @bulletin_categorys.each do |post| %>
 	<%= render :partial => 'bulletin_category', :collection => @bulletin_categorys %>
-<%# end %>
+	
+	</tbody>
 </table>
 
-<br />
-<br />
-<br />
-<br />
-
-<h2>Add New</h2>
 <div id="form"><%= render :partial => "form" %></div>
 
 
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb
index 86785ee0..6da49ceb 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb
@@ -6,10 +6,22 @@
 			<%= f.file_field :file %>
 
 			<%= f.label :file_title %>
-			<%= f.text_field :filetitle %>
+			<%#= f.text_field :filetitle %>
+			<%= f.fields_for :filetitle, (bulletin_file.new_record? ? bulletin_file.build_filetitle : bulletin_file.filetitle ) do |f| %>
+				<% @site_valid_locales.each do |locale| %>
+				 <%= I18nVariable.from_locale(locale) %>
+				 <%= f.text_field locale %>
+				<% end %>
+			<% end %>
 
 			<%= f.label :file_description %>
-			<%= f.text_field :description %>
+			<%#= f.text_field :description %>
+			<%= f.fields_for :description, (bulletin_file.new_record? ? bulletin_file.build_description : bulletin_file.description ) do |f| %>
+				<% @site_valid_locales.each do |locale| %>
+				 <%= I18nVariable.from_locale(locale) %>
+				 <%= f.text_field locale %>
+				<% end %>
+			<% end %>
 
 			<span class="action">
 			<% if bulletin_file.new_record? %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - 複製.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - 複製.erb
new file mode 100644
index 00000000..33d1ba1e
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - 複製.erb	
@@ -0,0 +1,27 @@
+
+		<div  id="<%= "bulletin_#{bulletin_link.id}" if !bulletin_link.new_record? %>" class='list_item'>
+		  <div class="field">
+
+			<%= f.label :link_url %>
+			<%= f.text_field :url %>
+
+			<%= f.label :link_name %>
+			<%#= f.text_field :name %>			
+			<%= f.fields_for :i18n_variable, (bulletin_link.new_record? ? bulletin_link.build_i18n_variable : bulletin_link.i18n_variable) do |f| %>
+			  <% @site_valid_locales.each do |locale| %>
+				<%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
+				<%= f.text_field locale, :style => "width:130px" %>
+			  <% end %>
+			<% end %>
+
+			<span class="action">
+			<% if bulletin_link.new_record? %>
+			  <a href="#" class="delete"><%= t(:delete) %></a>
+			<% else %>	
+			  <%= f.hidden_field :id %>
+			  <a href="#" class="remove_existing_record"><%= t(:delete) %></a>
+			  <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
+			<% end %>
+			</span>
+		  </div>
+		</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb
index 44c7ab75..e0077384 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb
@@ -1,12 +1,18 @@
 
-		<div  id="<%= "bulletin_#{bulletin_link.id}" if !bulletin_link.new_record? %>" class='list_item'>
+		<div id="<%= "bulletin_#{bulletin_link.id}" if !bulletin_link.new_record? %>" class='list_item'>
 		  <div class="field">
 
 			<%= f.label :link_url %>
 			<%= f.text_field :url %>
 
 			<%= f.label :link_name %>
-			<%= f.text_field :name %>
+			<%#= f.text_field :name %>			
+			<%= f.fields_for :i18n_variable, (bulletin_link.new_record? ? bulletin_link.build_i18n_variable : bulletin_link.i18n_variable) do |f| %>
+			  <% @site_valid_locales.each do |locale| %>
+				<%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
+				<%= f.text_field locale, :style => "width:130px" %>
+			  <% end %>
+			<% end %>
 
 			<span class="action">
 			<% if bulletin_link.new_record? %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - 複製.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - 複製.erb
new file mode 100644
index 00000000..c44b5c92
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - 複製.erb	
@@ -0,0 +1,16 @@
+		
+				<tr id="<%= "bulletin_#{bulletin_link2.id}" %>">
+					<td><%= link_to bulletin_link2.i18n_variable.zh_tw, bulletin_link2.url, :target => '_blank' %></td>
+					<td><%= link_to bulletin_link2.i18n_variable.en, bulletin_link2.url, :target => '_blank' %></td>
+					<td><a href="#modal-link" data-toggle="modal" class="action"><i class="icon-pencil"></i></a>
+					<span class="action">
+					 <%= f.hidden_field :id %>
+					 <a href class="remove_existing_record"><i class="icon-remove"></i></a>
+					 <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
+					 </span>
+					</td>
+				</tr>
+
+
+				
+				
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html.erb
new file mode 100644
index 00000000..a3bc5243
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html.erb
@@ -0,0 +1,17 @@
+		
+				<tr id="<%= "bulletin_#{bulletin_link2.id}" %>">
+					<td><%= link_to bulletin_link2.i18n_variable.zh_tw, bulletin_link2.url, :target => '_blank' %></td>
+					<td><%= link_to bulletin_link2.i18n_variable.en, bulletin_link2.url, :target => '_blank' %></td>
+					<td>
+					<a href="<%= panel_announcement_back_end_bulletin_link_quick_edit_path(bulletin_link2) %>#modal-link" data-toggle="modal" data-remote="true" class="action"><i class="icon-pencil"></i></a>
+					<span class="action">
+					 <%= f.hidden_field :id %>
+					 <a href class="remove_existing_record"><i class="icon-remove"></i></a>
+					 <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
+					 </span>
+					</td>
+				</tr>
+
+
+				
+				
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb
new file mode 100644
index 00000000..7208f73c
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb
@@ -0,0 +1,41 @@
+<% # encoding: utf-8 %>
+
+		<%= form_for(@bulletin.bulletin_links, :remote => true, :url => @link_url) do |f| %>
+		
+        <div id="modal-link" class="modal hide fade">
+            <div class="modal-header">
+                <a class="close" data-dismiss="modal">��</a>
+                <h3>Add Link / Edit Link</h3>
+            </div>
+            <div class="modal-body form-horizontal">
+                <div class="control-group">
+                    <label for="http" class="control-label">URL</label>
+                    <div class="controls">
+					<%= f.text_field :url %>
+                    <span class="help-inline">Please correct the error</span>
+                    </div>
+                </div>
+				
+				<% @site_valid_locales.each do |locale| %>
+					<div class="control-group error">
+						<label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
+						<div class="controls">
+						<input type="text" value="" id="link-<%= locale %>" class="input-xlarge">
+						<span class="help-inline">Please correct the error</span>
+						</div>
+					</div>
+				<% end %>
+				
+            </div>
+			
+            <div class="modal-footer">
+                <a class="btn btn-primary" href="#">Submit/蝣箏��</a>
+                <a class="btn" data-dismiss="modal" href="#">Cancel/���瘨�</a>
+            </div>
+
+        </div>
+		
+		<% end %>
+		
+
+ 		
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index 751a5f12..2e41f302 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -1,118 +1,246 @@
 <% # encoding: utf-8 %>
 
   <%= f.error_messages %>
-  <%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
+  
+	<!--Widget start-->
+	
+	<div id="sub-wiget">
+		
+		<div id="widget-picture" class="widget-box widget-size-300">
+			<div class="widget-action clear">
+				<a class="action"><i title="Upload pictures" class="icon-exclamation-sign icon-white tip"></i></a>
+			</div>
+			<h3 class="widget-title"><i class="icons-picture icons-white"></i>Picture</h3>
+			<div class="widget-content clear">
+				<div class="control-group">
+					<img class="pull-left upload-picture" src="images/default-img.png" />
+					<div class="controls file-upload">
+					<label class="control-label btn" for="input-upload">
+						Browse/��豢��瑼�獢�
+						<%= f.file_field :image, :id => "input-upload", :class => 'upload', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
+					</label>
+					<span id='fu' class="file-name"></span>
+					<br>
+					<input name='fu' class="input-large" type="text">
+					<br>
+					<% if @bulletin.image.file %>
+					  <%= f.check_box :remove_image %>
+					  <%= t('announcement.��芷�文歇銝���單��獢�') %>
+					<% end %>
+					</div>
+				</div>
+			</div>
+		</div>
 
-  <div class="field">
-    <%= f.label :image, t('announcement.image') %><br />
-    <%= f.file_field :image %>
-	<% if @bulletin.image.file %>
-	  <%= check_box_tag 'bulletin[image_del]' %>
-	  <%= t('announcement.��芷�文歇銝���單��獢�') %>
-	<% end %>
-  </div>
+		<div id="widget-date" class="widget-box widget-size-300">
+			<div class="widget-action clear">
+				<a href="#" class="action"><i title="Set the announcement to start and end dates" class="icon-exclamation-sign icon-white tip"></i></a>
+			</div>
+			<h3 class="widget-title"><i class="icons-calendar icons-white"></i> Date</h3>
+				<div class="widget-content clear">
+				<div class="control-group">
+					<label class="control-label">Start</label>
+					<div class="controls">
+						<%= f.date_select :postdate, {:use_month_numbers => true, :prompt => { :month => 'Month', :day => 'Day', :year => 'Year'}, :order => [:day, :month, :year] }, {:class => 'input-small'} %>				
+					</div>
+				</div>
+				<div class="control-group">
+					<label class="control-label">End</label>
+					<div class="controls">
+						<%= f.date_select :deadline, {:use_month_numbers => true, :prompt => { :month => 'Month', :day => 'Day', :year => 'Year'}, :order => [:day, :month, :year] }, {:class => 'input-small'} %>
+					</div>
+				</div>
+			</div>
+		</div>
+		  
+		<div id="widget-status" class="widget-box widget-size-300">
+			<div class="widget-action clear">
+				<a class="action"><i title="Setting the announcement state" class="icon-exclamation-sign icon-white tip"></i></a>
+			</div>
+			<h3 class="widget-title"><i class="icons-star-thin icons-white"></i>Status</h3>
+			<div class="widget-content clear">
+				<div class="controls">
+					<%= f.check_box :is_top %><%= t('top') %>
+					<%= f.check_box :is_hot %><%= t('hot') %>
+					<%= f.check_box :is_hidden %><%= t('hide') %>
+				</div>
+			</div>
+		</div>
 
-	<div class="field">
-    <%= f.label :title %>
-		<%= f.fields_for :title, (@bulletin.new_record? ? @bulletin.build_title : @bulletin.title ) do |f| %>
-		  <% @site_valid_locales.each do |locale| %>
-		    <td>
-					<%= I18nVariable.from_locale(locale) %>
-					<%= f.text_field locale %>
-				</td>
-		  <% end %>
-		<% end %>
+		<div id="widget-tags" class="widget-box widget-size-300">
+			<div class="widget-action clear">
+				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
+			</div>
+			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+				<div class="widget-content clear form-horizontal">
+					<% @tags.each do |tag| %>
+					<%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id)%>
+					<%= tag[I18n.locale] %>
+					<% end %>
+				</div>
+		</div>  
+  
 	</div>
   
-	<div class="field">
-		<%= f.label :subtitle %>
-		<%= f.fields_for :subtitle, (@bulletin.new_record? ? @bulletin.build_subtitle : @bulletin.subtitle ) do |f| %>
-			<% @site_valid_locales.each do |locale| %>
-				<td>
-					<%= I18nVariable.from_locale(locale) %>
-					<%= f.text_area locale, :rows => 10, :cols => 40 %>
-				</td>
-			<% end %>
-		<% end %>
-	</div>
+  
+<!--Wiget End-->
+<!--Post Start-->
 
-	<div class="field">
-		<%= f.label :text %>
-		<%= f.fields_for :text, (@bulletin.new_record? ? @bulletin.build_text : @bulletin.text ) do |f| %>
-			<% @site_valid_locales.each do |locale| %>
-				<td>
-					<%= I18nVariable.from_locale(locale) %>
-					<%= f.text_area locale, :rows => 10, :cols => 40 %>
-				</td>
-			<% end %>
-		<% end %>
-	</div>
-  
-  <div class="field">
-    <%= f.label :postdate %><br />
-    <%= f.date_select :postdate, :order => [:year, :month, :day], :use_month_numbers => true %>
-    <%#= date_select("bulletin", "postdate", :use_month_numbers => true) %>
-  </div>
-  
-  <div class="field">
-    <%= f.label :deadline %><br />
-    <%= f.date_select :deadline, :use_month_numbers => true, :prompt => { :day => 'Select day', :month => 'Select month', :year => 'Select year'}  %>
-    <%#= f.date_select :deadline, :order => [:year, :month, :day],:default => 1.years.from_now, :use_month_numbers => true  %>
-  </div>
-  
-  <div class="field">
-    <%#= f.label :url %><br />
-    <%#= f.text_field :url, :size => 60 %>
-  </div>
-  
-  
-  <div id='bulletin_links' class="bulletin_links_block <%= @class %>">
+	<div id="post-body">
+		<div id="post-body-content" class="clear">
+		
+			<%= f.label :category %>
+			<%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
+
+			<div class="btn-group pull-right">
+				<a class="btn dropdown-toggle" href="#" data-toggle="dropdown">
+					English
+					<span class="caret"></span>
+				</a>
+				<ul class="dropdown-menu">
+					<li><a href="#">English</a></li>
+					<li><a href="#">Chinese</a></li>
+					<li><a href="#">Japanese</a></li>
+					<li><a href="#">French</a></li>
+					<li><a href="#">German</a></li>
+					<!--<li class="divider"></li>
+					<li><a href="#">Separated link</a></li>-->
+				</ul>
+			</div>
+
+			<div class="title">
+				<%= f.label :title %>
+				<%= f.fields_for :title, (@bulletin.new_record? ? @bulletin.build_title : @bulletin.title ) do |f| %>
+				  <% @site_valid_locales.each do |locale| %>
+					<td>
+							<%= I18nVariable.from_locale(locale) %>
+							<%= f.text_field locale, :class=>'post-title' %>
+						</td>
+				  <% end %>
+				<% end %>
+			</div>	
+
+			<div class="title">
+				<%= f.label :subtitle %>
+				<%= f.fields_for :subtitle, (@bulletin.new_record? ? @bulletin.build_subtitle : @bulletin.subtitle ) do |f| %>
+					<% @site_valid_locales.each do |locale| %>
+						<td>
+							<%= I18nVariable.from_locale(locale) %>
+							<%= f.text_area locale, :style=>"width:100%" %>
+						</td>
+					<% end %>
+				<% end %>
+			</div>  
+
+			<div class="title">
+				<%= f.label :text %>
+				<%= f.fields_for :text, (@bulletin.new_record? ? @bulletin.build_text : @bulletin.text ) do |f| %>
+					<% @site_valid_locales.each do |locale| %>
+						<td>
+							<%= I18nVariable.from_locale(locale) %>
+							<%= f.text_area locale, :style=>"width:100%" %>
+						</td>
+					<% end %>
+				<% end %>
+			</div>
+			
+		  
+		  <div id='bulletin_links' class="bulletin_links_block <%= @class %>">
+			
+			<div id='add_bulletin_link' class="info_input bulletin_links_block">
+				<h2>Bulletin links</h2>
+				<%= hidden_field_tag 'bulletin_link_field_count', @bulletin.bulletin_links.count %>
+				<a href="#" class="add"><%= t(:add) %></a>
+			</div>
+			
+			<%#= render :partial => 'link', :locals => { :bulletin_links => @bulletin.bulletin_links , :f => f} %>
+			
+			
+			<% @bulletin.bulletin_links.each_with_index do |bulletin_link, i| %>
+				<%#= fields_for "bulletin[bulletin_links][]", bulletin_link do |f| %>
+				<%= f.fields_for :bulletin_links, bulletin_link do |f| %>
+					<%= render :partial => 'bulletin_link', :object => bulletin_link, :locals => {:f => f, :i => i} %>
+				<% end %>
+			<% end %>	
+			
+		  </div>
+		  
+		  
+
+<div class="main-wiget">
+	<div id="widget-link" class="widget-box">
+		<div class="widget-action clear">
+			<a class="action"><i title="Add a reference link" class="icon-exclamation-sign icon-white tip"></i></a>
+		</div>
+		<h3 class="widget-title"><i class="icons-link icons-white"></i>Link</h3>
+		<div class="widget-content">
+			<table class="table table-condensed">
+				<thead>
+					<tr>
+						<th>Chinese</th>
+						<th>English</th>
+						<th class="span1"></th>
+					</tr>
+				</thead>
+                <tfoot>
+                    <tr>
+                        <td style="text-align:center" colspan="3">
+                            <a class="btn btn-primary btn-small" href="#modal-link" data-toggle="modal"><i class="icon-plus icon-white"></i> ADD/��啣��</a>
+                        </td>
+                    </tr>
+                </tfoot>
+                <tbody>
+					<%#= render :partial => 'bulletin_link2', :collection => @bulletin.bulletin_links %>
+					
+					<% @bulletin.bulletin_links.each_with_index do |bulletin_link2, i| %>
+						<%= f.fields_for :bulletin_links, bulletin_link2 do |f| %>
+							<%= render :partial => 'bulletin_link2', :object => bulletin_link2, :locals => {:f => f, :i => i} %>
+						<% end %>
+					<% end %>	
+					
+                </tbody>
+            </table>
+        </div>
+		
+		<div id="bulletin_link_qe"><%= render :partial => "bulletin_link_qe" %></div>
+		
+    </div>
+</div>		  
+		  
+		  
+		  
+		  
+		  <div id='bulletin_files' class="bulletin_files_block <%= @class %>">
+			
+			<div id='add_bulletin_file' class="info_input bulletin_files_block">
+				<h2>Bulletin files</h2>
+				<%= hidden_field_tag 'bulletin_file_field_count', @bulletin.bulletin_files.count %>
+				<a href="#" class="add"><%= t(:add) %></a>
+			</div>
+			
+			<%#= render :partial => 'file', :locals => { :bulletin_files => @bulletin.bulletin_files , :f => f} %>
+			
+			
+			<% @bulletin.bulletin_files.each_with_index do |bulletin_file, i| %>
+				<%#= fields_for "bulletin[bulletin_files][]", bulletin_file do |f| %>
+				<%= f.fields_for :bulletin_files, bulletin_file do |f| %>
+					<%= render :partial => 'bulletin_file', :object => bulletin_file, :locals => {:f => f, :i => i} %>
+				<% end %>
+			<% end %>	
+			
+		  </div>
+		  
+		  <br />
+		  <br />
 	
-	<div id='add_bulletin_link' class="info_input bulletin_links_block">
-		<h2>Bulletin links</h2>
-		<%= hidden_field_tag 'bulletin_link_field_count', @bulletin.bulletin_links.count %>
-		<a href="#" class="add"><%= t(:add) %></a>
 	</div>
 	
-	<%#= render :partial => 'link', :locals => { :bulletin_links => @bulletin.bulletin_links , :f => f} %>
-	
-	
-	<% @bulletin.bulletin_links.each_with_index do |bulletin_link, i| %>
-		<%#= fields_for "bulletin[bulletin_links][]", bulletin_link do |f| %>
-		<%= f.fields_for :bulletin_links, bulletin_link do |f| %>
-			<%= render :partial => 'bulletin_link', :object => bulletin_link, :locals => {:f => f, :i => i} %>
-		<% end %>
-	<% end %>	
-	
-  </div>
+	<!--Post End-->
   
+	  <div class="form-actions">
+		<%= f.submit 'Submit/������', :class=>'btn btn-primary' %>
+	  </div>
   
-  <div id='bulletin_files' class="bulletin_files_block <%= @class %>">
-	
-	<div id='add_bulletin_file' class="info_input bulletin_files_block">
-		<h2>Bulletin files</h2>
-		<%= hidden_field_tag 'bulletin_file_field_count', @bulletin.bulletin_files.count %>
-		<a href="#" class="add"><%= t(:add) %></a>
-	</div>
-	
-	<%#= render :partial => 'file', :locals => { :bulletin_files => @bulletin.bulletin_files , :f => f} %>
-	
-	
-	<% @bulletin.bulletin_files.each_with_index do |bulletin_file, i| %>
-		<%#= fields_for "bulletin[bulletin_files][]", bulletin_file do |f| %>
-		<%= f.fields_for :bulletin_files, bulletin_file do |f| %>
-			<%= render :partial => 'bulletin_file', :object => bulletin_file, :locals => {:f => f, :i => i} %>
-		<% end %>
-	<% end %>	
-	
-  </div>
-  
-  <br />
-  <br />
-  
-  
-  <div class="actions">
-    <%= f.submit %>
   </div>
   
   
@@ -141,391 +269,3 @@
 	  });
 	</script>
 <% end %>
-
-<!--Widget start-->
-<!-- <div id="sub-wiget">
-    <div id="widget-date" class="widget-box">
-        <div class="widget-action clear">
-            <a href="#" class="action"><i title="Set the announcement to start and end dates" class="icon-exclamation-sign icon-white tip"></i></a>
-        </div>
-        <h3 class="widget-title"><i class="icons-calendar icons-white"></i> Date</h3>
-            <div class="widget-content clear">
-            <div class="control-group">
-                <label class="control-label">Start</label>
-                <div class="controls">
-                    <select id="start-day" class="input-small">
-                        <option>Day</option>
-                        <option>1</option>
-                        <option>2</option>
-                        <option>3</option>
-                        <option>4</option>
-                        <option>5</option>
-                        <option>6</option>
-                        <option>7</option>
-                        <option>8</option>
-                        <option>9</option>
-                        <option>10</option>
-                        <option>11</option>
-                        <option>12</option>
-                        <option>13</option>
-                        <option>14</option>
-                        <option>15</option>
-                        <option>16</option>
-                        <option>17</option>
-                        <option>18</option>
-                        <option>19</option>
-                        <option>20</option>
-                        <option>21</option>
-                        <option>22</option>
-                        <option>23</option>
-                        <option>24</option>
-                        <option>25</option>
-                        <option>26</option>
-                        <option>27</option>
-                        <option>28</option>
-                        <option>29</option>
-                        <option>30</option>
-                        <option>31</option>
-                    </select>
-                    <select id="start-month" class="input-small">
-                        <option>Month</option>
-                        <option>1</option>
-                        <option>2</option>
-                        <option>3</option>
-                        <option>4</option>
-                        <option>5</option>
-                        <option>6</option>
-                        <option>7</option>
-                        <option>8</option>
-                        <option>9</option>
-                        <option>10</option>
-                        <option>11</option>
-                        <option>12</option>
-                    </select>
-                    <select id="start-year" class="input-small">
-                        <option>Year</option>
-                        <option>2012</option>
-                        <option>2011</option>
-                        <option>2010</option>
-                        <option>2009</option>
-                    </select>
-                </div>
-            </div>
-            <div class="control-group">
-                <label class="control-label">End</label>
-                <div class="controls">
-                    <select id="start-day" class="input-small">
-                        <option>Day</option>
-                        <option>1</option>
-                        <option>2</option>
-												<option>3</option>
-												<option>4</option>
-												<option>5</option>
-												<option>6</option>
-												<option>7</option>
-												<option>8</option>
-												<option>9</option>
-                        <option>10</option>
-                        <option>11</option>
-                        <option>12</option>
-                        <option>13</option>
-                        <option>14</option>
-                        <option>15</option>
-                        <option>16</option>
-                        <option>17</option>
-                        <option>18</option>
-                        <option>19</option>
-                        <option>20</option>
-                        <option>21</option>
-                        <option>22</option>
-                        <option>23</option>
-                        <option>24</option>
-                        <option>25</option>
-                        <option>26</option>
-                        <option>27</option>
-                        <option>28</option>
-                        <option>29</option>
-                        <option>30</option>
-                        <option>31</option>
-                    </select>
-                    <select id="start-month" class="input-small">
-                        <option>Month</option>
-                        <option>1</option>
-                        <option>2</option>
-                        <option>3</option>
-                        <option>4</option>
-                        <option>5</option>
-                        <option>6</option>
-                        <option>7</option>
-                        <option>8</option>
-                        <option>9</option>
-                        <option>10</option>
-                        <option>11</option>
-                        <option>12</option>
-                    </select>
-                    <select id="start-year" class="input-small">
-                        <option>Year</option>
-                        <option>2012</option>
-                        <option>2011</option>
-                        <option>2010</option>
-                        <option>2009</option>
-                    </select>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div id="widget-status" class="widget-box">
-        <div class="widget-action clear">
-            <a class="action"><i title="Setting the announcement state" class="icon-exclamation-sign icon-white tip"></i></a>
-        </div>
-        <h3 class="widget-title"><i class="icons-star-thin icons-white"></i>Status</h3>
-        <div class="widget-content clear">
-            <div class="controls">
-                <label class="checkbox inline"><input type="checkbox" value="hot">Hot</label>
-                <label class="checkbox inline"><input type="checkbox" value="top">Top</label>
-                <label class="checkbox inline"><input type="checkbox" value="hide">Hide</label>
-            </div>
-        </div>
-    </div>
-    <div id="widget-role" class="widget-box">
-        <div class="widget-action clear">
-            <a class="action"><i title="Set the read role" class="icon-exclamation-sign icon-white tip"></i></a>
-            <a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
-        </div>
-        <h3 class="widget-title"><i class="icons-lock icons-white"></i>Permissions</h3>
-        <div class="widget-content clear">
-            <div class="controls">
-                <label class="radio inline"><input class="privacy" type="radio" value="public" name="privacy">Public</label>
-                <label class="radio inline"><input class="privacy" type="radio" value="private" name="privacy">Private</label>
-                <div class="well select-role">
-                    <label class="checkbox inline"><input type="checkbox" value="hot">Student</label>
-                    <label class="checkbox inline"><input type="checkbox" value="top">Teacher</label>
-                    <label class="checkbox inline"><input type="checkbox" value="hide">Staff</label>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div id="widget-picture" class="widget-box">
-        <div class="widget-action clear">
-            <a class="action"><i title="Upload pictures" class="icon-exclamation-sign icon-white tip"></i></a>
-        </div>
-        <h3 class="widget-title"><i class="icons-picture icons-white"></i>Picture</h3>
-        <div class="widget-content clear">
-            <div class="control-group">
-                <img class="pull-left upload-picture" src="images/default-img.png" />
-                <div class="controls file-upload">
-                <label class="control-label btn" for="input-upload">
-                    Browse/��豢��瑼�獢�
-                    <input id="input-upload" class="upload" type="file" name="upload" onchange="document.getElementById('fu').innerHTML = this.form.fu.value = this.value;">
-                </label>
-                <span id='fu' class="file-name"></span>
-                <br>
-                <input name='fu' class="input-medium" type="text">
-                </div>
-            </div>
-        </div>
-    </div>
-    
-    <div id="widget-tags" class="widget-box">
-        <div class="widget-action clear">
-            <a class="action"><i title="Enter post tags, Chinese and English required" class="icon-exclamation-sign icon-white tip"></i></a>
-            <a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
-        </div>
-        <h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
-            <div class="widget-content clear form-horizontal">
-                <div class="control-group error">
-                    <label class="control-label" for="tags-zh-tw">
-                        Chinese
-                    </label>
-                    <div class="controls">
-                        <input id='tags-zh-tw' class="input-prepend" type="text">
-                        <span class="help-inline">Please correct the error</span>
-                    </div>
-                </div>
-                <div class="control-group">
-                    <label class="control-label" for="tags-en">
-                        English
-                    </label>
-                    <div class="controls">
-                        <input id='tags-en' class="input-prepend" type="text">
-                        <span class="help-inline">Please correct the error</span>
-                    </div>
-                </div>
-                <div class="clear">
-                    <a class="pull-right btn btn-primary" href="#">Add/��啣��</a>
-                </div>
-                <hr>
-                <span class="label label-tags">Default<a href><i class="icon-remove icon-white"></i></a></span>
-                <span class="label label-tags">Default<a href><i class="icon-remove icon-white"></i></a></span>
-                <span class="label label-tags">Default<a href><i class="icon-remove icon-white"></i></a></span>
-                <span class="label label-tags">Default<a href><i class="icon-remove icon-white"></i></a></span>
-            </div>
-    </div>
-</div> -->
-<!--Wiget End-->
-<!--Post Start-->
-<!-- <div id="post-body">
-  <div id="post-body-content" class="clear">
-    <%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>      <div class="btn-group pull-right">
-      <a class="btn dropdown-toggle" href="#" data-toggle="dropdown">
-                English
-                <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu">
-                <li><a href="#">English</a></li>
-                <li><a href="#">Chinese</a></li>
-                <li><a href="#">Japanese</a></li>
-                <li><a href="#">French</a></li>
-                <li><a href="#">German</a></li>
-                <!--<li class="divider"></li>
-             <li><a href="#">Separated link</a></li>-->
-            </ul>
-        </div>
-
-
-        <div class="title">
-            <input class="post-title" type="text" placeholder="Enter title here">
-        </div>
-
-
-        <div class="editor">
-        	<%= text_area_tag 'locale', nil, :style=>"width:100%" %>
-        </div>
-        <div class="main-wiget">
-            <div id="widget-link" class="widget-box">
-                <div class="widget-action clear">
-                    <a class="action"><i title="Add a reference link" class="icon-exclamation-sign icon-white tip"></i></a>
-                </div>
-                <h3 class="widget-title"><i class="icons-link icons-white"></i>Link</h3>
-                <div class="widget-content">
-                    <table class="table table-condensed">
-                        <thead>
-                            <tr>
-                                <th>Chinese</th>
-                                <th>English</th>
-                                <th class="span1"></th>
-                            </tr>
-                        </thead>
-                        <tfoot>
-                            <tr>
-                                <td style="text-align:center" colspan="3">
-                                    <a class="btn btn-primary btn-small" href="#modal-link" data-toggle="modal"><i class="icon-plus icon-white"></i> ADD/��啣��</a>
-                                </td>
-                            </tr>
-                        </tfoot>
-                        <tbody>
-                            <tr>
-                                <td>���</td>
-                                <td>���</td>
-                                <td><a href="#modal-link" data-toggle="modal" class="action"><i class="icon-pencil"></i></a><a href class="action"><i class="icon-remove"></i></a></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-                <div id="modal-link" class="modal hide fade">
-                    <div class="modal-header">
-                        <a class="close" data-dismiss="modal">��</a>
-                        <h3>Add Link / Edit Link</h3>
-                    </div>
-                    <div class="modal-body form-horizontal">
-                        <div class="control-group">
-                            <label for="http" class="control-label">http://</label>
-                            <div class="controls">
-                            <input type="text" value="" id="http" class="input-xlarge">
-                            <span class="help-inline">Please correct the error</span>
-                            </div>
-                        </div>
-                        <div class="control-group error">
-                            <label for="link-zh-tw" class="control-label">Chinese</label>
-                            <div class="controls">
-                            <input type="text" value="" id="link-zh-tw" class="input-xlarge">
-                            <span class="help-inline">Please correct the error</span>
-                            </div>
-                        </div>
-                        <div class="control-group">
-                            <label for="link-en" class="control-label">English</label>
-                            <div class="controls">
-                            <input type="text" value="" id="link-en" class="input-xlarge">
-                            <span class="help-inline">Please correct the error</span>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <a class="btn btn-primary" href="#">Submit/蝣箏��</a>
-                        <a class="btn" data-dismiss="modal" href="#">Cancel/���瘨�</a>
-                    </div>
-                </div>
-            </div>
-            <div id="widget-file" class="widget-box">
-                <div class="widget-action clear">
-                    <a class="action"><i title="Added to the file" class="icon-exclamation-sign icon-white tip"></i></a>
-                </div>
-                <h3 class="widget-title"><i class="icons-paperclip icons-white"></i>File</h3>
-                <div class="widget-content">
-                    <table class="table table-condensed">
-                        <thead>
-                            <tr>
-                                <th>Chinese</th>
-                                <th>English</th>
-                                <th class="span1"></th>
-                            </tr>
-                        </thead>
-                        <tfoot>
-                            <tr>
-                                <td style="text-align:center" colspan="3">
-                                    <a class="btn btn-primary btn-small" href="#modal-file" data-toggle="modal"><i class="icon-plus icon-white"></i> ADD/��啣��</a>
-                                </td>
-                            </tr>
-                        </tfoot>
-                        <tbody>
-                            <tr>
-                                <td>���</td>
-                                <td>���</td>
-                                <td><a href="#modal-file" data-toggle="modal" class="action"><i class="icon-pencil"></i></a><a href class="action"><i class="icon-remove"></i></a></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-                <div id="modal-file" class="modal hide fade">
-                    <div class="modal-header">
-                        <a class="close" data-dismiss="modal">��</a>
-                        <h3>Add File / Edit File</h3>
-                    </div>
-                    <div class="modal-body form-horizontal">
-                        <div class="controls file-upload">
-                        <label class="control-label btn" for="input-upload">
-                            Browse
-                            <input id="input-upload" class="upload" type="file" name="upload" onchange="document.getElementById('fn').innerHTML = this.value;">
-                        </label>
-                        <span id='fn' class="file-name"></span>
-                        </div>
-                        <div class="control-group">
-                            <label for="file-zh-tw" class="control-label">Chinese</label>
-                            <div class="controls">
-                            <input type="text" value="" id="file-zh-tw" class="input-xlarge">
-                            <span class="help-inline">Please correct the error</span>
-                            </div>
-                        </div>
-                        <div class="control-group">
-                            <label for="file-en" class="control-label">English</label>
-                            <div class="controls">
-                            <input type="text" value="" id="file-en" class="input-xlarge">
-                            <span class="help-inline">Please correct the error</span>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <a class="btn btn-primary" href="#">Submit/蝣箏��</a>
-                        <a class="btn" data-dismiss="modal" href="#">Cancel/���瘨�</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div> -->
-<!--Post End-->
-<!-- <div class="form-actions"> -->
-  <button class="btn btn-success" type="submit">Preview/���閬�</button>
-    <button class="btn btn-primary" type="submit">Submit/������</button>
-    <button class="btn" type="reset">Cancel/���瘨�</button>
-<!-- </div> -->
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb
index adfe015c..1d9004c8 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb
@@ -17,11 +17,13 @@
                     </tr>
                 </tfoot>
                 <tbody>
+					<% bulletin.bulletin_links.each_with_index do |blink, i| %>
                     <tr>
-                        <td>���</td>
-                        <td>���</td>
+                        <td><%= link_to blink.i18n_variable.zh_tw, blink.url, :target => '_blank' %></td>
+                        <td><%= link_to blink.i18n_variable.en, blink.url, :target => '_blank' %></td>
                         <td><a href="#modal-link" data-toggle="modal" class="action"><i class="icon-pencil"></i></a><a href class="action"><i class="icon-remove"></i></a></td>
                     </tr>
+					<% end %>
                 </tbody>
             </table>
         </div>
@@ -32,27 +34,25 @@
             </div>
             <div class="modal-body form-horizontal">
                 <div class="control-group">
-                    <label for="http" class="control-label">http://</label>
+                    <label for="http" class="control-label">URL</label>
                     <div class="controls">
                     <input type="text" value="" id="http" class="input-xlarge">
                     <span class="help-inline">Please correct the error</span>
                     </div>
                 </div>
-                <div class="control-group error">
-                    <label for="link-zh-tw" class="control-label">Chinese</label>
-                    <div class="controls">
-                    <input type="text" value="" id="link-zh-tw" class="input-xlarge">
-                    <span class="help-inline">Please correct the error</span>
-                    </div>
-                </div>
-                <div class="control-group">
-                    <label for="link-en" class="control-label">English</label>
-                    <div class="controls">
-                    <input type="text" value="" id="link-en" class="input-xlarge">
-                    <span class="help-inline">Please correct the error</span>
-                    </div>
-                </div>
+				
+				<% @site_valid_locales.each do |locale| %>
+					<div class="control-group error">
+						<label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
+						<div class="controls">
+						<input type="text" value="" id="link-<%= locale %>" class="input-xlarge">
+						<span class="help-inline">Please correct the error</span>
+						</div>
+					</div>
+				<% end %>
+				
             </div>
+			
             <div class="modal-footer">
                 <a class="btn btn-primary" href="#">Submit/蝣箏��</a>
                 <a class="btn" data-dismiss="modal" href="#">Cancel/���瘨�</a>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb
index 6e7c656a..ff59280f 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb
@@ -5,13 +5,18 @@
             <div class="control-group">
                 <img class="pull-left upload-picture" src="" />
                 <div class="controls file-upload">
-                <label class="control-label btn" for="input-upload">
-                    Browse/��豢��瑼�獢�
-                    <input id="input-upload" class="upload" type="file" name="upload" onchange="document.getElementById('fu').innerHTML = this.form.fu.value = this.value;">
-                </label>
+				<label class="control-label btn" for="input-upload">
+					Browse/��豢��瑼�獢�
+					<%= f.file_field :image, :id => "input-upload", :class => 'upload', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
+				</label>
                 <span id='fu' class="file-name"></span>
                 <br>
                 <input name='fu' class="input-large" type="text">
+				<br>
+				<% if bulletin.image.file %>
+					<%= f.check_box :remove_image %>
+					<%= t('announcement.��芷�文歇銝���單��獢�') %>
+				<% end %>
                 </div>
             </div>
         </div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 複製.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 複製.erb
new file mode 100644
index 00000000..d37d2134
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 複製.erb	
@@ -0,0 +1,9 @@
+<%= render 'filter' %>
+<table id="bulettin_sort_list" class="table main-list">
+	<%= render 'bulletins' %>
+</table>
+
+<div class="form-actions">
+	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %>
+</div>
+
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb
new file mode 100644
index 00000000..cbe5e3c7
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb
@@ -0,0 +1,2 @@
+//$.each($(".quick_edit"),function(obj){ $(this).remove(); });
+$("#<%= "bulletin_#{bulletin_link2.id}" %>").append("<%= j render "bulletin_link_qe" %>");
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 f02d9156..ace4ec12 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
@@ -17,7 +17,7 @@
 	</li>
 	<li>
   <b><%= t('announcement.title') %></b>
-  <%= @bulletin.title %>
+  <%= @bulletin.title[I18n.locale] %>
 	</li>
 	<li>
   <%#= image_tag(@bulletin.image.url, :size => "320x240") if @bulletin.image.file %>
@@ -25,23 +25,23 @@
 	</li>
 	<li>
   <b><%= t('announcement.subtitle') %></b>
-  <%= @bulletin.subtitle %>
+  <%= @bulletin.subtitle[I18n.locale].html_safe %>
 	</li>
 	<li>
   <b><%= t('announcement.text') %></b>
-  <%= @bulletin.text %>
+  <%= @bulletin.text[I18n.locale].html_safe %>
 	</li>
 	<li>
 	<li>
 	<b><%= t('announcement.link') %></b>
 	<% @bulletin.bulletin_links.each do | blink | %>
-    <%= link_to blink.name, blink.url, :target => '_blank' %>
+    <%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %>
 	<% end %>
 	</li>
 	<li>
 	<b><%= t('announcement.file') %></b>
 	<% @bulletin.bulletin_files.each do | bfile | %>
-	<%= link_to bfile.filetitle, bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
+	<%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description[I18n.locale]} if bfile.file.file %>
 	<% end %>
 	</li>
 	<li>
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 e3ba9d48..33166165 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
@@ -11,7 +11,7 @@
 		<li>
 			<div class="news_img"><%= image_tag(post.image.url, :size => "290x130") if post.image.file %></div>
 			<h3 class="h3 news_title"><%= link_to post.title[I18n.locale], panel_announcement_front_end_bulletin_path(post, :category_id => post.bulletin_category_id) %></h3>
-			<p class="news_wrap"><%= post.subtitle[I18n.locale] %></p>
+			<p class="news_wrap"><%= post.subtitle[I18n.locale].html_safe %></p>
 		</li>
 		<% end %>
 	</ul>
diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb
index c3a60f74..9a405ecc 100644
--- a/vendor/built_in_modules/announcement/config/routes.rb
+++ b/vendor/built_in_modules/announcement/config/routes.rb
@@ -3,7 +3,10 @@ Rails.application.routes.draw do
     namespace :announcement do
       namespace :back_end do
         root :to => "bulletins#index"
-        resources :bulletins
+        resources :bulletins do
+          match "link_quick_add/:bulletin_id" => "bulletins#link_quick_add" ,:as => :link_quick_add
+          match "link_quick_edit/:bulletin_id" => "bulletins#link_quick_edit" ,:as => :link_quick_edit
+        end
         resources :bulletin_categorys, :controller => 'bulletin_categorys' do
           match "quick_edit/:bulletin_category_id" => "bulletin_categorys#quick_edit" ,:as => :quick_edit
         end
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
index e5c7fc45..4ca568a9 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
@@ -1,31 +1,32 @@
 <% # encoding: utf-8 %>
 
-  <%= f.error_messages %>
-  <%#= debugger %>
-  
- <div class="field">
-  <%= f.label :name %>
-  <%= @page_context.page.i18n_variable[I18n.locale] %>
- </div>
+<%= f.error_messages %>
 
- <div class="field">
-  <%= f.label :context %>
-  <%= f.fields_for :context, (@page_context.new_record? ? @page_context.build_context : @page_context.context ) do |f| %>
-   <% @site_valid_locales.each do |locale| %>
-    <td>
-     <%= I18nVariable.from_locale(locale) %>
-     <%= f.text_area locale, :rows => 10, :cols => 40 %>
-    </td>
-   <% end %>
-  <% end %>
- </div>
-  
-  <br />
-  <br />
-  
-  <div class="actions">
-    <%= f.submit %>
-  </div>
+<div id="post-body">
+
+	<div class="title">
+	  <%= f.label :name %>
+	  <%= @page_context.page.i18n_variable[I18n.locale] %>
+	</div>
+
+	<div class="title">
+		<%= f.label :context %>
+		<%= f.fields_for :context, (@page_context.new_record? ? @page_context.build_context : @page_context.context ) do |f| %>
+			<% @site_valid_locales.each do |locale| %>
+				<td>
+					<%= I18nVariable.from_locale(locale) %>
+					<%= f.text_area locale, :style=>"width:100%" %>
+				</td>
+			<% end %>
+		<% end %>
+	</div>
+	  
+	  
+	<div class="form-actions">
+		<%= f.submit 'Submit/������', :class=>'btn btn-primary' %>
+	</div>
+
+</div>
 
 
 <% content_for :page_specific_javascript do %>
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 c1d86fe1..08db9b2d 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
@@ -1,10 +1,14 @@
 
-<tr id="<%= dom_id page_context %>">
-	<td><%= page_context.page.i18n_variable[I18n.locale] %></td>
-	<td><%= link_to page_context.version, panel_page_content_back_end_view_path(page_context.page_id) %></td>
-	<td><%= page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %></td>
-	<td><%= User.find(page_context.create_user_id).name %></td>
-	<td>
-	<%= link_to t('page_context.edit'), edit_panel_page_content_back_end_page_context_path(page_context) %> 
-	</td>
-</tr>
+			<tr id="<%= dom_id page_context %>" class="with_action">
+				<td>
+					<%= page_context.page.i18n_variable[I18n.locale] %>
+					<div class="quick-edit">
+						<ul class="nav nav-pills hide">
+							<li><%= link_to t('page_context.edit'), edit_panel_page_content_back_end_page_context_path(page_context) %></li>
+						</ul>
+					</div>
+				</td>
+				<td><%= link_to page_context.version, panel_page_content_back_end_view_path(page_context.page_id) %></td>
+				<td><%= page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %></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 db23a280..7035a700 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
@@ -1,10 +1,15 @@
 
-<tr id="<%= dom_id view_page_context %>">
-	<td><%= view_page_context.page.i18n_variable[I18n.locale] %></td>
-	<td><%= view_page_context.version %></td>
-	<td><%= view_page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %></td>
-	<td><%= User.find(view_page_context.create_user_id).name %></td>
-	<td>
-	<%= link_to t('view_page_context.show'), panel_page_content_back_end_page_context_path(view_page_context) %>
-	</td>
-</tr>
+
+			<tr id="<%= dom_id view_page_context %>" class="with_action">
+				<td>
+					<%= view_page_context.page.i18n_variable[I18n.locale] %>
+					<div class="quick-edit">
+						<ul class="nav nav-pills hide">
+							<li><%= link_to t('view_page_context.show'), panel_page_content_back_end_page_context_path(view_page_context) %></li>
+						</ul>
+					</div>
+				</td>
+				<td><%= view_page_context.version %></td>
+				<td><%= view_page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %></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/edit.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb
index 18bb0ce5..86f2398c 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb
@@ -1,7 +1,3 @@
-<br />
-<br />
-<br />
-<br />
 
 <h1><%= t('page_content.editing_page_content') %></h1>
 
@@ -9,8 +5,4 @@
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>
 
-<%= link_back %>
-<br />
-<br />
-<br />
-<br />
\ No newline at end of file
+<%#= link_back %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
index a1566881..3227dcd4 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
@@ -1,36 +1,20 @@
-<% content_for :secondary do %>
-<br />
-<br />
-<br />
-<br />
-<br />
-  <ul class="list">
-	  <li><%= link_to t('page_context.page_content_list'), panel_page_content_back_end_page_contexts_path %></li>
-  </ul>
-<% end -%>
 
 <%= flash_messages %>
 
-<br />
-<br />
-<br />
-<br />
-<br />
-
-<h1><%= t('page_context.list_page_content') %></h1>
-
-	<table>
-	  <tr>
-		<th><%= t('page_context.name') %></th>
-		<th><%= t('page_context.version') %></th>
-		<th><%= t('page_context.update_time') %></th>
-		<th><%= t('page_context.last_modified') %></th>
-		<th><%= t('page_context.action') %></th>
-	  </tr>
+<table class="table main-list">
+	<thead>
+		<tr>
+			<th class="span7 select"><%= t('page_context.name') %></th>
+			<th class="span1-2"><%= t('page_context.version') %></th>
+			<th class="span1-2"><%= t('page_context.update_time') %></th>
+			<th class="span1-2"><%= t('page_context.last_modified') %></th>
+		</tr>
+	</thead>
+	<tbody>
 	  
-	<%= render :partial => 'page_context', :collection => @page_contexts %>
+		<%= render :partial => 'page_context', :collection => @page_contexts %>
 
-	</table>
+	</tbody>
+</table>
 
-<br />
 
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/view.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/view.html.erb
index c5a9871a..d88df80e 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/view.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/view.html.erb
@@ -1,36 +1,19 @@
-<% content_for :secondary do %>
-<br />
-<br />
-<br />
-<br />
-<br />
-  <ul class="list">
-	  <li><%= link_to t('page_context.page_content_list'), panel_page_content_back_end_page_contexts_path %></li>
-  </ul>
-<% end -%>
 
 <%= flash_messages %>
 
-<br />
-<br />
-<br />
-<br />
-<br />
-
-<h1><%= t('page_context.list_page_content') %></h1>
-
-	<table>
-	  <tr>
-		<th><%= t('page_context.name') %></th>
-		<th><%= t('page_context.version') %></th>
-		<th><%= t('page_context.update_time') %></th>
-		<th><%= t('page_context.last_modified') %></th>
-		<th><%= t('page_context.action') %></th>
-	  </tr>
+<table class="table main-list">
+	<thead>
+		<tr>
+			<th class="span7 select"><%= t('page_context.name') %></th>
+			<th class="span1-2"><%= t('page_context.version') %></th>
+			<th class="span1-2"><%= t('page_context.update_time') %></th>
+			<th class="span1-2"><%= t('page_context.last_modified') %></th>
+		</tr>
+	</thead>
+	<tbody>
 	  
 	<%= render :partial => 'view_page_context', :collection => @page_contexts %>
 
-	</table>
-
-<br />
+	</tbody>
+</table>
 
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 3db38add..0ba3236a 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
@@ -1,6 +1,6 @@
 class Panel::WebResource::BackEnd::WebLinkCategorysController < ApplicationController
   
-  layout 'admin'
+  layout 'new_admin'
   
   def index
     @web_link_categorys = WebLinkCategory.all
diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
index f1ec7485..dfe09ce5 100644
--- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
+++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
@@ -1,7 +1,7 @@
 class Panel::WebResource::BackEnd::WebLinksController < ApplicationController
 
   
-  layout 'admin'
+  layout 'new_admin'
   
   before_filter :authenticate_user!
   before_filter :is_admin?
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb
index 7eb698ea..2e0f61ff 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb
@@ -1,25 +1,29 @@
 <% # encoding: utf-8 %>
 
 <%= form_for(@web_link_category, :remote => true, :url => @url) do |f| %>
-<%#= form_for(@web_link_category, :remote => true, :url => panel_web_resource_back_end_web_link_category_path(@web_link_category)) do |f| %>
 
-  <div class="field">
-    <%= f.label :key %><br />
-    <%= f.text_field :key %>
-  </div>
+	<h2><%= (@web_link_category.new_record? ? 'Add' : 'Edit') %></h2>
+
+	<div id="widget-title">
+		<%= f.label :key %>
+		<%= f.text_field :key %>
+	</div>
+	
+	<div id="widget-title">
+		<%= f.fields_for :i18n_variable, (@web_link_category.new_record? ? @web_link_category.build_i18n_variable : @web_link_category.i18n_variable) do |f| %>
+		  <% @site_valid_locales.each do |locale| %>
+				<div class="control-group">
+					<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
+					<div class="controls">
+						<%= f.text_field locale, :class => 'input-xxlarge' %>
+					</div>
+				</div>
+		  <% end %>
+		<% end %>
+	</div>
   
-  <div class="field">
-    <%= f.label :name %><br />
-	<%= f.fields_for :i18n_variable, (@web_link_category.new_record? ? @web_link_category.build_i18n_variable : @web_link_category.i18n_variable) do |f| %>
-	  <% @site_valid_locales.each do |locale| %>
-		<%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
-		<%= f.text_field locale, :style => "width:130px" %>
-	  <% end %>
-	<% end %>
-  </div>
-  
-  <div class="actions">
-    <%= f.submit %>
+  <div class="form-actions">
+    <%= f.submit 'Submit/������', :class=>'btn btn-primary' %>
   </div>
   
 <% end %>
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb
index d6e27e8d..3f6a1a71 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb
@@ -1,12 +1,16 @@
 
-<tr id="<%= dom_id web_link_category %>">
-	<td><%= web_link_category.key %></td>
-	<% @site_valid_locales.each do |locale| %>
-	<td><%= web_link_category.i18n_variable[locale] rescue nil %></td>
-	<% end %>
-	<td>
-	<%= link_to t('web_link_category.edit'), edit_panel_web_resource_back_end_web_link_category_path(web_link_category), :remote => true %> |
-	<%= link_to t('web_link_category.quick_edit'), panel_web_resource_back_end_web_link_category_quick_edit_path(web_link_category), :remote => true %> |
-	<%= link_to t('web_link_category.delete'), panel_web_resource_back_end_web_link_category_path(web_link_category), :confirm => t('sure?'), :method => :delete, :remote => true %>
-	</td>
-</tr>
\ No newline at end of file
+
+	<tr id="<%= dom_id web_link_category %>" class="with_action">
+		<td>
+			<%= web_link_category.key %>
+			<div class="quick-edit">
+				<ul class="nav nav-pills hide">
+					<li><%= link_to t('web_link_category.edit'), edit_panel_web_resource_back_end_web_link_category_path(web_link_category), :remote => true %></li>
+					<li><%= link_to t('web_link_category.delete'), panel_web_resource_back_end_web_link_category_quick_edit_path(web_link_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
+				</ul>
+			</div>
+		</td>
+		<% @site_valid_locales.each do |locale| %>
+		<td><%= web_link_category.i18n_variable[locale] rescue nil %></td>
+		<% end %>
+	</tr>
\ No newline at end of file
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb
index 45842451..762da9e7 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb
@@ -1,43 +1,23 @@
-<% content_for :secondary do %>
-<br />
-<br />
-<br />
-<br />
-<br />
-  <ul class="list">
-	  <li><%#= link_to t('web_link_category.new_web_resource_class'), new_panel_web_resource_back_end_web_link_category_path, :class => 'seclink1' %></li>
-  </ul>
-<% end -%>
+
 
 <%= flash_messages %>
 
-<h1><%= t('web_link_category.list_web_resource_class') %></h1>
-<br />
-<br />
-<br />
-<br />
-<br />
-<table id="web_link_categorys">
-  <tr>
-    <th><%= t('web_link_category.key') %></th>
-	<% @site_valid_locales.each do |locale| %>
-	<th><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
-	<% end %>
-    <th><%= t('web_link.action') %></th>
-  </tr>
+<table id="web_link_categorys" class="table main-list">
+	<thead>
+		<tr>
+			<th class="span1-2"><%= t('web_link_category.key') %></th>
+			<% @site_valid_locales.each do |locale| %>
+			<th class="span1-2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
+			<% end %>
+		</tr>
+	</thead>
+	<tbody>
 
-<%# @web_link_categorys.each do |post| %>
 	<%= render :partial => 'web_link_category', :collection => @web_link_categorys %>
-<%# end %>
+	
+	</tbody>
 </table>
 
-<br />
-<br />
-<br />
-<br />
-
-<h2>Add New</h2>
 <div id="form"><%= render :partial => "form" %></div>
 
 
-
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
index ce17555a..2abdf4a0 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
@@ -1,62 +1,101 @@
 <% # encoding: utf-8 %>
 
   <%= f.error_messages %>
-  <%#= debugger %>
-	
-  <div class="field">
-    <%= f.label :category %><br />
-	<%= f.select :web_link_category_id, @web_link_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ]} %>
-  </div>
-  
- <div class="field">
-  <%= f.label :name %>
-  <%= f.fields_for :name, (@web_link.new_record? ? @web_link.build_name : @web_link.name ) do |f| %>
-   <% @site_valid_locales.each do |locale| %>
-    <td>
-     <%= I18nVariable.from_locale(locale) %>
-     <%= f.text_field locale %>
-    </td>
-   <% end %>
-  <% end %>
- </div>
-  
-  <div class="field">
-    <%= f.label :url %><br />
-    <%= f.text_field :url, :size => 60 %>
-  </div>
 
- <div class="field">
-  <%= f.label :describe %>
-  <%= f.fields_for :context, (@web_link.new_record? ? @web_link.build_context : @web_link.context ) do |f| %>
-   <% @site_valid_locales.each do |locale| %>
-    <td>
-     <%= I18nVariable.from_locale(locale) %>
-     <%= f.text_area locale, :rows => 10, :cols => 40 %>
-    </td>
-   <% end %>
-  <% end %>
- </div>
+	<!--Widget start-->
+	
+	<div id="sub-wiget">
+		  
+		<div id="widget-status" class="widget-box widget-size-300">
+			<div class="widget-action clear">
+				<a class="action"><i title="Setting the announcement state" class="icon-exclamation-sign icon-white tip"></i></a>
+			</div>
+			<h3 class="widget-title"><i class="icons-star-thin icons-white"></i>Status</h3>
+			<div class="widget-content clear">
+				<div class="controls">
+					<%= f.check_box :is_top %><%= t('top') %>
+					<%= f.check_box :is_hot %><%= t('hot') %>
+					<%= f.check_box :is_hidden %><%= t('hide') %>
+				</div>
+			</div>
+		</div>
+
+		<div id="widget-tags" class="widget-box widget-size-300">
+			<div class="widget-action clear">
+				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
+			</div>
+			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+				<div class="widget-content clear form-horizontal">
+					<% @tags.each do |tag| %>
+					<%= check_box_tag 'web_link[tag_ids][]', tag.id, @web_link.tag_ids.include?(tag.id)%>
+					<%= tag[I18n.locale] %>
+					<% end %>
+				</div>
+		</div>  
   
-  <div class="field">
-    <%= f.label :status %><br />
-    <%= f.check_box :is_top %><%= t('top') %>
-    <%= f.check_box :is_hot %><%= t('hot') %>
-    <%= f.check_box :is_hidden %><%= t('hidden') %>
-  </div>
-  
-  <div class="field">
-    <%= f.label :tags %><br />
-	<% @tags.each do |tag| %>
-	<%= check_box_tag 'web_link[tag_ids][]', tag.id, @web_link.tag_ids.include?(tag.id)%>
-	<%= tag[I18n.locale] %>
-	<% end %>
-  </div>
-  
-  <br />
-  <br />
+	</div>
   
   
-  <div class="actions">
-    <%= f.submit %>
+<!--Wiget End-->
+<!--Post Start-->
+
+	<div id="post-body">
+		<div id="post-body-content" class="clear">
+		
+			<%= f.label :category %>
+			<%= f.select :web_link_category_id, @web_link_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ]} %>
+
+			<div class="btn-group pull-right">
+				<a class="btn dropdown-toggle" href="#" data-toggle="dropdown">
+					English
+					<span class="caret"></span>
+				</a>
+				<ul class="dropdown-menu">
+					<li><a href="#">English</a></li>
+					<li><a href="#">Chinese</a></li>
+					<li><a href="#">Japanese</a></li>
+					<li><a href="#">French</a></li>
+					<li><a href="#">German</a></li>
+					<!--<li class="divider"></li>
+					<li><a href="#">Separated link</a></li>-->
+				</ul>
+			</div>
+
+			<div class="title">
+				<%= f.label :name %>
+				<%= f.fields_for :name, (@web_link.new_record? ? @web_link.build_name : @web_link.name ) do |f| %>
+				  <% @site_valid_locales.each do |locale| %>
+					<td>
+						<%= I18nVariable.from_locale(locale) %>
+						<%= f.text_field locale, :class=>'post-title' %>
+					</td>
+				  <% end %>
+				<% end %>
+			</div>
+
+			<div class="title">
+				<%= f.label :url %>
+				<%= f.text_field :url %>
+			</div>
+
+			<div class="title">
+				<%= f.label :describe %>
+				<%= f.fields_for :context, (@web_link.new_record? ? @web_link.build_context : @web_link.context ) do |f| %>
+				  <% @site_valid_locales.each do |locale| %>
+					<td>
+						<%= I18nVariable.from_locale(locale) %>
+						<%= f.text_area locale, :style=>"width:100%" %>
+					</td>
+				  <% end %>
+				<% end %>
+			</div>
+	
+	</div>
+	
+	<!--Post End-->
+  
+  
+  <div class="form-actions">
+    <%= f.submit 'Submit/������', :class=>'btn btn-primary' %>
   </div>
  
\ No newline at end of file
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb
index d87b59d8..c58f15e4 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb
@@ -1,5 +1,5 @@
 
-<tr id="<%= dom_id post %>">
+<tr id="<%= dom_id post %>" class="with_action">
 	<td>
 		<% if post.is_top? %>
 			<span class="label label-success"><%= t(:top) %></span>
@@ -10,6 +10,12 @@
 		<% if post.is_hidden? %>
 			<span class="label"><%= t(:hidden) %></span>
 		<% end %>	
+		<div class="quick-edit">
+			<ul class="nav nav-pills hide">
+				<li><%= link_to t('web_link.edit'), edit_panel_web_resource_back_end_web_link_path(post) %></li>
+				<li><%= link_to t('web_link.delete'), panel_web_resource_back_end_web_link_path(post), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			</ul>
+		</div>
 	</td>
 	<td><%= post.web_link_category.i18n_variable[I18n.locale] %></td>
 	<td>
@@ -20,12 +26,5 @@
 			<span class="label label-tags"><%= tag[I18n.locale] %></span>
 		<% end %>
 	</td>
-	<td>
-	<%= link_to t('web_link.edit'), edit_panel_web_resource_back_end_web_link_path(post) %> | 
-	
-	<%= link_to t(:set_top), eval("panel_web_resource_back_end_web_link_path(post, :authenticity_token => form_authenticity_token, :web_link => {:is_top => true})"), :remote => true, :method => :put, :id => "disable_#{post.id}", :style => "display:#{post.is_top? ? 'none' : ''}", :class => 'switch' %>
-	<%= link_to t(:cancel_top), eval("panel_web_resource_back_end_web_link_path(post, :authenticity_token => form_authenticity_token, :web_link => {:is_top => false})"), :remote => true, :method => :put, :id => "enable_#{post.id}", :style => "display:#{post.is_top? ? '' : 'none'}", :class => 'switch' %>
-			
-	 | <%= link_to t('web_link.delete'), panel_web_resource_back_end_web_link_path(post), :confirm => t('sure?'), :method => :delete, :remote => true %>
-	</td>
 </tr>
+
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
index 82afe4ea..301c1bbe 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
@@ -1,52 +1,21 @@
-<% content_for :secondary do %>
-<br />
-<br />
-<br />
-<br />
-<br />
-  <ul class="list">
-	  <li><%= link_to t('web_link.new_link'), new_panel_web_resource_back_end_web_link_path %></li>
-	  <li><%= link_to t('web_link.link_list'), panel_web_resource_back_end_web_links_path %></li>
-	  <li><%= link_to t('web_link.new_link_class'), panel_web_resource_back_end_web_link_categorys_path %></li>
-  </ul>
-<% end -%>
 
 <%= flash_messages %>
 
-<br />
-<br />
-<br />
-<br />
-<br />
-
-  <%= form_for :web_link, :action => 'search', :method => 'get', :url => panel_web_resource_back_end_web_links_path do |f| %>
-  
-  <%#= f.select :web_link_category_id, @web_link_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ] },{ :include_blank => t('web_link.select') }%>
-  
-  Category <%= select_tag "category_id", options_for_select(@web_link_categorys.collect{|t| [t.i18n_variable[I18n.locale], t.id]}), :prompt => t('web_link.select') %>
-  
-  <%= submit_tag "OK", :name => nil %> 
-  
-  <% end %>
-
-<br />
-<br />
-
-<h1><%= t('web_link.list_link') %></h1>
-
-	<table>
-	  <tr>
-		<th><%= t('web_link.status') %></th>
-		<th><%= t('web_link.category') %></th>
-		<th><%= t('web_link.name') %></th>
-		<th><%= t('web_link.tags') %></th>
-		<th><%= t('web_link.action') %></th>
-	  </tr>
+<table class="table main-list">
+	<thead>
+		<tr>
+			<th class="span1-2"><%= t('web_link.status') %></th>
+			<th class="span1-2"><%= t('web_link.category') %></th>
+			<th class="span1-2"><%= t('web_link.name') %></th>
+			<th class="span1-2"><%= t('web_link.tags') %></th>
+		</tr>
+	</thead>
+	<tbody>
 
 	<% @web_links.each do |post| %>
 		<%= render :partial => 'web_links', :locals => {:post => post} %>
-	<% end %>	
-	</table>
-
-<br />
+	<% end %>
+	
+	</tbody>
+</table>
 

From 13b6892f873e625aeff2ce7b640b2a2d9ee4d586 Mon Sep 17 00:00:00 2001
From: Matt Fu <matt@rulingcom.com>
Date: Fri, 16 Mar 2012 11:09:44 +0800
Subject: [PATCH 10/20] code for new fact check

---
 app/controllers/orbit_backend_controller.rb   |  1 +
 app/views/layouts/_side_bar.html.erb          |  1 +
 lib/tasks/anc_tasks.rake                      | 12 +--
 .../back_end/bulletins_controller.rb          |  7 +-
 .../back_end/fact_checks_controller.rb        | 92 +++++++++++++------
 .../announcement/app/models/bulletin.rb       |  3 +
 .../back_end/bulletins/_bulletin.html.erb     |  5 +-
 .../back_end/bulletins/_form.html.erb         | 13 ++-
 .../back_end/bulletins/_quick_edit.html.erb   | 10 +-
 .../back_end/bulletins/index.html.erb         |  1 -
 .../back_end/fact_checks/_list_table.html.erb | 15 ---
 .../back_end/fact_checks/index.html.erb       | 40 --------
 .../announcement/config/locales/en.yml        |  6 ++
 .../announcement/config/locales/zh_tw.yml     |  7 ++
 .../announcement/config/routes.rb             |  5 +-
 15 files changed, 114 insertions(+), 104 deletions(-)
 delete mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb
 delete mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb

diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb
index d3639ebe..b52384c6 100644
--- a/app/controllers/orbit_backend_controller.rb
+++ b/app/controllers/orbit_backend_controller.rb
@@ -4,6 +4,7 @@ class OrbitBackendController< ApplicationController
  # before_filter {|c| c.front_end_available(@app_title)}
   before_filter :check_user_can_use,:except => [:public]
   include OrbitCoreLib::PermissionUnility
+  include AdminHelper
   
   layout 'admin'
   
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index 33e41597..d287e46c 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -9,6 +9,7 @@
 		<%= content_tag :li, link_to(t('admin.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %>
 		<%= content_tag :li, link_to(t('admin.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %>
 		<%= content_tag :li, link_to(t('admin.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('tags', 'index') %>
+		<%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('tags', 'index') %>
 	<% end -%>
 <% end -%>
 
diff --git a/lib/tasks/anc_tasks.rake b/lib/tasks/anc_tasks.rake
index 3145d119..cd534b93 100644
--- a/lib/tasks/anc_tasks.rake
+++ b/lib/tasks/anc_tasks.rake
@@ -11,12 +11,12 @@ namespace :anc do
     bulletin_category_3.create_i18n_variable(:en => "MattCheckChrisPreview", :zh_tw => 'MattCheckChrisPreview')
     
   
-    bulletin_1 = Bulletin.create(:title => "C1P1",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_1  )
-    bulletin_2 = Bulletin.create(:title => "C1P2",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_1  )
-    bulletin_3 = Bulletin.create(:title => "C2P1",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_2  )
-    bulletin_4 = Bulletin.create(:title => "C2P2",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_2  )
-    bulletin_5 = Bulletin.create(:title => "C3P1",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_3  )
-    bulletin_6 = Bulletin.create(:title => "C3P2",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_3  )
+    bulletin_1 = Bulletin.create(:title => "C1P1",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_1  )
+    bulletin_2 = Bulletin.create(:title => "C1P2",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_1  )
+    bulletin_3 = Bulletin.create(:title => "C2P1",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_2  )
+    bulletin_4 = Bulletin.create(:title => "C2P2",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_2  )
+    bulletin_5 = Bulletin.create(:title => "C3P1",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_3  )
+    bulletin_6 = Bulletin.create(:title => "C3P2",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_3  )
   
   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 dcd3de04..e8eb6149 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -1,5 +1,4 @@
-class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
-  
+class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   layout 'new_admin'
   
   before_filter :authenticate_user!
@@ -151,7 +150,6 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
     elsif is_sub_manager?
       @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new')
     end
-<<<<<<< HEAD
   end
 
   def get_sorted_bulletins
@@ -196,8 +194,7 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
         a.flatten!
         a.uniq
      end
-=======
->>>>>>> 26cd6951dba43b1f6eaf5056160309c5c77a8716
+
   end
   
   
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb
index dd471958..c47e91fb 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb
@@ -1,38 +1,76 @@
 class Panel::Announcement::BackEnd::FactChecksController  < OrbitBackendController
   before_filter :authenticate_user!
   include AdminHelper
-  layout 'admin'
+  # layout 'admin'
+  layout 'new_admin'
   
-  def index
-    @bulletin_categorys_submit_new = []
-    @bulletin_categorys_check =[]
-    if is_admin? || is_manager?
-      #@bulletin_categorys_submit_new = BulletinCategory.all
-      @bulletin_categorys_check = BulletinCategory.all
-    # elsif is_sub_manager?
-    #   @bulletin_categorys_submit_new = BulletinCategory.authed_for_user(current_user,'submit_new')
-    #   @bulletin_categorys_check = BulletinCategory.authed_for_user(current_user,'fact_check')
+  def setting
+    @bulletin_categorys = BulletinCategory.all
+    if params.has_key?(:category_id)
+      first_category = BulletinCategory.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
+    else
+      first_category =  @bulletin_categorys.first
+    end  
+    preload_object_auth = first_category.object_auths.where(title: 'fact_check') || (first_category.object_auths.create :title=> 'fact_check')
+    @users_array =  preload_object_auth.first.privilege_users rescue []
+    respond_to do |format|
+      format.html
+      format.js
     end
   end
   
-  def new
+  def update_setting
     
   end
-  
-  def create
-    
+  # def index
+  #   get_categorys(params[:bulletin_category_id])
+  #   
+  #   @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all
+  #   @bulletin_categories = BulletinCategory.all
+  #   
+  #   module_app = ModuleApp.first(:conditions => {:key => 'announcement'})
+  #   @tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc)
+  # 
+  #   respond_to do |format|
+  #     format.html # index.html.erb
+  #     format.js
+  #     format.xml  { render :xml => @bulletins }
+  #   end
+  # end
+  # 
+  # def new
+  #   
+  # end
+  # 
+  # def create
+  #   
+  # end
+  # 
+  # def update
+  #   
+  # end
+  # 
+  # def edit
+  #   
+  # end
+  # 
+  # def destroy
+  #   
+  # end
+  protected
+  def get_categorys(id = nil)
+    @bulletin_categorys = []
+    if(is_manager? || is_admin?)
+      @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true))
+    elsif is_sub_manager?
+      @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new')
+    end
   end
-  
-  def update
-    
-  end
-  
-  def edit
-    
-  end
-  
-  def destroy
-    
-  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 188142ea..e68e2c97 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb
@@ -19,6 +19,9 @@ class Bulletin
   field :is_top, :type => Boolean, :default => false
   field :is_hot, :type => Boolean, :default => false
   field :is_hidden, :type => Boolean, :default => false
+  field :is_checked, :type => Boolean, :default => false 
+  
+  field :not_checked_reason
   
   field :public, :type => Boolean, :default => true
   
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 3f6f50e1..e12af233 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
@@ -24,11 +24,12 @@
 					</ul>
 				</li>
 				<li class="dropdown"><%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
+				<li><%= link_to t('bulletin.fact_check'), edit_panel_announcement_back_end_bulletin_path(bulletin)   %></li><%#= #TODO add ancher so user can quick access into that part %>
 			</ul>
 		</div>
 	</td>
 	<td><%= bulletin.bulletin_category.i18n_variable[I18n.locale] %></td>
-	<td><%= link_to bulletin.title[I18n.locale], panel_announcement_back_end_bulletin_path(bulletin) %></td>
+	<td><%= link_to bulletin.title[I18n.locale], panel_announcement_back_end_bulletin_path(bulletin) rescue ''%></td>
 	<td><%= bulletin.postdate %></td>
 	<td><%= (bulletin.deadline) ? bulletin.deadline : t('bulletin.no_deadline') %></td>
 	<td>
@@ -36,7 +37,7 @@
 			<span class="label label-tags"><%= tag[I18n.locale] %></span>
 		<% end %>
 	</td>
-	<td><%= User.from_id(bulletin.update_user_id).name %></td>
+	<td><%= User.from_id(bulletin.update_user_id).name rescue ''%></td>
 </tr>
 
 <%= render :partial => 'quick_edit', :locals => {:bulletin => bulletin} %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index 751a5f12..2236b5ed 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -2,7 +2,16 @@
 
   <%= f.error_messages %>
   <%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
-
+	<div class="field">
+		<%= label :fact_check_stat, t('announcement.bulletin.fact_check_stat') %>
+		<%= f.radio_button :is_checked, true%> 
+		  <%= label :is_checked_true, t('announcement.bulletin.fact_check_pass')  %>
+		  <%= f.radio_button :is_checked, false, (@bulletin.is_checked.nil?? {:checked => true} : {})  %>
+		  <%= label :is_checked_false, t('announcement.bulletin.fact_check_not_pass') %>
+		
+		  <%= label :is_checked_false, t('announcement.bulletin.fact_check_not_pass_reason') %>
+		<%= f.text_field :not_checked_reason %>
+	</div>
   <div class="field">
     <%= f.label :image, t('announcement.image') %><br />
     <%= f.file_field :image %>
@@ -523,6 +532,8 @@
         </div>
     </div>
 </div> -->
+
+
 <!--Post End-->
 <!-- <div class="form-actions"> -->
   <button class="btn btn-success" type="submit">Preview/���閬�</button>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit.html.erb
index 91726d88..96e8237c 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit.html.erb
@@ -3,11 +3,11 @@
 	<td colspan="8">
 		<legend><%= t(:quick_edit) %> - <span class='qe_title'></span>Basic / Picture / Tags / Link / File</legend>
 		<%= form_for bulletin, :url => panel_announcement_back_end_bulletin_path(bulletin), :html => {:class => 'form-horizontal'} do |f| %>
-			<%= render :partial => "quick_edit_basic", :locals => { :f => f, :bulletin => bulletin } %>
-			<%= render :partial => "quick_edit_picture", :locals => { :f => f, :bulletin => bulletin } %>
-			<%= render :partial => "quick_edit_tags", :locals => { :f => f, :bulletin => bulletin } %>
-			<%= render :partial => "quick_edit_links", :locals => { :f => f, :bulletin => bulletin } %>
-			<%= render :partial => "quick_edit_files", :locals => { :f => f, :bulletin => bulletin } %>
+			<%= render :partial => "panel/announcement/back_end/bulletins/quick_edit_basic", :locals => { :f => f, :bulletin => bulletin } %>
+			<%= render :partial => "panel/announcement/back_end/bulletins/quick_edit_picture", :locals => { :f => f, :bulletin => bulletin } %>
+			<%= render :partial => "panel/announcement/back_end/bulletins/quick_edit_tags", :locals => { :f => f, :bulletin => bulletin } %>
+			<%= render :partial => "panel/announcement/back_end/bulletins/quick_edit_links", :locals => { :f => f, :bulletin => bulletin } %>
+			<%= render :partial => "panel/announcement/back_end/bulletins/quick_edit_files", :locals => { :f => f, :bulletin => bulletin } %>
 			<div class="form-actions">
 				<%= f.submit t(:submit), :class => 'btn btn-primary' %>
 				<%= f.submit t(:cancel), :class => 'btn', :type => 'reset' %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
index fd2b29b5..c833297a 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
@@ -2,7 +2,6 @@
 <table id="bulettin_sort_list" class="table main-list">
 	<%= render 'bulletins' %>
 </table>
-
 <div class="form-actions">
 	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %>
 </div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb
deleted file mode 100644
index 59bac03a..00000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<h1><%= bulletin_category.key %></h1>
-<table>
-  <tr>
-	<th><%= t('bulletin.status') %></th>
-	<th><%= t('bulletin.category') %></th>
-	<th><%= t('bulletin.title') %></th>
-	<th><%= t('bulletin.postdate') %></th>
-	<th><%= t('bulletin.deadline') %></th>
-	<th><%= t('bulletin.action') %></th>
-  </tr>
-
-<% bulletin_category.bulletins.each do |post| %>
-	<%= render :partial => 'panel/announcement/back_end/bulletins/bulletins', :locals => {:post => post,:fact_check_allow=>true} %>
-<% end %>	
-</table>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb
deleted file mode 100644
index 6f878b06..00000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-<% content_for :secondary do %>
-<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %>
-<% end -%>
-
-<%= flash_messages %>
-
-<br />
-<br />
-<br />
-<br />
-<br />
-  
-  <fieldset><legend><%= t('bulletin.search') %></legend>	
-
-  <%= form_for :bulletin, :action => 'search', :method => 'get', :url => panel_announcement_back_end_bulletins_path do |f| %>
-  
-  <%#= f.select :bulletin_category_id, @bulletin_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ] },{ :include_blank => t('bulletin.select') }%>
-  
-  Category <%#= select_tag "category_id", options_for_select(@bulletin_categorys.collect{|t| [t.i18n_variable[I18n.locale], t.id]}), :prompt => t('bulletin.select') %>
-  
-  KeyWord <%#= text_field_tag :search, params[:search], :id => 'search_field' %>
-  
-  <%= submit_tag "Search", :name => nil %> 
-  
-  <% end %>
-
-  
-  </fieldset>
-
-<br />
-<br />
-
-<h1><%= t('bulletin.list_announcement') %></h1>
-
-<div id="check_block">	
-	<h1>Check Please</h1>
-	<%= render :partial => "list_table", :collection => @bulletin_categorys_check,:as => :bulletin_category%>
-</div>
-<br />
-
diff --git a/vendor/built_in_modules/announcement/config/locales/en.yml b/vendor/built_in_modules/announcement/config/locales/en.yml
index 1f544b28..6143b177 100644
--- a/vendor/built_in_modules/announcement/config/locales/en.yml
+++ b/vendor/built_in_modules/announcement/config/locales/en.yml
@@ -35,6 +35,12 @@ en:
       list_lower: " list"
       title: Title
       postdate: Postdate
+      fact_check: Fact Check
+      fact_check_setting: Fact Check Setting
+      fact_check_stat: Fact Check Status
+      fact_check_not_pass: 'Not Pass'
+      fact_check_not_pass_reason: 'Reason'
+      fact_check_pass: 'Pass'
   # admin:
   #     action: Action
   #     add_language: Add language
diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
index a9da545b..e2dfd957 100644
--- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
@@ -30,6 +30,13 @@ zh_tw:
       list_lower: ���銵�
       title: 璅�憿�
       postdate: 撘菔票��交��
+      fact_check: ��砍��撖拇��
+      fact_check_setting: 撖拇�貉身摰�
+      fact_check_stat: 撖拇�貊��瘜�
+      fact_check_not_pass: '銝�������'
+      fact_check_pass: '������'
+      fact_check_not_pass_reason: '銝�������������'
+      
 #  admin:
 #    action: 銵����
 #    add_language: ��啣��隤�閮�
diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb
index cb39d253..f6f30b31 100644
--- a/vendor/built_in_modules/announcement/config/routes.rb
+++ b/vendor/built_in_modules/announcement/config/routes.rb
@@ -3,8 +3,9 @@ Rails.application.routes.draw do
     namespace :announcement do
       namespace :back_end do
         match 'public' => "announcements#public",:as => :public
-        resources :fact_checks
-        match 'list_mine' => "announcements#list_mine"
+        match 'fact_check_setting' => "fact_checks#setting" ,:as => :fact_checks_setting
+        match 'update_setting' => "fact_checks#update_setting" ,:as => :fact_checks_update_setting
+        
         root :to => "bulletins#index"
         resources :bulletins
         resources :bulletin_categorys, :controller => 'bulletin_categorys' do

From b6d49df1453c8c3c0f6b0a080c2b0f3805030bac Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Fri, 16 Mar 2012 11:20:16 +0800
Subject: [PATCH 11/20] Change Obit to Orbit

---
 app/controllers/orbit_widget_controller.rb                      | 2 +-
 .../panel/announcement/back_end/bulletins_controller.rb         | 1 -
 .../panel/announcement/front_end/bulletins_controller.rb        | 2 +-
 .../panel/announcement/widget/bulletins_controller.rb           | 2 +-
 .../app/controllers/panel/new_blog/widget/posts_controller.rb   | 2 +-
 .../panel/page_content/front_end/page_contexts_controller.rb    | 2 +-
 .../panel/web_resource/front_end/web_links_controller.rb        | 2 +-
 .../panel/web_resource/widget/web_links_controller.rb           | 2 +-
 8 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/controllers/orbit_widget_controller.rb b/app/controllers/orbit_widget_controller.rb
index c2be4691..47e24fe0 100644
--- a/app/controllers/orbit_widget_controller.rb
+++ b/app/controllers/orbit_widget_controller.rb
@@ -1,3 +1,3 @@
-class ObitWidgetController< OrbitFrontendComponentController
+class OrbitWidgetController< OrbitFrontendComponentController
 
 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 e8eb6149..c6eb0180 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
@@ -194,7 +194,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
         a.flatten!
         a.uniq
      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 e840d65f..ff3cbdc9 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
@@ -1,4 +1,4 @@
-class Panel::Announcement::FrontEnd::BulletinsController < ObitWidgetController
+class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
   
   def initialize
     super
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
index 333f88e7..60aad3d9 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
@@ -1,4 +1,4 @@
-class Panel::Announcement::Widget::BulletinsController < ObitWidgetController
+class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
 
   def initialize
     super
diff --git a/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb b/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
index dab532ee..73098dda 100644
--- a/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
+++ b/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
@@ -1,4 +1,4 @@
-class Panel::NewBlog::Widget::PostsController < ObitWidgetController
+class Panel::NewBlog::Widget::PostsController < OrbitWidgetController
   # GET /posts
   # GET /posts.xml
   def index
diff --git a/vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb b/vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
index 8b750dcc..5b46866b 100644
--- a/vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
+++ b/vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
@@ -1,4 +1,4 @@
-class Panel::PageContent::FrontEnd::PageContextsController < ObitWidgetController
+class Panel::PageContent::FrontEnd::PageContextsController < OrbitWidgetController
   
   def initialize
     super
diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
index c230140d..54374ed3 100644
--- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
+++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
@@ -1,4 +1,4 @@
-class Panel::WebResource::FrontEnd::WebLinksController < ObitWidgetController
+class Panel::WebResource::FrontEnd::WebLinksController < OrbitWidgetController
   
   def initialize
     super
diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
index bbe4a8d9..750897ae 100644
--- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
+++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
@@ -1,4 +1,4 @@
-class Panel::WebResource::Widget::WebLinksController < ObitWidgetController
+class Panel::WebResource::Widget::WebLinksController < OrbitWidgetController
 
   def initialize
     super

From 6f6e84b0157e301f117bcd28aa867b1ef4eec96a Mon Sep 17 00:00:00 2001
From: unknown <Spen@Spen-VAIO.(none)>
Date: Wed, 14 Mar 2012 20:05:03 +0800
Subject: [PATCH 12/20] fix dashboard & announcement

---
 app/assets/javascripts/bulletin_form.js.erb   |   3 +-
 app/views/layouts/_side_bar.html.erb          |  14 +-
 .../back_end/bulletins_controller.rb          |  51 ++-
 .../announcement/app/models/bulletin.rb       |  26 +-
 .../announcement/app/models/bulletin_file.rb  |  22 +-
 .../announcement/app/models/bulletin_link.rb  |   8 +-
 .../_bulletin_category.html.erb               |  40 ++-
 .../bulletin_categorys/_form.html.erb         |  54 +--
 .../bulletin_categorys/_quick_edit.html.erb   |  13 +
 .../_quick_edit_qe.html.erb                   |  28 ++
 .../bulletin_categorys/index.html.erb         |  41 +--
 .../bulletins/_bulletin_file.html.erb         |  16 +-
 .../bulletins/_bulletin_link.html - 複製.erb  |  27 ++
 .../bulletins/_bulletin_link.html.erb         |  10 +-
 .../bulletins/_bulletin_link2.html - 複製.erb |  16 +
 .../bulletins/_bulletin_link2.html.erb        |  17 +
 .../bulletins/_bulletin_link_qe.html.erb      |  41 +++
 .../back_end/bulletins/_form.html.erb         | 322 +++++++++++++-----
 .../bulletins/_quick_edit_links.html.erb      |  34 +-
 .../bulletins/_quick_edit_picture.html.erb    |  13 +-
 .../back_end/bulletins/index.html - 複製.erb  |   9 +
 .../back_end/bulletins/link_quick_edit.js.erb |   2 +
 .../back_end/bulletins/show.html.erb          |  10 +-
 .../announcement/config/routes.rb             |   5 +-
 .../back_end/page_contexts/_form.html.erb     |  51 +--
 .../page_contexts/_page_context.html.erb      |  22 +-
 .../page_contexts/_view_page_context.html.erb |  23 +-
 .../back_end/page_contexts/edit.html.erb      |  10 +-
 .../back_end/page_contexts/index.html.erb     |  42 +--
 .../back_end/page_contexts/view.html.erb      |  41 +--
 .../back_end/web_link_categorys_controller.rb |   2 +-
 .../back_end/web_links_controller.rb          |   2 +-
 .../web_link_categorys/_form.html.erb         |  38 ++-
 .../_web_link_category.html.erb               |  26 +-
 .../web_link_categorys/index.html.erb         |  46 +--
 .../back_end/web_links/_form.html.erb         | 145 +++++---
 .../back_end/web_links/_web_links.html.erb    |  17 +-
 .../back_end/web_links/index.html.erb         |  59 +---
 38 files changed, 849 insertions(+), 497 deletions(-)
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit.html.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - 複製.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - 複製.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 複製.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb

diff --git a/app/assets/javascripts/bulletin_form.js.erb b/app/assets/javascripts/bulletin_form.js.erb
index 5002cfae..17f86060 100644
--- a/app/assets/javascripts/bulletin_form.js.erb
+++ b/app/assets/javascripts/bulletin_form.js.erb
@@ -1,4 +1,4 @@
-$('.bulletin_urls_block a.delete').live('click', function(){
+$('.bulletin_links_block a.delete').live('click', function(){
   $(this).parents('.list_item').remove();
 });
 
@@ -9,4 +9,5 @@ $('.bulletin_files_block a.delete').live('click', function(){
 $('.action a.remove_existing_record').live('click', function(){
   $(this).next('.should_destroy').attr('value', 1);
   $("#bulletin_" + $(this).prev().attr('value')).hide();
+  $("tr#bulletin_" + $(this).prev().attr('value')).hide();
 });
\ No newline at end of file
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index d287e46c..44f448fd 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -17,17 +17,25 @@
 	<%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), admin_users_path %>
 <% end -%>
 
-<%= content_tag :li, :class => active_for_controllers(nil) do -%>
+<%= content_tag :li, :class => active_for_controllers('page_contexts') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-page') + t('admin.page'), panel_page_content_back_end_page_contexts_path %>
+	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('page_contexts')) do -%>
+		<%= content_tag :li, link_to(t('admin.all_articles'), panel_page_content_back_end_page_contexts_path), :class => active_for_action('page_context', 'index') %>
+	<% 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 -%>
 
-<%= content_tag :li, :class => active_for_controllers(nil) do -%>
+<%= content_tag :li, :class => active_for_controllers('web_links', 'tags', 'web_link_categorys') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), panel_web_resource_back_end_web_links_path %>
-<% end -%>
+	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('web_links', 'tags', 'web_link_categorys')) do -%>
+		<%= content_tag :li, link_to(t('admin.all_articles'), panel_web_resource_back_end_web_links_path), :class => active_for_action('web_link', 'index') %>
+		<%= content_tag :li, link_to(t('admin.add_new'), new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_link', 'new') %>
+		<%= content_tag :li, link_to(t('admin.categories'), panel_web_resource_back_end_web_link_categorys_path), :class => active_for_action('web_link_categorys', 'index') %>
+		<%= content_tag :li, link_to(t('admin.tags'), panel_web_resource_back_end_tags_path), :class => active_for_action('tags', 'index') %>
+	<% end -%>
 
 <%= content_tag :li, :class => active_for_controllers(nil) do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), nil %>
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 c6eb0180..8b86a7a4 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
@@ -8,6 +8,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     # @bulletins = Bulletin.all
     # @bulletins = Bulletin.desc("postdate desc")
 	  get_categorys(params[:bulletin_category_id])
+	  get_tags
 	
     # @bulletins = Bulletin.where("bulletin_category_id" => params[:bulletin_category_id]).desc("postdate") if params[:bulletin_category_id]
     
@@ -15,9 +16,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     # @bulletins = Bulletin.all.order_by([params[:sort], params[:direction]])
     @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all
   	@bulletin_categories = BulletinCategory.all
-  	
-  	module_app = ModuleApp.first(:conditions => {:key => 'announcement'})
-  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -30,6 +28,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # GET /bulletins/1.xml
   def show
     @bulletin = Bulletin.find(params[:id])
+	get_tags
 	# get_categorys
 	
     # @bulletin_categorys = BulletinCategory.where("_id" => params[:id])
@@ -50,11 +49,14 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # GET /bulletins/new.xml
   def new
     @bulletin = Bulletin.new
+	
+	@link_url = panel_announcement_back_end_bulletins_path
     
 	# @bulletin.bulletin_files.build
 	# @bulletin.bulletin_files.new
 	
 	get_categorys
+	get_tags
 
     respond_to do |format|
       format.html # new.html.erb
@@ -66,7 +68,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   def edit
     @bulletin = Bulletin.find(params[:id])
     # @summary_variable = @bulletin.summary_variable
+	
+	@link_url = panel_announcement_back_end_bulletin_path(@bulletin)
+	
 	get_categorys
+	get_tags
   end
 
   # POST /bulletins
@@ -89,6 +95,32 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     end
   end
 
+  def link_quick_add
+	# debugger
+	
+    @bulletin = Bulletin.find(params[:bulletin_id])
+	
+	@link_url = panel_announcement_back_end_bulletins_path
+	
+    respond_to do |format|
+      format.js
+    end
+	
+  end
+
+  def link_quick_edit
+	# debugger
+	
+    @bulletin = Bulletin.find(params[:bulletin_id])
+	
+	@link_url = panel_announcement_back_end_bulletin_path(@bulletin)
+	
+    respond_to do |format|
+      format.js
+    end
+	
+  end
+
   # PUT /bulletins/1
   # PUT /bulletins/1.xml
   def update
@@ -97,11 +129,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     @bulletin.update_user_id = current_user.id
 	
 	# @bulletin.image.clear if params[:bulletin][:image_del] == '1'
-	if params[:bulletin][:image_del] == '1' 
-		@bulletin.remove_image!
+	# if params[:bulletin][:image_del] == '1' 
+		# @bulletin.remove_image!
 		# @bulletin.image_del = nil
-		params[:bulletin][:image_del] = nil
-	end
+		# params[:bulletin][:image_del] = nil
+	# end
 
     respond_to do |format|
       if @bulletin.update_attributes(params[:bulletin]) && @bulletin.save
@@ -151,6 +183,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
       @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new')
     end
   end
+  
+  def get_tags
+  	module_app = ModuleApp.first(:conditions => {:key => 'announcement'})
+  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc)
+  end
 
   def get_sorted_bulletins
     bulletins = Bulletin.all
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb
index e68e2c97..d1b7f3c5 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb
@@ -29,10 +29,11 @@ class Bulletin
   
   belongs_to :bulletin_category
   
-  embeds_many :bulletin_links, :cascade_callbacks => true
-  embeds_many :bulletin_files, :cascade_callbacks => true
+  # embeds_many :bulletin_links, :cascade_callbacks => true
+  # embeds_many :bulletin_files, :cascade_callbacks => true
 
-  # has_many :bulletin_files, :autosave => true, :dependent => :destroy
+  has_many :bulletin_links, :autosave => true, :dependent => :destroy
+  has_many :bulletin_files, :autosave => true, :dependent => :destroy
   
   accepts_nested_attributes_for :bulletin_files, :allow_destroy => true
   accepts_nested_attributes_for :bulletin_links, :allow_destroy => true
@@ -41,6 +42,9 @@ class Bulletin
   
   before_save :set_key
   
+  after_save :save_bulletin_links
+  after_save :save_bulletin_files
+  
 
   def self.search( search = nil, category_id = nil )
   
@@ -97,6 +101,22 @@ class Bulletin
     self.is_hidden
   end
   
+  def save_bulletin_links
+	self.bulletin_links.each do |t|
+	  if t.should_destroy
+		t.destroy
+	  end
+    end
+  end
+  
+  def save_bulletin_files
+	self.bulletin_files.each do |t|
+	  if t.should_destroy
+		t.destroy
+	  end
+    end
+  end
+  
   
   def title
     @title ||= I18nVariable.first(:conditions => {:key => 'title', :language_value_id => self.id, :language_value_type => self.class}) rescue nil
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 28062d40..05894515 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb
@@ -5,13 +5,27 @@ class BulletinFile
 
   mount_uploader :file, AssetUploader
   
-  field :filetitle
-  field :description
+  # field :filetitle
+  # field :description
+  has_one :filetitle, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
+  has_one :description, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
   
   # field :to_save, :type => Boolean
   field :should_destroy, :type => Boolean
   
-  # belongs_to :bulletin
-  embedded_in :bulletin
+  belongs_to :bulletin
+  # embedded_in :bulletin
+  
+  
+  protected
+  
+  def set_key
+    if filetitle.new_record?
+      filetitle.key = 'filetitle'
+    end
+    if description.new_record?
+      description.key = 'description'
+    end
+  end  
 
 end
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_link.rb b/vendor/built_in_modules/announcement/app/models/bulletin_link.rb
index a999d45d..30363182 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin_link.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin_link.rb
@@ -4,10 +4,12 @@ class BulletinLink
   include Mongoid::Timestamps
   
   field :url
-  field :name
+  # field :name
+  
+  has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
   
   field :should_destroy, :type => Boolean
   
-  embedded_in :bulletin
-
+  # embedded_in :bulletin
+  belongs_to :bulletin
 end
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
index e834ec60..9c95881a 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
@@ -1,21 +1,25 @@
 
-<tr id="<%= dom_id bulletin_category %>">
-	<td><%= bulletin_category.key %></td>
-	<% @site_valid_locales.each do |locale| %>
-	<td><%= bulletin_category.i18n_variable[locale] rescue nil %></td>
-	<% end %>
-	<td><%= bulletin_category.display %></td>
-	<% if is_manager? %>
+	<tr id="<%= dom_id bulletin_category %>" class="with_action">
 		<td>
-		<%= link_to t('blog.new_auth'), init_admin_object_auths_path("BulletinCategory",bulletin_category,:token => @module_app.token) %>  <br/ >
-		<% bulletin_category.object_auths.each do |obj_auth| %>
-			 <%= link_to obj_auth.title,edit_admin_object_auth_url(obj_auth,:token => @module_app.token)  %><br />
-		<% end %>
+			<%= bulletin_category.key %>
+			<div class="quick-edit">
+				<ul class="nav nav-pills hide">
+					<% if is_manager? %>
+
+							<%= link_to t('blog.new_auth'), init_admin_object_auths_path("BulletinCategory",bulletin_category,:token => @module_app.token) %>  <br/ >
+							<% bulletin_category.object_auths.each do |obj_auth| %>
+								 <%= link_to obj_auth.title,edit_admin_object_auth_url(obj_auth,:token => @module_app.token)  %><br />
+							<% end %>
+					<% end %>	
+
+					<li><%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %></li>
+					<li><%= link_to t('bulletin_category.quick_edit'), panel_announcement_back_end_bulletin_category_quick_edit_path(bulletin_category), :remote => true %></li>
+					<li><%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
+				</ul>
+			</div>
 		</td>
-		<td>
-	<% end %>	
-	<%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %> |
-	<%= link_to t('bulletin_category.quick_edit'), panel_announcement_back_end_bulletin_category_quick_edit_path(bulletin_category), :remote => true %> |
-	<%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
-	</td>
-</tr>
\ No newline at end of file
+		<% @site_valid_locales.each do |locale| %>
+		<td><%= bulletin_category.i18n_variable[locale] rescue nil %></td>
+		<% end %>
+		<td><%= bulletin_category.display %></td>
+	</tr>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb
index d7bfac7b..1ce7f629 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb
@@ -1,36 +1,36 @@
 <% # encoding: utf-8 %>
 
 <%= form_for(@bulletin_category, :remote => true, :url => @url) do |f| %>
-<%#= form_for(@bulletin_category, :remote => true, :url => panel_announcement_back_end_bulletin_category_path(@bulletin_category)) do |f| %>
 
-  <div class="field">
-    <%= f.label :key %><br />
-    <%= f.text_field :key %>
-  </div>
-  
-  <div class="field">
-    <%= f.label :name %><br />
-	<%= f.fields_for :i18n_variable, (@bulletin_category.new_record? ? @bulletin_category.build_i18n_variable : @bulletin_category.i18n_variable) do |f| %>
-	  <% @site_valid_locales.each do |locale| %>
-		<%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
-		<%= f.text_field locale, :style => "width:130px" %>
-	  <% end %>
-	<% end %>
-  </div>
-  
-  <div class="field">
-	<%= f.label :display %> <br />
-	<%#= f.select :display, BulletinCategory::PAYMENT_TYPES, :prompt => 'Select a display method' %>
+	<h2><%= (@bulletin_category.new_record? ? 'Add' : 'Edit') %></h2>
 
-	<%= f.radio_button :display, "List" %>List
-	<%#= f.label :display, 'list', :value => '1', :checked => @a %> 
-	<%= f.radio_button :display, "Picture" %>Picture
-	<%#= f.label :display, 'picture', :value => '2', :checked => @b %> 
-	<br />憿舐內��孵����航身摰���典����圈����Ｘ��嚗�鞈�閮���������曄��璅�撘�
-  </div>
+	<div id="widget-title">
+		<%= f.label :key %>
+		<%= f.text_field :key %>
+	</div>
+	
+	<div id="widget-title">
+		<%= f.fields_for :i18n_variable, (@bulletin_category.new_record? ? @bulletin_category.build_i18n_variable : @bulletin_category.i18n_variable) do |f| %>
+		  <% @site_valid_locales.each do |locale| %>
+				<div class="control-group">
+					<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
+					<div class="controls">
+						<%= f.text_field locale, :class => 'input-xxlarge' %>
+					</div>
+				</div>
+		  <% end %>
+		<% end %>
+	</div>
+	
+	<div id="widget-title">
+		<%= f.label :display %>
+		<%= f.radio_button :display, "List" %>List
+		<%= f.radio_button :display, "Picture" %>Picture
+		<br />憿舐內��孵����航身摰���典����圈����Ｘ��嚗�鞈�閮���������曄��璅�撘�
+	</div>
   
-  <div class="actions">
-    <%= f.submit %>
+  <div class="form-actions">
+    <%= f.submit 'Submit/������', :class=>'btn btn-primary' %>
   </div>
   
 <% end %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit.html.erb
new file mode 100644
index 00000000..14a72951
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit.html.erb
@@ -0,0 +1,13 @@
+<!-- <tr class="qe-block hide"> -->
+<tr class="qe-block hide">
+	<td colspan="8">
+		<legend><%= t(:quick_edit) %></legend>
+		<%= form_for bulletin_category, :url => panel_announcement_back_end_bulletin_category_path(bulletin_category), :html => {:class => 'form-horizontal'} do |f| %>
+			<%= render :partial => "quick_edit_qe", :locals => { :f => f, :bulletin_category => bulletin_category } %>
+			<div class="form-actions">
+				<%= f.submit t(:submit), :class => 'btn btn-primary' %>
+				<%= f.submit t(:cancel), :class => 'btn', :type => 'reset' %>
+			</div>
+		<% end %>
+	</td>
+</tr>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb
new file mode 100644
index 00000000..cb32d861
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb
@@ -0,0 +1,28 @@
+<% # encoding: utf-8 %>
+
+<div id="qe-basic" class="qe-edit-div">
+	
+	<div id="widget-title">
+		<%= f.label :key %>
+		<%= f.text_field :key %>
+	</div>
+	<div id="widget-title">
+		<%= f.fields_for :i18n_variable, bulletin_category.i18n_variable  do |f| %>
+		  <% @site_valid_locales.each do |locale| %>
+				<div class="control-group">
+					<%= label_tag "title-#{locale}", "Title-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
+					<div class="controls">
+						<%= f.text_field locale, :class => 'input-xxlarge' %>
+					</div>
+				</div>
+		  <% end %>
+		<% end %>
+	</div>
+	
+	<div id="widget-title">
+		<%= f.label :display %>
+		<%= f.radio_button :display, "List" %>List
+		<%= f.radio_button :display, "Picture" %>Picture
+		<br />憿舐內��孵����航身摰���典����圈����Ｘ��嚗�鞈�閮���������曄��璅�撘�
+	</div>
+</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
index 87b30a04..0a6e7f83 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
@@ -1,38 +1,23 @@
-<% content_for :secondary do %>
-<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %>
-<% end -%>
 
 <%= flash_messages %>
 
-<br />
-<br />
-<br />
-<br />
-<br />
+<table id="bulletin_categorys" class="table main-list">
+	<thead>
+		<tr>
+			<th class="span1-2"><%= t('bulletin_category.key') %></th>
+			<% @site_valid_locales.each do |locale| %>
+			<th class="span1-2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
+			<% end %>
+			<th class="span1-2"><%= t('bulletin_category.display') %></th>
+		</tr>
+	</thead>
+	<tbody>
 
-<h1><%= t('bulletin_category.list_announcement_class') %></h1>
-
-<table id="bulletin_categorys">
-  <tr>
-    <th><%= t('bulletin_category.key') %></th>
-	<% @site_valid_locales.each do |locale| %>
-	<th><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
-	<% end %>
-    <th><%= t('bulletin_category.display') %></th>
-    <th><%= t('bulletin.action') %></th>
-  </tr>
-
-<%# @bulletin_categorys.each do |post| %>
 	<%= render :partial => 'bulletin_category', :collection => @bulletin_categorys %>
-<%# end %>
+	
+	</tbody>
 </table>
 
-<br />
-<br />
-<br />
-<br />
-
-<h2>Add New</h2>
 <div id="form"><%= render :partial => "form" %></div>
 
 
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb
index 86785ee0..6da49ceb 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb
@@ -6,10 +6,22 @@
 			<%= f.file_field :file %>
 
 			<%= f.label :file_title %>
-			<%= f.text_field :filetitle %>
+			<%#= f.text_field :filetitle %>
+			<%= f.fields_for :filetitle, (bulletin_file.new_record? ? bulletin_file.build_filetitle : bulletin_file.filetitle ) do |f| %>
+				<% @site_valid_locales.each do |locale| %>
+				 <%= I18nVariable.from_locale(locale) %>
+				 <%= f.text_field locale %>
+				<% end %>
+			<% end %>
 
 			<%= f.label :file_description %>
-			<%= f.text_field :description %>
+			<%#= f.text_field :description %>
+			<%= f.fields_for :description, (bulletin_file.new_record? ? bulletin_file.build_description : bulletin_file.description ) do |f| %>
+				<% @site_valid_locales.each do |locale| %>
+				 <%= I18nVariable.from_locale(locale) %>
+				 <%= f.text_field locale %>
+				<% end %>
+			<% end %>
 
 			<span class="action">
 			<% if bulletin_file.new_record? %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - 複製.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - 複製.erb
new file mode 100644
index 00000000..33d1ba1e
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - 複製.erb	
@@ -0,0 +1,27 @@
+
+		<div  id="<%= "bulletin_#{bulletin_link.id}" if !bulletin_link.new_record? %>" class='list_item'>
+		  <div class="field">
+
+			<%= f.label :link_url %>
+			<%= f.text_field :url %>
+
+			<%= f.label :link_name %>
+			<%#= f.text_field :name %>			
+			<%= f.fields_for :i18n_variable, (bulletin_link.new_record? ? bulletin_link.build_i18n_variable : bulletin_link.i18n_variable) do |f| %>
+			  <% @site_valid_locales.each do |locale| %>
+				<%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
+				<%= f.text_field locale, :style => "width:130px" %>
+			  <% end %>
+			<% end %>
+
+			<span class="action">
+			<% if bulletin_link.new_record? %>
+			  <a href="#" class="delete"><%= t(:delete) %></a>
+			<% else %>	
+			  <%= f.hidden_field :id %>
+			  <a href="#" class="remove_existing_record"><%= t(:delete) %></a>
+			  <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
+			<% end %>
+			</span>
+		  </div>
+		</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb
index 44c7ab75..e0077384 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb
@@ -1,12 +1,18 @@
 
-		<div  id="<%= "bulletin_#{bulletin_link.id}" if !bulletin_link.new_record? %>" class='list_item'>
+		<div id="<%= "bulletin_#{bulletin_link.id}" if !bulletin_link.new_record? %>" class='list_item'>
 		  <div class="field">
 
 			<%= f.label :link_url %>
 			<%= f.text_field :url %>
 
 			<%= f.label :link_name %>
-			<%= f.text_field :name %>
+			<%#= f.text_field :name %>			
+			<%= f.fields_for :i18n_variable, (bulletin_link.new_record? ? bulletin_link.build_i18n_variable : bulletin_link.i18n_variable) do |f| %>
+			  <% @site_valid_locales.each do |locale| %>
+				<%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
+				<%= f.text_field locale, :style => "width:130px" %>
+			  <% end %>
+			<% end %>
 
 			<span class="action">
 			<% if bulletin_link.new_record? %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - 複製.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - 複製.erb
new file mode 100644
index 00000000..c44b5c92
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - 複製.erb	
@@ -0,0 +1,16 @@
+		
+				<tr id="<%= "bulletin_#{bulletin_link2.id}" %>">
+					<td><%= link_to bulletin_link2.i18n_variable.zh_tw, bulletin_link2.url, :target => '_blank' %></td>
+					<td><%= link_to bulletin_link2.i18n_variable.en, bulletin_link2.url, :target => '_blank' %></td>
+					<td><a href="#modal-link" data-toggle="modal" class="action"><i class="icon-pencil"></i></a>
+					<span class="action">
+					 <%= f.hidden_field :id %>
+					 <a href class="remove_existing_record"><i class="icon-remove"></i></a>
+					 <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
+					 </span>
+					</td>
+				</tr>
+
+
+				
+				
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html.erb
new file mode 100644
index 00000000..a3bc5243
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html.erb
@@ -0,0 +1,17 @@
+		
+				<tr id="<%= "bulletin_#{bulletin_link2.id}" %>">
+					<td><%= link_to bulletin_link2.i18n_variable.zh_tw, bulletin_link2.url, :target => '_blank' %></td>
+					<td><%= link_to bulletin_link2.i18n_variable.en, bulletin_link2.url, :target => '_blank' %></td>
+					<td>
+					<a href="<%= panel_announcement_back_end_bulletin_link_quick_edit_path(bulletin_link2) %>#modal-link" data-toggle="modal" data-remote="true" class="action"><i class="icon-pencil"></i></a>
+					<span class="action">
+					 <%= f.hidden_field :id %>
+					 <a href class="remove_existing_record"><i class="icon-remove"></i></a>
+					 <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
+					 </span>
+					</td>
+				</tr>
+
+
+				
+				
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb
new file mode 100644
index 00000000..7208f73c
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb
@@ -0,0 +1,41 @@
+<% # encoding: utf-8 %>
+
+		<%= form_for(@bulletin.bulletin_links, :remote => true, :url => @link_url) do |f| %>
+		
+        <div id="modal-link" class="modal hide fade">
+            <div class="modal-header">
+                <a class="close" data-dismiss="modal">��</a>
+                <h3>Add Link / Edit Link</h3>
+            </div>
+            <div class="modal-body form-horizontal">
+                <div class="control-group">
+                    <label for="http" class="control-label">URL</label>
+                    <div class="controls">
+					<%= f.text_field :url %>
+                    <span class="help-inline">Please correct the error</span>
+                    </div>
+                </div>
+				
+				<% @site_valid_locales.each do |locale| %>
+					<div class="control-group error">
+						<label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
+						<div class="controls">
+						<input type="text" value="" id="link-<%= locale %>" class="input-xlarge">
+						<span class="help-inline">Please correct the error</span>
+						</div>
+					</div>
+				<% end %>
+				
+            </div>
+			
+            <div class="modal-footer">
+                <a class="btn btn-primary" href="#">Submit/蝣箏��</a>
+                <a class="btn" data-dismiss="modal" href="#">Cancel/���瘨�</a>
+            </div>
+
+        </div>
+		
+		<% end %>
+		
+
+ 		
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index 2236b5ed..35137b4f 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -20,108 +20,246 @@
 	  <%= t('announcement.��芷�文歇銝���單��獢�') %>
 	<% end %>
   </div>
+  
+	<!--Widget start-->
+	
+	<div id="sub-wiget">
+		
+		<div id="widget-picture" class="widget-box widget-size-300">
+			<div class="widget-action clear">
+				<a class="action"><i title="Upload pictures" class="icon-exclamation-sign icon-white tip"></i></a>
+			</div>
+			<h3 class="widget-title"><i class="icons-picture icons-white"></i>Picture</h3>
+			<div class="widget-content clear">
+				<div class="control-group">
+					<img class="pull-left upload-picture" src="images/default-img.png" />
+					<div class="controls file-upload">
+					<label class="control-label btn" for="input-upload">
+						Browse/��豢��瑼�獢�
+						<%= f.file_field :image, :id => "input-upload", :class => 'upload', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
+					</label>
+					<span id='fu' class="file-name"></span>
+					<br>
+					<input name='fu' class="input-large" type="text">
+					<br>
+					<% if @bulletin.image.file %>
+					  <%= f.check_box :remove_image %>
+					  <%= t('announcement.��芷�文歇銝���單��獢�') %>
+					<% end %>
+					</div>
+				</div>
+			</div>
+		</div>
 
-	<div class="field">
-    <%= f.label :title %>
-		<%= f.fields_for :title, (@bulletin.new_record? ? @bulletin.build_title : @bulletin.title ) do |f| %>
-		  <% @site_valid_locales.each do |locale| %>
-		    <td>
-					<%= I18nVariable.from_locale(locale) %>
-					<%= f.text_field locale %>
-				</td>
-		  <% end %>
-		<% end %>
-	</div>
-  
-	<div class="field">
-		<%= f.label :subtitle %>
-		<%= f.fields_for :subtitle, (@bulletin.new_record? ? @bulletin.build_subtitle : @bulletin.subtitle ) do |f| %>
-			<% @site_valid_locales.each do |locale| %>
-				<td>
-					<%= I18nVariable.from_locale(locale) %>
-					<%= f.text_area locale, :rows => 10, :cols => 40 %>
-				</td>
-			<% end %>
-		<% end %>
-	</div>
+		<div id="widget-date" class="widget-box widget-size-300">
+			<div class="widget-action clear">
+				<a href="#" class="action"><i title="Set the announcement to start and end dates" class="icon-exclamation-sign icon-white tip"></i></a>
+			</div>
+			<h3 class="widget-title"><i class="icons-calendar icons-white"></i> Date</h3>
+				<div class="widget-content clear">
+				<div class="control-group">
+					<label class="control-label">Start</label>
+					<div class="controls">
+						<%= f.date_select :postdate, {:use_month_numbers => true, :prompt => { :month => 'Month', :day => 'Day', :year => 'Year'}, :order => [:day, :month, :year] }, {:class => 'input-small'} %>				
+					</div>
+				</div>
+				<div class="control-group">
+					<label class="control-label">End</label>
+					<div class="controls">
+						<%= f.date_select :deadline, {:use_month_numbers => true, :prompt => { :month => 'Month', :day => 'Day', :year => 'Year'}, :order => [:day, :month, :year] }, {:class => 'input-small'} %>
+					</div>
+				</div>
+			</div>
+		</div>
+		  
+		<div id="widget-status" class="widget-box widget-size-300">
+			<div class="widget-action clear">
+				<a class="action"><i title="Setting the announcement state" class="icon-exclamation-sign icon-white tip"></i></a>
+			</div>
+			<h3 class="widget-title"><i class="icons-star-thin icons-white"></i>Status</h3>
+			<div class="widget-content clear">
+				<div class="controls">
+					<%= f.check_box :is_top %><%= t('top') %>
+					<%= f.check_box :is_hot %><%= t('hot') %>
+					<%= f.check_box :is_hidden %><%= t('hide') %>
+				</div>
+			</div>
+		</div>
 
-	<div class="field">
-		<%= f.label :text %>
-		<%= f.fields_for :text, (@bulletin.new_record? ? @bulletin.build_text : @bulletin.text ) do |f| %>
-			<% @site_valid_locales.each do |locale| %>
-				<td>
-					<%= I18nVariable.from_locale(locale) %>
-					<%= f.text_area locale, :rows => 10, :cols => 40 %>
-				</td>
-			<% end %>
-		<% end %>
+		<div id="widget-tags" class="widget-box widget-size-300">
+			<div class="widget-action clear">
+				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
+			</div>
+			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+				<div class="widget-content clear form-horizontal">
+					<% @tags.each do |tag| %>
+					<%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id)%>
+					<%= tag[I18n.locale] %>
+					<% end %>
+				</div>
+		</div>  
+  
 	</div>
   
-  <div class="field">
-    <%= f.label :postdate %><br />
-    <%= f.date_select :postdate, :order => [:year, :month, :day], :use_month_numbers => true %>
-    <%#= date_select("bulletin", "postdate", :use_month_numbers => true) %>
-  </div>
   
-  <div class="field">
-    <%= f.label :deadline %><br />
-    <%= f.date_select :deadline, :use_month_numbers => true, :prompt => { :day => 'Select day', :month => 'Select month', :year => 'Select year'}  %>
-    <%#= f.date_select :deadline, :order => [:year, :month, :day],:default => 1.years.from_now, :use_month_numbers => true  %>
-  </div>
-  
-  <div class="field">
-    <%#= f.label :url %><br />
-    <%#= f.text_field :url, :size => 60 %>
-  </div>
-  
-  
-  <div id='bulletin_links' class="bulletin_links_block <%= @class %>">
+<!--Wiget End-->
+<!--Post Start-->
+
+	<div id="post-body">
+		<div id="post-body-content" class="clear">
+		
+			<%= f.label :category %>
+			<%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
+
+			<div class="btn-group pull-right">
+				<a class="btn dropdown-toggle" href="#" data-toggle="dropdown">
+					English
+					<span class="caret"></span>
+				</a>
+				<ul class="dropdown-menu">
+					<li><a href="#">English</a></li>
+					<li><a href="#">Chinese</a></li>
+					<li><a href="#">Japanese</a></li>
+					<li><a href="#">French</a></li>
+					<li><a href="#">German</a></li>
+					<!--<li class="divider"></li>
+					<li><a href="#">Separated link</a></li>-->
+				</ul>
+			</div>
+
+			<div class="title">
+				<%= f.label :title %>
+				<%= f.fields_for :title, (@bulletin.new_record? ? @bulletin.build_title : @bulletin.title ) do |f| %>
+				  <% @site_valid_locales.each do |locale| %>
+					<td>
+							<%= I18nVariable.from_locale(locale) %>
+							<%= f.text_field locale, :class=>'post-title' %>
+						</td>
+				  <% end %>
+				<% end %>
+			</div>	
+
+			<div class="title">
+				<%= f.label :subtitle %>
+				<%= f.fields_for :subtitle, (@bulletin.new_record? ? @bulletin.build_subtitle : @bulletin.subtitle ) do |f| %>
+					<% @site_valid_locales.each do |locale| %>
+						<td>
+							<%= I18nVariable.from_locale(locale) %>
+							<%= f.text_area locale, :style=>"width:100%" %>
+						</td>
+					<% end %>
+				<% end %>
+			</div>  
+
+			<div class="title">
+				<%= f.label :text %>
+				<%= f.fields_for :text, (@bulletin.new_record? ? @bulletin.build_text : @bulletin.text ) do |f| %>
+					<% @site_valid_locales.each do |locale| %>
+						<td>
+							<%= I18nVariable.from_locale(locale) %>
+							<%= f.text_area locale, :style=>"width:100%" %>
+						</td>
+					<% end %>
+				<% end %>
+			</div>
+			
+		  
+		  <div id='bulletin_links' class="bulletin_links_block <%= @class %>">
+			
+			<div id='add_bulletin_link' class="info_input bulletin_links_block">
+				<h2>Bulletin links</h2>
+				<%= hidden_field_tag 'bulletin_link_field_count', @bulletin.bulletin_links.count %>
+				<a href="#" class="add"><%= t(:add) %></a>
+			</div>
+			
+			<%#= render :partial => 'link', :locals => { :bulletin_links => @bulletin.bulletin_links , :f => f} %>
+			
+			
+			<% @bulletin.bulletin_links.each_with_index do |bulletin_link, i| %>
+				<%#= fields_for "bulletin[bulletin_links][]", bulletin_link do |f| %>
+				<%= f.fields_for :bulletin_links, bulletin_link do |f| %>
+					<%= render :partial => 'bulletin_link', :object => bulletin_link, :locals => {:f => f, :i => i} %>
+				<% end %>
+			<% end %>	
+			
+		  </div>
+		  
+		  
+
+<div class="main-wiget">
+	<div id="widget-link" class="widget-box">
+		<div class="widget-action clear">
+			<a class="action"><i title="Add a reference link" class="icon-exclamation-sign icon-white tip"></i></a>
+		</div>
+		<h3 class="widget-title"><i class="icons-link icons-white"></i>Link</h3>
+		<div class="widget-content">
+			<table class="table table-condensed">
+				<thead>
+					<tr>
+						<th>Chinese</th>
+						<th>English</th>
+						<th class="span1"></th>
+					</tr>
+				</thead>
+                <tfoot>
+                    <tr>
+                        <td style="text-align:center" colspan="3">
+                            <a class="btn btn-primary btn-small" href="#modal-link" data-toggle="modal"><i class="icon-plus icon-white"></i> ADD/��啣��</a>
+                        </td>
+                    </tr>
+                </tfoot>
+                <tbody>
+					<%#= render :partial => 'bulletin_link2', :collection => @bulletin.bulletin_links %>
+					
+					<% @bulletin.bulletin_links.each_with_index do |bulletin_link2, i| %>
+						<%= f.fields_for :bulletin_links, bulletin_link2 do |f| %>
+							<%= render :partial => 'bulletin_link2', :object => bulletin_link2, :locals => {:f => f, :i => i} %>
+						<% end %>
+					<% end %>	
+					
+                </tbody>
+            </table>
+        </div>
+		
+		<div id="bulletin_link_qe"><%= render :partial => "bulletin_link_qe" %></div>
+		
+    </div>
+</div>		  
+		  
+		  
+		  
+		  
+		  <div id='bulletin_files' class="bulletin_files_block <%= @class %>">
+			
+			<div id='add_bulletin_file' class="info_input bulletin_files_block">
+				<h2>Bulletin files</h2>
+				<%= hidden_field_tag 'bulletin_file_field_count', @bulletin.bulletin_files.count %>
+				<a href="#" class="add"><%= t(:add) %></a>
+			</div>
+			
+			<%#= render :partial => 'file', :locals => { :bulletin_files => @bulletin.bulletin_files , :f => f} %>
+			
+			
+			<% @bulletin.bulletin_files.each_with_index do |bulletin_file, i| %>
+				<%#= fields_for "bulletin[bulletin_files][]", bulletin_file do |f| %>
+				<%= f.fields_for :bulletin_files, bulletin_file do |f| %>
+					<%= render :partial => 'bulletin_file', :object => bulletin_file, :locals => {:f => f, :i => i} %>
+				<% end %>
+			<% end %>	
+			
+		  </div>
+		  
+		  <br />
+		  <br />
 	
-	<div id='add_bulletin_link' class="info_input bulletin_links_block">
-		<h2>Bulletin links</h2>
-		<%= hidden_field_tag 'bulletin_link_field_count', @bulletin.bulletin_links.count %>
-		<a href="#" class="add"><%= t(:add) %></a>
 	</div>
 	
-	<%#= render :partial => 'link', :locals => { :bulletin_links => @bulletin.bulletin_links , :f => f} %>
-	
-	
-	<% @bulletin.bulletin_links.each_with_index do |bulletin_link, i| %>
-		<%#= fields_for "bulletin[bulletin_links][]", bulletin_link do |f| %>
-		<%= f.fields_for :bulletin_links, bulletin_link do |f| %>
-			<%= render :partial => 'bulletin_link', :object => bulletin_link, :locals => {:f => f, :i => i} %>
-		<% end %>
-	<% end %>	
-	
-  </div>
+	<!--Post End-->
   
+	  <div class="form-actions">
+		<%= f.submit 'Submit/������', :class=>'btn btn-primary' %>
+	  </div>
   
-  <div id='bulletin_files' class="bulletin_files_block <%= @class %>">
-	
-	<div id='add_bulletin_file' class="info_input bulletin_files_block">
-		<h2>Bulletin files</h2>
-		<%= hidden_field_tag 'bulletin_file_field_count', @bulletin.bulletin_files.count %>
-		<a href="#" class="add"><%= t(:add) %></a>
-	</div>
-	
-	<%#= render :partial => 'file', :locals => { :bulletin_files => @bulletin.bulletin_files , :f => f} %>
-	
-	
-	<% @bulletin.bulletin_files.each_with_index do |bulletin_file, i| %>
-		<%#= fields_for "bulletin[bulletin_files][]", bulletin_file do |f| %>
-		<%= f.fields_for :bulletin_files, bulletin_file do |f| %>
-			<%= render :partial => 'bulletin_file', :object => bulletin_file, :locals => {:f => f, :i => i} %>
-		<% end %>
-	<% end %>	
-	
-  </div>
-  
-  <br />
-  <br />
-  
-  
-  <div class="actions">
-    <%= f.submit %>
   </div>
   
   
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb
index adfe015c..1d9004c8 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb
@@ -17,11 +17,13 @@
                     </tr>
                 </tfoot>
                 <tbody>
+					<% bulletin.bulletin_links.each_with_index do |blink, i| %>
                     <tr>
-                        <td>���</td>
-                        <td>���</td>
+                        <td><%= link_to blink.i18n_variable.zh_tw, blink.url, :target => '_blank' %></td>
+                        <td><%= link_to blink.i18n_variable.en, blink.url, :target => '_blank' %></td>
                         <td><a href="#modal-link" data-toggle="modal" class="action"><i class="icon-pencil"></i></a><a href class="action"><i class="icon-remove"></i></a></td>
                     </tr>
+					<% end %>
                 </tbody>
             </table>
         </div>
@@ -32,27 +34,25 @@
             </div>
             <div class="modal-body form-horizontal">
                 <div class="control-group">
-                    <label for="http" class="control-label">http://</label>
+                    <label for="http" class="control-label">URL</label>
                     <div class="controls">
                     <input type="text" value="" id="http" class="input-xlarge">
                     <span class="help-inline">Please correct the error</span>
                     </div>
                 </div>
-                <div class="control-group error">
-                    <label for="link-zh-tw" class="control-label">Chinese</label>
-                    <div class="controls">
-                    <input type="text" value="" id="link-zh-tw" class="input-xlarge">
-                    <span class="help-inline">Please correct the error</span>
-                    </div>
-                </div>
-                <div class="control-group">
-                    <label for="link-en" class="control-label">English</label>
-                    <div class="controls">
-                    <input type="text" value="" id="link-en" class="input-xlarge">
-                    <span class="help-inline">Please correct the error</span>
-                    </div>
-                </div>
+				
+				<% @site_valid_locales.each do |locale| %>
+					<div class="control-group error">
+						<label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
+						<div class="controls">
+						<input type="text" value="" id="link-<%= locale %>" class="input-xlarge">
+						<span class="help-inline">Please correct the error</span>
+						</div>
+					</div>
+				<% end %>
+				
             </div>
+			
             <div class="modal-footer">
                 <a class="btn btn-primary" href="#">Submit/蝣箏��</a>
                 <a class="btn" data-dismiss="modal" href="#">Cancel/���瘨�</a>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb
index 6e7c656a..ff59280f 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb
@@ -5,13 +5,18 @@
             <div class="control-group">
                 <img class="pull-left upload-picture" src="" />
                 <div class="controls file-upload">
-                <label class="control-label btn" for="input-upload">
-                    Browse/��豢��瑼�獢�
-                    <input id="input-upload" class="upload" type="file" name="upload" onchange="document.getElementById('fu').innerHTML = this.form.fu.value = this.value;">
-                </label>
+				<label class="control-label btn" for="input-upload">
+					Browse/��豢��瑼�獢�
+					<%= f.file_field :image, :id => "input-upload", :class => 'upload', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
+				</label>
                 <span id='fu' class="file-name"></span>
                 <br>
                 <input name='fu' class="input-large" type="text">
+				<br>
+				<% if bulletin.image.file %>
+					<%= f.check_box :remove_image %>
+					<%= t('announcement.��芷�文歇銝���單��獢�') %>
+				<% end %>
                 </div>
             </div>
         </div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 複製.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 複製.erb
new file mode 100644
index 00000000..d37d2134
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 複製.erb	
@@ -0,0 +1,9 @@
+<%= render 'filter' %>
+<table id="bulettin_sort_list" class="table main-list">
+	<%= render 'bulletins' %>
+</table>
+
+<div class="form-actions">
+	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %>
+</div>
+
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb
new file mode 100644
index 00000000..cbe5e3c7
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb
@@ -0,0 +1,2 @@
+//$.each($(".quick_edit"),function(obj){ $(this).remove(); });
+$("#<%= "bulletin_#{bulletin_link2.id}" %>").append("<%= j render "bulletin_link_qe" %>");
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 7b886e77..5a33b86a 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
@@ -21,7 +21,7 @@
 	</li>
 	<li>
   <b><%= t('announcement.title') %></b>
-  <%= @bulletin.title %>
+  <%= @bulletin.title[I18n.locale] %>
 	</li>
 	<li>
   <%#= image_tag(@bulletin.image.url, :size => "320x240") if @bulletin.image.file %>
@@ -29,23 +29,23 @@
 	</li>
 	<li>
   <b><%= t('announcement.subtitle') %></b>
-  <%= @bulletin.subtitle %>
+  <%= @bulletin.subtitle[I18n.locale].html_safe %>
 	</li>
 	<li>
   <b><%= t('announcement.text') %></b>
-  <%= @bulletin.text %>
+  <%= @bulletin.text[I18n.locale].html_safe %>
 	</li>
 	<li>
 	<li>
 	<b><%= t('announcement.link') %></b>
 	<% @bulletin.bulletin_links.each do | blink | %>
-    <%= link_to blink.name, blink.url, :target => '_blank' %>
+    <%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %>
 	<% end %>
 	</li>
 	<li>
 	<b><%= t('announcement.file') %></b>
 	<% @bulletin.bulletin_files.each do | bfile | %>
-	<%= link_to bfile.filetitle, bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
+	<%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description[I18n.locale]} if bfile.file.file %>
 	<% end %>
 	</li>
 	<li>
diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb
index f6f30b31..61056e49 100644
--- a/vendor/built_in_modules/announcement/config/routes.rb
+++ b/vendor/built_in_modules/announcement/config/routes.rb
@@ -7,7 +7,10 @@ Rails.application.routes.draw do
         match 'update_setting' => "fact_checks#update_setting" ,:as => :fact_checks_update_setting
         
         root :to => "bulletins#index"
-        resources :bulletins
+        resources :bulletins do
+          match "link_quick_add/:bulletin_id" => "bulletins#link_quick_add" ,:as => :link_quick_add
+          match "link_quick_edit/:bulletin_id" => "bulletins#link_quick_edit" ,:as => :link_quick_edit
+        end
         resources :bulletin_categorys, :controller => 'bulletin_categorys' do
           match "quick_edit/:bulletin_category_id" => "bulletin_categorys#quick_edit" ,:as => :quick_edit
         end
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
index e5c7fc45..4ca568a9 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
@@ -1,31 +1,32 @@
 <% # encoding: utf-8 %>
 
-  <%= f.error_messages %>
-  <%#= debugger %>
-  
- <div class="field">
-  <%= f.label :name %>
-  <%= @page_context.page.i18n_variable[I18n.locale] %>
- </div>
+<%= f.error_messages %>
 
- <div class="field">
-  <%= f.label :context %>
-  <%= f.fields_for :context, (@page_context.new_record? ? @page_context.build_context : @page_context.context ) do |f| %>
-   <% @site_valid_locales.each do |locale| %>
-    <td>
-     <%= I18nVariable.from_locale(locale) %>
-     <%= f.text_area locale, :rows => 10, :cols => 40 %>
-    </td>
-   <% end %>
-  <% end %>
- </div>
-  
-  <br />
-  <br />
-  
-  <div class="actions">
-    <%= f.submit %>
-  </div>
+<div id="post-body">
+
+	<div class="title">
+	  <%= f.label :name %>
+	  <%= @page_context.page.i18n_variable[I18n.locale] %>
+	</div>
+
+	<div class="title">
+		<%= f.label :context %>
+		<%= f.fields_for :context, (@page_context.new_record? ? @page_context.build_context : @page_context.context ) do |f| %>
+			<% @site_valid_locales.each do |locale| %>
+				<td>
+					<%= I18nVariable.from_locale(locale) %>
+					<%= f.text_area locale, :style=>"width:100%" %>
+				</td>
+			<% end %>
+		<% end %>
+	</div>
+	  
+	  
+	<div class="form-actions">
+		<%= f.submit 'Submit/������', :class=>'btn btn-primary' %>
+	</div>
+
+</div>
 
 
 <% content_for :page_specific_javascript do %>
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 c1d86fe1..08db9b2d 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
@@ -1,10 +1,14 @@
 
-<tr id="<%= dom_id page_context %>">
-	<td><%= page_context.page.i18n_variable[I18n.locale] %></td>
-	<td><%= link_to page_context.version, panel_page_content_back_end_view_path(page_context.page_id) %></td>
-	<td><%= page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %></td>
-	<td><%= User.find(page_context.create_user_id).name %></td>
-	<td>
-	<%= link_to t('page_context.edit'), edit_panel_page_content_back_end_page_context_path(page_context) %> 
-	</td>
-</tr>
+			<tr id="<%= dom_id page_context %>" class="with_action">
+				<td>
+					<%= page_context.page.i18n_variable[I18n.locale] %>
+					<div class="quick-edit">
+						<ul class="nav nav-pills hide">
+							<li><%= link_to t('page_context.edit'), edit_panel_page_content_back_end_page_context_path(page_context) %></li>
+						</ul>
+					</div>
+				</td>
+				<td><%= link_to page_context.version, panel_page_content_back_end_view_path(page_context.page_id) %></td>
+				<td><%= page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %></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 db23a280..7035a700 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
@@ -1,10 +1,15 @@
 
-<tr id="<%= dom_id view_page_context %>">
-	<td><%= view_page_context.page.i18n_variable[I18n.locale] %></td>
-	<td><%= view_page_context.version %></td>
-	<td><%= view_page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %></td>
-	<td><%= User.find(view_page_context.create_user_id).name %></td>
-	<td>
-	<%= link_to t('view_page_context.show'), panel_page_content_back_end_page_context_path(view_page_context) %>
-	</td>
-</tr>
+
+			<tr id="<%= dom_id view_page_context %>" class="with_action">
+				<td>
+					<%= view_page_context.page.i18n_variable[I18n.locale] %>
+					<div class="quick-edit">
+						<ul class="nav nav-pills hide">
+							<li><%= link_to t('view_page_context.show'), panel_page_content_back_end_page_context_path(view_page_context) %></li>
+						</ul>
+					</div>
+				</td>
+				<td><%= view_page_context.version %></td>
+				<td><%= view_page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %></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/edit.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb
index 18bb0ce5..86f2398c 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb
@@ -1,7 +1,3 @@
-<br />
-<br />
-<br />
-<br />
 
 <h1><%= t('page_content.editing_page_content') %></h1>
 
@@ -9,8 +5,4 @@
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>
 
-<%= link_back %>
-<br />
-<br />
-<br />
-<br />
\ No newline at end of file
+<%#= link_back %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
index a1566881..3227dcd4 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
@@ -1,36 +1,20 @@
-<% content_for :secondary do %>
-<br />
-<br />
-<br />
-<br />
-<br />
-  <ul class="list">
-	  <li><%= link_to t('page_context.page_content_list'), panel_page_content_back_end_page_contexts_path %></li>
-  </ul>
-<% end -%>
 
 <%= flash_messages %>
 
-<br />
-<br />
-<br />
-<br />
-<br />
-
-<h1><%= t('page_context.list_page_content') %></h1>
-
-	<table>
-	  <tr>
-		<th><%= t('page_context.name') %></th>
-		<th><%= t('page_context.version') %></th>
-		<th><%= t('page_context.update_time') %></th>
-		<th><%= t('page_context.last_modified') %></th>
-		<th><%= t('page_context.action') %></th>
-	  </tr>
+<table class="table main-list">
+	<thead>
+		<tr>
+			<th class="span7 select"><%= t('page_context.name') %></th>
+			<th class="span1-2"><%= t('page_context.version') %></th>
+			<th class="span1-2"><%= t('page_context.update_time') %></th>
+			<th class="span1-2"><%= t('page_context.last_modified') %></th>
+		</tr>
+	</thead>
+	<tbody>
 	  
-	<%= render :partial => 'page_context', :collection => @page_contexts %>
+		<%= render :partial => 'page_context', :collection => @page_contexts %>
 
-	</table>
+	</tbody>
+</table>
 
-<br />
 
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/view.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/view.html.erb
index c5a9871a..d88df80e 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/view.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/view.html.erb
@@ -1,36 +1,19 @@
-<% content_for :secondary do %>
-<br />
-<br />
-<br />
-<br />
-<br />
-  <ul class="list">
-	  <li><%= link_to t('page_context.page_content_list'), panel_page_content_back_end_page_contexts_path %></li>
-  </ul>
-<% end -%>
 
 <%= flash_messages %>
 
-<br />
-<br />
-<br />
-<br />
-<br />
-
-<h1><%= t('page_context.list_page_content') %></h1>
-
-	<table>
-	  <tr>
-		<th><%= t('page_context.name') %></th>
-		<th><%= t('page_context.version') %></th>
-		<th><%= t('page_context.update_time') %></th>
-		<th><%= t('page_context.last_modified') %></th>
-		<th><%= t('page_context.action') %></th>
-	  </tr>
+<table class="table main-list">
+	<thead>
+		<tr>
+			<th class="span7 select"><%= t('page_context.name') %></th>
+			<th class="span1-2"><%= t('page_context.version') %></th>
+			<th class="span1-2"><%= t('page_context.update_time') %></th>
+			<th class="span1-2"><%= t('page_context.last_modified') %></th>
+		</tr>
+	</thead>
+	<tbody>
 	  
 	<%= render :partial => 'view_page_context', :collection => @page_contexts %>
 
-	</table>
-
-<br />
+	</tbody>
+</table>
 
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 3db38add..0ba3236a 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
@@ -1,6 +1,6 @@
 class Panel::WebResource::BackEnd::WebLinkCategorysController < ApplicationController
   
-  layout 'admin'
+  layout 'new_admin'
   
   def index
     @web_link_categorys = WebLinkCategory.all
diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
index f1ec7485..dfe09ce5 100644
--- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
+++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
@@ -1,7 +1,7 @@
 class Panel::WebResource::BackEnd::WebLinksController < ApplicationController
 
   
-  layout 'admin'
+  layout 'new_admin'
   
   before_filter :authenticate_user!
   before_filter :is_admin?
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb
index 7eb698ea..2e0f61ff 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb
@@ -1,25 +1,29 @@
 <% # encoding: utf-8 %>
 
 <%= form_for(@web_link_category, :remote => true, :url => @url) do |f| %>
-<%#= form_for(@web_link_category, :remote => true, :url => panel_web_resource_back_end_web_link_category_path(@web_link_category)) do |f| %>
 
-  <div class="field">
-    <%= f.label :key %><br />
-    <%= f.text_field :key %>
-  </div>
+	<h2><%= (@web_link_category.new_record? ? 'Add' : 'Edit') %></h2>
+
+	<div id="widget-title">
+		<%= f.label :key %>
+		<%= f.text_field :key %>
+	</div>
+	
+	<div id="widget-title">
+		<%= f.fields_for :i18n_variable, (@web_link_category.new_record? ? @web_link_category.build_i18n_variable : @web_link_category.i18n_variable) do |f| %>
+		  <% @site_valid_locales.each do |locale| %>
+				<div class="control-group">
+					<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
+					<div class="controls">
+						<%= f.text_field locale, :class => 'input-xxlarge' %>
+					</div>
+				</div>
+		  <% end %>
+		<% end %>
+	</div>
   
-  <div class="field">
-    <%= f.label :name %><br />
-	<%= f.fields_for :i18n_variable, (@web_link_category.new_record? ? @web_link_category.build_i18n_variable : @web_link_category.i18n_variable) do |f| %>
-	  <% @site_valid_locales.each do |locale| %>
-		<%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
-		<%= f.text_field locale, :style => "width:130px" %>
-	  <% end %>
-	<% end %>
-  </div>
-  
-  <div class="actions">
-    <%= f.submit %>
+  <div class="form-actions">
+    <%= f.submit 'Submit/������', :class=>'btn btn-primary' %>
   </div>
   
 <% end %>
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb
index d6e27e8d..3f6a1a71 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb
@@ -1,12 +1,16 @@
 
-<tr id="<%= dom_id web_link_category %>">
-	<td><%= web_link_category.key %></td>
-	<% @site_valid_locales.each do |locale| %>
-	<td><%= web_link_category.i18n_variable[locale] rescue nil %></td>
-	<% end %>
-	<td>
-	<%= link_to t('web_link_category.edit'), edit_panel_web_resource_back_end_web_link_category_path(web_link_category), :remote => true %> |
-	<%= link_to t('web_link_category.quick_edit'), panel_web_resource_back_end_web_link_category_quick_edit_path(web_link_category), :remote => true %> |
-	<%= link_to t('web_link_category.delete'), panel_web_resource_back_end_web_link_category_path(web_link_category), :confirm => t('sure?'), :method => :delete, :remote => true %>
-	</td>
-</tr>
\ No newline at end of file
+
+	<tr id="<%= dom_id web_link_category %>" class="with_action">
+		<td>
+			<%= web_link_category.key %>
+			<div class="quick-edit">
+				<ul class="nav nav-pills hide">
+					<li><%= link_to t('web_link_category.edit'), edit_panel_web_resource_back_end_web_link_category_path(web_link_category), :remote => true %></li>
+					<li><%= link_to t('web_link_category.delete'), panel_web_resource_back_end_web_link_category_quick_edit_path(web_link_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
+				</ul>
+			</div>
+		</td>
+		<% @site_valid_locales.each do |locale| %>
+		<td><%= web_link_category.i18n_variable[locale] rescue nil %></td>
+		<% end %>
+	</tr>
\ No newline at end of file
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb
index 45842451..762da9e7 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb
@@ -1,43 +1,23 @@
-<% content_for :secondary do %>
-<br />
-<br />
-<br />
-<br />
-<br />
-  <ul class="list">
-	  <li><%#= link_to t('web_link_category.new_web_resource_class'), new_panel_web_resource_back_end_web_link_category_path, :class => 'seclink1' %></li>
-  </ul>
-<% end -%>
+
 
 <%= flash_messages %>
 
-<h1><%= t('web_link_category.list_web_resource_class') %></h1>
-<br />
-<br />
-<br />
-<br />
-<br />
-<table id="web_link_categorys">
-  <tr>
-    <th><%= t('web_link_category.key') %></th>
-	<% @site_valid_locales.each do |locale| %>
-	<th><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
-	<% end %>
-    <th><%= t('web_link.action') %></th>
-  </tr>
+<table id="web_link_categorys" class="table main-list">
+	<thead>
+		<tr>
+			<th class="span1-2"><%= t('web_link_category.key') %></th>
+			<% @site_valid_locales.each do |locale| %>
+			<th class="span1-2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
+			<% end %>
+		</tr>
+	</thead>
+	<tbody>
 
-<%# @web_link_categorys.each do |post| %>
 	<%= render :partial => 'web_link_category', :collection => @web_link_categorys %>
-<%# end %>
+	
+	</tbody>
 </table>
 
-<br />
-<br />
-<br />
-<br />
-
-<h2>Add New</h2>
 <div id="form"><%= render :partial => "form" %></div>
 
 
-
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
index ce17555a..2abdf4a0 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
@@ -1,62 +1,101 @@
 <% # encoding: utf-8 %>
 
   <%= f.error_messages %>
-  <%#= debugger %>
-	
-  <div class="field">
-    <%= f.label :category %><br />
-	<%= f.select :web_link_category_id, @web_link_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ]} %>
-  </div>
-  
- <div class="field">
-  <%= f.label :name %>
-  <%= f.fields_for :name, (@web_link.new_record? ? @web_link.build_name : @web_link.name ) do |f| %>
-   <% @site_valid_locales.each do |locale| %>
-    <td>
-     <%= I18nVariable.from_locale(locale) %>
-     <%= f.text_field locale %>
-    </td>
-   <% end %>
-  <% end %>
- </div>
-  
-  <div class="field">
-    <%= f.label :url %><br />
-    <%= f.text_field :url, :size => 60 %>
-  </div>
 
- <div class="field">
-  <%= f.label :describe %>
-  <%= f.fields_for :context, (@web_link.new_record? ? @web_link.build_context : @web_link.context ) do |f| %>
-   <% @site_valid_locales.each do |locale| %>
-    <td>
-     <%= I18nVariable.from_locale(locale) %>
-     <%= f.text_area locale, :rows => 10, :cols => 40 %>
-    </td>
-   <% end %>
-  <% end %>
- </div>
+	<!--Widget start-->
+	
+	<div id="sub-wiget">
+		  
+		<div id="widget-status" class="widget-box widget-size-300">
+			<div class="widget-action clear">
+				<a class="action"><i title="Setting the announcement state" class="icon-exclamation-sign icon-white tip"></i></a>
+			</div>
+			<h3 class="widget-title"><i class="icons-star-thin icons-white"></i>Status</h3>
+			<div class="widget-content clear">
+				<div class="controls">
+					<%= f.check_box :is_top %><%= t('top') %>
+					<%= f.check_box :is_hot %><%= t('hot') %>
+					<%= f.check_box :is_hidden %><%= t('hide') %>
+				</div>
+			</div>
+		</div>
+
+		<div id="widget-tags" class="widget-box widget-size-300">
+			<div class="widget-action clear">
+				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
+			</div>
+			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+				<div class="widget-content clear form-horizontal">
+					<% @tags.each do |tag| %>
+					<%= check_box_tag 'web_link[tag_ids][]', tag.id, @web_link.tag_ids.include?(tag.id)%>
+					<%= tag[I18n.locale] %>
+					<% end %>
+				</div>
+		</div>  
   
-  <div class="field">
-    <%= f.label :status %><br />
-    <%= f.check_box :is_top %><%= t('top') %>
-    <%= f.check_box :is_hot %><%= t('hot') %>
-    <%= f.check_box :is_hidden %><%= t('hidden') %>
-  </div>
-  
-  <div class="field">
-    <%= f.label :tags %><br />
-	<% @tags.each do |tag| %>
-	<%= check_box_tag 'web_link[tag_ids][]', tag.id, @web_link.tag_ids.include?(tag.id)%>
-	<%= tag[I18n.locale] %>
-	<% end %>
-  </div>
-  
-  <br />
-  <br />
+	</div>
   
   
-  <div class="actions">
-    <%= f.submit %>
+<!--Wiget End-->
+<!--Post Start-->
+
+	<div id="post-body">
+		<div id="post-body-content" class="clear">
+		
+			<%= f.label :category %>
+			<%= f.select :web_link_category_id, @web_link_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ]} %>
+
+			<div class="btn-group pull-right">
+				<a class="btn dropdown-toggle" href="#" data-toggle="dropdown">
+					English
+					<span class="caret"></span>
+				</a>
+				<ul class="dropdown-menu">
+					<li><a href="#">English</a></li>
+					<li><a href="#">Chinese</a></li>
+					<li><a href="#">Japanese</a></li>
+					<li><a href="#">French</a></li>
+					<li><a href="#">German</a></li>
+					<!--<li class="divider"></li>
+					<li><a href="#">Separated link</a></li>-->
+				</ul>
+			</div>
+
+			<div class="title">
+				<%= f.label :name %>
+				<%= f.fields_for :name, (@web_link.new_record? ? @web_link.build_name : @web_link.name ) do |f| %>
+				  <% @site_valid_locales.each do |locale| %>
+					<td>
+						<%= I18nVariable.from_locale(locale) %>
+						<%= f.text_field locale, :class=>'post-title' %>
+					</td>
+				  <% end %>
+				<% end %>
+			</div>
+
+			<div class="title">
+				<%= f.label :url %>
+				<%= f.text_field :url %>
+			</div>
+
+			<div class="title">
+				<%= f.label :describe %>
+				<%= f.fields_for :context, (@web_link.new_record? ? @web_link.build_context : @web_link.context ) do |f| %>
+				  <% @site_valid_locales.each do |locale| %>
+					<td>
+						<%= I18nVariable.from_locale(locale) %>
+						<%= f.text_area locale, :style=>"width:100%" %>
+					</td>
+				  <% end %>
+				<% end %>
+			</div>
+	
+	</div>
+	
+	<!--Post End-->
+  
+  
+  <div class="form-actions">
+    <%= f.submit 'Submit/������', :class=>'btn btn-primary' %>
   </div>
  
\ No newline at end of file
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb
index d87b59d8..c58f15e4 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb
@@ -1,5 +1,5 @@
 
-<tr id="<%= dom_id post %>">
+<tr id="<%= dom_id post %>" class="with_action">
 	<td>
 		<% if post.is_top? %>
 			<span class="label label-success"><%= t(:top) %></span>
@@ -10,6 +10,12 @@
 		<% if post.is_hidden? %>
 			<span class="label"><%= t(:hidden) %></span>
 		<% end %>	
+		<div class="quick-edit">
+			<ul class="nav nav-pills hide">
+				<li><%= link_to t('web_link.edit'), edit_panel_web_resource_back_end_web_link_path(post) %></li>
+				<li><%= link_to t('web_link.delete'), panel_web_resource_back_end_web_link_path(post), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			</ul>
+		</div>
 	</td>
 	<td><%= post.web_link_category.i18n_variable[I18n.locale] %></td>
 	<td>
@@ -20,12 +26,5 @@
 			<span class="label label-tags"><%= tag[I18n.locale] %></span>
 		<% end %>
 	</td>
-	<td>
-	<%= link_to t('web_link.edit'), edit_panel_web_resource_back_end_web_link_path(post) %> | 
-	
-	<%= link_to t(:set_top), eval("panel_web_resource_back_end_web_link_path(post, :authenticity_token => form_authenticity_token, :web_link => {:is_top => true})"), :remote => true, :method => :put, :id => "disable_#{post.id}", :style => "display:#{post.is_top? ? 'none' : ''}", :class => 'switch' %>
-	<%= link_to t(:cancel_top), eval("panel_web_resource_back_end_web_link_path(post, :authenticity_token => form_authenticity_token, :web_link => {:is_top => false})"), :remote => true, :method => :put, :id => "enable_#{post.id}", :style => "display:#{post.is_top? ? '' : 'none'}", :class => 'switch' %>
-			
-	 | <%= link_to t('web_link.delete'), panel_web_resource_back_end_web_link_path(post), :confirm => t('sure?'), :method => :delete, :remote => true %>
-	</td>
 </tr>
+
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
index 82afe4ea..301c1bbe 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
@@ -1,52 +1,21 @@
-<% content_for :secondary do %>
-<br />
-<br />
-<br />
-<br />
-<br />
-  <ul class="list">
-	  <li><%= link_to t('web_link.new_link'), new_panel_web_resource_back_end_web_link_path %></li>
-	  <li><%= link_to t('web_link.link_list'), panel_web_resource_back_end_web_links_path %></li>
-	  <li><%= link_to t('web_link.new_link_class'), panel_web_resource_back_end_web_link_categorys_path %></li>
-  </ul>
-<% end -%>
 
 <%= flash_messages %>
 
-<br />
-<br />
-<br />
-<br />
-<br />
-
-  <%= form_for :web_link, :action => 'search', :method => 'get', :url => panel_web_resource_back_end_web_links_path do |f| %>
-  
-  <%#= f.select :web_link_category_id, @web_link_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ] },{ :include_blank => t('web_link.select') }%>
-  
-  Category <%= select_tag "category_id", options_for_select(@web_link_categorys.collect{|t| [t.i18n_variable[I18n.locale], t.id]}), :prompt => t('web_link.select') %>
-  
-  <%= submit_tag "OK", :name => nil %> 
-  
-  <% end %>
-
-<br />
-<br />
-
-<h1><%= t('web_link.list_link') %></h1>
-
-	<table>
-	  <tr>
-		<th><%= t('web_link.status') %></th>
-		<th><%= t('web_link.category') %></th>
-		<th><%= t('web_link.name') %></th>
-		<th><%= t('web_link.tags') %></th>
-		<th><%= t('web_link.action') %></th>
-	  </tr>
+<table class="table main-list">
+	<thead>
+		<tr>
+			<th class="span1-2"><%= t('web_link.status') %></th>
+			<th class="span1-2"><%= t('web_link.category') %></th>
+			<th class="span1-2"><%= t('web_link.name') %></th>
+			<th class="span1-2"><%= t('web_link.tags') %></th>
+		</tr>
+	</thead>
+	<tbody>
 
 	<% @web_links.each do |post| %>
 		<%= render :partial => 'web_links', :locals => {:post => post} %>
-	<% end %>	
-	</table>
-
-<br />
+	<% end %>
+	
+	</tbody>
+</table>
 

From f4fda08e865b1672d5bb4284e32cafdce527f014 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 5 Mar 2012 16:19:08 +0800
Subject: [PATCH 13/20] Replace PrototypeR4 by Orbit. Move session into
 mongoid_store. Reset session when sing_in.

---
 Gemfile                                       |  3 ++
 Gemfile.lock                                  | 32 +++++++++++++++++++
 Rakefile                                      |  2 +-
 app/controllers/admin/sessions_controller.rb  |  8 +++++
 app/models/session.rb                         | 12 +++++++
 config.ru                                     |  2 +-
 config/application.rb                         |  3 +-
 config/environment.rb                         |  2 +-
 config/environments/development.rb            |  2 +-
 config/environments/production.rb             |  2 +-
 config/environments/test.rb                   |  2 +-
 .../cookie_verification_secret.rb             |  2 +-
 config/initializers/secret_token.rb           |  2 +-
 config/initializers/session_store.rb          |  7 +---
 config/routes.rb                              |  2 +-
 .../config/initializers/app_config.rb         |  4 +--
 16 files changed, 69 insertions(+), 18 deletions(-)
 create mode 100644 app/controllers/admin/sessions_controller.rb
 create mode 100644 app/models/session.rb

diff --git a/Gemfile b/Gemfile
index eb1f5434..cd8c36f9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,8 @@
 source 'http://rubygems.org'
 gem 'rails', '>=3.1.0', '<3.2.0'
 
+gem "brakeman"
+
 gem 'bson_ext'
 gem 'carrierwave'
 gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
@@ -13,6 +15,7 @@ gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
 
 gem 'mini_magick'
 gem 'mongoid'
+gem "mongo_session_store-rails3"
 gem 'radius'
 gem 'rake'
 gem 'ruby-debug19'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8889b1d5..b1ab1679 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,6 +42,14 @@ GEM
     arel (2.2.1)
     bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-x86-mingw32)
+    brakeman (1.5.0)
+      activesupport
+      erubis (~> 2.6)
+      haml (~> 3.0)
+      i18n
+      ruby2ruby (~> 1.2)
+      ruport (~> 1.6)
+      sass (~> 3.0)
     bson (1.5.2)
     bson_ext (1.5.2)
       bson (= 1.5.2)
@@ -59,6 +67,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
+    color (1.4.1)
     columnize (0.3.6)
     database_cleaner (0.7.1)
     delorean (1.2.0)
@@ -78,7 +87,11 @@ GEM
     factory_girl_rails (1.6.0)
       factory_girl (~> 2.5.0)
       railties (>= 3.0.0)
+    fastercsv (1.5.4)
+    haml (3.1.4)
     hike (1.2.1)
+    hoe (2.15.0)
+      rake (~> 0.8)
     i18n (0.6.0)
     jquery-rails (1.0.19)
       railties (~> 3.0)
@@ -96,12 +109,18 @@ GEM
       subexec (~> 0.2.1)
     mongo (1.5.2)
       bson (= 1.5.2)
+    mongo_session_store-rails3 (3.0.5)
+      actionpack (>= 3.0)
+      mongo
     mongoid (2.4.2)
       activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
     multi_json (1.0.4)
     orm_adapter (0.0.6)
+    pdf-writer (1.1.8)
+      color (>= 1.4.0)
+      transaction-simple (~> 1.3)
     polyglot (0.3.3)
     rack (1.3.6)
     rack-cache (1.1)
@@ -154,15 +173,24 @@ GEM
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
+    ruby2ruby (1.3.1)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
+    ruby_parser (2.3.1)
+      sexp_processor (~> 3.0)
     rubyzip (0.9.5)
+    ruport (1.6.3)
+      fastercsv
+      pdf-writer (= 1.1.8)
     sass (3.1.12)
     sass-rails (3.1.5)
       actionpack (~> 3.1.0)
       railties (~> 3.1.0)
       sass (~> 3.1.10)
       tilt (~> 1.3.2)
+    sexp_processor (3.1.0)
     shoulda-matchers (1.0.0)
     simplecov (0.5.4)
       multi_json (~> 1.0.3)
@@ -186,6 +214,8 @@ GEM
     tilt (1.3.3)
     tinymce-rails (3.4.8)
       railties (>= 3.1)
+    transaction-simple (1.4.0)
+      hoe (>= 1.1.7)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
@@ -210,6 +240,7 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
+  brakeman
   bson_ext
   carrierwave
   carrierwave-mongoid
@@ -223,6 +254,7 @@ DEPENDENCIES
   jquery-rails
   kaminari!
   mini_magick
+  mongo_session_store-rails3
   mongoid
   radius
   rails (>= 3.1.0, < 3.2.0)
diff --git a/Rakefile b/Rakefile
index 2036d04c..9a495de7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -5,4 +5,4 @@ require File.expand_path('../config/application', __FILE__)
 require 'rake/dsl_definition'
 require 'rake'
 
-PrototypeR4::Application.load_tasks
+Orbit::Application.load_tasks
diff --git a/app/controllers/admin/sessions_controller.rb b/app/controllers/admin/sessions_controller.rb
new file mode 100644
index 00000000..00649580
--- /dev/null
+++ b/app/controllers/admin/sessions_controller.rb
@@ -0,0 +1,8 @@
+class SessionsController < Devise::SessionsController
+
+  def create 
+    super
+    reset_session
+  end
+
+end
\ No newline at end of file
diff --git a/app/models/session.rb b/app/models/session.rb
new file mode 100644
index 00000000..3c6deb54
--- /dev/null
+++ b/app/models/session.rb
@@ -0,0 +1,12 @@
+class Session
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  
+  def self.sweep(time = 1.hour)
+    if time.is_a?(String)
+      time = time.split.inject { |count, unit| count.to_i.send(unit) }
+    end
+ 
+    delete_all "updated_at < '#{time.ago.to_s(:db)}' OR created_at < '#{2.days.ago.to_s(:db)}'"
+  end
+end
\ No newline at end of file
diff --git a/config.ru b/config.ru
index 20d6bd1f..6a593e4a 100644
--- a/config.ru
+++ b/config.ru
@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)
-run PrototypeR4::Application
+run Orbit::Application
diff --git a/config/application.rb b/config/application.rb
index 50b9f4a7..d1243133 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -13,12 +13,13 @@ require 'sprockets/railtie'
 # or test environments.
 Bundler.require *Rails.groups(:assets) if defined?(Bundler)
 
-module PrototypeR4
+module Orbit
   class Application < Rails::Application
 
     # Add directories for plugins
     config.paths["vendor/plugins"] += %W(#{config.root}/vendor/built_in_modules)
     config.paths["vendor/plugins"] += %W(#{config.root}/vendor/downloaded_modules)
+    config.paths.app.views << "app/views/devise"
     
     
     # Settings in config/environments/* take precedence over those specified here.
diff --git a/config/environment.rb b/config/environment.rb
index efd38a40..3538bc87 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -4,4 +4,4 @@ require 'yaml'
 YAML::ENGINE.yamler = 'syck'
 
 # Initialize the rails application
-PrototypeR4::Application.initialize!
+Orbit::Application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index c2b4c930..1dbff032 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,4 +1,4 @@
-PrototypeR4::Application.configure do
+Orbit::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on
diff --git a/config/environments/production.rb b/config/environments/production.rb
index f52ead13..001ff2c6 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,4 +1,4 @@
-PrototypeR4::Application.configure do
+Orbit::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # The production environment is meant for finished, "live" apps.
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 6d22bb12..e55cc24b 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,4 +1,4 @@
-PrototypeR4::Application.configure do
+Orbit::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's
diff --git a/config/initializers/cookie_verification_secret.rb b/config/initializers/cookie_verification_secret.rb
index 5a8601a7..694e666d 100644
--- a/config/initializers/cookie_verification_secret.rb
+++ b/config/initializers/cookie_verification_secret.rb
@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random, 
 # no regular words or you'll be exposed to dictionary attacks.
-PrototypeR4::Application.config.secret_token =  'cbf6409102b30cb9f4da455ee08c3a7e9d8b2a3d32a0e5b59a354dad03f469d363a8127ef4b7bc3b1afa632d7cf947a1e59e09022d2d4cd8df1f4fa521d7ec07'
+Orbit::Application.config.secret_token =  'cbf6409102b30cb9f4da455ee08c3a7e9d8b2a3d32a0e5b59a354dad03f469d363a8127ef4b7bc3b1afa632d7cf947a1e59e09022d2d4cd8df1f4fa521d7ec07'
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index 67abf723..ae9a444a 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-PrototypeR4::Application.config.secret_token = 'b8d78ecaf3086ebfc1ba42e912acba60d85cf3d789d933e117770e1a045a12911f121ff012a234982abb446c8b8c768052eea4bf8b2d5d336be821e2c25d8cdb'
+Orbit::Application.config.secret_token = 'b8d78ecaf3086ebfc1ba42e912acba60d85cf3d789d933e117770e1a045a12911f121ff012a234982abb446c8b8c768052eea4bf8b2d5d336be821e2c25d8cdb'
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index e6387adb..b1a4a2c1 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,8 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-PrototypeR4::Application.config.session_store :cookie_store, :key => '_prototype_R4_session'
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rails generate session_migration")
-# PrototypeR4::Application.config.session_store :active_record_store
+Orbit::Application.config.session_store :mongoid_store
diff --git a/config/routes.rb b/config/routes.rb
index cd3921f0..112d96e1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,4 @@
-PrototypeR4::Application.routes.draw do
+Orbit::Application.routes.draw do
 
   devise_for :users
   
diff --git a/vendor/built_in_modules/new_blog/config/initializers/app_config.rb b/vendor/built_in_modules/new_blog/config/initializers/app_config.rb
index c098b837..0e9f56e7 100644
--- a/vendor/built_in_modules/new_blog/config/initializers/app_config.rb
+++ b/vendor/built_in_modules/new_blog/config/initializers/app_config.rb
@@ -3,7 +3,7 @@
 #       # Add a load path for this specific Engine
 #       # config.autoload_paths << File.expand_path("../lib/some/path", __FILE__)
 #       put "ABC"
-#       PrototypeR4::Application::Orbit_Apps << "NewBlog"
+#       Orbit::Application::Orbit_Apps << "NewBlog"
 #       
 #       # initializer "my_engine.add_middleware" do |app|
 #       #   app.middleware.use MyEngine::Middleware
@@ -15,4 +15,4 @@ module NewBlog
   VERSION = "0.0.1"
   MOUDLEAPP_TITLE =  "NewBlog"
 end
-# PrototypeR4::Application::Orbit_Apps << "NewBlog"
\ No newline at end of file
+# Orbit::Application::Orbit_Apps << "NewBlog"
\ No newline at end of file

From 29ec36130e660318f8fbc86208e5952011413aac Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris@rulingcom.com>
Date: Fri, 16 Mar 2012 15:06:45 +0800
Subject: [PATCH 14/20] css and js changes

---
 app/assets/javascripts/orbit-1.0.js       |   9 +-
 app/assets/stylesheets/site_items.css.erb | 963 +++++++++++-----------
 2 files changed, 488 insertions(+), 484 deletions(-)

diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js
index efb7042e..f8daaecd 100644
--- a/app/assets/javascripts/orbit-1.0.js
+++ b/app/assets/javascripts/orbit-1.0.js
@@ -52,12 +52,15 @@ $(document).ready(function(){
 
 	/*tinyscrollbar&windows-Size*/
 	resize();
-	$('#main-sidebar').css("height", viewportheight-40);
-	$('#main-sidebar .viewport').css("height", viewportheight-40);
+	var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2;
+	$('#main-sidebar').css("height", viewportheight-30);
+	$('#main-sidebar .viewport').css("height", viewportheight-30);
 	$('.post-title').css("width", viewportwidth-495);
+	$('#main-wrap > .subnav').css("width", viewportwidth-$mainWrapMarginLeft)
 	$('#main-sidebar').tinyscrollbar();
 	$('.detal-list').tinyscrollbar();
-	$('#main-sidebar').tinyscrollbar({size:(viewportheight-44)});
+	$('#main-sidebar').tinyscrollbar({size:(viewportheight-34)});
+	mainTablePosition()
 
 	/*isotope*/
   var $container = $('#isotope');
diff --git a/app/assets/stylesheets/site_items.css.erb b/app/assets/stylesheets/site_items.css.erb
index 38b0a185..4e23bd4c 100644
--- a/app/assets/stylesheets/site_items.css.erb
+++ b/app/assets/stylesheets/site_items.css.erb
@@ -1,482 +1,483 @@
-html, body{
-    height: 100%;
-    margin: 0;
-    padding: 0;
-}
-html{
-    background: url(<%= asset_path "body.jpg" %>) no-repeat fixed 0 0 transparent;
-	background-size: cover;
-}
-
-body{
-    color: #000000;
-    font-family: Helvetica, '敺株��甇�暺�擃�';
-}
-#back_banner_link{
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #787e82), color-stop(0.05, #61676c), color-stop(1, #292c2d) );
-	background:-moz-linear-gradient( center top -90deg, #787e82 0%, #61676c 5%, #292c2d 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#61676c', endColorstr='#292c2d');
-	-moz-box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
-	-webkit-box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
-	box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
-	border-top: 1px solid #474a4c;
-	border-bottom: 1px solid #1d2020;
-    height: 41px;
-    width: 100%;
-	behavior: url(<%= asset_path "PIE.htc" %>);
-}
-.hmenu{
-	float: right;
-	height: 41px;
-}
-#back_orbit{
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #70787d), color-stop(1, #3b4043) );
-	background:-moz-linear-gradient( center top -90deg, #70787d 0%, #3b4043 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#70787d', endColorstr='#3b4043');
-	-webkit-border-radius: 0px 0px 5px 5px;
-	-moz-border-radius: 0px 0px 5px 5px;
-	border-radius: 0px 0px 5px 5px;
-	-moz-box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
-	-webkit-box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
-	box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
-    cursor: pointer;
-    float: left;
-    height: 43px;
-    margin-left: 10px;
-    width: 41px;
-	behavior: url(<%= asset_path "PIE.htc" %>);
-}
-#back_orbit span{
-	text-indent: -9999px;
-    background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 0 0 transparent;
-	display: block;
-	height: 43px;
-	width: 100%;
-}
-#back_orbit:hover{
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #fefefe), color-stop(1, #e4e4e4) );
-	background:-moz-linear-gradient( center top -90deg, #fefefe 0%, #e4e4e4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fefefe', endColorstr='#e4e4e4');
-	-webkit-border-radius: 0px;
-	-moz-border-radius: 0px;
-	border-radius: 0px;
-}
-#back_orbit:hover span{
-	background-position: 0 -44px;
-}
-#back_orbit:hover #orblist{
-	display:block;
-}
-#orblist{
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #e4e4e4), color-stop(1, #FFFFFF) );
-	background:-moz-linear-gradient( center top -90deg, #e4e4e4 0%, #FFFFFF 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e4e4e4', endColorstr='#FFFFFF');
-	-webkit-border-radius: 0px 3px 3px 3px;
-	-moz-border-radius: 0px 3px 3px 3px;
-    border-radius: 0px 3px 3px 3px;
-    -webkit-box-shadow: 0 3px 3px #000000;
-    -moz-box-shadow: 0 3px 3px #000000;
-    box-shadow: 0 3px 3px #000000;
-    display: none;
-    margin: 0;
-    padding: 10px;
-    position: absolute;
-    top: 43px;
-    width: 130px;
-}
-#orblist li{
-	border-bottom:1px solid #aaa;
-	list-style:none;
-}
-.orblink{
-    color: #333333;
-    display: block;
-    font: 12px/100% arial,sans-serif;
-    padding: 5px;
-    text-decoration: none;
-}
-.orblink:hover{
-	background:#eee;
-	color:#333;
-}
-#log_out{
-	-moz-box-shadow:inset 1px 0px 0px 0px #73777b;
-	-webkit-box-shadow:inset 1px 0px 0px 0px #73777b;
-	box-shadow:inset 1px 0px 0px 0px #73777b;
-	border-right:1px solid #41474c;
-	border-left:1px solid #41474c;
-	float:right;
-	width:41px;
-	height:41px;
-}
-#log_out:hover{
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #01afde), color-stop(1, #007ec6) );
-	background:-moz-linear-gradient( center top -90deg, #01afde 0%, #007ec6 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#01afde', endColorstr='#007ec6');
-}
-#log_out a{
-    background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right 0 transparent;
-	display: block;
-	height: 41px;
-	text-indent: -9999px;
-	width: 41px;
-}
-#log_out a:hover{
-    background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right bottom transparent !important;
-}
-.lang{
-	color: #FFFFFF;
-	float: right;
-	font-size: 15px;
-	line-height: 40px;
-	margin-right: 10px;
-}
-.lang a{
-	color:#fff;
-	text-decoration:none;
-}
-.lang a:hover{
-	text-decoration:underline;
-}
-#back_content{
-    height: 100%;
-}
-#back_footer{
-	background-color: #101010;
-	bottom: 0;
-	color: #FFFFFF;
-	font-size: 11px;
-	padding: 10px;
-	position: fixed;
-	width: 100%;
-	left: 0;
-	box-shadow: 0 -3px 4px #000;
-}
-.items_setup{
-	padding:42px 0 0 0;
-}
-#back_sidebar .items_setup .list li{
-    padding: 6px 0 7px 5px;
-}
-#back_sidebar .items_setup .list li a{
-    display: inline;
-    font-size: 0.9em;
-    padding: 0;
-}
-#back_sidebar .items_setup .list li a span{
-	background:none;
-	padding:0;
-	text-shadow:none;
-}
-.main {
-    background: none repeat scroll 0 0 #FFFFFF;
-    height: 100%;
-    margin-left: 220px;
-    padding: 0 40px;
-    position: relative;
-}
-.main_list {
-    padding-top: 70px;
-}
-.main_list ul {
-	clear:both;
-}
-#porfile {
-	padding-top: 100px;
-}
-/*add_buttom*/
-.button_bar {
-	float: right;
-	-moz-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
-	box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #4f4f4f), color-stop(1, #000000) );
-	background:-moz-linear-gradient( center top, #4f4f4f 5%, #000000 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4f4f4f', endColorstr='#000000');
-	background-color:#4f4f4f;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-	display:inline-block;
-	padding:0;
-	margin:10px 0 60px;
-}
-.button_bar a {
-	text-decoration:none;
-	text-shadow:0px -1px 0px #000000;
-	font-size:12px;
-	color:#EDEDED;
-	border-right:1px solid #555;
-	-moz-box-shadow:1px 0px 0px black;
-	-webkit-box-shadow:1px 0px 0px black;
-	box-shadow:1px 0px 0px black;
-	padding: 6px 10px 4px;
-	display: inline-block;
-	float: left;
-}
-.button_bar a:active {
-	padding: 7px 10px 3px !important;
-	text-shadow:0px 1px 0px #000000;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #000000), color-stop(1, #4f4f4f) );
-	background:-moz-linear-gradient( center top, #000000 5%, #4f4f4f 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#4f4f4f');
-}
-.button_bar a:last-child {
-	border-right:none;
-	-moz-box-shadow:none;
-	-webkit-box-shadow:none;
-	box-shadow:none;
-	-moz-border-radius:0px 5px 5px 0px;
-	-webkit-border-radius:0px 5px 5px 0px;
-	border-radius:0px 5px 5px 0px;
-}
-.button_bar a:first-child {
-	-moz-border-radius:5px 0px 0px 5px;
-	-webkit-border-radius:5px 0px 0px 5px;
-	border-radius:5px 0px 0px 5px;
-}
-.button_bar a.new {
-	padding: 5px 10px;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-}
-.button_bar a:hover {
-	color:#FFFFFF;
-}
-.up {
-	margin:10px 0;
-}
-#person {
-	left: 245px;
-	position: fixed;
-	text-align: center;
-	top: 75px;
-	width: 140px;
-	background-color:#FFF;
-	padding:15px;
-	border-radius: 5px;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	-moz-box-shadow: 0px 0px 4px #180902; /* Firefox */
-	-webkit-box-shadow: 0px 0px 4px #180902;/* Safari ��� Chrome */
-	box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */
-}
-#file {
-	display:none;
-}
-#person img {
-}
-.user_mail {
-    border: medium none;
-	border:1px solid #DDDDDD;
-    color: #666666;
-    font-size: 12px;
-    width: 140px;
-}
-#person label {
-	display: block;
-	margin: 15px 0 0;
-}
-#person label input {
-}
-#person label #user_admin {
-	float:right;
-	margin: 0;
-}
-#person label span {
-	text-align:left;
-	font-size:11px;
-	color:#888;
-	display:block;
-}
-#person select {
-    border: 1px solid #DDDDDD;
-    padding: 0;
-    width: 140px;
-}
-#porfile .users{
-	margin-left: 180px;
-}
-.roles_block {
-    background: url(<%= asset_path "75.png" %>) repeat left top;
-	min-width:710px;
-	margin-bottom:50px;
-	position:relative;
-	padding-bottom: 20px;
-	border-radius: 5px;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	-moz-box-shadow: 0px 0px 4px #180902; /* Firefox */
-	-webkit-box-shadow: 0px 0px 4px #180902;/* Safari ��� Chrome */
-	box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */
-}
-.roles_block h2 {
-    color: #FFFFFF;
-    font-weight: normal;
-    margin: 0;
-    padding: 0;
-    position: absolute;
-    text-shadow: 0 3px 2px #000000;
-    top: -30px;
-}
-.main hr {
-	height:8px;
-	border:none;
-	margin:0;
-	border-radius: 5px 5px 0px 0px;
-	-moz-border-radius: 5px 5px 0px 0px;
-	-webkit-border-radius: 5px 5px 0px 0px;
-	border-bottom:1px solid #000;
-}
-.main2{
-	padding:70px 0 0;
-}
-#basic_block hr {
-    background-color: #666666;
-}
-#teacher_block hr {
-    background-color: #0071A9;
-}
-#student_block hr {
-    background-color: #AF0045;
-}
-.info_input {
-	padding:10px 20px;
-}
-.info_input table {
-	color:#fff;
-	width:100%;
-	font-size:14px;
-}
-.info_input table td {
-	padding:5px 10px 5px 0;
-	width: 10%;
-}
-.info_input .list_head {
-	background:url(<%= asset_path "line.png" %>) left bottom repeat-x;
-}
-.info_input .list_head td {
-}
-.info_input .list_item {
-	color:#AEAEAE;
-}
-.info_input .add {
-	display:block;
-	padding-left:22px;
-	font-size:12px;
-	line-height:21px;
-	height:19px;
-	background:url(<%= asset_path "icon.png" %>) no-repeat -59px 0;
-	margin-top: 10px;
-	color: #DDDDDD;
-}
-
-.main table {
-	width:100%;
-}
-.main td {
-	padding-left:20px;
-	color:#fff;
-	font-size:14px;
-	line-height:40px;
-}
-.main tr.have td{
-	background: url(<%= asset_path "75.png" %>) repeat left top;
-}
-.main tr.have td:first-child{
-	border-radius: 5px 0 0 5px;
-	-moz-border-radius: 5px 0 0 5px;
-	-webkit-border-radius: 5px 0 0 5px;
-}
-.main tr.have td:last-child{
-	border-radius: 0 5px 5px 0;
-	-moz-border-radius: 0 5px 5px 0;
-	-webkit-border-radius: 0 5px 5px 0;
-}
-.main thead td {
-	line-height:40px;
-	font-size:16px;
-	text-shadow: 0px 1px 1px #3e2914;
-}
-.main thead td.action {
-	width:140px;
-}
-.main tbody td.roles {
-    background-image: url(<%= asset_path "roles_type.jpg" %>);
-    background-repeat: repeat-x;
-}
-.main tbody td.teacher {
-    background-position: 0 -54px;
-}
-.main tbody td.student {
-	background-position: 0 -5px;
-}
-.main tbody td.action a {
-    background-image: url(<%= asset_path "icon.png" %>);
-    display: inline-block;
-    height: 19px;
-    margin-right: 10px;
-    top: 8px;
-    text-indent: -9999px;
-    width: 19px;
-	position: relative;
-}
-.main tbody td.action a.show {
-    background-position: left top;
-}
-.main tbody td.action a.show:hover {
-    background-position: left -19px;
-}
-.main tbody td.action a.edit {
-    background-position: -19px top;
-}
-.main tbody td.action a.edit:hover {
-    background-position: -19px -19px;
-}
-.main tbody td.action a.delete {
-    background-position: -38px top;
-}
-.main tbody td.action a.delete:hover {
-    background-position: -38px -19px;
-}
-.main tbody td.action a.switch {
-    background: url(<%= asset_path "switch.png" %>) no-repeat left 3px;
-    width: 40px;
-}
-.main tbody tr.disable td.action a.switch {
-    background-position:left bottom;
-}
-.main tbody td.action a.delete:hover {
-    background-position: -38px -19px;
-}
-.main tbody tr.have {
-}
-.main tbody tr.disable {
-    opacity: 0.7;
-}
-.main tbody tr {
-	background:none;
-	height:15px;
-}
-h1{
-	margin:0 0 20px;
-}
-p{
-	margin:0 0 10px;
-}
-
-#back_sidebar .items_setup .list li{
-	background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top;
-	border:none;
-    padding: 0 0 0 5px;
-}
-#back_sidebar .items_setup .list li a{
-	line-height:31px;
-}
-#back_sidebar .items_setup .list li:hover{
-	background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top;
-	border:none;
-}
-#back_sidebar .items_setup ul .list {
+html, body{
+    height: 100%;
+    margin: 0;
+    padding: 0;
+}
+html{
+    background: url(<%= asset_path "body.jpg" %>) no-repeat fixed 0 0 transparent;
+	background-size: cover;
+}
+
+body{
+    color: #000000;
+    font-family: Helvetica, '敺株��甇�暺�擃�';
+}
+#back_banner_link{
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #787e82), color-stop(0.05, #61676c), color-stop(1, #292c2d) );
+	background:-moz-linear-gradient( center top -90deg, #787e82 0%, #61676c 5%, #292c2d 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#61676c', endColorstr='#292c2d');
+	-moz-box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
+	-webkit-box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
+	box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
+	border-top: 1px solid #474a4c;
+	border-bottom: 1px solid #1d2020;
+    height: 41px;
+    width: 100%;
+	behavior: url(<%= asset_path "PIE.htc" %>);
+}
+.hmenu{
+	float: right;
+	height: 41px;
+}
+#back_orbit{
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #70787d), color-stop(1, #3b4043) );
+	background:-moz-linear-gradient( center top -90deg, #70787d 0%, #3b4043 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#70787d', endColorstr='#3b4043');
+	-webkit-border-radius: 0px 0px 5px 5px;
+	-moz-border-radius: 0px 0px 5px 5px;
+	border-radius: 0px 0px 5px 5px;
+	-moz-box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
+	-webkit-box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
+	box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
+    cursor: pointer;
+    float: left;
+    height: 43px;
+    margin-left: 10px;
+    width: 41px;
+	behavior: url(<%= asset_path "PIE.htc" %>);
+}
+#back_orbit span{
+	text-indent: -9999px;
+    background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 0 0 transparent;
+	display: block;
+	height: 43px;
+	width: 100%;
+}
+#back_orbit:hover{
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #fefefe), color-stop(1, #e4e4e4) );
+	background:-moz-linear-gradient( center top -90deg, #fefefe 0%, #e4e4e4 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fefefe', endColorstr='#e4e4e4');
+	-webkit-border-radius: 0px;
+	-moz-border-radius: 0px;
+	border-radius: 0px;
+}
+#back_orbit:hover span{
+	background-position: 0 -44px;
+}
+#back_orbit:hover #orblist{
+	display:block;
+}
+#orblist{
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #e4e4e4), color-stop(1, #FFFFFF) );
+	background:-moz-linear-gradient( center top -90deg, #e4e4e4 0%, #FFFFFF 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e4e4e4', endColorstr='#FFFFFF');
+	-webkit-border-radius: 0px 3px 3px 3px;
+	-moz-border-radius: 0px 3px 3px 3px;
+    border-radius: 0px 3px 3px 3px;
+    -webkit-box-shadow: 0 3px 3px #000000;
+    -moz-box-shadow: 0 3px 3px #000000;
+    box-shadow: 0 3px 3px #000000;
+    display: none;
+    margin: 0;
+    padding: 10px;
+    position: absolute;
+    top: 43px;
+    width: 130px;
+}
+#orblist li{
+	border-bottom:1px solid #aaa;
+	list-style:none;
+}
+.orblink{
+    color: #333333;
+    display: block;
+    font: 12px/100% arial,sans-serif;
+    padding: 5px;
+    text-decoration: none;
+}
+.orblink:hover{
+	background:#eee;
+	color:#333;
+}
+#log_out{
+	-moz-box-shadow:inset 1px 0px 0px 0px #73777b;
+	-webkit-box-shadow:inset 1px 0px 0px 0px #73777b;
+	box-shadow:inset 1px 0px 0px 0px #73777b;
+	border-right:1px solid #41474c;
+	border-left:1px solid #41474c;
+	float:right;
+	width:41px;
+	height:41px;
+}
+#log_out:hover{
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #01afde), color-stop(1, #007ec6) );
+	background:-moz-linear-gradient( center top -90deg, #01afde 0%, #007ec6 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#01afde', endColorstr='#007ec6');
+}
+#log_out a{
+    background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right 0 transparent;
+	display: block;
+	height: 41px;
+	text-indent: -9999px;
+	width: 41px;
+}
+#log_out a:hover{
+    background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right bottom transparent !important;
+}
+.lang{
+	color: #FFFFFF;
+	float: right;
+	font-size: 15px;
+	line-height: 40px;
+	margin-right: 10px;
+}
+.lang a{
+	color:#fff;
+	text-decoration:none;
+}
+.lang a:hover{
+	text-decoration:underline;
+}
+#back_content{
+    height: 100%;
+}
+#back_footer{
+	background-color: #101010;
+	bottom: 0;
+	color: #FFFFFF;
+	display:none;
+	font-size: 11px;
+	padding: 10px;
+	position: fixed;
+	width: 100%;
+	left: 0;
+	box-shadow: 0 -3px 4px #000;
+}
+.items_setup{
+	padding:42px 0 0 0;
+}
+#back_sidebar .items_setup .list li{
+    padding: 6px 0 7px 5px;
+}
+#back_sidebar .items_setup .list li a{
+    display: inline;
+    font-size: 0.9em;
+    padding: 0;
+}
+#back_sidebar .items_setup .list li a span{
+	background:none;
+	padding:0;
+	text-shadow:none;
+}
+.main {
+    background: none repeat scroll 0 0 #FFFFFF;
+    height: 100%;
+    margin-left: 220px;
+    padding: 0 40px;
+    position: relative;
+}
+.main_list {
+    padding-top: 70px;
+}
+.main_list ul {
+	clear:both;
+}
+#porfile {
+	padding-top: 100px;
+}
+/*add_buttom*/
+.button_bar {
+	float: right;
+	-moz-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
+	-webkit-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
+	box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #4f4f4f), color-stop(1, #000000) );
+	background:-moz-linear-gradient( center top, #4f4f4f 5%, #000000 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4f4f4f', endColorstr='#000000');
+	background-color:#4f4f4f;
+	-moz-border-radius:5px;
+	-webkit-border-radius:5px;
+	border-radius:5px;
+	display:inline-block;
+	padding:0;
+	margin:10px 0 60px;
+}
+.button_bar a {
+	text-decoration:none;
+	text-shadow:0px -1px 0px #000000;
+	font-size:12px;
+	color:#EDEDED;
+	border-right:1px solid #555;
+	-moz-box-shadow:1px 0px 0px black;
+	-webkit-box-shadow:1px 0px 0px black;
+	box-shadow:1px 0px 0px black;
+	padding: 6px 10px 4px;
+	display: inline-block;
+	float: left;
+}
+.button_bar a:active {
+	padding: 7px 10px 3px !important;
+	text-shadow:0px 1px 0px #000000;
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #000000), color-stop(1, #4f4f4f) );
+	background:-moz-linear-gradient( center top, #000000 5%, #4f4f4f 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#4f4f4f');
+}
+.button_bar a:last-child {
+	border-right:none;
+	-moz-box-shadow:none;
+	-webkit-box-shadow:none;
+	box-shadow:none;
+	-moz-border-radius:0px 5px 5px 0px;
+	-webkit-border-radius:0px 5px 5px 0px;
+	border-radius:0px 5px 5px 0px;
+}
+.button_bar a:first-child {
+	-moz-border-radius:5px 0px 0px 5px;
+	-webkit-border-radius:5px 0px 0px 5px;
+	border-radius:5px 0px 0px 5px;
+}
+.button_bar a.new {
+	padding: 5px 10px;
+	-moz-border-radius:5px;
+	-webkit-border-radius:5px;
+	border-radius:5px;
+}
+.button_bar a:hover {
+	color:#FFFFFF;
+}
+.up {
+	margin:10px 0;
+}
+#person {
+	left: 245px;
+	position: fixed;
+	text-align: center;
+	top: 75px;
+	width: 140px;
+	background-color:#FFF;
+	padding:15px;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	-moz-box-shadow: 0px 0px 4px #180902; /* Firefox */
+	-webkit-box-shadow: 0px 0px 4px #180902;/* Safari ��� Chrome */
+	box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */
+}
+#file {
+	display:none;
+}
+#person img {
+}
+.user_mail {
+    border: medium none;
+	border:1px solid #DDDDDD;
+    color: #666666;
+    font-size: 12px;
+    width: 140px;
+}
+#person label {
+	display: block;
+	margin: 15px 0 0;
+}
+#person label input {
+}
+#person label #user_admin {
+	float:right;
+	margin: 0;
+}
+#person label span {
+	text-align:left;
+	font-size:11px;
+	color:#888;
+	display:block;
+}
+#person select {
+    border: 1px solid #DDDDDD;
+    padding: 0;
+    width: 140px;
+}
+#porfile .users{
+	margin-left: 180px;
+}
+.roles_block {
+    background: url(<%= asset_path "75.png" %>) repeat left top;
+	min-width:710px;
+	margin-bottom:50px;
+	position:relative;
+	padding-bottom: 20px;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	-moz-box-shadow: 0px 0px 4px #180902; /* Firefox */
+	-webkit-box-shadow: 0px 0px 4px #180902;/* Safari ��� Chrome */
+	box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */
+}
+.roles_block h2 {
+    color: #FFFFFF;
+    font-weight: normal;
+    margin: 0;
+    padding: 0;
+    position: absolute;
+    text-shadow: 0 3px 2px #000000;
+    top: -30px;
+}
+.main hr {
+	height:8px;
+	border:none;
+	margin:0;
+	border-radius: 5px 5px 0px 0px;
+	-moz-border-radius: 5px 5px 0px 0px;
+	-webkit-border-radius: 5px 5px 0px 0px;
+	border-bottom:1px solid #000;
+}
+.main2{
+	padding:70px 0 0;
+}
+#basic_block hr {
+    background-color: #666666;
+}
+#teacher_block hr {
+    background-color: #0071A9;
+}
+#student_block hr {
+    background-color: #AF0045;
+}
+.info_input {
+	padding:10px 20px;
+}
+.info_input table {
+	color:#fff;
+	width:100%;
+	font-size:14px;
+}
+.info_input table td {
+	padding:5px 10px 5px 0;
+	width: 10%;
+}
+.info_input .list_head {
+	background:url(<%= asset_path "line.png" %>) left bottom repeat-x;
+}
+.info_input .list_head td {
+}
+.info_input .list_item {
+	color:#AEAEAE;
+}
+.info_input .add {
+	display:block;
+	padding-left:22px;
+	font-size:12px;
+	line-height:21px;
+	height:19px;
+	background:url(<%= asset_path "icon.png" %>) no-repeat -59px 0;
+	margin-top: 10px;
+	color: #DDDDDD;
+}
+
+.main table {
+	width:100%;
+}
+.main td {
+	padding-left:20px;
+	color:#fff;
+	font-size:14px;
+	line-height:40px;
+}
+.main tr.have td{
+	background: url(<%= asset_path "75.png" %>) repeat left top;
+}
+.main tr.have td:first-child{
+	border-radius: 5px 0 0 5px;
+	-moz-border-radius: 5px 0 0 5px;
+	-webkit-border-radius: 5px 0 0 5px;
+}
+.main tr.have td:last-child{
+	border-radius: 0 5px 5px 0;
+	-moz-border-radius: 0 5px 5px 0;
+	-webkit-border-radius: 0 5px 5px 0;
+}
+.main thead td {
+	line-height:40px;
+	font-size:16px;
+	text-shadow: 0px 1px 1px #3e2914;
+}
+.main thead td.action {
+	width:140px;
+}
+.main tbody td.roles {
+    background-image: url(<%= asset_path "roles_type.jpg" %>);
+    background-repeat: repeat-x;
+}
+.main tbody td.teacher {
+    background-position: 0 -54px;
+}
+.main tbody td.student {
+	background-position: 0 -5px;
+}
+.main tbody td.action a {
+    background-image: url(<%= asset_path "icon.png" %>);
+    display: inline-block;
+    height: 19px;
+    margin-right: 10px;
+    top: 8px;
+    text-indent: -9999px;
+    width: 19px;
+	position: relative;
+}
+.main tbody td.action a.show {
+    background-position: left top;
+}
+.main tbody td.action a.show:hover {
+    background-position: left -19px;
+}
+.main tbody td.action a.edit {
+    background-position: -19px top;
+}
+.main tbody td.action a.edit:hover {
+    background-position: -19px -19px;
+}
+.main tbody td.action a.delete {
+    background-position: -38px top;
+}
+.main tbody td.action a.delete:hover {
+    background-position: -38px -19px;
+}
+.main tbody td.action a.switch {
+    background: url(<%= asset_path "switch.png" %>) no-repeat left 3px;
+    width: 40px;
+}
+.main tbody tr.disable td.action a.switch {
+    background-position:left bottom;
+}
+.main tbody td.action a.delete:hover {
+    background-position: -38px -19px;
+}
+.main tbody tr.have {
+}
+.main tbody tr.disable {
+    opacity: 0.7;
+}
+.main tbody tr {
+	background:none;
+	height:15px;
+}
+h1{
+	margin:0 0 20px;
+}
+p{
+	margin:0 0 10px;
+}
+
+#back_sidebar .items_setup .list li{
+	background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top;
+	border:none;
+    padding: 0 0 0 5px;
+}
+#back_sidebar .items_setup .list li a{
+	line-height:31px;
+}
+#back_sidebar .items_setup .list li:hover{
+	background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top;
+	border:none;
+}
+#back_sidebar .items_setup ul .list {
 }
\ No newline at end of file

From eb2b4b80b7b136baf526a8a81a108f090c052963 Mon Sep 17 00:00:00 2001
From: Matt Fu <matt@rulingcom.com>
Date: Fri, 16 Mar 2012 15:48:13 +0800
Subject: [PATCH 15/20] add new files

---
 .../app/models/bulletin - %BDしs.rb            | 101 ++++++++++++++++++
 .../fact_checks/_list_table.html.erb.can_del  |  15 +++
 .../fact_checks/_privilege_user.html.erb      |   7 ++
 .../fact_checks/index.html.erb.can_del        |  50 +++++++++
 .../back_end/fact_checks/setting.html.erb     |  20 ++++
 .../back_end/fact_checks/setting.js.erb       |   1 +
 .../widget/bulletins/index.html - %BDしs.erb   |  42 ++++++++
 7 files changed, 236 insertions(+)
 create mode 100644 vendor/built_in_modules/announcement/app/models/bulletin - %BDしs.rb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb.can_del
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb.can_del
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html - %BDしs.erb

diff --git a/vendor/built_in_modules/announcement/app/models/bulletin - %BDしs.rb b/vendor/built_in_modules/announcement/app/models/bulletin - %BDしs.rb
new file mode 100644
index 00000000..c65e65f7
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/models/bulletin - %BDしs.rb	
@@ -0,0 +1,101 @@
+# encoding: utf-8
+
+class Bulletin
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::MultiParameterAttributes
+  
+  # field :category_id, :type => Integer
+  field :title
+  # has_one :title_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
+  # has_one :subtitle_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
+  # has_one :text_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
+  field :subtitle
+  field :text
+  field :postdate , :type => Date
+  field :deadline , :type => Date
+  # field :url
+  field :create_user_id
+  field :update_user_id
+  
+  field :is_top, :type => Boolean, :default => false
+  
+  mount_uploader :image, ImageUploader
+  
+  belongs_to :bulletin_category
+  
+  embeds_many :bulletin_links, :cascade_callbacks => true
+  embeds_many :bulletin_files, :cascade_callbacks => true
+
+  # has_many :bulletin_files, :autosave => true, :dependent => :destroy
+  
+  accepts_nested_attributes_for :bulletin_files, :allow_destroy => true
+  accepts_nested_attributes_for :bulletin_links, :allow_destroy => true
+  
+  # validates_presence_of :title_variable
+  validates_presence_of :title
+  
+  after_save :save_bulletin_links
+  after_save :save_bulletin_files
+  
+
+  def self.search( search = nil, category_id = nil )
+  
+	if category_id.to_s.size > 0 and search.to_s.size > 0
+	
+      key = /#{search}/
+	
+	  find(:all, :conditions => {title: key, bulletin_category_id: category_id}).desc( :is_top, :postdate )
+		  
+	elsif category_id.to_s.size > 0 and search.to_s.size < 1
+	
+	  find(:all, :conditions => {bulletin_category_id: category_id}).desc( :is_top, :postdate )
+	
+	elsif search.to_s.size > 0 and category_id.to_s.size < 1
+	
+      key = /#{search}/
+	  
+	  find(:all, :conditions => {title: key}).desc( :is_top, :postdate )
+	else
+	  
+	  find(:all).desc( :is_top, :postdate)
+	  
+	end
+	
+  end
+
+
+  def self.widget_datas
+  
+	date_now = Time.now
+	
+    # find(:all, :conditions => {:postdate => {"$lte" => Date.today}, deadline: nil} ).desc( :is_top, :postdate)
+	# where( :postdate.lte => date_now ).where( :deadline => nil ).desc(:is_top, :postdate)
+	# any_of({ :title => "test" },{:deadline => nil, :title => "123"})
+	any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).limit(5)
+
+
+  end
+ 
+
+  def is_top?
+    self.is_top
+  end
+  
+  def save_bulletin_links
+	self.bulletin_links.each do |t|
+	  if t.should_destroy
+		t.destroy
+	  end
+    end
+  end
+  
+  def save_bulletin_files
+	self.bulletin_files.each do |t|
+	  if t.should_destroy
+		t.destroy
+	  end
+    end
+  end
+  
+end
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb.can_del b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb.can_del
new file mode 100644
index 00000000..59bac03a
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb.can_del
@@ -0,0 +1,15 @@
+<h1><%= bulletin_category.key %></h1>
+<table>
+  <tr>
+	<th><%= t('bulletin.status') %></th>
+	<th><%= t('bulletin.category') %></th>
+	<th><%= t('bulletin.title') %></th>
+	<th><%= t('bulletin.postdate') %></th>
+	<th><%= t('bulletin.deadline') %></th>
+	<th><%= t('bulletin.action') %></th>
+  </tr>
+
+<% bulletin_category.bulletins.each do |post| %>
+	<%= render :partial => 'panel/announcement/back_end/bulletins/bulletins', :locals => {:post => post,:fact_check_allow=>true} %>
+<% end %>	
+</table>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
new file mode 100644
index 00000000..347b15b2
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
@@ -0,0 +1,7 @@
+<%= content_tag :div ,:id => "users_checkbox_ary", do -%>
+<% sys_users = User.all -%>
+	<% sys_users.each do |user| -%>
+		<%= label_tag "lab-user-#{user.id}", user.name rescue '' -%>
+		<%= check_box_tag "[users][#{user.id}]", 'true',users.include?(user)  -%>
+	<% end -%>
+<% end -%>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb.can_del b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb.can_del
new file mode 100644
index 00000000..32f3d820
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb.can_del
@@ -0,0 +1,50 @@
+<%= render 'panel/announcement/back_end/bulletins/filter' %>
+<table id="bulettin_sort_list" class="table main-list">
+	<%= render 'panel/announcement/back_end/bulletins/bulletins' %>
+</table>
+<div class="form-actions">
+	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %>
+</div>
+
+<!--
+<% content_for :secondary do %>
+<%#= render :partial => '/panel/announcement/back_end/announcement_secondary' %>
+<% end -%>
+
+<%= flash_messages %>
+
+<br />
+<br />
+<br />
+<br />
+<br />
+  
+  <fieldset><legend><%= t('bulletin.search') %></legend>	
+
+  <%= form_for :bulletin, :action => 'search', :method => 'get', :url => panel_announcement_back_end_bulletins_path do |f| %>
+  
+  <%#= f.select :bulletin_category_id, @bulletin_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ] },{ :include_blank => t('bulletin.select') }%>
+  
+  Category <%#= select_tag "category_id", options_for_select(@bulletin_categorys.collect{|t| [t.i18n_variable[I18n.locale], t.id]}), :prompt => t('bulletin.select') %>
+  
+  KeyWord <%#= text_field_tag :search, params[:search], :id => 'search_field' %>
+  
+  <%= submit_tag "Search", :name => nil %> 
+  
+  <% end %>
+
+  
+  </fieldset>
+
+<br />
+<br />
+
+<h1><%= t('bulletin.list_announcement') %></h1>
+
+<div id="check_block">	
+	<h1>Check Please</h1>
+	<%#= render :partial => "list_table", :collection => @bulletin_categorys_check,:as => :bulletin_category%>
+</div>
+<br />
+
+-->
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
new file mode 100644
index 00000000..d5d589cf
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
@@ -0,0 +1,20 @@
+<%= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %>
+<br/>
+<%= form_tag('', :remote => true)  %>
+<%= label_tag :category, t("announcement.bulletin.category") %>
+<%= select_tag "category_id", options_from_collection_for_select(@bulletin_categorys, "id", "key") %>
+
+<br/>
+<%= label_tag :role, t("admin.roles") %>
+<%= content_tag :div do -%>
+	<% form_tag :action => "update_setting"  do %>
+		<%= render :partial => "privilege_user", :locals => {:users => @users_array} %>
+		<%= submit_tag "Update" %>
+	<% end -%>
+<% end -%>
+
+<script type="text/javascript" charset="utf-8">
+	$('#category_id').change(function() {
+	  $(this).parents('form').submit();
+	});
+</script>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb
new file mode 100644
index 00000000..a01c9d6a
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb
@@ -0,0 +1 @@
+$("#users_checkbox_ary").replaceWith('<%= (render :partial => 'privilege_user', :locals => {:users => @users_array}).html_safe%>');
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html - %BDしs.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html - %BDしs.erb
new file mode 100644
index 00000000..2c4cd153
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html - %BDしs.erb	
@@ -0,0 +1,42 @@
+
+
+<% if @bulletin and !@bulletin.nil? %>
+
+<div id="col1" class="col">
+	<h1 class="h1 ini_heading col_title"><%= @bulletin.title %></h1>
+	<p class="ini_txt"><%= @bulletin.subtitle %></p>
+	<%= link_to "read more >",panel_announcement_front_end_bulletin_path(@bulletin.id) %>
+	<a class="btn" href="">read more &gt;</a>
+</div>
+
+<% end %>
+
+<% if @bulletins and !@bulletins.nil? %>
+
+<div id="col2" class="col">
+<h1 class="h1 ini_heading col_title">news</h1>
+<ul class="ini_list">
+	<% @bulletins.each do |post| %>
+	<li><span class="time"><%= post.postdate.to_s.gsub("-", "") %></span><%= link_to post.title,panel_announcement_front_end_bulletin_path(post) %></li>
+	<% end %>
+</ul>
+<%= link_to "read more >",panel_announcement_front_end_bulletins_path(), :class => "btn" %>
+<a class="btn" href="announcement">read more &gt;</a>
+</div>
+
+<div id="col2" class="col">
+<h1 class="h1 ini_heading col_title">news</h1>
+<ul class="ini_list">
+	<% @bulletins.each do |post| %>
+	<li>
+	<%= image_tag(post.image.url, :size => "160x140") if post.image.file %>
+	<h4><%= post.title %></h4>
+	<%= post.subtitle %>
+	</li>
+	<% end %>
+</ul>
+<%= link_to "read more >",panel_announcement_front_end_bulletins_path(), :class => "btn" %>
+<a class="btn" href="announcement">read more &gt;</a>
+</div>
+
+<% end %>

From c7a333f99034ff0095d8f6d655834b251ee454a3 Mon Sep 17 00:00:00 2001
From: Matt Fu <matt@rulingcom.com>
Date: Fri, 16 Mar 2012 15:51:59 +0800
Subject: [PATCH 16/20] after merge

---
 .../bulletins/_bulletin_link.html - %BDしs.erb | 27 +++++++++++++++++++
 .../_bulletin_link2.html - %BDしs.erb          | 16 +++++++++++
 .../back_end/bulletins/index.html - %BDしs.erb |  9 +++++++
 3 files changed, 52 insertions(+)
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - %BDしs.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - %BDしs.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - %BDしs.erb

diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - %BDしs.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - %BDしs.erb
new file mode 100644
index 00000000..33d1ba1e
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - %BDしs.erb	
@@ -0,0 +1,27 @@
+
+		<div  id="<%= "bulletin_#{bulletin_link.id}" if !bulletin_link.new_record? %>" class='list_item'>
+		  <div class="field">
+
+			<%= f.label :link_url %>
+			<%= f.text_field :url %>
+
+			<%= f.label :link_name %>
+			<%#= f.text_field :name %>			
+			<%= f.fields_for :i18n_variable, (bulletin_link.new_record? ? bulletin_link.build_i18n_variable : bulletin_link.i18n_variable) do |f| %>
+			  <% @site_valid_locales.each do |locale| %>
+				<%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
+				<%= f.text_field locale, :style => "width:130px" %>
+			  <% end %>
+			<% end %>
+
+			<span class="action">
+			<% if bulletin_link.new_record? %>
+			  <a href="#" class="delete"><%= t(:delete) %></a>
+			<% else %>	
+			  <%= f.hidden_field :id %>
+			  <a href="#" class="remove_existing_record"><%= t(:delete) %></a>
+			  <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
+			<% end %>
+			</span>
+		  </div>
+		</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - %BDしs.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - %BDしs.erb
new file mode 100644
index 00000000..c44b5c92
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - %BDしs.erb	
@@ -0,0 +1,16 @@
+		
+				<tr id="<%= "bulletin_#{bulletin_link2.id}" %>">
+					<td><%= link_to bulletin_link2.i18n_variable.zh_tw, bulletin_link2.url, :target => '_blank' %></td>
+					<td><%= link_to bulletin_link2.i18n_variable.en, bulletin_link2.url, :target => '_blank' %></td>
+					<td><a href="#modal-link" data-toggle="modal" class="action"><i class="icon-pencil"></i></a>
+					<span class="action">
+					 <%= f.hidden_field :id %>
+					 <a href class="remove_existing_record"><i class="icon-remove"></i></a>
+					 <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
+					 </span>
+					</td>
+				</tr>
+
+
+				
+				
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - %BDしs.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - %BDしs.erb
new file mode 100644
index 00000000..d37d2134
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - %BDしs.erb	
@@ -0,0 +1,9 @@
+<%= render 'filter' %>
+<table id="bulettin_sort_list" class="table main-list">
+	<%= render 'bulletins' %>
+</table>
+
+<div class="form-actions">
+	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %>
+</div>
+

From 7d553acaec68331b34e3bc261fd9ac114478a929 Mon Sep 17 00:00:00 2001
From: unknown <Spen@Spen-VAIO.(none)>
Date: Fri, 16 Mar 2012 15:53:57 +0800
Subject: [PATCH 17/20] fix announcement link & files

---
 app/assets/javascripts/bulletin_form.js.erb   |  12 +-
 app/views/layouts/_side_bar.html.erb          |   2 +-
 .../back_end/bulletin_links_controller.rb     |  14 ++
 .../back_end/bulletins_controller.rb          |   2 +-
 .../bulletins/_bulletin_file.html.erb         |  63 ++++---
 .../bulletins/_bulletin_link.html.erb         |  48 +++---
 .../back_end/bulletins/_form.html.erb         | 155 ++++++++++++------
 .../bulletins/_quick_edit_links.html.erb      |  12 +-
 .../back_end/bulletins/index.html.erb         |   3 +
 .../announcement/config/routes.rb             |   1 +
 10 files changed, 200 insertions(+), 112 deletions(-)
 create mode 100644 vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller.rb

diff --git a/app/assets/javascripts/bulletin_form.js.erb b/app/assets/javascripts/bulletin_form.js.erb
index 17f86060..a427667d 100644
--- a/app/assets/javascripts/bulletin_form.js.erb
+++ b/app/assets/javascripts/bulletin_form.js.erb
@@ -1,13 +1,15 @@
-$('.bulletin_links_block a.delete').live('click', function(){
-  $(this).parents('.list_item').remove();
+$('.bulletin_links_block a.remove_existing_record').live('click', function(){
+  //$(this).parents('.list_item').remove();
+  $(this).parents('tr.list_item').remove();
 });
 
-$('.bulletin_files_block a.delete').live('click', function(){
-  $(this).parents('.list_item').remove();
+$('.bulletin_files_block a.remove_existing_record').live('click', function(){
+  //$(this).parents('.list_item').remove();
+  $(this).parents('tr.list_item').remove();
 });
 
 $('.action a.remove_existing_record').live('click', function(){
   $(this).next('.should_destroy').attr('value', 1);
-  $("#bulletin_" + $(this).prev().attr('value')).hide();
+  //$("#bulletin_" + $(this).prev().attr('value')).hide();
   $("tr#bulletin_" + $(this).prev().attr('value')).hide();
 });
\ No newline at end of file
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index 61e2c4d8..220781a7 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -13,7 +13,7 @@
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('users') do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), panel_web_resource_back_end_web_links_path %>
+	<%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), admin_users_path %>
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('page_contexts') do -%>
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller.rb
new file mode 100644
index 00000000..04a75fa6
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller.rb
@@ -0,0 +1,14 @@
+class Panel::Announcement::BackEnd::BulletinLinksController < ApplicationController
+  
+  layout 'new_admin'
+  
+  def index
+    @bulletin_links = BulletinLink.all
+	
+    respond_to do |format|
+      format.html # index.html.erb
+      # format.xml  { render :xml => @bulletins }
+      format.js
+    end
+	
+end
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 09e94c2d..77454b85 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
@@ -15,7 +15,7 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
     
   	# @bulletins = Bulletin.search(params[:search], params[:category_id])
     # @bulletins = Bulletin.all.order_by([params[:sort], params[:direction]])
-    @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all
+    @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.limit(1).desc("postdate")
   	@bulletin_categories = BulletinCategory.all
 
     respond_to do |format|
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb
index 6da49ceb..ef2d4bc7 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb
@@ -1,36 +1,47 @@
 
-		<div  id="<%= "bulletin_#{bulletin_file.id}" if !bulletin_file.new_record? %>" class='list_item'>
-		  <div class="field">
-			<%= f.label :file  %>
-			<%#= file_field_tag 'bulletin[file]' %>
-			<%= f.file_field :file %>
-
-			<%= f.label :file_title %>
-			<%#= f.text_field :filetitle %>
-			<%= f.fields_for :filetitle, (bulletin_file.new_record? ? bulletin_file.build_filetitle : bulletin_file.filetitle ) do |f| %>
-				<% @site_valid_locales.each do |locale| %>
-				 <%= I18nVariable.from_locale(locale) %>
-				 <%= f.text_field locale %>
+		<tr id="<%= "bulletin_#{bulletin_file.id}" if !bulletin_file.new_record? %>" class='list_item'>
+			<td>
+				<div class="control-group">
+					<div class="controls">
+					<%= f.file_field :file %>
+					</div>
+				</div>
+			</td>	
+			<td>	
+				<%= f.fields_for :filetitle, (bulletin_file.new_record? ? bulletin_file.build_filetitle : bulletin_file.filetitle ) do |f| %>
+				  <% @site_valid_locales.each do |locale| %>
+					<div class="control-group">
+						<label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
+						<div class="controls">
+						<%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %>
+						</div>
+					</div>
+				  <% end %>
 				<% end %>
-			<% end %>
-
-			<%= f.label :file_description %>
-			<%#= f.text_field :description %>
-			<%= f.fields_for :description, (bulletin_file.new_record? ? bulletin_file.build_description : bulletin_file.description ) do |f| %>
-				<% @site_valid_locales.each do |locale| %>
-				 <%= I18nVariable.from_locale(locale) %>
-				 <%= f.text_field locale %>
+			</td>	
+			<td>	
+				<%= f.fields_for :description, (bulletin_file.new_record? ? bulletin_file.build_description : bulletin_file.description ) do |f| %>
+				  <% @site_valid_locales.each do |locale| %>
+					<div class="control-group">
+						<label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
+						<div class="controls">
+						<%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %>
+						</div>
+					</div>
+				  <% end %>
 				<% end %>
-			<% end %>
-
+			</td>
+			<td>
 			<span class="action">
 			<% if bulletin_file.new_record? %>
-			  <a href="#" class="delete"><%= t(:delete) %></a>
+			  <a href class="remove_existing_record"><i class="icon-remove"></i></a>
 			<% else %>	
 			  <%= f.hidden_field :id %>
-			  <a href="#" class="remove_existing_record"><%= t(:delete) %></a>
+			  <a href class="remove_existing_record"><i class="icon-remove"></i></a>
 			  <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
 			<% end %>
 			</span>
-		  </div>
-		</div>
+			
+			</td>
+		</tr>
+		
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb
index e0077384..c8503083 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb
@@ -1,27 +1,37 @@
 
-		<div id="<%= "bulletin_#{bulletin_link.id}" if !bulletin_link.new_record? %>" class='list_item'>
-		  <div class="field">
-
-			<%= f.label :link_url %>
-			<%= f.text_field :url %>
-
-			<%= f.label :link_name %>
-			<%#= f.text_field :name %>			
-			<%= f.fields_for :i18n_variable, (bulletin_link.new_record? ? bulletin_link.build_i18n_variable : bulletin_link.i18n_variable) do |f| %>
-			  <% @site_valid_locales.each do |locale| %>
-				<%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
-				<%= f.text_field locale, :style => "width:130px" %>
-			  <% end %>
-			<% end %>
-
+		<tr id="<%= "bulletin_#{bulletin_link.id}" if !bulletin_link.new_record? %>" class='list_item'>
+			
+			<td>
+				<div class="control-group">
+					<div class="controls">
+					<%= f.text_field :url %>
+					</div>
+				</div>
+			</td>	
+			<td>	
+				<%= f.fields_for :i18n_variable, (bulletin_link.new_record? ? bulletin_link.build_i18n_variable : bulletin_link.i18n_variable) do |f| %>
+				  <% @site_valid_locales.each do |locale| %>
+					<div class="control-group">
+						<div class="controls">
+						<%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %>
+						</div>
+					</div>
+			</td>	
+			<td>	
+					
+				  <% end %>
+				<% end %>
+				
+			</td>
+			<td>
 			<span class="action">
 			<% if bulletin_link.new_record? %>
-			  <a href="#" class="delete"><%= t(:delete) %></a>
+			  <a href class="remove_existing_record"><i class="icon-remove"></i></a>
 			<% else %>	
 			  <%= f.hidden_field :id %>
-			  <a href="#" class="remove_existing_record"><%= t(:delete) %></a>
+			  <a href class="remove_existing_record"><i class="icon-remove"></i></a>
 			  <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
 			<% end %>
 			</span>
-		  </div>
-		</div>
+			</td>
+		</tr>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index 2e41f302..3cefe360 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -13,7 +13,8 @@
 			<h3 class="widget-title"><i class="icons-picture icons-white"></i>Picture</h3>
 			<div class="widget-content clear">
 				<div class="control-group">
-					<img class="pull-left upload-picture" src="images/default-img.png" />
+					<img class="pull-left upload-picture" src="/assets/default-img.png" />
+					
 					<div class="controls file-upload">
 					<label class="control-label btn" for="input-upload">
 						Browse/��豢��瑼�獢�
@@ -144,27 +145,53 @@
 				<% end %>
 			</div>
 			
-		  
-		  <div id='bulletin_links' class="bulletin_links_block <%= @class %>">
-			
-			<div id='add_bulletin_link' class="info_input bulletin_links_block">
-				<h2>Bulletin links</h2>
-				<%= hidden_field_tag 'bulletin_link_field_count', @bulletin.bulletin_links.count %>
-				<a href="#" class="add"><%= t(:add) %></a>
-			</div>
-			
-			<%#= render :partial => 'link', :locals => { :bulletin_links => @bulletin.bulletin_links , :f => f} %>
-			
-			
-			<% @bulletin.bulletin_links.each_with_index do |bulletin_link, i| %>
-				<%#= fields_for "bulletin[bulletin_links][]", bulletin_link do |f| %>
-				<%= f.fields_for :bulletin_links, bulletin_link do |f| %>
-					<%= render :partial => 'bulletin_link', :object => bulletin_link, :locals => {:f => f, :i => i} %>
-				<% end %>
-			<% end %>	
-			
-		  </div>
-		  
+
+			<div class="main-wiget">
+				<div id="widget-link" class="widget-box">
+					<div class="widget-action clear">
+						<a class="action"><i title="Add a reference link" class="icon-exclamation-sign icon-white tip"></i></a>
+					</div>
+					<h3 class="widget-title"><i class="icons-link icons-white"></i>Link</h3>
+					<div class="widget-content">
+					<table class="table table-condensed">
+						<thead>
+							<tr>
+								<th>URL</th>
+								<% @site_valid_locales.each do |locale| %>
+								<div class="control-group">
+									<th>Name - <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
+								<% end %>
+								<th class="span1"></th>
+							</tr>
+						</thead>
+						<tfoot>
+							<tr>
+								<td style="text-align:center" colspan="4">
+									<div id='add_bulletin_link' class="info_input bulletin_links_block">
+										<%= hidden_field_tag 'bulletin_link_field_count', @bulletin.bulletin_links.count %>
+										<a class="add"><span class="btn btn-primary btn-small"><i class="icon-plus icon-white"></i> ADD/��啣��</span></a>
+									</div>
+								</td>
+							</tr>
+						</tfoot>
+						<tbody>
+							
+							<div id='bulletin_links' class="bulletin_links_block">
+						
+							<% @bulletin.bulletin_links.each_with_index do |bulletin_link, i| %>
+								<%#= fields_for "bulletin[bulletin_links][]", bulletin_link do |f| %>
+								<%= f.fields_for :bulletin_links, bulletin_link do |f| %>
+									<%= render :partial => 'bulletin_link', :object => bulletin_link, :locals => {:f => f, :i => i} %>
+								<% end %>
+							<% end %>	
+								
+							</div>
+							
+						</tbody>
+					</table>
+					</div>
+				</div>
+			</div>	
 		  
 
 <div class="main-wiget">
@@ -202,38 +229,60 @@
             </table>
         </div>
 		
-		<div id="bulletin_link_qe"><%= render :partial => "bulletin_link_qe" %></div>
+		<div id="bulletin_link_qe"><%#= render :partial => "bulletin_link_qe" %></div>
 		
     </div>
-</div>		  
-		  
-		  
-		  
-		  
-		  <div id='bulletin_files' class="bulletin_files_block <%= @class %>">
-			
-			<div id='add_bulletin_file' class="info_input bulletin_files_block">
-				<h2>Bulletin files</h2>
-				<%= hidden_field_tag 'bulletin_file_field_count', @bulletin.bulletin_files.count %>
-				<a href="#" class="add"><%= t(:add) %></a>
-			</div>
-			
-			<%#= render :partial => 'file', :locals => { :bulletin_files => @bulletin.bulletin_files , :f => f} %>
-			
-			
-			<% @bulletin.bulletin_files.each_with_index do |bulletin_file, i| %>
-				<%#= fields_for "bulletin[bulletin_files][]", bulletin_file do |f| %>
-				<%= f.fields_for :bulletin_files, bulletin_file do |f| %>
-					<%= render :partial => 'bulletin_file', :object => bulletin_file, :locals => {:f => f, :i => i} %>
-				<% end %>
-			<% end %>	
-			
-		  </div>
-		  
-		  <br />
-		  <br />
+</div>
+
+
+
+
+			<div class="main-wiget">
+				<div id="widget-file" class="widget-box">
+					<div class="widget-action clear">
+						<a class="action"><i title="Added to the file" class="icon-exclamation-sign icon-white tip"></i></a>
+					</div>
+					<h3 class="widget-title"><i class="icons-paperclip icons-white"></i>File</h3>
+					<div class="widget-content">
+					<table class="table table-condensed">
+						<thead>
+							<tr>
+								<th>File</th>
+								<th>Name</th>
+								<th><%= t('description') %></th>
+								<th class="span1"></th>
+							</tr>
+						</thead>
+						<tfoot>
+							<tr>
+								<td style="text-align:center" colspan="4">
+									<div id='add_bulletin_file' class="info_input bulletin_files_block">
+										<%= hidden_field_tag 'bulletin_file_field_count', @bulletin.bulletin_files.count %>
+										<a class="add"><span class="btn btn-primary btn-small"><i class="icon-plus icon-white"></i> ADD/��啣��</span></a>
+									</div>
+								</td>
+							</tr>
+						</tfoot>
+						<tbody>
+						
+							<div id='bulletin_files' class="bulletin_files_block">
+							
+								<% @bulletin.bulletin_files.each_with_index do |bulletin_file, i| %>
+									<%#= fields_for "bulletin[bulletin_files][]", bulletin_file do |f| %>
+									<%= f.fields_for :bulletin_files, bulletin_file do |f| %>
+										<%= render :partial => 'bulletin_file', :object => bulletin_file, :locals => {:f => f, :i => i} %>
+									<% end %>
+								<% end %>	
+								
+							</div>
+							
+						</tbody>
+					</table>
+					</div>
+				</div>
+			</div>		
 	
-	</div>
+	</div>		
 	
 	<!--Post End-->
   
@@ -252,13 +301,13 @@
 			var new_id = $(this).prev().attr('value');
 			var old_id = new RegExp("new_bulletin_links", "g");
 			$(this).prev().attr('value', parseInt(new_id) + 1);
-		  $('#bulletin_links').append(("<%= escape_javascript(add_attribute 'bulletin_link', f, :bulletin_links) %>").replace(old_id, new_id));
+			$(this).parents('table').append(("<%= escape_javascript(add_attribute 'bulletin_link', f, :bulletin_links) %>").replace(old_id, new_id));
 		});
 		$('#add_bulletin_file a.add').live('click', function(){
 			var new_id = $(this).prev().attr('value');
 			var old_id = new RegExp("new_bulletin_files", "g");
 			$(this).prev().attr('value', parseInt(new_id) + 1);
-		  $('#bulletin_files').append(("<%= escape_javascript(add_attribute 'bulletin_file', f, :bulletin_files) %>").replace(old_id, new_id));
+			$(this).parents('table').append(("<%= escape_javascript(add_attribute 'bulletin_file', f, :bulletin_files) %>").replace(old_id, new_id));
 		});
 	</script>
 	<script type="text/javascript">
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb
index 1d9004c8..affd717c 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb
@@ -17,13 +17,11 @@
                     </tr>
                 </tfoot>
                 <tbody>
-					<% bulletin.bulletin_links.each_with_index do |blink, i| %>
-                    <tr>
-                        <td><%= link_to blink.i18n_variable.zh_tw, blink.url, :target => '_blank' %></td>
-                        <td><%= link_to blink.i18n_variable.en, blink.url, :target => '_blank' %></td>
-                        <td><a href="#modal-link" data-toggle="modal" class="action"><i class="icon-pencil"></i></a><a href class="action"><i class="icon-remove"></i></a></td>
-                    </tr>
-					<% end %>
+					<% bulletin.bulletin_links.each_with_index do |bulletin_link2, i| %>
+						<%= f.fields_for :bulletin_links, bulletin_link2 do |f| %>
+							<%= render :partial => 'bulletin_link2', :object => bulletin_link2, :locals => {:f => f, :i => i} %>
+						<% end %>
+					<% end %>	
                 </tbody>
             </table>
         </div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
index d37d2134..50f6b4cb 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
@@ -7,3 +7,6 @@
 	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %>
 </div>
 
+<% content_for :page_specific_javascript do %>
+	<%= javascript_include_tag "bulletin_form" %>
+<% end %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb
index 9a405ecc..1fc864f6 100644
--- a/vendor/built_in_modules/announcement/config/routes.rb
+++ b/vendor/built_in_modules/announcement/config/routes.rb
@@ -10,6 +10,7 @@ Rails.application.routes.draw do
         resources :bulletin_categorys, :controller => 'bulletin_categorys' do
           match "quick_edit/:bulletin_category_id" => "bulletin_categorys#quick_edit" ,:as => :quick_edit
         end
+        resources :bulletin_links
         resources :tags
       end
       namespace :front_end do

From 9c8b0235b06763fbc20d5930752579d83fe094d3 Mon Sep 17 00:00:00 2001
From: Matt Fu <matt@rulingcom.com>
Date: Fri, 16 Mar 2012 15:48:13 +0800
Subject: [PATCH 18/20] add new files

---
 .../app/models/bulletin - %BDしs.rb            | 101 ++++++++++++++++++
 .../fact_checks/_list_table.html.erb.can_del  |  15 +++
 .../fact_checks/_privilege_user.html.erb      |   7 ++
 .../fact_checks/index.html.erb.can_del        |  50 +++++++++
 .../back_end/fact_checks/setting.html.erb     |  20 ++++
 .../back_end/fact_checks/setting.js.erb       |   1 +
 .../widget/bulletins/index.html - %BDしs.erb   |  42 ++++++++
 7 files changed, 236 insertions(+)
 create mode 100644 vendor/built_in_modules/announcement/app/models/bulletin - %BDしs.rb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb.can_del
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb.can_del
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html - %BDしs.erb

diff --git a/vendor/built_in_modules/announcement/app/models/bulletin - %BDしs.rb b/vendor/built_in_modules/announcement/app/models/bulletin - %BDしs.rb
new file mode 100644
index 00000000..c65e65f7
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/models/bulletin - %BDしs.rb	
@@ -0,0 +1,101 @@
+# encoding: utf-8
+
+class Bulletin
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::MultiParameterAttributes
+  
+  # field :category_id, :type => Integer
+  field :title
+  # has_one :title_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
+  # has_one :subtitle_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
+  # has_one :text_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
+  field :subtitle
+  field :text
+  field :postdate , :type => Date
+  field :deadline , :type => Date
+  # field :url
+  field :create_user_id
+  field :update_user_id
+  
+  field :is_top, :type => Boolean, :default => false
+  
+  mount_uploader :image, ImageUploader
+  
+  belongs_to :bulletin_category
+  
+  embeds_many :bulletin_links, :cascade_callbacks => true
+  embeds_many :bulletin_files, :cascade_callbacks => true
+
+  # has_many :bulletin_files, :autosave => true, :dependent => :destroy
+  
+  accepts_nested_attributes_for :bulletin_files, :allow_destroy => true
+  accepts_nested_attributes_for :bulletin_links, :allow_destroy => true
+  
+  # validates_presence_of :title_variable
+  validates_presence_of :title
+  
+  after_save :save_bulletin_links
+  after_save :save_bulletin_files
+  
+
+  def self.search( search = nil, category_id = nil )
+  
+	if category_id.to_s.size > 0 and search.to_s.size > 0
+	
+      key = /#{search}/
+	
+	  find(:all, :conditions => {title: key, bulletin_category_id: category_id}).desc( :is_top, :postdate )
+		  
+	elsif category_id.to_s.size > 0 and search.to_s.size < 1
+	
+	  find(:all, :conditions => {bulletin_category_id: category_id}).desc( :is_top, :postdate )
+	
+	elsif search.to_s.size > 0 and category_id.to_s.size < 1
+	
+      key = /#{search}/
+	  
+	  find(:all, :conditions => {title: key}).desc( :is_top, :postdate )
+	else
+	  
+	  find(:all).desc( :is_top, :postdate)
+	  
+	end
+	
+  end
+
+
+  def self.widget_datas
+  
+	date_now = Time.now
+	
+    # find(:all, :conditions => {:postdate => {"$lte" => Date.today}, deadline: nil} ).desc( :is_top, :postdate)
+	# where( :postdate.lte => date_now ).where( :deadline => nil ).desc(:is_top, :postdate)
+	# any_of({ :title => "test" },{:deadline => nil, :title => "123"})
+	any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).limit(5)
+
+
+  end
+ 
+
+  def is_top?
+    self.is_top
+  end
+  
+  def save_bulletin_links
+	self.bulletin_links.each do |t|
+	  if t.should_destroy
+		t.destroy
+	  end
+    end
+  end
+  
+  def save_bulletin_files
+	self.bulletin_files.each do |t|
+	  if t.should_destroy
+		t.destroy
+	  end
+    end
+  end
+  
+end
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb.can_del b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb.can_del
new file mode 100644
index 00000000..59bac03a
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb.can_del
@@ -0,0 +1,15 @@
+<h1><%= bulletin_category.key %></h1>
+<table>
+  <tr>
+	<th><%= t('bulletin.status') %></th>
+	<th><%= t('bulletin.category') %></th>
+	<th><%= t('bulletin.title') %></th>
+	<th><%= t('bulletin.postdate') %></th>
+	<th><%= t('bulletin.deadline') %></th>
+	<th><%= t('bulletin.action') %></th>
+  </tr>
+
+<% bulletin_category.bulletins.each do |post| %>
+	<%= render :partial => 'panel/announcement/back_end/bulletins/bulletins', :locals => {:post => post,:fact_check_allow=>true} %>
+<% end %>	
+</table>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
new file mode 100644
index 00000000..347b15b2
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
@@ -0,0 +1,7 @@
+<%= content_tag :div ,:id => "users_checkbox_ary", do -%>
+<% sys_users = User.all -%>
+	<% sys_users.each do |user| -%>
+		<%= label_tag "lab-user-#{user.id}", user.name rescue '' -%>
+		<%= check_box_tag "[users][#{user.id}]", 'true',users.include?(user)  -%>
+	<% end -%>
+<% end -%>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb.can_del b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb.can_del
new file mode 100644
index 00000000..32f3d820
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb.can_del
@@ -0,0 +1,50 @@
+<%= render 'panel/announcement/back_end/bulletins/filter' %>
+<table id="bulettin_sort_list" class="table main-list">
+	<%= render 'panel/announcement/back_end/bulletins/bulletins' %>
+</table>
+<div class="form-actions">
+	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %>
+</div>
+
+<!--
+<% content_for :secondary do %>
+<%#= render :partial => '/panel/announcement/back_end/announcement_secondary' %>
+<% end -%>
+
+<%= flash_messages %>
+
+<br />
+<br />
+<br />
+<br />
+<br />
+  
+  <fieldset><legend><%= t('bulletin.search') %></legend>	
+
+  <%= form_for :bulletin, :action => 'search', :method => 'get', :url => panel_announcement_back_end_bulletins_path do |f| %>
+  
+  <%#= f.select :bulletin_category_id, @bulletin_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ] },{ :include_blank => t('bulletin.select') }%>
+  
+  Category <%#= select_tag "category_id", options_for_select(@bulletin_categorys.collect{|t| [t.i18n_variable[I18n.locale], t.id]}), :prompt => t('bulletin.select') %>
+  
+  KeyWord <%#= text_field_tag :search, params[:search], :id => 'search_field' %>
+  
+  <%= submit_tag "Search", :name => nil %> 
+  
+  <% end %>
+
+  
+  </fieldset>
+
+<br />
+<br />
+
+<h1><%= t('bulletin.list_announcement') %></h1>
+
+<div id="check_block">	
+	<h1>Check Please</h1>
+	<%#= render :partial => "list_table", :collection => @bulletin_categorys_check,:as => :bulletin_category%>
+</div>
+<br />
+
+-->
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
new file mode 100644
index 00000000..d5d589cf
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
@@ -0,0 +1,20 @@
+<%= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %>
+<br/>
+<%= form_tag('', :remote => true)  %>
+<%= label_tag :category, t("announcement.bulletin.category") %>
+<%= select_tag "category_id", options_from_collection_for_select(@bulletin_categorys, "id", "key") %>
+
+<br/>
+<%= label_tag :role, t("admin.roles") %>
+<%= content_tag :div do -%>
+	<% form_tag :action => "update_setting"  do %>
+		<%= render :partial => "privilege_user", :locals => {:users => @users_array} %>
+		<%= submit_tag "Update" %>
+	<% end -%>
+<% end -%>
+
+<script type="text/javascript" charset="utf-8">
+	$('#category_id').change(function() {
+	  $(this).parents('form').submit();
+	});
+</script>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb
new file mode 100644
index 00000000..a01c9d6a
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb
@@ -0,0 +1 @@
+$("#users_checkbox_ary").replaceWith('<%= (render :partial => 'privilege_user', :locals => {:users => @users_array}).html_safe%>');
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html - %BDしs.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html - %BDしs.erb
new file mode 100644
index 00000000..2c4cd153
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html - %BDしs.erb	
@@ -0,0 +1,42 @@
+
+
+<% if @bulletin and !@bulletin.nil? %>
+
+<div id="col1" class="col">
+	<h1 class="h1 ini_heading col_title"><%= @bulletin.title %></h1>
+	<p class="ini_txt"><%= @bulletin.subtitle %></p>
+	<%= link_to "read more >",panel_announcement_front_end_bulletin_path(@bulletin.id) %>
+	<a class="btn" href="">read more &gt;</a>
+</div>
+
+<% end %>
+
+<% if @bulletins and !@bulletins.nil? %>
+
+<div id="col2" class="col">
+<h1 class="h1 ini_heading col_title">news</h1>
+<ul class="ini_list">
+	<% @bulletins.each do |post| %>
+	<li><span class="time"><%= post.postdate.to_s.gsub("-", "") %></span><%= link_to post.title,panel_announcement_front_end_bulletin_path(post) %></li>
+	<% end %>
+</ul>
+<%= link_to "read more >",panel_announcement_front_end_bulletins_path(), :class => "btn" %>
+<a class="btn" href="announcement">read more &gt;</a>
+</div>
+
+<div id="col2" class="col">
+<h1 class="h1 ini_heading col_title">news</h1>
+<ul class="ini_list">
+	<% @bulletins.each do |post| %>
+	<li>
+	<%= image_tag(post.image.url, :size => "160x140") if post.image.file %>
+	<h4><%= post.title %></h4>
+	<%= post.subtitle %>
+	</li>
+	<% end %>
+</ul>
+<%= link_to "read more >",panel_announcement_front_end_bulletins_path(), :class => "btn" %>
+<a class="btn" href="announcement">read more &gt;</a>
+</div>
+
+<% end %>

From 670011495560a810823b00b43aec20ad226e20a6 Mon Sep 17 00:00:00 2001
From: Matt Fu <matt@rulingcom.com>
Date: Fri, 16 Mar 2012 15:51:59 +0800
Subject: [PATCH 19/20] after merge

---
 .../bulletins/_bulletin_link.html - %BDしs.erb | 27 +++++++++++++++++++
 .../_bulletin_link2.html - %BDしs.erb          | 16 +++++++++++
 .../back_end/bulletins/index.html - %BDしs.erb |  9 +++++++
 3 files changed, 52 insertions(+)
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - %BDしs.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - %BDしs.erb
 create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - %BDしs.erb

diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - %BDしs.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - %BDしs.erb
new file mode 100644
index 00000000..33d1ba1e
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - %BDしs.erb	
@@ -0,0 +1,27 @@
+
+		<div  id="<%= "bulletin_#{bulletin_link.id}" if !bulletin_link.new_record? %>" class='list_item'>
+		  <div class="field">
+
+			<%= f.label :link_url %>
+			<%= f.text_field :url %>
+
+			<%= f.label :link_name %>
+			<%#= f.text_field :name %>			
+			<%= f.fields_for :i18n_variable, (bulletin_link.new_record? ? bulletin_link.build_i18n_variable : bulletin_link.i18n_variable) do |f| %>
+			  <% @site_valid_locales.each do |locale| %>
+				<%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
+				<%= f.text_field locale, :style => "width:130px" %>
+			  <% end %>
+			<% end %>
+
+			<span class="action">
+			<% if bulletin_link.new_record? %>
+			  <a href="#" class="delete"><%= t(:delete) %></a>
+			<% else %>	
+			  <%= f.hidden_field :id %>
+			  <a href="#" class="remove_existing_record"><%= t(:delete) %></a>
+			  <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
+			<% end %>
+			</span>
+		  </div>
+		</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - %BDしs.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - %BDしs.erb
new file mode 100644
index 00000000..c44b5c92
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - %BDしs.erb	
@@ -0,0 +1,16 @@
+		
+				<tr id="<%= "bulletin_#{bulletin_link2.id}" %>">
+					<td><%= link_to bulletin_link2.i18n_variable.zh_tw, bulletin_link2.url, :target => '_blank' %></td>
+					<td><%= link_to bulletin_link2.i18n_variable.en, bulletin_link2.url, :target => '_blank' %></td>
+					<td><a href="#modal-link" data-toggle="modal" class="action"><i class="icon-pencil"></i></a>
+					<span class="action">
+					 <%= f.hidden_field :id %>
+					 <a href class="remove_existing_record"><i class="icon-remove"></i></a>
+					 <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
+					 </span>
+					</td>
+				</tr>
+
+
+				
+				
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - %BDしs.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - %BDしs.erb
new file mode 100644
index 00000000..d37d2134
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - %BDしs.erb	
@@ -0,0 +1,9 @@
+<%= render 'filter' %>
+<table id="bulettin_sort_list" class="table main-list">
+	<%= render 'bulletins' %>
+</table>
+
+<div class="form-actions">
+	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %>
+</div>
+

From b58db48d26e32dea6594e035bc7707248cda9143 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 19 Mar 2012 14:04:28 +0800
Subject: [PATCH 20/20] Changes in Gemfile

---
 Gemfile               |  4 ++--
 Gemfile.lock          | 11 ++++++-----
 config/application.rb |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index fabc1833..024f3449 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem "brakeman"
 gem 'bson_ext'
 gem 'carrierwave'
 gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
-gem 'devise'
+gem 'devise', '1.5.3'
 gem 'exception_notification' # Send error trace
 gem 'execjs'
 gem 'jquery-rails'
@@ -23,7 +23,7 @@ gem 'rubyzip'
 gem 'sinatra'
 gem 'sprockets'
 gem 'tinymce-rails'
-#gem 'therubyracer'
+gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
 
 # Gems used only for assets and not required
 # in production environments by default.
diff --git a/Gemfile.lock b/Gemfile.lock
index dd1a1d59..1df648c4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,7 +40,7 @@ GEM
       multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
     arel (2.2.3)
-    bcrypt-ruby (3.0.1-x86-mingw32)
+    bcrypt-ruby (3.0.1)
     brakeman (1.5.1)
       activesupport
       erubis (~> 2.6)
@@ -71,11 +71,10 @@ GEM
     database_cleaner (0.7.1)
     delorean (1.2.0)
       chronic
-    devise (2.0.4)
+    devise (1.5.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
-      railties (~> 3.1)
-      warden (~> 1.1.1)
+      warden (~> 1.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     exception_notification (2.5.2)
@@ -199,6 +198,7 @@ GEM
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
+    spork (0.9.0)
     spork (0.9.0-x86-mingw32)
       win32-process
     sprockets (2.0.3)
@@ -232,6 +232,7 @@ GEM
       windows-api (>= 0.3.0)
 
 PLATFORMS
+  ruby
   x86-mingw32
 
 DEPENDENCIES
@@ -242,7 +243,7 @@ DEPENDENCIES
   coffee-rails
   database_cleaner
   delorean
-  devise
+  devise (= 1.5.3)
   exception_notification
   execjs
   factory_girl_rails
diff --git a/config/application.rb b/config/application.rb
index d1243133..381d1c64 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -19,7 +19,7 @@ module Orbit
     # Add directories for plugins
     config.paths["vendor/plugins"] += %W(#{config.root}/vendor/built_in_modules)
     config.paths["vendor/plugins"] += %W(#{config.root}/vendor/downloaded_modules)
-    config.paths.app.views << "app/views/devise"
+    config.paths["app/views"] += %W(#{config.root}/app/views/devise)
     
     
     # Settings in config/environments/* take precedence over those specified here.