Merge branch 'design_team' into ldap

Conflicts:
	config/environments/development.rb

config/environments/development.rb

@@ -29,15 +29,16 @@ Orbit::Application.configure do
   #   :sender_address => %{"notifier" <redmine@rulingcom.com>},
   #   :exception_recipients => %w{chris@rulingcom.com}
     
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = {
-    :tls => true,
-    :enable_starttls_auto => true,
-    :address => "smtp.gmail.com",
-    :port => '587',
-    :domain => "smtp.gmail.com",
-    :authentication => "plain",
-    :user_name => "redmine@rulingcom.com",
-    :password => "rulingredmine" }
+  # config.action_mailer.delivery_method = :smtp
+  # config.action_mailer.smtp_settings = {
+  #   :tls => true,
+  #   :enable_starttls_auto => true,
+  #   :address => "smtp.gmail.com",
+  #   :port => '587',
+  #   :domain => "smtp.gmail.com",
+  #   :authentication => "plain",
+  #   :user_name => "redmine@rulingcom.com",
+  #   :password => "rulingredmine" }
+    
 end
 

config/initializers/resque.rb

@@ -17,4 +17,4 @@ Dir["#{Rails.root}/app/jobs/*.rb"].each { |file| require file }
 
 # The schedule doesn't need to be stored in a YAML, it just needs to
 # be a hash.  YAML is usually the easiest.
-Resque.schedule = YAML.load_file(Rails.root.join('config', 'resque_schedule.yml'))
+Resque.schedule = YAML.load_file(Rails.root.join('config', 'resque_schedule.yml'))

config/locales/en.yml

@@ -162,6 +162,14 @@ en:
     list_users: Users list
     list_infos: User information list
     list_roles: User roles list
+    mail_address: Address
+    mail_port: Port
+    mail_domain: Domain
+    mail_authentication: Authentication
+    mail_user_name: User Name
+    mail_password: Password
+    mail_tls: TLS
+    mail_enable_starttls_auto: Enable Start TLS Auto
     member: Member
     menu_enabled_for: Menu enabled for
     module:
@@ -205,6 +213,7 @@ en:
     site_description: Site description
     site_footer: Site footer
     site_settings: Site Setting
+    site_sub_menu: Site sub-menu
     site_title: Site title
     super_pages: Super pages
     structure: Structure
@@ -241,7 +250,13 @@ en:
     info: User information
     panel: User panel
     role: User role
-    
+  
+  dashboard:
+    bulletin: Announcement
+    news_bulletin: News
+    page_context: Page
+    web_link: Link
+
   panel:
     
   modal:

config/locales/zh_tw.yml

@@ -163,6 +163,14 @@ zh_tw:
     list_users: 使用列表
     list_infos: 用戶資料列表
     list_roles: 用戶身份列表
+    mail_address: 郵件地址
+    mail_port: 傳輸埠
+    mail_domain: 網域名稱
+    mail_authentication: 認證
+    mail_user_name: 帳號
+    mail_password: 密碼
+    mail_tls: TLS
+    mail_enable_starttls_auto: Enable Start TLS Auto
     member: 會員
     menu_enabled_for: 選單啟用
     module:
@@ -201,6 +209,7 @@ zh_tw:
     site_description: 網站描述
     site_footer: 網站頁尾
     site_settings: 基本設定
+    site_sub_menu: 網站次選單
     site_title: 網站標題
     setup_member: 成員設置
     setup_translations: 語系設定
@@ -243,6 +252,12 @@ zh_tw:
     panel: 用戶面板
     role: 用戶身份
     
+  dashboard:
+    bulletin: 公告
+    news_bulletin: 新聞
+    page_context: 頁面
+    web_link: 鏈接
+  
   panel: