From e97ac28918feae134897fa6dcbedd734f51ea6fc Mon Sep 17 00:00:00 2001
From: shimingxy <shimingxy@163.com>
Date: Sun, 1 Mar 2020 17:14:00 +0800
Subject: [PATCH] fix ui

fix ui
---
 .../templates/views/apps/basic/appUpdate.ftl  |  2 +-
 .../templates/views/apps/cas/appUpdate.ftl    |  2 +-
 .../templates/views/apps/desktop/appAdd.ftl   |  2 +-
 .../views/apps/desktop/appUpdate.ftl          |  6 +--
 .../templates/views/apps/extendapi/appAdd.ftl |  6 +--
 .../views/apps/extendapi/appUpdate.ftl        |  2 +-
 .../templates/views/apps/formbased/appAdd.ftl | 38 +------------------
 .../views/apps/formbased/appUpdate.ftl        |  2 +-
 8 files changed, 12 insertions(+), 48 deletions(-)

diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl
index ce8c3856..f275e6de 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl
@@ -42,7 +42,7 @@ $(function(){
 			enctype="multipart/form-data">		 
   	        <!-- content -->    
   	      	<!--table-->
-  	      	<table   class="datatable" >
+  	      	<table   class="table table-bordered" >
 				<tbody>
 				<tr>
 					<td ><#include  "../appUpdateCommon.ftl"/></td>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl
index 6fcf6817..e327547d 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl
@@ -42,7 +42,7 @@ $(function(){
 			enctype="multipart/form-data">		 
   	        <!-- content -->    
   	      	<!--table-->
-  	      	<table   class="datatable" >
+  	      	<table   class="table table-bordered" >
 				<tbody>
 				<tr>
 					<td ><#include  "../appUpdateCommon.ftl"/></td>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl
index 99e2de91..34090972 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl
@@ -190,7 +190,7 @@ $(function(){
 					<th><@locale code="apps.credential" />：</th>
 					<td colspan="3">
 						<select id="systemUserAttr" name="systemUserAttr" class="form-control" >
-							<option value="uid"><@locale code="userinfo.uid" /></option>
+							<option value="uid"><@locale code="userinfo.id" /></option>
 							<option value="employeeNumber"><@locale code="userinfo.employeeNumber" /></option>
 							<option value="username"  selected><@locale code="userinfo.username" /></option>
 							<option value="email"><@locale code="userinfo.email" /></option>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl
index 34c90211..506bec0f 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl
@@ -78,14 +78,14 @@ $(function(){
 			enctype="multipart/form-data">		 
   	        <!-- content -->    
   	      	<!--table-->
-			<table width="960" class="datatable" >
+			<table   class="table table-bordered" >
 				<tbody>
 				<tr>
 					<td ><#include  "../appUpdateCommon.ftl"/></td>
 				</tr>
 				<tr>
 					<td>
-			   <table width="960"   class="datatable" >
+			  <table   class="table table-bordered" >
 				<tbody>
 				<tr>
 					<td colspan=4><@locale code="apps.desktop.info" /></td>
@@ -202,7 +202,7 @@ $(function(){
 					<th><@locale code="apps.credential.system" />：</th>
 					<td colspan="3">
 						<select id="systemUserAttr" name="systemUserAttr" class="form-control">
-							<option value="uid"   <#if 'uid'==model.systemUserAttr>selected</#if> ><@locale code="userinfo.uid" /></option>
+							<option value="uid"   <#if 'uid'==model.systemUserAttr>selected</#if> ><@locale code="userinfo.id" /></option>
 							<option value="employeeNumber" <#if 'employeeNumber'==model.systemUserAttr>selected</#if> ><@locale code="userinfo.employeeNumber" /></option>
 							<option value="username" <#if 'username'==model.systemUserAttr>selected</#if> ><@locale code="userinfo.username" /></option>
 							<option value="email" <#if 'email'==model.systemUserAttr>selected</#if> ><@locale code="userinfo.email" /></option>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl
index 26b4a926..751e3e06 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl
@@ -89,7 +89,7 @@ $(function(){
 					<td colspan="3">
 						<select  class="form-control" id="systemUserAttr" name="systemUserAttr">
 							<option value="uid">
-								<@locale code="userinfo.uid"/></option>
+								<@locale code="userinfo.id"/></option>
 							<option value="employeeNumber">
 								<@locale code="userinfo.employeeNumber"/></option>
 							<option value="username"  selected>
@@ -103,12 +103,12 @@ $(function(){
 					</td>
 				</tr>
 				<tr id="sharedconfigure"  style="display:none">
-					<th><@locale code="apps.formbased.sharedUsername"/>：</th>
+					<th><@locale code="apps.credential.sharedUsername"/>：</th>
 					<td>
 						<input  class="form-control" type="text" id="sharedUsername" name="sharedUsername" value="" />
 						<b class="orange">*</b><label for="sharedUsername"></label>
 					</td>
-					<th><@locale code="apps.formbased.sharedPassword"/>：</th>
+					<th><@locale code="apps.credential.sharedPassword"/>：</th>
 					<td>
 						<input  class="form-control" type="text" id="sharedPassword" name="sharedPassword" value="" />
 						<b class="orange">*</b><label for="sharedPassword"></label>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl
index 3babab0d..19914cf4 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl
@@ -93,7 +93,7 @@ $(function(){
 					<td colspan="3">
 						<select id="systemUserAttr" name="systemUserAttr"  class="form-control" >
 							<option value="uid"   <#if  'uid'==model.systemUserAttr >selected</#if> >
-								<@locale code="userinfo.uid"/></option>
+								<@locale code="userinfo.id"/></option>
 							<option value="employeeNumber" <#if  'employeeNumber'==model.systemUserAttr >selected</#if> >
 								<@locale code="userinfo.employeeNumber"/></option>
 							<option value="username" <#if  'username'==model.systemUserAttr >selected</#if> >
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl
index 0ba16d38..06a04674 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl
@@ -13,40 +13,6 @@
 <script type="text/javascript">
 <!--
 $(function(){		
-	$("#isExtendAttr").on('click',function(){
-		if(this.checked){
-				$("#showExtendAttr").show();
-			} else {
-				$("#showExtendAttr").hide();
-				$('#extendAttrBody').empty();
-			}
-			
-	});
-	
-	var attrIndex = 0;
-		
-	function addExtendAttr(attribute,attributeValue){
-		var html = '<tr  id="extendTr_' + attrIndex + '"><th><@locale code="apps.formbased.parameter"/>：';   
-		 html += '<input  class="button delExtendTr"  type="button" name="delExtendTr" attrTrId="extendTr_'+attrIndex+'" value="<@locale code="button.text.delete" />"/>';
-		html += '</th><td>';   
-		html += '<input type="text" id="attribute_' + attrIndex + '" name="attribute" class="form-control" title="" value="'+attribute+'"/>';   
-        html += '</span></td><th><@locale code="apps.formbased.parameter.value"/>：</th>	<td><span class="intspan">';
-        html += '<input type="text" id="attributeValue_' + attrIndex + '" name="attributeValue"class="form-control"  title="" value="'+attributeValue+'"/>';
-        html += '</span>';
-       
-        html += '</td></tr>'; 
-		$('#extendAttrBody').append(html);
-		attrIndex++;
-	}
-	
-	$("#addExtendAttr").on('click',function(){
-		addExtendAttr("","");
-	});	
-				
-	$("#extendAttrBody").delegate(".delExtendTr",'click',function(){
-		$("#"+$(this).attr("attrTrId")).remove();
-	});
-	
 	$(".credential").on("click",function(){
 		if($(this).val()=="3"){
 			$("#sharedconfigure").hide();
@@ -141,7 +107,7 @@ $(function(){
 					<td colspan="3">
 						<select id="systemUserAttr" name="systemUserAttr"  class="form-control" >
 							<option value="uid">
-								<@locale code="userinfo.uid"/></option>
+								<@locale code="userinfo.id"/></option>
 							<option value="employeeNumber">
 								<@locale code="userinfo.employeeNumber"/></option>
 							<option value="username"  selected>
@@ -177,8 +143,6 @@ $(function(){
 					</td>
 				</tr>
 				</tbody>
-				<tbody id="extendAttrBody">
-				</tbody>
 				<tbody >
 					<tr>
 						<td colspan =4>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl
index 24f1b6cd..47652603 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl
@@ -110,7 +110,7 @@ $(function(){
 					<td colspan="3">
 						<select id="systemUserAttr" name="systemUserAttr" class="form-control">
 							<option value="uid"   <#if 'uid'==model.systemUserAttr>selected</#if> >
-								<@locale code="userinfo.uid"/></option>
+								<@locale code="userinfo.id"/></option>
 							<option value="employeeNumber" <#if 'employeeNumber'==model.systemUserAttr>selected</#if> >
 								<@locale code="userinfo.employeeNumber"/></option>
 							<option value="username" <#if 'username'==model.systemUserAttr>selected</#if> >