Merge branch 'master' into desktop

* master: (57 commits)
  Add translations
  Add mobile version in site settings
  Add mobile but remove news in it
  Remove mysql
  Fix album widget options
  Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end
  Add link to default widget (temporary)
  Ika's fix for width
  Ika's fix for width
  Gallery i18n
  Ika's changes for css default widgets
  Ika's changes for css default widgets
  change bulletin object to bulletin title
  fixing default widget error when needs image
  make default widget works without init
  Fix order in structure
  Fix old tags
  correct pic file format
  complete page error handler logic
  change sub_menu to header in site setting
  ...

config/initializers/devise.rb

@@ -80,7 +80,7 @@ Devise.setup do |config|
   # The time you want to timeout the user session without activity. After this
   # time the user will be asked for credentials again.
   # config.timeout_in = 10.minutes
-  config.timeout_in = 10.minutes
+  config.timeout_in = 5.days
 
   # ==> Configuration for :lockable
   # Defines which strategy will be used to lock an account.

config/initializers/mime_types.rb

@@ -3,3 +3,5 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register_alias "text/html", :iphone
+
+Mime::Type.register_alias "text/html", :mobile

config/initializers/nccu_ldap_connection.rb

@@ -1,16 +0,0 @@
-#encoding: utf-8
-require 'mysql2'
-
-$nccu_ldap_connection
-
-module  NccuLdapConnection
-  BASE = 'ou=People,dc=nccu,dc=edu,dc=tw'
-
-  def self.establish
-      $nccu_ldap_connection = Net::LDAP.new
-      $nccu_ldap_connection.port =LDAP_CONFIG["port"]
-      $nccu_ldap_connection.host = LDAP_CONFIG["host"]
-      $nccu_ldap_connection.authenticate(LDAP_CONFIG["authenticate_info"],LDAP_CONFIG["authenticate_pwd"]) 
-  end
-
-end

config/locales/en.yml

@@ -284,7 +284,9 @@ en:
     text: Text Area
   passed: Approved
   password: Password
-  password_confirmation: Password Confirmation
+  password_change: Change password
+  password_confirmation: Password confirmation
+  password_current: Current password
   pending: Pending
   picture: Picture
   placeholder: Placeholder
@@ -327,11 +329,13 @@ en:
     description: Site description
     description_help: ''
     footer: Site footer
+    header: Site header
     footer_help: ''
     info: Site information
     keywords: Site keywords
     keywords_help: ''
     language: Site language
+    mobile_version: Mobile version
     search: Site Search
     search_help: Please Enter the search argument for Google search.
     settings: Site setting

config/locales/mobile.en.yml

@@ -0,0 +1,11 @@
+en:
+
+  mobile:
+    bulletin: Bulletin
+    contact: Contact
+    copyright: Copyright
+    home: Home
+    language: Language
+    location: Location
+    location_description: '<h3>國立政治大學</h3>11605 臺北市文山區指南路二段64號'
+    page: Page

config/locales/mobile.zh_tw.yml

@@ -0,0 +1,11 @@
+zh_tw:
+
+  mobile:
+    bulletin: 公告
+    contact: 聯絡資訊
+    copyright: 版權宣告
+    home: 首頁
+    language: 語言
+    location: 地理位置
+    location_description: '<h3>國立政治大學</h3>11605 臺北市文山區指南路二段64號'
+    page: 頁面

config/locales/zh_tw.yml

@@ -284,7 +284,9 @@ zh_tw:
     text: 文字區域
   passed: 通過審核
   password: 密碼
+  password_change: 更改密碼
   password_confirmation: 確認密碼
+  password_current: 目前的密碼
   pending: 待審核
   picture: 圖片
   placeholder: Placeholder
@@ -327,11 +329,13 @@ zh_tw:
     description: 網站描述
     description_help: ''
     footer: 網站頁尾
+    header: 網站頁首
     footer_help: ''
     info: 網站資訊
     keywords: 搜尋關鍵字
     keywords_help: ''
     language: 網站語言
+    mobile_version: 手機版
     search: 網站搜尋
     search_help: 請輸入送交Google搜尋的參數
     settings: 基本設定
@@ -389,6 +393,7 @@ zh_tw:
       paper: Paper was successfully updated.
       user: User was successfully updated.
     success_: S使用者已更新成功
+  update_: 更新
   update_at: 最後更新時間
   url: 網址
   use_status: ''

config/routes.rb

@@ -241,6 +241,21 @@ Orbit::Application.routes.draw do
     match 'show_sitemap' => 'front#show_sitemap', :as => :front_show_sitemap
   end
 
+  scope '/mobile' do
+    match 'announcement' => 'mobile#announcement', :as => 'mobile_announcement'
+    match 'announcement_content/:id' => 'mobile#announcement_content', :as => 'mobile_announcement_content'
+    match 'dialog_contact' => 'mobile#dialog_contact', :as => 'mobile_dialog_contact'
+    match 'dialog_copyright' => 'mobile#dialog_copyright', :as => 'mobile_dialog_copyright'
+    match 'dialog_language' => 'mobile#dialog_language', :as => 'mobile_dialog_language'
+    match 'map' => 'mobile#map', :as => 'mobile_map'
+    match 'page' => 'mobile#page', :as => 'mobile_page'
+    match 'page_content/:id' => 'mobile#page_content', :as => 'mobile_page_content'
+    root :to => 'mobile#index', :as => 'mobile'
+  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|
     !request.query_string.include?("inner=true")