Página Principal Explorar Ajuda
Iniciar Sessão
chendeben
/
zheng
1
0
Fork 0
Ficheiros Problemas 0 Pull Requests 0 Wiki
Ver Fonte

引入公共页面片段，美化表单

shuzheng há 9 anos atrás
pai
da72835a52
commit
b458716a5d
12 ficheiros alterados com 70 adições e 106 exclusões
Visão Dividida Mostrar Estatísticas Diff
  1. 1 1
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/organization/create.jsp
  2. 2 13
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/organization/index.jsp
  3. 1 1
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/organization/update.jsp
  4. 1 1
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/create.jsp
  5. 2 13
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp
  6. 1 1
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/update.jsp
  7. 10 8
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/system/create.jsp
  8. 3 14
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/system/index.jsp
  9. 10 8
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/system/update.jsp
  10. 18 16
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/create.jsp
  11. 3 14
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/index.jsp
  12. 18 16
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/update.jsp

+ 1 - 1
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/organization/create.jsp
Ver Ficheiro 

@@ -16,7 +16,7 @@
 
 			<label for="description">描述</label>
 
 			<input id="description" type="text" class="form-control" name="description" maxlength="300">
 
 		</div>
 
-		<div class="form-group text-right">
 
+		<div class="form-group text-right dialog-buttons">
 
 			<a class="waves-effect waves-button" href="javascript:;" onclick="createSubmit();">保存</a>
 
 			<a class="waves-effect waves-button" href="javascript:;" onclick="createDialog.close();">取消</a>
 
 		</div>

+ 2 - 13
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/organization/index.jsp
Ver Ficheiro 

@@ -13,12 +13,7 @@
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<title>组织管理</title>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/jquery-confirm/jquery-confirm.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/css/common.css" rel="stylesheet"/>
 
+	<jsp:include page="/resources/inc/head.jsp" flush="true"/>
 
 </head>
 
 <body>
 
 <div id="main">
 
@@ -29,13 +24,7 @@
 
 	</div>
 
 	<table id="table"></table>
 
 </div>
 
-<script src="${basePath}/resources/zheng-ui/plugins/jquery.1.12.4.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/jquery-confirm/jquery-confirm.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/js/common.js"></script>
 
+<jsp:include page="/resources/inc/footer.jsp" flush="true"/>
 
 <script>
 
 var $table = $('#table');
 
 $(function() {

+ 1 - 1
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/organization/update.jsp
Ver Ficheiro 

@@ -16,7 +16,7 @@
 
 			<label for="description">描述</label>
 
 			<input id="description" type="text" class="form-control" name="description" maxlength="300" value="${organization.description}">
 
 		</div>
 
-		<div class="form-group text-right">
 
+		<div class="form-group text-right dialog-buttons">
 
 			<a class="waves-effect waves-button" href="javascript:;" onclick="createSubmit();">保存</a>
 
 			<a class="waves-effect waves-button" href="javascript:;" onclick="updateDialog.close();">取消</a>
 
 		</div>

+ 1 - 1
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/create.jsp
Ver Ficheiro 

@@ -20,7 +20,7 @@
 
 			<label for="description">描述</label>
 
 			<input id="description" type="text" class="form-control" name="description" maxlength="300">
 
 		</div>
 
-		<div class="form-group text-right">
 
+		<div class="form-group text-right dialog-buttons">
 
 			<a class="waves-effect waves-button" href="javascript:;" onclick="createSubmit();">保存</a>
 
 			<a class="waves-effect waves-button" href="javascript:;" onclick="createDialog.close();">取消</a>
 
 		</div>

+ 2 - 13
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp
Ver Ficheiro 

@@ -13,12 +13,7 @@
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<title>角色管理</title>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/jquery-confirm/jquery-confirm.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/css/common.css" rel="stylesheet"/>
 
+	<jsp:include page="/resources/inc/head.jsp" flush="true"/>
 
 </head>
 
 <body>
 
 <div id="main">
 
@@ -29,13 +24,7 @@
 
 	</div>
 
 	<table id="table"></table>
 
 </div>
 
-<script src="${basePath}/resources/zheng-ui/plugins/jquery.1.12.4.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/jquery-confirm/jquery-confirm.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/js/common.js"></script>
 
+<jsp:include page="/resources/inc/footer.jsp" flush="true"/>
 
 <script>
 
 var $table = $('#table');
 
 $(function() {

+ 1 - 1
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/update.jsp
Ver Ficheiro 

@@ -20,7 +20,7 @@
 
 			<label for="description">描述</label>
 
 			<input id="description" type="text" class="form-control" name="description" maxlength="300" value="${role.description}">
 
 		</div>
 
-		<div class="form-group text-right">
 
+		<div class="form-group text-right dialog-buttons">
 
 			<a class="waves-effect waves-button" href="javascript:;" onclick="createSubmit();">保存</a>
 
 			<a class="waves-effect waves-button" href="javascript:;" onclick="updateDialog.close();">取消</a>
 
 		</div>

+ 10 - 8
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/system/create.jsp
Ver Ficheiro 

@@ -28,15 +28,17 @@
 
 			<label for="basepath">根目录</label>
 
 			<input id="basepath" type="text" class="form-control" name="basepath" maxlength="100">
 
 		</div>
 
-		<div>
 
-			<label class="checkbox-inline">
 
-				<label for="status_1"><input id="status_1" type="radio" name="status" value="1" checked> 正常</label>
 
-			</label>
 
-			<label class="checkbox-inline">
 
-				<label for="status_0"><input id="status_0" type="radio" name="status" value="-1"> 锁定</label>
 
-			</label>
 
+		<div class="radio">
 
+			<div class="radio radio-inline radio-success">
 
+				<input id="status_1" type="radio" name="status" value="1" checked>
 
+				<label for="status_1"> 正常 </label>
 
+			</div>
 
+			<div class="radio radio-inline">
 
+				<input id="status_0" type="radio" name="status" value="-1">
 
+				<label for="status_0"> 锁定 </label>
 
+			</div>
 
 		</div>
 
-		<div class="form-group text-right">
 
+		<div class="form-group text-right dialog-buttons">
 
 			<a class="waves-effect waves-button" href="javascript:;" onclick="createSubmit();">保存</a>
 
 			<a class="waves-effect waves-button" href="javascript:;" onclick="createDialog.close();">取消</a>
 
 		</div>

+ 3 - 14
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/system/index.jsp
Ver Ficheiro 

@@ -13,12 +13,7 @@
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<title>系统管理</title>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/jquery-confirm/jquery-confirm.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/css/common.css" rel="stylesheet"/>
 
+	<jsp:include page="/resources/inc/head.jsp" flush="true"/>
 
 </head>
 
 <body>
 
 <div id="main">
 
@@ -29,13 +24,7 @@
 
 	</div>
 
 	<table id="table"></table>
 
 </div>
 
-<script src="${basePath}/resources/zheng-ui/plugins/jquery.1.12.4.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/jquery-confirm/jquery-confirm.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/js/common.js"></script>
 
+<jsp:include page="/resources/inc/footer.jsp" flush="true"/>
 
 <script>
 
 var $table = $('#table');
 
 $(function() {
 
@@ -89,7 +78,7 @@ function statusFormatter(value, row, index) {
 
 	if (value == 1) {
 
 		return '<span class="label label-success">正常</span>';
 
 	} else {
 
-		return '<span class="label label-danger">锁定</span>';
 
+		return '<span class="label label-default">锁定</span>';
 
 	}
 
 }
 
 // 新增

+ 10 - 8
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/system/update.jsp
Ver Ficheiro 

@@ -28,15 +28,17 @@
 
 			<label for="basepath">根目录</label>
 
 			<input id="basepath" type="text" class="form-control" name="basepath" maxlength="100" value="${system.basepath}">
 
 		</div>
 
-		<div>
 
-			<label class="checkbox-inline">
 
-				<label for="status_1"><input id="status_1" type="radio" name="status" value="1" <c:if test="${system.status==1}">checked</c:if>> 正常</label>
 
-			</label>
 
-			<label class="checkbox-inline">
 
-				<label for="status_0"><input id="status_0" type="radio" name="status" value="-1" <c:if test="${system.status!=1}">checked</c:if>> 锁定</label>
 
-			</label>
 
+		<div class="radio">
 
+			<div class="radio radio-inline radio-success">
 
+				<input id="status_1" type="radio" name="status" value="1" <c:if test="${system.status==1}">checked</c:if>>
 
+				<label for="status_1"> 正常 </label>
 
+			</div>
 
+			<div class="radio radio-inline">
 
+				<input id="status_0" type="radio" name="status" value="-1" <c:if test="${system.status!=1}">checked</c:if>>
 
+				<label for="status_0"> 锁定 </label>
 
+			</div>
 
 		</div>
 
-		<div class="form-group text-right">
 
+		<div class="form-group text-right dialog-buttons">
 
 			<a class="waves-effect waves-button" href="javascript:;" onclick="createSubmit();">保存</a>
 
 			<a class="waves-effect waves-button" href="javascript:;" onclick="updateDialog.close();">取消</a>
 
 		</div>

+ 18 - 16
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/create.jsp
Ver Ficheiro 

@@ -32,23 +32,25 @@
 
 			<label for="email">邮箱</label>
 
 			<input id="email" type="text" class="form-control" name="email" maxlength="50">
 
 		</div>
 
-		<div>
 
-			<label class="checkbox-inline">
 
-				<label for="sex_1"><input id="sex_1" type="radio" name="sex" value="1" checked> 男</label>
 
-			</label>
 
-			<label class="checkbox-inline">
 
-				<label for="sex_0"><input id="sex_0" type="radio" name="sex" value="0"> 女</label>
 
-			</label>
 
+		<div class="radio">
 
+			<div class="radio radio-inline radio-info">
 
+				<input id="sex_1" type="radio" name="sex" value="1" checked>
 
+				<label for="sex_1"> 男 </label>
 
+			</div>
 
+			<div class="radio radio-inline radio-danger">
 
+				<input id="sex_0" type="radio" name="sex" value="0">
 
+				<label for="sex_0"> 女 </label>
 
+			</div>
 
+			<div class="radio radio-inline radio-success">
 
+				<input id="locked_0" type="radio" name="locked" value="0" checked>
 
+				<label for="locked_0"> 正常 </label>
 
+			</div>
 
+			<div class="radio radio-inline">
 
+				<input id="locked_1" type="radio" name="locked" value="1">
 
+				<label for="locked_1"> 锁定 </label>
 
+			</div>
 
 		</div>
 
-		<div>
 
-			<label class="checkbox-inline">
 
-				<label for="locked_0"><input id="locked_0" type="radio" name="locked" value="0" checked> 正常</label>
 
-			</label>
 
-			<label class="checkbox-inline">
 
-				<label for="locked_1"><input id="locked_1" type="radio" name="locked" value="1"> 锁定</label>
 
-			</label>
 
-		</div>
 
-		<div class="form-group text-right">
 
+		<div class="form-group text-right dialog-buttons">
 
 			<a class="waves-effect waves-button" href="javascript:;" onclick="createSubmit();">保存</a>
 
 			<a class="waves-effect waves-button" href="javascript:;" onclick="createDialog.close();">取消</a>
 
 		</div>

+ 3 - 14
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/index.jsp
Ver Ficheiro 

@@ -13,12 +13,7 @@
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<title>用户管理</title>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/plugins/jquery-confirm/jquery-confirm.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-ui/css/common.css" rel="stylesheet"/>
 
+	<jsp:include page="/resources/inc/head.jsp" flush="true"/>
 
 </head>
 
 <body>
 
 <div id="main">
 
@@ -29,13 +24,7 @@
 
 	</div>
 
 	<table id="table"></table>
 
 </div>
 
-<script src="${basePath}/resources/zheng-ui/plugins/jquery.1.12.4.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/plugins/jquery-confirm/jquery-confirm.min.js"></script>
 
-<script src="${basePath}/resources/zheng-ui/js/common.js"></script>
 
+<jsp:include page="/resources/inc/footer.jsp" flush="true"/>
 
 <script>
 
 var $table = $('#table');
 
 $(function() {
 
@@ -99,7 +88,7 @@ function sexFormatter(value, row, index) {
 
 // 格式化状态
 
 function lockedFormatter(value, row, index) {
 
 	if (value == 1) {
 
-		return '<span class="label label-danger">锁定</span>';
 
+		return '<span class="label label-default">锁定</span>';
 
 	} else {
 
 		return '<span class="label label-success">正常</span>';
 
 	}

+ 18 - 16
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/update.jsp
Ver Ficheiro 

@@ -32,23 +32,25 @@
 
 			<label for="email">邮箱</label>
 
 			<input id="email" type="text" class="form-control" name="email" maxlength="50" value="${user.email}">
 
 		</div>
 
-		<div>
 
-			<label class="checkbox-inline">
 
-				<label for="sex_1"><input id="sex_1" type="radio" name="sex" value="1" <c:if test="${user.sex==1}">checked</c:if>> 男</label>
 
-			</label>
 
-			<label class="checkbox-inline">
 
-				<label for="sex_0"><input id="sex_0" type="radio" name="sex" value="0" <c:if test="${user.sex==0}">checked</c:if>> 女</label>
 
-			</label>
 
+		<div class="radio">
 
+			<div class="radio radio-inline radio-info">
 
+				<input id="sex_1" type="radio" name="sex" value="1" <c:if test="${user.sex==1}">checked</c:if>>
 
+				<label for="sex_1"> 男 </label>
 
+			</div>
 
+			<div class="radio radio-inline radio-danger">
 
+				<input id="sex_0" type="radio" name="sex" value="0" <c:if test="${user.sex==0}">checked</c:if>>
 
+				<label for="sex_0"> 女 </label>
 
+			</div>
 
+			<div class="radio radio-inline radio-success">
 
+				<input id="locked_0" type="radio" name="locked" value="0" <c:if test="${user.locked==0}">checked</c:if>>
 
+				<label for="locked_0"> 正常 </label>
 
+			</div>
 
+			<div class="radio radio-inline">
 
+				<input id="locked_1" type="radio" name="locked" value="1" <c:if test="${user.locked==1}">checked</c:if>>
 
+				<label for="locked_1"> 锁定 </label>
 
+			</div>
 
 		</div>
 
-		<div>
 
-			<label class="checkbox-inline">
 
-				<label for="locked_0"><input id="locked_0" type="radio" name="locked" value="0" <c:if test="${user.locked==0}">checked</c:if>> 正常</label>
 
-			</label>
 
-			<label class="checkbox-inline">
 
-				<label for="locked_1"><input id="locked_1" type="radio" name="locked" value="1" <c:if test="${user.locked==1}">checked</c:if>> 锁定</label>
 
-			</label>
 
-		</div>
 
-		<div class="form-group text-right">
 
+		<div class="form-group text-right dialog-buttons">
 
 			<a class="waves-effect waves-button" href="javascript:;" onclick="createSubmit();">保存</a>
 
 			<a class="waves-effect waves-button" href="javascript:;" onclick="updateDialog.close();">取消</a>
 
 		</div>