Почетна Преглед Помоћ
Пријавите се
dromara
/
MaxKey
огледало од https://gitee.com/dromara/MaxKey.git
2
0
Креирај огранак 0
Датотеке Дискусије 0 Вики
Преглед изворни кода

style 优化

Crystal.Sea пре 3 година
родитељ
9c2b785678
комит
ad2e3c9eba
18 измењених фајлова са 64 додато и 100 уклоњено
Подељен поглед Покажи статистику Diff
  1. 10 6
      maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/appAccountsAdd.ftl
  2. 1 1
      maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appsList.ftl
  3. 6 10
      maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/selectAppsList.ftl
  4. 6 10
      maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl
  5. 4 3
      maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/groupAppsList.ftl
  6. 1 6
      maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/selectGroupsList.ftl
  7. 1 6
      maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl
  8. 7 6
      maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/layout/sidenav.ftl
  9. 1 6
      maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/resources/selectResourcesList.ftl
  10. 1 6
      maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/roles/selectRolesList.ftl
  11. 1 6
      maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/roleusers/addRoleUsersList.ftl
  12. 1 7
      maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/userInfoAdjointAdd.ftl
  13. 1 7
      maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/userInfoAdjointUpdate.ftl
  14. 1 6
      maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/userinfoAdjointList.ftl
  15. 1 6
      maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/userinfoSelect.ftl
  16. 5 0
      maxkey-webs/maxkey-web-resources/src/main/resources/static/css/base.css
  17. 14 0
      maxkey-webs/maxkey-web-resources/src/main/resources/static/css/minitable.css
  18. 2 8
      maxkey-webs/maxkey-web-resources/src/main/resources/static/css_mgt/base.css

+ 10 - 6
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/appAccountsAdd.ftl
Прегледај датотеку 

@@ -3,12 +3,16 @@
 
 <head>
 
 	<#include  "../layout/header.ftl"/>
 
 	<#include  "../layout/common.cssjs.ftl"/>
 
-<style   type="text/css">
 
-  .table th, .table td {
 
-    padding: .2rem;
 
-    vertical-align: middle;
 
-  }
 
-</style>
 
+    <link type="text/css" rel="stylesheet"  href="<@base />/static/css/minitable.css"/>
 
+    <script type="text/javascript">
 
+    $(function(){
 
+        $("#relatedUsername").focus(function(){
 
+          if($("#relatedUsername").val()==""){
 
+            $("#relatedUsername").val($("#username").val());
 
+          }
 
+        });
 
+    });
 
+    </script>
 
 </head>
 
 <body>

+ 1 - 1
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appsList.ftl
Прегледај датотеку 

@@ -5,7 +5,7 @@
 
 	<#include  "../layout/common.cssjs.ftl"/>
 
 <script type="text/javascript">				
 	function iconFormatter(value, row, index){
 
-  			return "<img width='30' height='30' border='0px' src='<@base/>/image/"+value+"'/>";
 
+  			return "<img height='30' border='0px' src='<@base/>/image/"+value+"'/>";
 
 	};
 
 	
 	function vendorFormatter(value, options, rData){

+ 6 - 10
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/selectAppsList.ftl
Прегледај датотеку 

@@ -3,15 +3,11 @@
 
 <head>
 
 	<#include  "../layout/header.ftl"/>
 
 	<#include  "../layout/common.cssjs.ftl"/>
 
-<style>
 
-<!--
 
-
 
--->
 
-</style>
 
-
 
+    <link type="text/css" rel="stylesheet"  href="<@base />/static/css/minitable.css"/>
 
+  
 <script type="text/javascript">				
 	function iconFormatter(value, row, index){
 
-  			return "<img width='30' height='30' border='0px' src='<@base/>/image/"+value+"'/>";
 
+  			return "<img height='30' border='0px' src='<@base/>/image/"+value+"'/>";
 
 	};
 
 
 	$(function () {
 
@@ -62,7 +58,7 @@
 
 						data-click-to-select="true"
 
 						data-pagination="true"
 
 						data-total-field="records"
 
-						data-page-list="[10, 25, 50, 100]"
 
+						data-page-list="[5, 10, 25, 50]"
 
 						data-search="false"
 
 						data-locale="zh-CN"
 
 						data-query-params="dataGridQueryParams"
 
@@ -74,9 +70,9 @@
 
 						<th data-sortable="true" data-field="id"   data-visible="false">Id</th>
 
 						<th data-field="id" data-formatter="iconFormatter"><@locale code="apps.icon"/></th>
 
 						<th data-field="name"><@locale code="apps.name"/></th>
 
-						<th data-field="protocol"><@locale code="apps.protocol"/></th>
 
+						<th data-field="protocol"  data-visible="false"><@locale code="apps.protocol"/></th>
 
 						<th data-field="category"><@locale code="apps.category"/></th>
 
-						<th data-field="vendor"><@locale code="apps.vendor"/></th>
 
+						<th data-field="vendor"  data-visible="false"><@locale code="apps.vendor"/></th>
 
 						<th data-field="loginUrl" data-visible="false"><@locale code="log.loginhistory.loginUrl"/></th>
 
 			
 					</tr>

+ 6 - 10
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl
Прегледај датотеку 

@@ -3,19 +3,15 @@
 
 <head>
 
 	<#include  "../layout/header.ftl"/>
 
 	<#include  "../layout/common.cssjs.ftl"/>
 
-<style   type="text/css">
 
-  .table th, .table td {
 
-    padding: .2rem;
 
-    vertical-align: middle;
 
-  }
 
-</style>
 
+    <link type="text/css" rel="stylesheet"  href="<@base />/static/css/minitable.css"/>
 
+    
 <script type="text/javascript">	
 			function afterSubmit(data){
 
 				//$("#list").trigger('reloadGrid');
 
 			}
 
 			
 			function iconFormatter(value, row, index){
 
-  			return "<img width='30' height='30' border='0px' src='<@base/>/image/"+value+"'/>";
 
+  			return "<img height='30' border='0px' src='<@base/>/image/"+value+"'/>";
 
 			};
 
 		   	
 			$(function () {
 
@@ -102,7 +98,7 @@
 
 				data-click-to-select="true"
 
 				data-pagination="true"
 
 				data-total-field="records"
 
-				data-page-list="[10, 25, 50, 100]"
 
+				data-page-list="[5, 10, 25, 50]"
 
 				data-search="false"
 
 				data-sort-name="name"
 
 				data-locale="zh-CN"
 
@@ -115,9 +111,9 @@
 
 				<th data-sortable="true" data-field="id"   data-visible="false">Id</th>
 
 				<th data-field="id" data-formatter="iconFormatter"><@locale code="apps.icon"/></th>
 
 				<th data-field="name"><@locale code="apps.name"/></th>
 
-				<th data-field="protocol"><@locale code="apps.protocol"/></th>
 
+				<th data-field="protocol"  data-visible="false"><@locale code="apps.protocol"/></th>
 
 				<th data-field="category"><@locale code="apps.category"/></th>
 
-				<th data-field="vendor"><@locale code="apps.vendor"/></th>
 
+				<th data-field="vendor"  data-visible="false"><@locale code="apps.vendor"/></th>
 
 				<th data-field="loginUrl" data-visible="false"><@locale code="log.loginhistory.loginUrl"/></th>
 
 	
 			</tr>

+ 4 - 3
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/groupAppsList.ftl
Прегледај датотеку 

@@ -3,10 +3,11 @@
 
 <head>
 
 	<#include  "../layout/header.ftl"/>
 
 	<#include  "../layout/common.cssjs.ftl"/>
 
+	<link type="text/css" rel="stylesheet"  href="<@base />/static/css/minitable.css"/>
 
 <script type="text/javascript">	
 	
 	function iconFormatter(value, row, index){
 
-  			return "<img width='30' height='30' border='0px' src='<@base/>/image/"+value+"'/>";
 
+  			return "<img height='30' border='0px' src='<@base/>/image/"+value+"'/>";
 
 	};
 
    	
 	$(function () {
 
@@ -127,9 +128,9 @@
 
 				<th data-sortable="true" data-field="id"   data-visible="false">Id</th>
 
 				<th data-field="id" data-formatter="iconFormatter"><@locale code="apps.icon"/></th>
 
 				<th data-field="name"><@locale code="apps.name"/></th>
 
-				<th data-field="protocol"><@locale code="apps.protocol"/></th>
 
+				<th data-field="protocol"  data-visible="false"><@locale code="apps.protocol"/></th>
 
 				<th data-field="category"><@locale code="apps.category"/></th>
 
-				<th data-field="vendor"><@locale code="apps.vendor"/></th>
 
+				<th data-field="vendor"    data-visible="false"><@locale code="apps.vendor"/></th>
 
 				<th data-field="loginUrl" data-visible="false"><@locale code="log.loginhistory.loginUrl"/></th>
 
 	
 			</tr>

+ 1 - 6
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/selectGroupsList.ftl
Прегледај датотеку 

@@ -3,12 +3,7 @@
 
 <head>
 
 	<#include  "../layout/header.ftl"/>
 
 	<#include  "../layout/common.cssjs.ftl"/>
 
-<style   type="text/css">
 
-  .table th, .table td {
 
-    padding: .2rem;
 
-    vertical-align: middle;
 
-  }
 
-</style>
 
+    <link type="text/css" rel="stylesheet"  href="<@base />/static/css/minitable.css"/>
 
 <script type="text/javascript">	
 	
 	$(function () {

+ 1 - 6
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl
Прегледај датотеку 

@@ -3,12 +3,7 @@
 
 <head>
 
 	<#include  "../layout/header.ftl"/>
 
 	<#include  "../layout/common.cssjs.ftl"/>
 
-<style   type="text/css">
 
-  .table th, .table td {
 
-    padding: .2rem;
 
-    vertical-align: middle;
 
-  }
 
-</style>
 
+    <link type="text/css" rel="stylesheet"  href="<@base />/static/css/minitable.css"/>
 
 <script type="text/javascript">	
     function genderFormatter(value, row, index){
 
         if(value==1){

+ 7 - 6
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/layout/sidenav.ftl
Прегледај датотеку 

@@ -27,12 +27,7 @@
 
        		<span class="fa fa-fw fa-vcard  fa-lg"></span>
 
      	</a>
 
    	</li>  	
-   	<li>
 
-        <a class="side-nav-menu" href="<@base />/apps/list/">
 
-            <@locale code="navs.apps"/>
 
-            <span class="fa fa-fw fa-globe fa-lg"></span>
 
-        </a>
 
-    </li>
 
+   	
    	<li>
 
      	<a class="side-nav-menu has-arrow" href="#">
 
        		<@locale code="navs.privileges"/>
 
@@ -98,6 +93,12 @@
 
        		<span class="fa fa-fw fa-cogs fa-lg"></span>
 
      	</a>
 
      	<ul>
 
+            <li>
 
+                <a class="side-nav-menu" href="<@base />/apps/list/">
 
+                    <@locale code="navs.apps"/>
 
+                    <span class="fa fa-fw fa-globe fa-lg"></span>
 
+                </a>
 
+            </li>
 
            <li>
 
              <a class="side-nav-menu" href="<@base />/notices/list/">
 
                 <@locale code="navs.notices"/>

+ 1 - 6
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/resources/selectResourcesList.ftl
Прегледај датотеку 

@@ -3,12 +3,7 @@
 
 <head>
 
 	<#include  "../layout/header.ftl"/>
 
 	<#include  "../layout/common.cssjs.ftl"/>
 
-<style   type="text/css">
 
-  .table th, .table td {
 
-    padding: .2rem;
 
-    vertical-align: middle;
 
-  }
 
-</style>
 
+    <link type="text/css" rel="stylesheet"  href="<@base />/static/css/minitable.css"/>
 
 <script type="text/javascript">	
 	
 	$(function () {

+ 1 - 6
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/roles/selectRolesList.ftl
Прегледај датотеку 

@@ -3,12 +3,7 @@
 
 <head>
 
 	<#include  "../layout/header.ftl"/>
 
 	<#include  "../layout/common.cssjs.ftl"/>
 
-<style   type="text/css">
 
-  .table th, .table td {
 
-    padding: .2rem;
 
-    vertical-align: middle;
 
-  }
 
-</style>
 
+    <link type="text/css" rel="stylesheet"  href="<@base />/static/css/minitable.css"/>
 
 <script type="text/javascript">	
 	
 	$(function () {

+ 1 - 6
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/roleusers/addRoleUsersList.ftl
Прегледај датотеку 

@@ -3,12 +3,7 @@
 
 <head>
 
 	<#include  "../layout/header.ftl"/>
 
 	<#include  "../layout/common.cssjs.ftl"/>
 
-<style   type="text/css">
 
-  .table th, .table td {
 
-    padding: .2rem;
 
-    vertical-align: middle;
 
-  }
 
-</style>
 
+    <link type="text/css" rel="stylesheet"  href="<@base />/static/css/minitable.css"/>
 
 <script type="text/javascript">	
     function genderFormatter(value, row, index){
 
         if(value==1){

+ 1 - 7
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/userInfoAdjointAdd.ftl
Прегледај датотеку 

@@ -16,13 +16,7 @@
 
       });
 
       //-->
 
 </script>
 
-
 
-<style   type="text/css">
 
-  .table th, .table td {
 
-    padding: .2rem;
 
-    vertical-align: middle;
 
-  }
 
-</style>
 
+<link type="text/css" rel="stylesheet"  href="<@base />/static/css/minitable.css"/>
 
 </head>
 
 <body>
 
 <form  id="actionForm"

+ 1 - 7
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/userInfoAdjointUpdate.ftl
Прегледај датотеку 

@@ -12,13 +12,7 @@
 
       });
 
       //-->
 
 </script>
 
-
 
-<style   type="text/css">
 
-  .table th, .table td {
 
-    padding: .2rem;
 
-    vertical-align: middle;
 
-  }
 
-</style>
 
+<link type="text/css" rel="stylesheet"  href="<@base />/static/css/minitable.css"/>
 
 </head>
 
 <body>
 
 <form  id="actionForm"

+ 1 - 6
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/userinfoAdjointList.ftl
Прегледај датотеку 

@@ -3,12 +3,7 @@
 
 <head>
 
 	<#include  "../layout/header.ftl"/>
 
 	<#include  "../layout/common.cssjs.ftl"/>
 
-<style   type="text/css">
 
-  .table th, .table td {
 
-    padding: .2rem;
 
-    vertical-align: middle;
 
-  }
 
-</style>
 
+    <link type="text/css" rel="stylesheet"  href="<@base />/static/css/minitable.css"/>
 
 
 <script type="text/javascript">
 
 	function genderFormatter(value, row, index){

+ 1 - 6
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/userinfoSelect.ftl
Прегледај датотеку 

@@ -3,12 +3,7 @@
 
 <head>
 
 	<#include  "../layout/header.ftl"/>
 
 	<#include  "../layout/common.cssjs.ftl"/>
 
-<style   type="text/css">
 
-  .table th, .table td {
 
-    padding: .2rem;
 
-    vertical-align: middle;
 
-  }
 
-</style>
 
+    <link type="text/css" rel="stylesheet"  href="<@base />/static/css/minitable.css"/>
 
 
 <script type="text/javascript">
 
 	function genderFormatter(value, row, index){

+ 5 - 0
maxkey-webs/maxkey-web-resources/src/main/resources/static/css/base.css
Прегледај датотеку 

@@ -107,6 +107,11 @@ body{
 
 	border: 1px solid #e5e5e5;
 
 }
 
 
+#tool_box  .table td, #tool_box  .table th,.toolbox .table td, .tool_box  .table th{
 
+    padding: 0.2rem;
 
+    vertical-align: middle;
 
+}
 
+
 
 #tool_box_left {
 
 	padding-left: 10px;
 
 	float: left;

+ 14 - 0
maxkey-webs/maxkey-web-resources/src/main/resources/static/css/minitable.css
Прегледај датотеку 

@@ -0,0 +1,14 @@
 
+.table td, .table th {
 
+    padding: 0.2rem;
 
+    vertical-align: middle;
 
+}
 
+
 
+.bootstrap-table .fixed-table-container .table th, .bootstrap-table .fixed-table-container .table td{
 
+  padding: .5rem;
 
+}
 
+
 
+.bootstrap-table .fixed-table-container .table thead th .th-inner {
 
+    padding: 0.5rem;
 
+}
 
+
 
+

+ 2 - 8
maxkey-webs/maxkey-web-resources/src/main/resources/static/css_mgt/base.css
Прегледај датотеку 

@@ -303,15 +303,9 @@ header .header-container .nav-left>li, .header .header-container .nav-right>li {
 
 	border: 1px solid #e5e5e5;
 
 }
 
 
-
 
-#tool_box  .table td, .table th {
 
-    vertical-align: middle;
 
-    padding: .40rem;
 
-}
 
-
 
-.toolbox  .table td, .table th {
 
+#tool_box  .table td, #tool_box  .table th,.toolbox .table td, .tool_box  .table th{
 
+    padding: 0.2rem;
 
     vertical-align: middle;
 
-    padding: .40rem;
 
 }
 
 
 #tool_box_left {