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

Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/routes.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb
	vendor/built_in_modules/archive/init.rb
	vendor/built_in_modules/miss_module/config/locales/zh_tw.yml

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

@@ -1,12 +1,16 @@
 class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendController
   include OrbitControllerLib::DivisionForDisable
 
-  before_filter :for_app_manager,:except => [:index,:get_categorys_json]
-  before_filter :set_module_app
+# <<<<<<< HEAD
+#   before_filter :for_app_manager,:except => [:index,:get_categorys_json]
+#   before_filter :set_module_app
+
+#   def set_module_app
+#     @module_app = ModuleApp.where(:title=>'Announcement').first
+#   end
+# =======
+  before_filter :for_app_manager,:except => [:index,:get_categorys_json,:get_bulletins_json]
 
-  def set_module_app
-    @module_app = ModuleApp.where(:title=>'Announcement').first
-  end
 
   before_filter :force_order_for_visitor,:only=>[:index,:get_categorys_json,:get_bulletins_json]
   before_filter :force_order_for_user,:except => [:index,:get_categorys_json,:get_bulletins_json]

vendor/built_in_modules/announcement/init.rb

@@ -2,7 +2,11 @@ module Announcement
   OrbitApp.registration "Announcement",:type=> 'ModuleApp' do
     module_label 'announcement.announcement'
     base_url File.expand_path File.dirname(__FILE__)    
+
     personal_plugin :enable => true,:path=>"panel/announcement/plugin/profile",:i18n=>'announcement.announcement'
+
+#    personal_plugin :enable => true,:path=>"panel/announcement/plugin/profile",:i18n=>'admin.announcement'
+
     
     version "0.1"
     organization "Rulingcom"
@@ -64,6 +68,54 @@ module Announcement
                             # :active_for_action=>{:bulletin_categorys=>:index},
                             :available_for => [:manager]
 
+
+    # widgets do
+    #   default_widget do
+    #     query 'Bulletin.all'
+    #     image :image
+    #   end
+
+    #   categories_query 'BulletinCategory.all'
+    #   tags_query 'AnnouncementTag.all'
+
+    #   customize_widget "index","announcement.widget.index",:fields=>["title","category","postdate"],:style=>["cu_style_1","cu_style_2","cu_style_3","cu_style_4","cu_style_5"]
+    #   customize_widget "bulletins_and_web_links","announcement.widget.bulletins_and_web_links"
+    #   # item "index","announcement.widget.index",:default_template=>true,:fields=>["title","category","postdate"]
+    #   # item "bulletins_and_web_links","announcement.widget.bulletins_and_web_links"
+    # end
+    
+    # side_bar do
+    #   head_label_i18n  'admin.announcement',:icon_class=>"icons-megaphone"
+    #   available_for [:admin,:guest,:manager,:sub_manager]
+    #   active_for_controllers ({:private=>['bulletins', 'bulletin_categorys', 'approvals','tags']})
+    #   active_for_object_auth ['BulletinCategory'] 
+
+    #   head_link_path "panel_announcement_back_end_bulletins_path"
+
+    #   context_link 'announcement.all_articles',
+    #                         :link_path=>"panel_announcement_back_end_bulletins_path" ,
+    #                         :priority=>1,
+    #                         :active_for_action=>{:bulletins=>:index},
+    #                         :available_for => [:all]
+
+    #   context_link 'announcement.add_new', 
+    #                         :link_path=>"new_panel_announcement_back_end_bulletin_path" ,
+    #                         :priority=>2,
+    #                         :active_for_action=>{:bulletins=>:new},
+    #                         :available_for => [:sub_manager]
+      
+    #   context_link 'announcement.categories',
+    #                         :link_path=>"panel_announcement_back_end_bulletin_categorys_path" ,
+    #                         :priority=>3,
+    #                         :active_for_action=>{:bulletin_categorys=>:index},
+    #                         :available_for => [:manager]
+
+    #   context_link 'announcement.tags',
+    #                         :link_path=>"panel_announcement_back_end_tags_path" ,
+    #                         :priority=>4,
+    #                         # :active_for_action=>{:bulletin_categorys=>:index},
+    #                         :available_for => [:manager]
+
       context_link 'announcement.approval_setting',
                             :link_path=>"panel_announcement_back_end_approval_setting_path" ,
                             :priority=>5,

vendor/built_in_modules/archive/init.rb

@@ -2,7 +2,11 @@ module Archive
   OrbitApp.registration "Archive",:type=> 'ModuleApp' do
     module_label 'miss_module_i18n.archive'
     base_url File.expand_path File.dirname(__FILE__)    
+<<<<<<< HEAD
     personal_plugin :enable => true,:path=>"panel/archive/plugin/profile",:i18n=>'miss_plugin_i18n.archive'
+=======
+    personal_plugin :enable => true,:path=>"panel/archive/plugin/profile",:i18n=>'admin.archive'
+>>>>>>> 858e942da234fffa3053a995231f2b0d9eee43d1
     
     version "0.1"
     organization "Rulingcom"

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

@@ -8,6 +8,7 @@ zh_tw:
     calendars: 日曆
     gallery: 相簿
     location: Location
+<<<<<<< HEAD
   miss_plugin_i18n:
     personal_book: Personal Book
     personal_diploma: Personal Diploma
@@ -18,4 +19,6 @@ zh_tw:
     personal_patent: Personal Patent
     personal_project: Personal Project
     personal_research: Personal Research
-    personal_seminar: Personal Seminar
+    personal_seminar: Personal Seminar
+=======
+>>>>>>> 858e942da234fffa3053a995231f2b0d9eee43d1