Merge branch 'desktop' of https://github.com/Rulingcom/orbit into desktop

* 'desktop' of https://github.com/Rulingcom/orbit:
  fix widget field reload
  link to more
  fix default widget link
  fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
  fix javascript disable checkbox failed after cate and tags being reloaded.
  first version of multi categories and tags
  fix widget field reload
  link to more
  fix default widget link
  fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
  fix javascript disable checkbox failed after cate and tags being reloaded.
  first version of multi categories and tags

vendor/built_in_modules/announcement/config/locales/zh_tw.yml

@@ -27,6 +27,7 @@ zh_tw:
     approval_setting: 審核權限
     tags: 標籤
     default_widget:
+        to_more: 更多
         bulletin_category_with_title: 分類
         title: 標題
         postdate: 張貼日期

vendor/built_in_modules/announcement/init.rb

@@ -18,6 +18,7 @@ module Announcement
     end
 
     category ["BulletinCategory"]
+    data_count 3..10
 
     widgets do
       default_widget do
@@ -26,6 +27,7 @@ module Announcement
         field :postdate
         link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self}
         link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:bulletin_category,:id]}}
+        link_to_more 'panel_announcement_front_end_bulletins_path',:title_i18n=> 'announcement.default_widget.to_more'
       end
 
       categories_query 'BulletinCategory.all'