add details for button in site info

Conflicts:
	config/locales/en.yml

app/views/admin/sites/site_info.html.erb

@@ -44,12 +44,12 @@
                   <% end %>
                  <% end %>
 
-                  <!-- Always shoe in the title bar -->
+                  <!-- Always show in the title bar -->
                   <div class="control-group">
                     <label class="control-label muted"><%= t :always_display_title %>
                     </label>
                     <div class="controls">
-                      <%= f.check_box :title_always_on, :class => "toggle-check" %> 
+                      <%= f.check_box :title_always_on, :class => "toggle-check", :data => { :title => t('site_title_always_display') } %> 
                     </div>
                   </div>
 
@@ -70,7 +70,7 @@
 
                     <!-- Sitemap menu in Header -->
                     <div class="control-group">
-                      <label class="control-label muted">Sitemap menu in header
+                      <label class="control-label muted"><%= t :sitemap_menu_in_header %>
                       </label>
                       <div class="controls">
                       <%= f.check_box :sitemap_menu_in_header, :class => "toggle-check" %> 
@@ -96,17 +96,16 @@
 
                   <!-- Terms of Use -->
                   <div class="control-group">
-                    <label class="control-label muted">Terms of Use
+                    <label class="control-label muted"><%= t('site.terms_of_use')%></label>
-                    </label>
                     <div class="controls">
-                      <%= f.check_box :enable_terms_of_use, :class => "toggle-check" %> 
+                      <%= f.check_box :enable_terms_of_use, :class => "toggle-check", :data => { :title => t('site.terms_display_in_footer') } %> 
                     </div>
                   </div>
 
                   <!-- CKeditor Site Footer -->
                   <% @site_in_use_locales.each do |locale|%>
                   <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
-                    <label class="control-label muted"><%= t('site.default_terms_of_use')%></label>
+                    <label class="control-label muted"><%= t('site.terms_of_use_content')%></label>
                     <div class="controls">
                       <div class="textarea">
                         <%= f.fields_for :terms_of_use_translations do |f| %>

config/locales/en.yml

@@ -424,6 +424,9 @@ en:
         no_data: No Data
         version: Version
         weekness_report: Weekness Report
+    terms_of_use: Terms of Use 
+    terms_of_use_content: Terms of Use Content
+    terms_display_in_footer: Display in footer
     title: Site Title
     title_help: Site Title Guide
   site_: Site
@@ -432,6 +435,8 @@ en:
   sitemap: Sitemap
   site_name: Site Name
   site_structure: Structure
+  site_title_always_display: "Site title will be always displayed in the title bar of the browser, page tile will be after site title."
+  sitemap_menu_in_header: Sitemap menu in header
   size: Size
   start: Start
   start_date: Start date

config/locales/zh_tw.yml

@@ -425,6 +425,9 @@ zh_tw:
         no_data: 沒有資訊
         version: 版本
         weekness_report: 弱點掃瞄資訊
+    terms_of_use: 使用規則
+    terms_of_use_content: 使用規則內容
+    terms_display_in_footer: 是否顯示於頁尾
     title: 網站標題
     title_help: 網站標題說明
   site_: 網站
@@ -433,6 +436,8 @@ zh_tw:
   site_structure: 網站架構
   sitemap: 網站地圖
   site_name: 網站名稱
+  site_title_always_display: 網站標題將永遠顯示於瀏覽器頁籤、頁面標題將列於網站標題後方
+  sitemap_menu_in_header: 網站導覽顯示於頁首
   size: 大小
   start: 開始
   start_date: 開始日期