diff --git a/app/views/admin/sites/_side_bar.html.erb b/app/views/admin/sites/_side_bar.html.erb index 4b25835e..d2e5c03e 100644 --- a/app/views/admin/sites/_side_bar.html.erb +++ b/app/views/admin/sites/_side_bar.html.erb @@ -4,7 +4,7 @@ <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('sites')) do -%> <%= content_tag :li, link_to(t('admin.site_info'), admin_site_site_info_path(@site)), :class => active_for_action('sites', 'site_info') %> <%= content_tag :li, link_to(t('admin.system_info'), admin_site_system_info_path(@site)), :class => active_for_action('sites', 'system_info') %> - <%= content_tag :li, link_to(t('admin.language'), admin_site_language_path(@site)), :class => active_for_action('sites', 'language') %> + <%= content_tag :li, link_to(t('admin.site_language'), admin_site_language_path(@site)), :class => active_for_action('sites', 'language') %> <%= content_tag :li, link_to(t('admin.mail_setting'), admin_site_mail_setting_path(@site)), :class => active_for_action('sites', 'mail_setting') %> <%= content_tag :li, link_to(t('admin.ui_theme'), admin_site_ui_theme_path(@site)), :class => active_for_action('sites', 'ui_theme') %> <% end -%> diff --git a/app/views/admin/sites/mail_setting.html.erb b/app/views/admin/sites/mail_setting.html.erb index 71c99bf7..72ec6787 100644 --- a/app/views/admin/sites/mail_setting.html.erb +++ b/app/views/admin/sites/mail_setting.html.erb @@ -12,56 +12,56 @@
<%= f.text_field :address, :value => (@site['site_settings']['address'] rescue nil) %> -

In addition to freeform text, any HTML5 text-based input appears like so.

+
<%= f.text_field :port, :value => (@site['site_settings']['port'] rescue nil) %> -

In addition to freeform text, any HTML5 text-based input appears like so.

+
<%= f.text_field :domain, :value => (@site['site_settings']['domain'] rescue nil) %> -

In addition to freeform text, any HTML5 text-based input appears like so.

+
<%= f.text_field :authentication, :value => (@site['site_settings']['authentication'] rescue nil) %> -

In addition to freeform text, any HTML5 text-based input appears like so.

+
<%= f.text_field :user_name, :value => (@site['site_settings']['user_name'] rescue nil) %> -

In addition to freeform text, any HTML5 text-based input appears like so.

+
<%= f.text_field :password, :value => (@site['site_settings']['password'] rescue nil) %> -

In addition to freeform text, any HTML5 text-based input appears like so.

+
<%= f.check_box :tls, :checked => (@site['site_settings']['tls'].eql?('1') rescue false) %> -

In addition to freeform text, any HTML5 text-based input appears like so.

+
<%= f.check_box 'enable_starttls_auto', :checked => (@site['site_settings']['enable_starttls_auto'].eql?('1') rescue false) %> -

In addition to freeform text, any HTML5 text-based input appears like so.

+
diff --git a/app/views/admin/sites/site_info.html.erb b/app/views/admin/sites/site_info.html.erb index f0ad23ce..e19307ca 100644 --- a/app/views/admin/sites/site_info.html.erb +++ b/app/views/admin/sites/site_info.html.erb @@ -28,7 +28,7 @@ <%= f.fields_for :title, @site.title do |f| %> <%= f.text_field locale, :class => "input-xxlarge" %> <% end %> -

In addition to freeform text, any HTML5 text-based input appears like so.

+

<%= (t 'admin.site_title_help').html_safe %>

<% end %> @@ -36,12 +36,12 @@ <% @site_valid_locales.each do |locale|%> <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
- +
<%= f.fields_for :keywords, @site.keywords do |f| %> <%= f.text_area locale, :class => "input-xxlarge textarea-height-s" %> <% end %> -

In addition to freeform text, any HTML5 text-based input appears like so.

+

<%= (t 'admin.site_keywords_help').html_safe %>

@@ -50,7 +50,7 @@ <%= f.fields_for :description, @site.description do |f| %> <%= f.text_area locale, :class => "input-xxlarge textarea-height-s" %> <% end %> -

In addition to freeform text, any HTML5 text-based input appears like so.

+

<%= (t 'admin.site_description_help').html_safe %>

@@ -59,6 +59,7 @@ <%= f.fields_for :footer, @site.footer do |f| %> <%= f.text_area locale, :class => "tinymce_textarea input-xxlarge" %> <% end %> +

<%= (t 'admin.site_footer_help').html_safe %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index d8b9a060..44469625 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -148,7 +148,6 @@ en: is_published: Is published item: Item key: Key - keywords: Keywords language: Language layout: Layout layout_name: Layout name @@ -162,6 +161,15 @@ en: list_users: Users list list_infos: User information list list_roles: User roles list + mail_address: Address + mail_authentication: Authentication + mail_domain: Domain + mail_enable_starttls_auto: Enable Starttls Auto + mail_password: Password + mail_port: Port + mail_setting: Mail Setting + mail_tls: Tls + mail_user_name: User Name member: Member menu_enabled_for: Menu enabled for module: @@ -203,23 +211,32 @@ en: setup_designs: Designs setup site: Site site_description: Site description + site_description_help: | + Describing your organization in a short paragraph within 50~80 words for recognition purpose of search engines.
+ Ex. MIT is devoted to the advancement of knowledge and education of students in areas that contribute to or prosper in an environment of science and technology. site_footer: Site footer + site_footer_help: | + Will be displayed on the website each page footer, usually for copyright information or contact information. + site_info: Website Info + site_keywords: Keywords + site_keywords_help: | + It can be the combination of title of your university, department, institute or sector.
+ (Full name or abbreviation)Divide different keyword with comma(,), keywords can be mixed with different languages, and different combination, but do not make it a too long list.
+ Example:清華大學,清大,化工,化學工程,研究所,Chemical Engineering,Tsing Hua,National Tsing Hua University,National University,NTHU,單元操作,單操,熱力學,流體力學,工程數學,工數,有機化學,無機化學,材料,生化,光譜,物化 + site_language: Language site_settings: Site Setting site_sub_menu: Site sub-menu site_title: Site title - 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 Starttls Auto + site_title_help: | + Please provide the Official Title of your organization. It is important keyword for search engines!
+ Example:Department of Communication Engineering, NCTU super_pages: Super pages structure: Structure + system_info: System Info title: Title translation: Translation type: Type + ui_theme: UI Theme up_to_date: Up-to-date update_error_link: Error when updating link. update_error_page: Error when updating page. diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 3365cef2..93c8d407 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -145,7 +145,6 @@ zh_tw: is_published: 被出版 item: 網站架構 key: 關鍵 - keywords: 關鍵字 language: 語言 layout: 佈局 layout_name: 佈局名字 @@ -159,6 +158,15 @@ zh_tw: list_users: 使用列表 list_infos: 用戶資料列表 list_roles: 用戶身份列表 + mail_address: 地址 + mail_authentication: 認證 + mail_domain: 域 + mail_enable_starttls_auto: Starttls自動啟用 + mail_password: 密碼 + mail_port: 港 + mail_setting: 郵件設定 + mail_tls: Tls + mail_user_name: 用戶名 member: 會員 menu_enabled_for: 選單啟用 module: @@ -193,10 +201,27 @@ zh_tw: role: 身份 roles: 身份 site_description: 網站描述 + site_description_help: | + 用在「敘述」貴單位網站,盡量在50~80個字左右。當您在搜尋引擎中搜尋時,貴單位的首頁連結下方出現用來介紹的文字。
+ 範例:臺灣第一所最完整,歷史最悠久,且最具代表之綜合性高等教育學府,肩負高深學術研究及教學之重任,並在強調基本理論之純學術研究與提倡學術思想之自由學風之下,自始即朝著人文學、社會科學、生物科學及物理科學四大領域之目標發展,賦有致用性之科系發展之專業學院。(以台大為例) site_footer: 網站頁尾 + site_footer_help: | + 將顯示於網站每頁網頁頁尾,通常為著作權資訊或聯繫資訊等 + site_info: 網站資訊 + site_keywords: 關鍵字 + site_keywords_help: | + 在搜尋引擎中,它可以為學校名稱(全名及簡寫)、單位名稱(平常會用到的縮寫)、專業科目的名稱等等組合搭配。
+ 需用半形逗點「,」隔開不同的關鍵字,建議不要太長,可多重組合搭配,可中英文混雜。關鍵字無上限,不要重複即可。
+ 範例:清華大學,清大,化工,化學工程,研究所,Chemical Engineering,Tsing Hua,National Tsing Hua University,National University,NTHU,單元操作,單操,熱力學,流體力學,工程數學,工數,有機化學,無機化學,材料,生化,光譜,物化 + + site_language: 語系設定 site_settings: 基本設定 site_sub_menu: 網站次選單 site_title: 網站標題 + site_title_help: | + 請提供貴單位網站抬頭,以可明確的辨識貴單位名稱為主。
+ 抬頭將會顯示於使用者瀏覽器標題列上,是搜尋條件中重要的關鍵字之一。
+ 若勾選永遠顯示則無論連至任一內頁,標題列都會顯示該網站標題,否則將只顯示該頁標題。 setup_member: 成員設置 setup_translations: 語系設定 setup_designs: 版型設定 @@ -204,9 +229,11 @@ zh_tw: site_setting: 網站設定 super_pages: 可編頁面 structure: 網站結構 + system_info: 系統資訊 title: 標題 translation: 翻譯 type: 類型 + ui_theme: 佈景主題 up_to_date: 最新版本 update_error_link: 更新鏈接時出現錯誤。 update_error_page: 更新頁面時出現錯誤。