From 9c6bef074c210d3e03dff7240cbfed9b5f44a8e1 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Wed, 5 Jul 2017 11:22:01 +0800
Subject: [PATCH] some mods

---
 app/views/member_counselors/_body.html.erb | 28 +++++++++++-----------
 app/views/member_counselors/login.html.erb |  4 ++--
 app/views/member_counselors/show.html.erb  |  2 +-
 config/locales/en.yml                      |  7 +++++-
 config/locales/zh_tw.yml                   |  5 ++++
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app/views/member_counselors/_body.html.erb b/app/views/member_counselors/_body.html.erb
index 9191eb5..48f6856 100644
--- a/app/views/member_counselors/_body.html.erb
+++ b/app/views/member_counselors/_body.html.erb
@@ -1,12 +1,12 @@
 <%= csrf_meta_tag %>
 <script type="text/javascript" src="/assets/jquery_ujs.js"></script>
 <table width="100%" border="1">
-	<caption>執行計畫書 <a style="float: right;" href="<%= upload_cuser_file_path %>" class="btn btn-primary">Upload File</a></caption>
+	<caption>執行計畫書 <a style="float: right;" href="<%= upload_cuser_file_path %>" class="btn btn-primary"><%= t("member_counselor.upload_file") %></a></caption>
 	<thead>
 		<tr>
-			<th width="100px" >Date</th>
-			<th>Title</th>
-			<th width="200px">Action</th>
+			<th width="100px" ><%= t("member_counselor.date") %></th>
+			<th><%= t("member_counselor.title") %></th>
+			<th width="200px"><%= t("member_counselor.action") %></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -17,14 +17,14 @@
 				<td><%= file.title %></td>
 				<td>
 					<a href="<%= file.file.url %>" target="_blank">Download</a>
-					<a href="<%= edit_upload_cuser_file_path(file) %>">Edit</a>
-					<a style="color: red;" href="<%= delete_upload_cuser_file_path(file) %>" data-method="delete" data-confirm="Are you sure?">Delete</a>
+					<a href="<%= edit_upload_cuser_file_path(file) %>"><%= t("edit") %></a>
+					<a style="color: red;" href="<%= delete_upload_cuser_file_path(file) %>" data-method="delete" data-confirm="Are you sure?"><%= t("delete") %></a>
 				</td>
 			</tr>
 		<% end %>
 	<% else  %>
 		<tr>
-			<td colspan="3" style="text-align: center;">No files uploaded.</td>
+			<td colspan="3" style="text-align: center;"><%= t("member_counselor.no_files_uploaded") %></td>
 		</tr>
 	<% end %>
 	</tbody>
@@ -33,12 +33,12 @@
 <br />
 <br />
 <table width="100%" border="1">
-	<caption>成果報告 <a style="float: right;" href="<%= upload_cuser_result_path %>" class="btn btn-primary">Upload Result</a></caption>
+	<caption>成果報告 <a style="float: right;" href="<%= upload_cuser_result_path %>" class="btn btn-primary"><%= t("member_counselor.upload_file") %></a></caption>
 	<thead>
 		<tr>
-			<th width="100px" >Date</th>
-			<th>Title</th>
-			<th width="200px">Action</th>
+			<th width="100px" ><%= t("member_counselor.date") %></th>
+			<th><%= t("member_counselor.title") %></th>
+			<th width="200px"><%= t("member_counselor.action") %></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -49,14 +49,14 @@
 				<td><%= file.title %></td>
 				<td>
 					<a href="<%= file.file.url %>" target="_blank">Download</a>
-					<a href="<%= edit_upload_cuser_result_path(file) %>">Edit</a>
-					<a style="color: red;" href="<%= delete_upload_cuser_result_path(file) %>" data-method="delete" data-confirm="Are you sure?">Delete</a>
+					<a href="<%= edit_upload_cuser_result_path(file) %>"><%= t("edit") %></a>
+					<a style="color: red;" href="<%= delete_upload_cuser_result_path(file) %>" data-method="delete" data-confirm="Are you sure?"><%= t("delete") %></a>
 				</td>
 			</tr>
 		<% end %>
 	<% else  %>
 		<tr>
-			<td colspan="3" style="text-align: center;">No files uploaded.</td>
+			<td colspan="3" style="text-align: center;"><%= t("member_counselor.no_files_uploaded") %></td>
 		</tr>
 	<% end %>
 	</tbody>
diff --git a/app/views/member_counselors/login.html.erb b/app/views/member_counselors/login.html.erb
index 02c2c61..9575065 100644
--- a/app/views/member_counselors/login.html.erb
+++ b/app/views/member_counselors/login.html.erb
@@ -8,11 +8,11 @@
 
 <form action="/cuser/member_counselor/login" method="post">
 	<div>
-		<label for="username">Account</label>
+		<label for="username"><%= t("member_counselor.account") %></label>
 		<input type="text" name="username" id="username" />
 	</div>
 	<div>
-		<label for="password">Password</label>
+		<label for="password"><%= t("member_counselor.password") %></label>
 		<input type="password" name="password" id="password" />
 	</div>
 	<div>
diff --git a/app/views/member_counselors/show.html.erb b/app/views/member_counselors/show.html.erb
index 906f9f0..a04264d 100644
--- a/app/views/member_counselors/show.html.erb
+++ b/app/views/member_counselors/show.html.erb
@@ -1,4 +1,4 @@
-<a href="<%= member_logout_path %>">Logout</a>
+<a class="cuser_logout" href="<%= member_logout_path %>"><%= t("member_counselor.logout") %></a>
 <% case current_counselor_user.user_type %>
 <% when 0,1 %>
 	<%= render :partial => "body" %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index dfefab7..8a1a436 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -9,6 +9,8 @@ en:
     account: User Account
     password: Password
     confirm_password: Confirm Password
+    logout: Logout
+    upload_file: Upload File
     affilated_committee: Affilated Committee
     name: Name
     organization: Organization
@@ -30,4 +32,7 @@ en:
     city: City
     year: Year
     file_date: Date
-    downloaded_times: Download Count
\ No newline at end of file
+    downloaded_times: Download Count
+    date: Date
+    action: Action
+    no_files_uploaded: No Files Uploaded 
\ No newline at end of file
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 23330cb..cee6202 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -9,7 +9,9 @@ zh_tw:
     account: 帳號
     password: 密碼
     confirm_password: 確認密碼
+    logout: 登出
     affilated_committee: 所屬委員
+    upload_file: 上傳檔案
     name: 姓名
     organization: 服務機關
     title: 職稱
@@ -31,6 +33,9 @@ zh_tw:
     year: 年度
     file_date: Date
     downloaded_times: Download Count
+    date: 日期
+    action: 操作
+    no_files_uploaded: 尚未上傳任何檔案