Commit fc37fcd5 authored by nickchen's avatar nickchen 🎨

Merge branch 'nick'

# Conflicts:
#	Merchant Token Vault Management/backstage/Views/Key/ListKeys.cshtml
parents 2a9247f3 ef148c4d
...@@ -177,6 +177,9 @@ ...@@ -177,6 +177,9 @@
<data name="Description" xml:space="preserve"> <data name="Description" xml:space="preserve">
<value>描述</value> <value>描述</value>
</data> </data>
<data name="Edit key" xml:space="preserve">
<value>編輯鑰匙</value>
</data>
<data name="Enable" xml:space="preserve"> <data name="Enable" xml:space="preserve">
<value>啟用</value> <value>啟用</value>
</data> </data>
......
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Back to list" xml:space="preserve">
<value>返回列表</value>
</data>
<data name="Basic" xml:space="preserve">
<value>基本資料</value>
</data>
<data name="created" xml:space="preserve">
<value>建立日期</value>
</data>
<data name="desc" xml:space="preserve">
<value>描述</value>
</data>
<data name="enabled" xml:space="preserve">
<value>狀態</value>
</data>
<data name="merchant_id" xml:space="preserve">
<value>編號</value>
</data>
<data name="Modify Token Vault" xml:space="preserve">
<value>修改Token Vault</value>
</data>
<data name="name" xml:space="preserve">
<value>名稱</value>
</data>
<data name="Submit" xml:space="preserve">
<value>送出</value>
</data>
<data name="tokenCount" xml:space="preserve">
<value>代碼數量</value>
</data>
<data name="type" xml:space="preserve">
<value>種類</value>
</data>
<data name="userCount" xml:space="preserve">
<value>使用者數量</value>
</data>
</root>
\ No newline at end of file
...@@ -195,6 +195,9 @@ ...@@ -195,6 +195,9 @@
<data name="Mask" xml:space="preserve"> <data name="Mask" xml:space="preserve">
<value>遮罩</value> <value>遮罩</value>
</data> </data>
<data name="Mask list management" xml:space="preserve">
<value>遮罩列表管理</value>
</data>
<data name="Name" xml:space="preserve"> <data name="Name" xml:space="preserve">
<value>名稱</value> <value>名稱</value>
</data> </data>
......
...@@ -129,6 +129,9 @@ ...@@ -129,6 +129,9 @@
<data name="Allow delete" xml:space="preserve"> <data name="Allow delete" xml:space="preserve">
<value>允許刪除</value> <value>允許刪除</value>
</data> </data>
<data name="Allow mask" xml:space="preserve">
<value>遮罩權限</value>
</data>
<data name="Allow new" xml:space="preserve"> <data name="Allow new" xml:space="preserve">
<value>允許新增</value> <value>允許新增</value>
</data> </data>
...@@ -186,6 +189,9 @@ ...@@ -186,6 +189,9 @@
<data name="Field List Management" xml:space="preserve"> <data name="Field List Management" xml:space="preserve">
<value>欄位列表管理</value> <value>欄位列表管理</value>
</data> </data>
<data name="Field Users List Management" xml:space="preserve">
<value>欄位使用者列表管理</value>
</data>
<data name="Format" xml:space="preserve"> <data name="Format" xml:space="preserve">
<value>格式</value> <value>格式</value>
</data> </data>
......
...@@ -123,6 +123,9 @@ ...@@ -123,6 +123,9 @@
<data name="Choose department" xml:space="preserve"> <data name="Choose department" xml:space="preserve">
<value>選擇部門</value> <value>選擇部門</value>
</data> </data>
<data name="Create" xml:space="preserve">
<value>建立</value>
</data>
<data name="Create date" xml:space="preserve"> <data name="Create date" xml:space="preserve">
<value>建立日</value> <value>建立日</value>
</data> </data>
...@@ -162,6 +165,9 @@ ...@@ -162,6 +165,9 @@
<data name="Permission" xml:space="preserve"> <data name="Permission" xml:space="preserve">
<value>權限</value> <value>權限</value>
</data> </data>
<data name="Permission Management" xml:space="preserve">
<value>權限管理</value>
</data>
<data name="Please select permission" xml:space="preserve"> <data name="Please select permission" xml:space="preserve">
<value>請選擇權限(複選)</value> <value>請選擇權限(複選)</value>
</data> </data>
......
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Account Information" xml:space="preserve">
<value>帳戶信息</value>
</data>
<data name="Cancel" xml:space="preserve">
<value>取消</value>
</data>
<data name="Change Password" xml:space="preserve">
<value>更改密碼</value>
</data>
<data name="Confirm" xml:space="preserve">
<value>確認</value>
</data>
<data name="Current passwrod" xml:space="preserve">
<value>目前密碼</value>
</data>
<data name="name" xml:space="preserve">
<value>名稱</value>
</data>
<data name="New password" xml:space="preserve">
<value>新密碼</value>
</data>
<data name="Submit" xml:space="preserve">
<value>送出</value>
</data>
<data name="username" xml:space="preserve">
<value>使用者名稱</value>
</data>
</root>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Back to list" xml:space="preserve">
<value>返回列表</value>
</data>
<data name="Basic" xml:space="preserve">
<value>基本資料</value>
</data>
<data name="creation_date" xml:space="preserve">
<value>建立日期</value>
</data>
<data name="merchant_id" xml:space="preserve">
<value>部門ID</value>
</data>
<data name="Modify Department" xml:space="preserve">
<value>修改部門</value>
</data>
<data name="name" xml:space="preserve">
<value>名稱</value>
</data>
<data name="phone" xml:space="preserve">
<value>電話</value>
</data>
<data name="Submit" xml:space="preserve">
<value>送出</value>
</data>
</root>
\ No newline at end of file
...@@ -129,6 +129,9 @@ ...@@ -129,6 +129,9 @@
<data name="Confrim" xml:space="preserve"> <data name="Confrim" xml:space="preserve">
<value>確認</value> <value>確認</value>
</data> </data>
<data name="created_date" xml:space="preserve">
<value>建立日期</value>
</data>
<data name="creation_date" xml:space="preserve"> <data name="creation_date" xml:space="preserve">
<value>建立日期</value> <value>建立日期</value>
</data> </data>
......
...@@ -57,6 +57,9 @@ ...@@ -57,6 +57,9 @@
</div> </div>
<div class="newBlock"> <div class="newBlock">
<button type="button" class="btn btn-info btn-mainblue-solid0 float-right disabledClass mb-3" data-toggle="modal" data-target="#newApp">@*<img src="~/images/memberGo/apiKey/newapp-w-300ppi.png">*@@Localizer["Create key"]</button> <button type="button" class="btn btn-info btn-mainblue-solid0 float-right disabledClass mb-3" data-toggle="modal" data-target="#newApp">@*<img src="~/images/memberGo/apiKey/newapp-w-300ppi.png">*@@Localizer["Create key"]</button>
=======
<button type="button" class="btn btn-mainblue-solid float-right disabledClass mb-2" data-toggle="modal" data-target="#newApp"><img src="~/images/memberGo/apiKey/newapp-w-300ppi.png">@Localizer["Create key"]</button>
>>>>>>> nick
<div class="table-responsive"> <div class="table-responsive">
<!--交易紀錄列表 table--> <!--交易紀錄列表 table-->
...@@ -132,7 +135,7 @@ ...@@ -132,7 +135,7 @@
<!--END of 權限 Popup Form--> <!--END of 權限 Popup Form-->
<!--New App Popup Form--> <!--New App Popup Form-->
<!-- Modal --> <!-- Modal -->
<div class="modal fade" id="newApp" role="dialog" tabindex="-1"> <div class="modal fade modal-full" id="newApp" role="dialog" tabindex="-1">
<div class="modal-dialog modalforMemberGo"> <div class="modal-dialog modalforMemberGo">
<!-- Modal content--> <!-- Modal content-->
<div class="modal-content"> <div class="modal-content">
...@@ -231,7 +234,7 @@ ...@@ -231,7 +234,7 @@
<!--END of 權限 Popup Form--> <!--END of 權限 Popup Form-->
<!--New App Popup Form--> <!--New App Popup Form-->
<!-- Modal --> <!-- Modal -->
<div class="modal fade" id="editApp" role="dialog" tabindex="-1"> <div class="modal fade modal-full" id="editApp" role="dialog" tabindex="-1">
<div class="modal-dialog modalforMemberGo"> <div class="modal-dialog modalforMemberGo">
<!-- Modal content--> <!-- Modal content-->
<div class="modal-content"> <div class="modal-content">
......
@model backstage.Models.TokenVault.TokenVault @using Microsoft.AspNetCore.Mvc.Localization
@inject IViewLocalizer Localizer
@model backstage.Models.TokenVault.TokenVault
@{ @{
ViewData["Title"] = "Modify Token Vault"; ViewData["Title"] = "Modify Token Vault";
} }
...@@ -7,7 +9,7 @@ ...@@ -7,7 +9,7 @@
<!-- partial --> <!-- partial -->
<div class="page-header"> <div class="page-header">
<h3 class="page-title">Modify Token Vault</h3> <h3 class="page-title">@Localizer["Modify Token Vault"]</h3>
<input id="msg" hidden value="@TempData["msg"]" /> <input id="msg" hidden value="@TempData["msg"]" />
@if (TempData["isSuccess"] != null) @if (TempData["isSuccess"] != null)
{ {
...@@ -19,20 +21,20 @@ ...@@ -19,20 +21,20 @@
<div class="col-12 grid-margin stretch-card"> <div class="col-12 grid-margin stretch-card">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<h4 class="card-title">Modify Token Vault</h4> <h4 class="card-title">@Localizer["Modify Token Vault"]</h4>
<form class="forms-sample" method="post" asp-action="CreateDepartment" autocomplete="off"> <form class="forms-sample" method="post" asp-action="CreateDepartment" autocomplete="off">
<div id="errorMsg" asp-validation-summary="All" class="text-danger"></div> <div id="errorMsg" asp-validation-summary="All" class="text-danger"></div>
<p class="form-title card-description">Basic data</p> <p class="form-title card-description">@Localizer["Basic"]</p>
<div class="row"> <div class="row">
<div class="col-md-6 form-group required"> <div class="col-md-6 form-group required">
<label asp-for="merchant_id" class="col-form-label" for=""></label> <label asp-for="merchant_id" class="col-form-label" for="">@Localizer["merchant_id"]</label>
<select id="selectDepartmentList" class="form-control" asp-items="ViewBag.DepartmentsList" asp-for="merchant_id"> <select id="selectDepartmentList" class="form-control" asp-items="ViewBag.DepartmentsList" asp-for="merchant_id">
</select> </select>
</div> </div>
<div class="col-md-4 form-group required"> <div class="col-md-4 form-group required">
<label asp-for="created" class="col-form-label" for=""></label> <label asp-for="created" class="col-form-label" for="">@Localizer["created"]</label>
<input asp-for="created" type="text" class="form-control" disabled> <input asp-for="created" type="text" class="form-control" disabled>
</div> </div>
...@@ -41,13 +43,13 @@ ...@@ -41,13 +43,13 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4 form-group required"> <div class="col-md-4 form-group required">
<label asp-for="name" class="col-form-label" for=""></label> <label asp-for="name" class="col-form-label" for="">@Localizer["name"]</label>
<input asp-for="name" type="text" class="form-control" id=""> <input asp-for="name" type="text" class="form-control" id="">
<span asp-validation-for="name" class="text-danger"></span> <span asp-validation-for="name" class="text-danger"></span>
</div> </div>
<div class="col-md-4 form-group required"> <div class="col-md-4 form-group required">
<label asp-for="desc" class="col-form-label" for=""></label> <label asp-for="desc" class="col-form-label" for="">@Localizer["desc"]</label>
<input asp-for="desc" type="text" class="form-control" id=""> <input asp-for="desc" type="text" class="form-control" id="">
<span asp-validation-for="desc" class="text-danger"></span> <span asp-validation-for="desc" class="text-danger"></span>
</div> </div>
...@@ -55,13 +57,13 @@ ...@@ -55,13 +57,13 @@
<div class="row"> <div class="row">
<div class="col-md-4 form-group required"> <div class="col-md-4 form-group required">
<label asp-for="type" class="col-form-label" for=""></label> <label asp-for="type" class="col-form-label" for="">@Localizer["type"]</label>
<input asp-for="type" type="text" class="form-control" id="" disabled> <input asp-for="type" type="text" class="form-control" id="" disabled>
<span asp-validation-for="type" class="text-danger"></span> <span asp-validation-for="type" class="text-danger"></span>
</div> </div>
<div class="col-md-4 form-group required"> <div class="col-md-4 form-group required">
<label asp-for="enabled" class="col-form-label" for=""></label> <label asp-for="enabled" class="col-form-label" for="">@Localizer["enabled"]</label>
<input asp-for="enabled" type="text" class="form-control" id="" disabled> <input asp-for="enabled" type="text" class="form-control" id="" disabled>
<span asp-validation-for="enabled" class="text-danger"></span> <span asp-validation-for="enabled" class="text-danger"></span>
</div> </div>
...@@ -70,13 +72,13 @@ ...@@ -70,13 +72,13 @@
<div class="row"> <div class="row">
<div class="col-md-4 form-group required"> <div class="col-md-4 form-group required">
<label asp-for="tokenCount" class="col-form-label" for=""></label> <label asp-for="tokenCount" class="col-form-label" for="">@Localizer["tokenCount"]</label>
<input asp-for="tokenCount" type="text" class="form-control" id="" disabled> <input asp-for="tokenCount" type="text" class="form-control" id="" disabled>
</div> </div>
<div class="col-md-4 form-group required"> <div class="col-md-4 form-group required">
<label asp-for="userCount" class="col-form-label" for=""></label> <label asp-for="userCount" class="col-form-label" for="">@Localizer["userCount"]</label>
<input asp-for="userCount" type="text" class="form-control" id="" disabled> <input asp-for="userCount" type="text" class="form-control" id="" disabled>
</div> </div>
...@@ -85,8 +87,8 @@ ...@@ -85,8 +87,8 @@
<button type="submit" class="btn btn-primary mr-2">Submit</button> <button type="submit" class="btn btn-primary mr-2">@Localizer["Submit"]</button>
<a type="button" class="btn btn-light" asp-action="List">Back to list</a> <a type="button" class="btn btn-light" asp-action="List">@Localizer["Back to list"]</a>
</form> </form>
</div> </div>
</div> </div>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<ul class="breadcrumb breadcrumb_memberGo"> <ul class="breadcrumb breadcrumb_memberGo">
<li class="breadcrumb-item active"><a asp-action="List" asp-route-merchantId="@ViewBag.Merchant_id"> @Localizer["Token Vault List"]</a></li> <li class="breadcrumb-item active"><a asp-action="List" asp-route-merchantId="@ViewBag.Merchant_id"> @Localizer["Token Vault List"]</a></li>
<li class="breadcrumb-item active"><a asp-action="ListFields" asp-route-merchant_id="@ViewBag.Merchant_id" asp-route-vault_id="@ViewBag.vault_id">@Localizer["Field List Management"]</a></li> <li class="breadcrumb-item active"><a asp-action="ListFields" asp-route-merchant_id="@ViewBag.Merchant_id" asp-route-vault_id="@ViewBag.vault_id">@Localizer["Field List Management"]</a></li>
<li class="breadcrumb-item ">@Localizer["Data mask"]</li> <li class="breadcrumb-item ">@Localizer["Data Mask"]</li>
</ul> </ul>
</div> </div>
</div> </div>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
} }
<div class="page-header"> <div class="page-header">
<h3 class="page-title">欄位Users列表管理</h3> <h3 class="page-title">@Localizer["Field Users List Management"]</h3>
<input id="msg" hidden value="@TempData["msg"]" /> <input id="msg" hidden value="@TempData["msg"]" />
@if (TempData["isSuccess"] != null) @if (TempData["isSuccess"] != null)
{ {
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
--> -->
<h3 class="modal-title"> <h3 class="modal-title">
@Localizer["Add user"] @Localizer["Add User"]
</h3> </h3>
</div> <!--END of div "modal-header"--> </div> <!--END of div "modal-header"-->
......
@model backstage.Models.Users.User @using Microsoft.AspNetCore.Mvc.Localization
@inject IViewLocalizer Localizer
@model backstage.Models.Users.User
@{ @{
ViewData["Title"] = "Change Password"; ViewData["Title"] = "Change Password";
} }
...@@ -10,7 +12,7 @@ ...@@ -10,7 +12,7 @@
<!-- partial --> <!-- partial -->
<div class="page-header"> <div class="page-header">
<h3 class="page-title">更改密碼</h3> <h3 class="page-title">@Localizer["Change Password"]</h3>
<input id="msg" hidden value="@TempData["msg"]" /> <input id="msg" hidden value="@TempData["msg"]" />
@if (TempData["isSuccess"] != null) @if (TempData["isSuccess"] != null)
{ {
...@@ -22,57 +24,57 @@ ...@@ -22,57 +24,57 @@
<div class="col-12 grid-margin stretch-card"> <div class="col-12 grid-margin stretch-card">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<h4 class="card-title">Change Password</h4> <h4 class="card-title">@Localizer["Change Password"]</h4>
<form class="forms-sample" method="post" asp-action="ChangePassword" asp-route-returnUrl="@ViewBag.returnUrl" autocomplete="off"> <form class="forms-sample" method="post" asp-action="ChangePassword" asp-route-returnUrl="@ViewBag.returnUrl" autocomplete="off">
<div id="errorMsg" asp-validation-summary="All" class="text-danger"></div> <div id="errorMsg" asp-validation-summary="All" class="text-danger"></div>
<input hidden asp-for="username" /> <input hidden asp-for="username" />
<p class="form-title card-description">Account Information</p> <p class="form-title card-description">@Localizer["Account Information"]</p>
<div class="row" style="@displayStyle"> <div class="row" style="@displayStyle">
<div class="col-md-4 form-group required"> <div class="col-md-4 form-group required">
<label asp-for="uid" class="col-form-label" for=""></label> <label asp-for="uid" class="col-form-label" for=""></label>
<input asp-for="uid" type="text" class="form-control" disabled> <input asp-for="uid" type="text" class="form-control" disabled>
</div> </div>
<div class="col-md-4 form-group required"> <div class="col-md-4 form-group required">
<label asp-for="name" class="col-form-label" for=""></label> <label asp-for="name" class="col-form-label" for="">@Localizer["name"]</label>
<input asp-for="name" type="text" class="form-control" disabled> <input asp-for="name" type="text" class="form-control" disabled>
</div> </div>
<div class="col-md-4 form-group required"> <div class="col-md-4 form-group required">
<label asp-for="username" class="col-form-label" for=""></label> <label asp-for="username" class="col-form-label" for="">@Localizer["username"]</label>
<input asp-for="username" type="text" class="form-control" disabled> <input asp-for="username" type="text" class="form-control" disabled>
</div> </div>
</div> </div>
<p class="form-title card-description">Change Password</p> <p class="form-title card-description">@Localizer["Change Password"]</p>
<div class="row"> <div class="row">
<div class="col-md-4 form-group required"> <div class="col-md-4 form-group required">
<label asp-for="password" class="col-form-label" for="">Current passwrod</label> <label asp-for="password" class="col-form-label" for="">@Localizer["Current passwrod"]</label>
<input asp-for="password" type="password" class="form-control"> <input asp-for="password" type="password" class="form-control">
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4 form-group required"> <div class="col-md-4 form-group required">
<label asp-for="newPassword" class="col-form-label">New password</label> <label asp-for="newPassword" class="col-form-label">@Localizer["New password"]</label>
<input asp-for="newPassword" type="password" class="form-control" id="newPWD"> <input asp-for="newPassword" type="password" class="form-control" id="newPWD">
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4 form-group required"> <div class="col-md-4 form-group required">
<label class="col-form-label">Confirm</label> <label class="col-form-label">@Localizer["Confirm"]</label>
<input class="form-control" type="password" id="confirmPWD"> <input class="form-control" type="password" id="confirmPWD">
<span id="passwordMatchError" class="text-danger" style="display: none;">The two passwords entered do not match</span> <span id="passwordMatchError" class="text-danger" style="display: none;">The two passwords entered do not match</span>
</div> </div>
</div> </div>
<button type="submit" class="btn btn-primary mr-2">Submit</button> <button type="submit" class="btn btn-primary mr-2">@Localizer["Submit"]</button>
<a type="button" class="btn btn-light" asp-action="Index" , asp-controller="Home">Cancel</a> <a type="button" class="btn btn-light" asp-action="Index" , asp-controller="Home">@Localizer["Cancel"]</a>
</form> </form>
</div> </div>
</div> </div>
......
@model backstage.Models.Users.Department @using Microsoft.AspNetCore.Mvc.Localization
@inject IViewLocalizer Localizer
@model backstage.Models.Users.Department
@{ @{
ViewData["Title"] = "Modify Department"; ViewData["Title"] = "Modify Department";
} }
...@@ -7,7 +9,7 @@ ...@@ -7,7 +9,7 @@
<!-- partial --> <!-- partial -->
<div class="page-header"> <div class="page-header">
<h3 class="page-title">Modify Department</h3> <h3 class="page-title">@Localizer["Modify Department"]</h3>
<input id="msg" hidden value="@TempData["msg"]" /> <input id="msg" hidden value="@TempData["msg"]" />
@if (TempData["isSuccess"] != null) @if (TempData["isSuccess"] != null)
{ {
...@@ -19,20 +21,20 @@ ...@@ -19,20 +21,20 @@
<div class="col-12 grid-margin stretch-card"> <div class="col-12 grid-margin stretch-card">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<h4 class="card-title">Modify Department</h4> <h4 class="card-title">@Localizer["Modify Department"]</h4>
<div> <div>
<form class="forms-sample" method="post" asp-action="EditDepartment" autocomplete="off"> <form class="forms-sample" method="post" asp-action="EditDepartment" autocomplete="off">
<div id="errorMsg" asp-validation-summary="All" class="text-danger"></div> <div id="errorMsg" asp-validation-summary="All" class="text-danger"></div>
<p class="form-title card-description">Basic</p> <p class="form-title card-description">@Localizer["Basic"]</p>
<div class="row"> <div class="row">
<div class="col-md-4 form-group required"> <div class="col-md-4 form-group required">
<label asp-for="merchant_id" class="col-form-label" for=""></label> <label asp-for="merchant_id" class="col-form-label" for="">@Localizer["merchant_id"]</label>
<input asp-for="merchant_id" type="text" class="form-control" id="" disabled> <input asp-for="merchant_id" type="text" class="form-control" id="" disabled>
</div> </div>
<div class="col-md-4 form-group "> <div class="col-md-4 form-group ">
<label asp-for="creation_date" class="col-form-label" for="creation_date"></label> <label asp-for="creation_date" class="col-form-label" for="creation_date">@Localizer["creation_date"]</label>
<input asp-for="creation_date" class="form-control" id="creation_date" disabled> <input asp-for="creation_date" class="form-control" id="creation_date" disabled>
</div> </div>
...@@ -40,12 +42,12 @@ ...@@ -40,12 +42,12 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4 form-group required"> <div class="col-md-4 form-group required">
<label asp-for="name" class="col-form-label" for=""></label> <label asp-for="name" class="col-form-label" for="">@Localizer["name"]</label>
<input asp-for="name" type="text" class="form-control" id=""> <input asp-for="name" type="text" class="form-control" id="">
<span asp-validation-for="name" class="text-danger"></span> <span asp-validation-for="name" class="text-danger"></span>
</div> </div>
<div class="col-md-4 form-group "> <div class="col-md-4 form-group ">
<label asp-for="phone" class="col-form-label" for="phone"></label> <label asp-for="phone" class="col-form-label" for="phone">@Localizer["phone"]</label>
<input asp-for="phone" class="form-control" id="phone"> <input asp-for="phone" class="form-control" id="phone">
<span asp-validation-for="phone" class="text-danger"></span> <span asp-validation-for="phone" class="text-danger"></span>
</div> </div>
...@@ -55,8 +57,8 @@ ...@@ -55,8 +57,8 @@
<button type="submit" class="btn btn-primary mr-2" id="submitButton">Submit</button> <button type="submit" class="btn btn-primary mr-2" id="submitButton">@Localizer["Submit"]</button>
<a type="button" class="btn btn-light" asp-action="ListDepartments">Back to list</a> <a type="button" class="btn btn-light" asp-action="ListDepartments">@Localizer["Back to list"]</a>
</form> </form>
</div> </div>
</div> </div>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<!-- partial --> <!-- partial -->
<div class="page-header"> <div class="page-header">
<h3 class="page-title">Modify User</h3> <h3 class="page-title">@Localizer["Modify User"]</h3>
<input id="msg" hidden value="@TempData["msg"]" /> <input id="msg" hidden value="@TempData["msg"]" />
@if (TempData["isSuccess"] != null) @if (TempData["isSuccess"] != null)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment