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

app/views/layouts/_side_bar_content.html.erb

@@ -1,8 +1,10 @@
+<%#= content_tag :li, :class => active_for_controllers('purchases') do -%>
+  <%#= link_to content_tag(:i, nil, :class => 'icons-purchase') + t('admin.purchase'), admin_purchases_path %>
+<%# end -%>
 <% content_for :page_specific_javascript do %>
   <%= javascript_include_tag "/static/kernel.js"  %>
 <% end %>
 
-
 <%OrbitApp::Module::SideBarRegisition.all.each do |t| %>
   <%= t.render(request,params,current_user,@module_app) %>
 <% end %>

config/locales/zh_tw.yml

@@ -13,51 +13,28 @@ zh_tw:
   account_settings: 帳號設定
   action: 操作
   ad:
-    chinese_1: 在套圖中出現次數 1次請輸入1
-    chinese_2: 輸入連結
-    chinese_3: 輸入標題
     ab_fx: 轉場效果
-    add_link: Add a reference link
     banner_best_size: 輪播圖片尺寸
     best_size: 最佳尺寸
-    best_size_example: "Ex: 500px x 300px"
     new_image: 新增輪播圖片
     not_showing: 沒有顯示
     picture_list: 圖片列表
     sec_place_holder: 每張輪播圖片顯示秒數(3秒就請輸入3)
-    select_fx: Select the effect type
-    set_dates: Set the image to start and end dates
-    set_range: Set the range time
     showing: 顯示中
     success_destroy_ad_image: 刪除圖片成功
     trans_unit_sec: 秒
     transition_sec: 轉場單位時間
     update_banner: 更新輪播
-    upload_pictures: Upload pictures
     widget_info_for_ad_image_size: "此區塊圖片尺寸使用: %{best_size}"
   ad_banner: 廣告輪播
   add: 新增
-  add_attribute_field: Add attribute field
-  add_image: Add image
   add_item: 新增項目
-  add_member: Add member
-  add_more: Add more
-  address_modal:
-    default_title: 地址
-    street_address: 街道地址
-    city: 城市
-    county: 縣市
-    zip: 郵遞區號
-    country: 國家/地區
   addthis_tools:
     add_to_bookmark: 加入書籤
   admin: 管理員
-  all: All
   all_content: 所有內容
   all_file: 所有檔案
   all_member: 所有會員
-  all_plugin_summary: All plugin summary
-  all_plugins: All plugins
   always_display_title: 永遠顯示標題
   app_auth:
     list_setting_result: 授權列表
@@ -75,7 +52,6 @@ zh_tw:
       fail: 刪除次管理員失敗
       success: 刪除次管理員成功
     failed_no_user: 失敗，不是使用者
-    operation_not_permitted: Operation not permitted
   approval: 
     not_pass: 拒絕
     not_pass_reason: 拒絕原因
@@ -84,9 +60,7 @@ zh_tw:
     stat: 審核狀態
     user_list: 使用者列表
   approval_: 審核
-  archive: Archive
   asset: 資產
-  attributes: 屬性
   auth:
     add_manager: 新增管理員
     add_sub_manager: 新增次管理員
@@ -100,8 +74,6 @@ zh_tw:
   back: 回上一步
   basic: 基本
   browse: 瀏覽
-  built_in: Built-in
-  calendar: Calendar
   cancel: 取消
   cant_delete_self: 不可以刪除自己
   cant_empty_star: 不能為空白 (*)
@@ -110,9 +82,7 @@ zh_tw:
   category: 類別
   category_auth: 類別授權
   clear: 清除
-  close: Close
   content: 內容
-  courses: 開課數
   create:
     error:
       link: 建立連結時出錯
@@ -120,45 +90,25 @@ zh_tw:
     fail: 建立失敗
     success:
       asset_category: 資產類別已成功建立
-      co_author: Co-author was successfully created.
-      link: Link was successfully created.
       link: 連結已成功建立
       page: 頁面已成功建立
       user: 使用者已成功建立
   create_: 建立
-  cross_lang: 跨語言輸入
   data: 資料
-  date:
-    calendar: 紀年法
-    range: 本欄為時間區段
-    format: 格式
-    tw_calendar: 民國
-    minguo_calendar: 
-      after: 民國
-      before: 民前
-      first_year: 民國元年
-      year: 年
-      month: 月
-    west_calendar: 西元
-  date_: Date
   dashboard:
     bulletin: 公告
     news_bulletin: 新聞
-    page_context: 頁面
+    page_context: 頁面內容
-    web_link: 鏈接
+    web_link: 連結
   dashboard_: 儀表版
   deadline: 最後期限
   default: Default
   default_css: 預設樣式表
-  delete:
+  delete: 刪除
-    file: 刪除檔案
+  delete_file: 刪除檔案
-    success:
-      paper: Paper was successfully deleted.
-  delete_: 刪除
   description: 描述
   desktop: 桌面
   disable: 關閉
-  disabled: Disabled
   dots: ●●●●●●
   download: 下載
   downloaded: 已下載
@@ -181,11 +131,8 @@ zh_tw:
     upload: 上傳檔案
   file_: 檔案
   file_type: 檔案類型
-  followers: Followers
   forgot_password: 忘記密碼?
   frequency: 頻率
-  frontend_data_count: Frontend data count
-  gallery: Gallery
   help: 幫助
   hidden: 隱藏的
   hide: 隱藏
@@ -194,14 +141,10 @@ zh_tw:
   horizontal: 水平的
   hot: 熱門
   image: 圖片
-  images: Images
   info: 信息
-  initial: 起始值
   intro: 簡介
   is_published: 已發佈
   item: 項目
-  item_name: Item name
-  javascripts: Javascripts
   key: 索引
   last_modified: 最後修改者
   layout: 範本
@@ -216,16 +159,25 @@ zh_tw:
     user: 使用者列表
   list_: 列表
   list_lower: 列表
+  address_modal:
+    default_title: 地址
+    street_address: 街道地址
+    city: 城市
+    county: 縣市
+    zip: 郵遞區號
+    country: 國家/地區
+  langs:
+    zh_tw: 中文
+    en: 英文
   lists:
     markups:
+      address: 地址欄位
       text_field: 文字輸入框
       select: 下拉選單
       date: 日期
       text_area: 文字輸入方塊
       radio_button: 單選
       checkbox: 多選
-  locale: Locale
-  location: Location
   login: 登入
   logout: 登出
   mail:
@@ -240,21 +192,20 @@ zh_tw:
     user_name: 電子郵件帳號
     manager: 管理者
   manager: 管理者
-  markup: 輸入模式
+  me: 我
-  markup_options: Markup options
-  markup_value: Markup value
-  me: Me
   member: 會員
   menu_enabled_for: 選單啟用
-  module: Module
+  modal:
+    close: 關閉
+    preview: 預覽
+  module: 模組
   module_authorization: 模組授權
   more_plus: 更多+
   most_visited_page: 最多瀏覽頁面
   multilingual: 多語系
   name: 名稱
-  need_home: You need a home page
+  nccu_c:
-  neutral_title: Neutral title
+    nccu_ldap_uid: 政治大學LDAP帳號
-  neutral_for: Neutral for
   new:
     asset: 新增資產
     banner: 新增橫幅
@@ -264,7 +215,6 @@ zh_tw:
     user: 新增使用者
     info: 新增使用者資訊
     role: 新增使用者角色
-  new_: New
   news: 新聞
   no_: "不是"
   no_deadline: 沒有期限
@@ -284,16 +234,11 @@ zh_tw:
     text: 文字區域
   passed: 通過審核
   password: 密碼
-  password_confirmation: 確認密碼
   pending: 待審核
   picture: 圖片
-  placeholder: Placeholder
-  plugins: Plugins
   postdate: 張貼日期
   posted_by: 張貼人
   preview: 預覽
-  profile: Profile
-  publications: Publications
   purchase: 購買
   quantity: 數量
   quick_edit: 快速編輯
@@ -305,8 +250,9 @@ zh_tw:
   rejected_reason: '拒絕原因:'
   rejected_reason_empty:  "拒絕核准, 沒有參考資訊" 
   related_links: 相關連結
-  role: 身份
+  remember_me: 記住我
-  roles: 身份
+  role: 角色
+  Roles: 角色
   ruling_site: 銳綸網站
   search:
     domains: Google Search Domains
@@ -315,15 +261,12 @@ zh_tw:
     sitesearch: 全站搜尋
     too_many: "搜尋有關 ' %{search_word} '尋找到超過 %{exceed_num} 筆資料，請嘗試加入更多關鍵字縮小搜尋範圍，以作更精確的搜尋?"
     unit_get: "列出由 :%{unit_name}發佈的資料，共有%{item_num}筆"
-  search_: Search
   search_google: 搜尋Google
+  search_nccu: 搜尋政治大學
   setup_member: 會員設定
   show: 顯示
-  show_mode:
-    index: 清單
-    summary: 摘要
-    thumbnail: 縮圖
   site:
+    default_image: 預設圖像
     description: 網站描述
     description_help: ''
     footer: 網站頁尾
@@ -342,7 +285,6 @@ zh_tw:
   site_info: 網站資訊
   sitemap: 網站地圖
   site_name: 網站名稱
-  size: Size
   start: 開始
   start_date: 開始日期
   statistics: 統計資訊
@@ -360,7 +302,6 @@ zh_tw:
     module_page_lang_not_support: "很抱歉，此頁面沒有開放中文版本"
     not_previewable: "不支援預覽"
     preview_only_for_img: "預覽僅支援：jpg,png,gif,bmp等圖片格式"
-  sys_basic_form: 系統基本資料表
   system_info: 系統資訊
   tag_cloud: 標籤雲
   tags: 標籤
@@ -375,20 +316,18 @@ zh_tw:
   traffic: 流量
   type: 類型
   unit_name: 單位名稱
-  unzip_success: "App unzip procress is finished, please restart the server to apply effect"
   up_to_date: 最新版本
   update:
     error:
       link: 更新連接時出錯
     fail: 更新消息
     success:
-      co_author: Co-author was successfully updated.
       content: 內容已更新成功
       link: 連結已更新成功
       page: 頁面已更新成功
-      paper: Paper was successfully updated.
+      user: 使用者已更新成功
-      user: User was successfully updated.
+    success_: 更新成功
-    success_: S使用者已更新成功
+  update_: 更新
   update_at: 最後更新時間
   url: 網址
   use_status: ''
@@ -403,7 +342,10 @@ zh_tw:
   visitors_today: 今日造訪人次
   yes_: "是"
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 858e942da234fffa3053a995231f2b0d9eee43d1
   nccu:
     date: 起迄日期
     file: 附加檔案
@@ -930,11 +872,11 @@ zh_tw:
   widget:
     default_widget: 系統預設Widget
     _default_widget:
-      style1: 表格列表
+      typeA: 表格列表
-      style2: 單行列佐圖(同邊)
+      typeB_style2: 單行列佐圖(同邊)
-      style3: 多行列佐圖(同邊)
+      typeB_style3: 多行列佐圖(同邊)
-      style4: 多行列佐圖(異邊)
+      typeB_style4: 多行列佐圖(異邊)
-      style5:  單行列佐單圖(同邊)
+      typeC:  單行列佐單圖(同邊)
   mongoid:
     models:
       news_bulletin: 新聞
@@ -970,4 +912,4 @@ zh_tw:
     module_page_lang_not_support: "很抱歉，本頁沒有開放中文版本"
   object_disable:
     change_to_true: "設為停用"
-    change_to_false: "重新啓用"
+    change_to_false: "重新啓用"

config/mongoid.yml

@@ -2,7 +2,7 @@ defaults: &defaults
   host: localhost
   # slaves:
   #   - host: slave1.local
-  # port: 27017
+  port: 27017
   #   - host: slave2.local
   #     port: 27019
 

config/routes.rb

@@ -232,7 +232,6 @@ Orbit::Application.routes.draw do
   # match '/desktop_orbit/eventajaxload' => 'desktop_publications#update_journal'
 
 
-
   scope '/front' do
     match 'show_banner/:id' => 'front#show_banner', :as => :front_show_banner
     match 'show_footer' => 'front#show_footer', :as => :front_show_footer
@@ -242,7 +241,6 @@ Orbit::Application.routes.draw do
     match 'show_sitemap' => 'front#show_sitemap', :as => :front_show_sitemap
   end
 
-
   match '/panel/orbit_app/widget/:type' => 'default_widget#default_widget'
 
   match '/panel/:app_name/front_end/:app_action/:id(/:controller_action)' => 'pages#show_from_link', :constraints => lambda { |request|

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]
+# <<<<<<< HEAD
-  before_filter :set_module_app
+#   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