調整UI、中英文名稱 (未完成)

Merchant Token Vault Management/backstage/Resources/Views/TokenVault/CreateTokenVault.zh.resx

@@ -160,7 +160,7 @@
     <value>狀態</value>
   </data>
   <data name="Token Vault List" xml:space="preserve">
-    <value>代碼化保險庫列管理</value>
+    <value>代碼化保險庫列表管理</value>
   </data>
   <data name="Tpye" xml:space="preserve">
     <value>種類</value>

Merchant Token Vault Management/backstage/Resources/Views/TokenVault/List.zh.resx

@@ -154,7 +154,7 @@
     <value>狀態</value>
   </data>
   <data name="Token Vault List" xml:space="preserve">
-    <value>代碼化保險庫列管理</value>
+    <value>代碼化保險庫列表管理</value>
   </data>
   <data name="Tpye" xml:space="preserve">
     <value>種類</value>

Merchant Token Vault Management/backstage/Resources/Views/TokenVault/ListFields.zh.resx

@@ -117,12 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Add Field" xml:space="preserve">
+    <value>新增欄位</value>
+  </data>
   <data name="Choose department" xml:space="preserve">
     <value>選擇部門</value>
   </data>
-  <data name="Create" xml:space="preserve">
-    <value>新增欄位</value>
-  </data>
   <data name="Create Department" xml:space="preserve">
     <value>新增部門</value>
   </data>
@@ -175,7 +175,7 @@
     <value>狀態</value>
   </data>
   <data name="Token Vault List" xml:space="preserve">
-    <value>代碼化保險庫列管理</value>
+    <value>代碼化保險庫列表管理</value>
   </data>
   <data name="Tpye" xml:space="preserve">
     <value>種類</value>

Merchant Token Vault Management/backstage/Resources/Views/TokenVault/ListMasks.zh.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Add Field" xml:space="preserve">
+    <value>新增欄位</value>
+  </data>
   <data name="Add mask" xml:space="preserve">
     <value>新增遮罩</value>
   </data>
@@ -144,9 +147,6 @@
   <data name="Confirm" xml:space="preserve">
     <value>確認</value>
   </data>
-  <data name="Create" xml:space="preserve">
-    <value>新增欄位</value>
-  </data>
   <data name="Create Department" xml:space="preserve">
     <value>新增部門</value>
   </data>
@@ -238,7 +238,7 @@
     <value>狀態</value>
   </data>
   <data name="Token Vault List" xml:space="preserve">
-    <value>代碼化保險庫列管理</value>
+    <value>代碼化保險庫列表管理</value>
   </data>
   <data name="Tpye" xml:space="preserve">
     <value>種類</value>

Merchant Token Vault Management/backstage/Resources/Views/TokenVault/ListUsers.zh.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Add Field" xml:space="preserve">
+    <value>新增欄位</value>
+  </data>
   <data name="Add User" xml:space="preserve">
     <value>新增使用者</value>
   </data>
@@ -153,9 +156,6 @@
   <data name="Confirm" xml:space="preserve">
     <value>確認</value>
   </data>
-  <data name="Create" xml:space="preserve">
-    <value>新增欄位</value>
-  </data>
   <data name="Create Department" xml:space="preserve">
     <value>新增部門</value>
   </data>
@@ -244,7 +244,7 @@
     <value>狀態</value>
   </data>
   <data name="Token Vault List" xml:space="preserve">
-    <value>代碼化保險庫列管理</value>
+    <value>代碼化保險庫列表管理</value>
   </data>
   <data name="Tpye" xml:space="preserve">
     <value>種類</value>

Merchant Token Vault Management/backstage/Resources/Views/User/ListDepartments.zh.resx

@@ -120,7 +120,7 @@
   <data name="Back to list" xml:space="preserve">
     <value>返回列表</value>
   </data>
-  <data name="Create" xml:space="preserve">
+  <data name="Create Department" xml:space="preserve">
     <value>新增部門</value>
   </data>
   <data name="Creation Date" xml:space="preserve">

Merchant Token Vault Management/backstage/Resources/Views/User/ListUsers.zh.resx

@@ -123,7 +123,7 @@
   <data name="Admin count" xml:space="preserve">
     <value>Admin數量</value>
   </data>
-  <data name="Create" xml:space="preserve">
+  <data name="Create User" xml:space="preserve">
     <value>新增使用者</value>
   </data>
   <data name="creation_date" xml:space="preserve">

Merchant Token Vault Management/backstage/Views/Key/ListKeys.cshtml

@@ -141,7 +141,7 @@
 						<button type="button" class="close" data-dismiss="modal">&times;</button>
 						-->
 						<h3 class="modal-title">
-							<img src="~/images/memberGo/apiKey/newapp-orange-300ppi.png">
+							@*<img src="~/images/memberGo/apiKey/newapp-orange-300ppi.png">*@
 							@Localizer["Create key"]
 						</h3>
 					</div> <!--END of div "modal-header"-->
@@ -214,8 +214,8 @@
 							</div> -->
 							<!--</div>-->  <!-- End of iOS Adv-->
 							<div class="SubmitBlock">
-								<button id="CreateKey" type="button" class="btn btn-mainblue-solid btnSubmit">@Localizer["Send out"]</button>
-								<button type="button" class="btn btn-mainblue-hollow btnReset" data-dismiss="modal">@Localizer["Cancel"]</button>
+								<button id="CreateKey" type="button" class="btn btn-mainblue-solid btnSubmit0">@Localizer["Send out"]</button>
+								<button type="button" class="btn btn-mainblue-hollow btnReset0" data-dismiss="modal">@Localizer["Cancel"]</button>
 							</div>
 						</form>
 					</div> <!--END of div "modal-body"-->
@@ -240,7 +240,7 @@
 						<button type="button" class="close" data-dismiss="modal">&times;</button>
 						-->
 						<h3 class="modal-title">
-							<img src="~/images/memberGo/apiKey/newapp-orange-300ppi.png">
+							@*<img src="~/images/memberGo/apiKey/newapp-orange-300ppi.png">*@
 							@Localizer["Edit key"]
 						</h3>
 					</div> <!--END of div "modal-header"-->
@@ -249,6 +249,7 @@
 							<div class="form-group">
 
 								<div>
+									<label class="control-label" for="projectid">@Localizer["ID"]:</label>
 									<input type="text" class="form-control input-sm" id="edit_key_id" disabled>
 								</div>
 							</div>
@@ -274,8 +275,8 @@
 
 
 							<div class="SubmitBlock">
-								<button id="edit_key_submit" type="button" class="btn btn-mainblue-solid btnSubmit">@Localizer["Send out"]</button>
-								<button type="button" class="btn btn-mainblue-hollow btnReset" data-dismiss="modal">@Localizer["Cancel"]</button>
+								<button id="edit_key_submit" type="button" class="btn btn-mainblue-solid btnSubmit0">@Localizer["Send out"]</button>
+								<button type="button" class="btn btn-mainblue-hollow btnReset0" data-dismiss="modal">@Localizer["Cancel"]</button>
 							</div>
 						</form>
 					</div> <!--END of div "modal-body"-->

Merchant Token Vault Management/backstage/Views/TokenVault/ListFields.cshtml

@@ -90,7 +90,7 @@
 						</div>
 					</div>
 					<div style="float: right;">
-						<a type="button" class="btn btn-info btn-textW float-right mb-2 @disabledClass" data-toggle="modal" data-target="#myModal">@Localizer["Create"]</a>
+						<a type="button" class="btn btn-info btn-textW float-right mb-2 @disabledClass" data-toggle="modal" data-target="#myModal">@Localizer["Add Field"]</a>
 					</div>
 				</div>
 
@@ -147,42 +147,59 @@
 </div>
 
 <!-- MODAL -->
-<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-	<div class="modal-dialog" role="document">
+<div class="modal fade modal-full" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+	<div class="modal-dialog modalforMemberGo" role="document">
 		<div class="modal-content">
-			<form class="forms-sample" method="post" asp-action="CreateField" autocomplete="off">
-				<div id="errorMsg" asp-validation-summary="All" class="text-danger"></div>
 
-				<div class="modal-body">
-					<div class="form-group">
-						<input name="merchant_id" value=@ViewBag.Merchant_id hidden />
-						<input name="vault_id" value=@ViewBag.vault_id hidden />
-					</div>
-					<div class="form-group required">
-						<label class="control-label">@Localizer["Name"]</label>
-						<input name="name" type="text" class="form-control" oninput="validateForm()">
+			<div class="modal-header">
+				<!--
+				<button type="button" class="close" data-dismiss="modal">&times;</button>
+				-->
+				<h3 class="modal-title">
+					@Localizer["Add Field"]
+				</h3>
+			</div>
 
-						<div id="nameError" class="text-danger"></div>
-					</div>
-					<div class="form-group required">
-						<label class="control-label">@Localizer["Description"]</label>
-						<input name="desc" type="text" class="form-control">
-					</div>
-					<div class="form-group required">
-						<label class="control-label">@Localizer["Format"]</label>
-						<input name="format_exp" type="text" class="form-control">
-					</div>
-					<div class="form-group required">
-						<label class="form-check-label label-space">@Localizer["Enable"]</label>
-						<input name="enabled" type="checkbox" class="form-check-input" checked>
+			@*<form class="forms-sample" method="post" asp-action="CreateField" autocomplete="off">
+				<div id="errorMsg" asp-validation-summary="All" class="text-danger"></div>*@
+
+			<div class="modal-body" style="padding-top:35px">
+				<form class="forms-sample" method="post" asp-action="CreateField" autocomplete="off">
+					<div id="errorMsg" asp-validation-summary="All" class="text-danger"></div>
+						<div class="form-group">
+							<input name="merchant_id" value=@ViewBag.Merchant_id hidden />
+							<input name="vault_id" value=@ViewBag.vault_id hidden />
+						</div>
+						<div class="form-group required">
+							<label class="control-label">@Localizer["Name"]</label>
+							<input name="name" type="text" class="form-control" oninput="validateForm()">
 
+							<div id="nameError" class="text-danger"></div>
+						</div>
+						<div class="form-group required">
+							<label class="control-label">@Localizer["Description"]</label>
+							<input name="desc" type="text" class="form-control">
+						</div>
+						<div class="form-group required">
+							<label class="control-label">@Localizer["Format"]</label>
+							<input name="format_exp" type="text" class="form-control">
+						</div>
+						<div class="form-group required">
+							<label class="form-check-label label-space">@Localizer["Enable"]</label>
+							<input name="enabled" type="checkbox" class="form-check-input" checked>
+						</div>
+					<div class="SubmitBlock">
+						<button type="submit" class="btn btn-primary0 btn-mainblue-solid" id="createFieldBtn" disabled>@Localizer["Submit"]</button>
+						<button type="button" class="btn btn-light0 btn-mainblue-hollow " data-dismiss="modal">@Localizer["Cancel"]</button>
 					</div>
-				</div>
-				<div class="modal-footer">
+				</form>
+			</div>
+				@*<div class="modal-footer">
 					<button type="submit" class="btn btn-primary" id="createFieldBtn" disabled>@Localizer["Submit"]</button>
 					<button type="button" class="btn btn-light" data-dismiss="modal">@Localizer["Cancel"]</button>
 				</div>
-			</form>
+			</form>*@
+			<div class="modal-footer modalforMemberGo"></div>
 		</div>
 	</div>
 </div>

Merchant Token Vault Management/backstage/Views/User/CreateUser.cshtml

@@ -9,7 +9,7 @@
 <!-- partial -->
 
 <div class="page-header">
-	<h3 class="page-title">Create User</h3>
+	<h3 class="page-title">@Localizer["Create User"]</h3>
 	<input id="msg" hidden value="@TempData["msg"]" />
 	@if (TempData["isSuccess"] != null)
 	{
@@ -21,7 +21,7 @@
 	<div class="col-12 grid-margin stretch-card">
 		<div class="card">
 			<div class="card-body">
-				<h4 class="card-title">@Localizer["Create User"]</h4>
+				@*<h4 class="card-title">@Localizer["Create User"]</h4>*@
 
 				<form class="forms-sample" method="post" asp-action="CreateUser" autocomplete="off">
 					<div id="errorMsg" asp-validation-summary="All" class="text-danger"></div>

Merchant Token Vault Management/backstage/Views/User/ListDepartments.cshtml

@@ -19,7 +19,7 @@
 	<div class="col-lg-12 grid-margin stretch-card">
 		<div class="card">
 			<div class="card-body">
-				<a type="button" class="btn btn-info float-right mb-3 @disabledClass" asp-action="CreateDepartment">@Localizer["Create"]</a>
+				<a type="button" class="btn btn-info float-right mb-3 @disabledClass" asp-action="CreateDepartment">@Localizer["Create Department"]</a>
 
 				@*列表*@
 				<div class="">

Merchant Token Vault Management/backstage/Views/User/ListUsers.cshtml

@@ -30,7 +30,7 @@
 		<div class="card">
 			<div class="card-body">
 				<div id="adminStatus" style="float: left;">@Localizer["User count"]:@ViewBag.userCount / @Localizer["Admin count"]:@ViewBag.adminCount </div>
-				<a type="button" class="btn btn-info float-right mb-3 @disabledClass" asp-action="CreateUser">@Localizer["Create"]</a>
+				<a type="button" class="btn btn-info float-right mb-3 @disabledClass" asp-action="CreateUser">@Localizer["Create User"]</a>
 
 				@*列表*@
 				<div class="table-responsive">

Merchant Token Vault Management/backstage/wwwroot/css/tokenizationPlatform.css

@@ -2247,10 +2247,10 @@ input:checked + .slider:before {
 	font-size: 0.96em;
 }
 
-#memberGoTbl_masksList a{
-	text-decoration: none;
-	color: #6e6e6e;
-}
+	#memberGoTbl_masksList a {
+		text-decoration: none;
+		color: #337ab7 !important
+	}
 
 #memberGoTbl_masksList tbody tr:last-child{
 	border-bottom:solid 1px #d9d9d9;