Просмотр исходного кода

修改zheng-admin资源文件路径

shuzheng 9 лет назад
Родитель
Сommit
598ac38b8c

+ 1 - 0
.gitignore

@@ -3,3 +3,4 @@
 target
 *.log
 *.log.*
+zheng-admin

+ 63 - 0
zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/tag/_list.jsp

@@ -0,0 +1,63 @@
+<%@ page contentType="text/html; charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%>
+<c:set var="basePath" value="${pageContext.request.contextPath}"/>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8"/>
+<title>列表</title>
+</head>
+<body>
+<div>
+	<a href="${basePath}/manage">首页</a> &gt; 标签列表
+</div>
+<div>
+	<table border="1">
+		<caption><a href="${basePath}/manage/tag/add">新增</a></caption>
+		<thead>
+			<tr>
+				<th>ID</th>
+				<th>名称</th>
+				<th>描述</th>
+				<th>图标</th>
+				<th>类型</th>
+				<th>别名</th>
+				<th>创建时间</th>
+				<th>操作</th>
+			</tr>
+		</thead>
+		<tbody>
+			<c:forEach var="tag" items="${tags}">
+			<tr>
+				<td>${tag.tagId}</td>
+				<td>${tag.name}</td>
+				<td>${tag.description}</td>
+				<td>${tag.icon}</td>
+				<td>
+					<c:if test="${tag.type==1}">普通</c:if>
+					<c:if test="${tag.type==2}">热门</c:if>
+				</td>
+				<td>${tag.alias}</td>
+				<td>
+					<jsp:useBean id="date" class="java.util.Date"/>
+					<jsp:setProperty name="date" property="time" value="${tag.ctime}"/>
+					<fmt:formatDate value="${date}" type="both" pattern="yyyy-MM-dd HH:mm:ss" timeZone="Asia/Shanghai"/>
+				</td>
+				<td>
+					<a href="${basePath}/manage/tag/update/${tag.tagId}">修改</a>
+					<a href="${basePath}/manage/tag/delete/${tag.tagId}" onclick="return confirm('确认删除吗?');">删除</a>
+					<a href="${basePath}/manage/tag/up/${article.articleId}">上移</a>
+					<a href="${basePath}/manage/tag/down/${article.articleId}">下移</a>
+				</td>
+			</tr>
+			</c:forEach>
+		</tbody>
+	</table>
+	<div>${paginator.html}</div>
+</div>
+</body>
+</html>

+ 110 - 50
zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/tag/list.jsp

@@ -5,59 +5,119 @@
 <%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%>
 <c:set var="basePath" value="${pageContext.request.contextPath}"/>
-<!DOCTYPE html>
-<html>
+<!DOCTYPE HTML>
+<html lang="zh-cn">
 <head>
-<meta charset="utf-8"/>
-<title>列表</title>
+	<meta charset="utf-8">
+	<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-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
+
+	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
 </head>
 <body>
-<div>
-	<a href="${basePath}/manage">首页</a> &gt; 标签列表
-</div>
-<div>
-	<table border="1">
-		<caption><a href="${basePath}/manage/tag/add">新增</a></caption>
-		<thead>
-			<tr>
-				<th>ID</th>
-				<th>名称</th>
-				<th>描述</th>
-				<th>图标</th>
-				<th>类型</th>
-				<th>别名</th>
-				<th>创建时间</th>
-				<th>操作</th>
-			</tr>
-		</thead>
-		<tbody>
-			<c:forEach var="tag" items="${tags}">
-			<tr>
-				<td>${tag.tagId}</td>
-				<td>${tag.name}</td>
-				<td>${tag.description}</td>
-				<td>${tag.icon}</td>
-				<td>
-					<c:if test="${tag.type==1}">普通</c:if>
-					<c:if test="${tag.type==2}">热门</c:if>
-				</td>
-				<td>${tag.alias}</td>
-				<td>
-					<jsp:useBean id="date" class="java.util.Date"/>
-					<jsp:setProperty name="date" property="time" value="${tag.ctime}"/>
-					<fmt:formatDate value="${date}" type="both" pattern="yyyy-MM-dd HH:mm:ss" timeZone="Asia/Shanghai"/>
-				</td>
-				<td>
-					<a href="${basePath}/manage/tag/update/${tag.tagId}">修改</a>
-					<a href="${basePath}/manage/tag/delete/${tag.tagId}" onclick="return confirm('确认删除吗?');">删除</a>
-					<a href="${basePath}/manage/tag/up/${article.articleId}">上移</a>
-					<a href="${basePath}/manage/tag/down/${article.articleId}">下移</a>
-				</td>
-			</tr>
-			</c:forEach>
-		</tbody>
-	</table>
-	<div>${paginator.html}</div>
+<div id="main">
+	<div id="toolbar">
+		<a class="waves-effect waves-button" href="javascript:;"><i class="zmdi zmdi-plus"></i> 新增用户</a>
+		<a class="waves-effect waves-button" href="javascript:;"><i class="zmdi zmdi-edit"></i> 编辑用户</a>
+		<a class="waves-effect waves-button" href="javascript:;"><i class="zmdi zmdi-close"></i> 删除用户</a>
+	</div>
+	<table id="table"></table>
 </div>
+<script src="${basePath}/resources/zheng-admin/plugins/jquery.1.12.4.min.js"></script>
+<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
+<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
+<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
+<script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
+
+<script src="${basePath}/resources/zheng-admin/js/common.js"></script>
+<script>
+	$(function() {
+		// bootstrap table初始化
+		$('#table').bootstrapTable({
+			idField: 'id',
+			url: '${basePath}/resources/zheng-admin/data/data1.json',
+			height: getHeight(),
+			striped: true,
+			search: true,
+			searchOnEnterKey: true,
+			showRefresh: true,
+			showToggle: true,
+			showColumns: true,
+			minimumCountColumns: 2,
+			showPaginationSwitch: true,
+			clickToSelect: true,
+			detailView: true,
+			detailFormatter: 'detailFormatter',
+			pagination: true,
+			paginationLoop: false,
+			classes: 'table table-hover table-no-bordered',
+			//sidePagination: 'server',
+			idField: 'id',
+			sortName: 'id',
+			sortOrder: 'desc',
+			toolbar: '#toolbar',
+			columns: [
+				{field: 'state', checkbox: true},
+				{field: 'id', title: '编号', sortable: true, halign: 'center'},
+				{field: 'username', title: '账号', sortable: true, halign: 'center'},
+				{field: 'password', title: '密码', sortable: true, halign: 'center'},
+				{field: 'name', title: '姓名', sortable: true, halign: 'center'},
+				{field: 'sex', title: '性别', sortable: true, halign: 'center'},
+				{field: 'age', title: '年龄', sortable: true, halign: 'center'},
+				{field: 'phone', title: '年龄', sortable: true, halign: 'center'},
+				{field: 'email', title: '邮箱', sortable: true, halign: 'center'},
+				{field: 'address', title: '地址', sortable: true, halign: 'center'},
+				{field: 'remark', title: '备注', sortable: true, halign: 'center'},
+				{field: 'action', title: '操作', halign: 'center', align: 'center', formatter: 'actionFormatter', events: 'actionEvents'}
+			]
+		}).on('all.bs.table', function (e, name, args) {
+			$('[data-toggle="tooltip"]').tooltip();
+			$('[data-toggle="popover"]').popover();
+		});
+		$(window).resize(function () {
+			$('#table').bootstrapTable('resetView', {
+				height: getHeight()
+			});
+		});
+	});
+	function actionFormatter(value, row, index) {
+		return [
+			'<a class="like" href="javascript:void(0)" data-toggle="tooltip" title="Like"><i class="glyphicon glyphicon-heart"></i></a> ',
+			'<a class="edit ml10" href="javascript:void(0)" data-toggle="tooltip" title="Edit"><i class="glyphicon glyphicon-edit"></i></a> ',
+			'<a class="remove ml10" href="javascript:void(0)" data-toggle="tooltip" title="Remove"><i class="glyphicon glyphicon-remove"></i></a>'
+		].join('');
+	}
+
+	window.actionEvents = {
+		'click .like': function (e, value, row, index) {
+			alert('You click like icon, row: ' + JSON.stringify(row));
+			console.log(value, row, index);
+		},
+		'click .edit': function (e, value, row, index) {
+			alert('You click edit icon, row: ' + JSON.stringify(row));
+			console.log(value, row, index);
+		},
+		'click .remove': function (e, value, row, index) {
+			alert('You click remove icon, row: ' + JSON.stringify(row));
+			console.log(value, row, index);
+		}
+	};
+	function detailFormatter(index, row) {
+		var html = [];
+		$.each(row, function (key, value) {
+			html.push('<p><b>' + key + ':</b> ' + value + '</p>');
+		});
+		return html.join('');
+	}
+	function getHeight() {
+		return $(window).height() - 20;
+	}
+</script>
 </body>
 </html>

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

@@ -13,11 +13,11 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>用户权限管理系统</title>
 
-	<link href="${basePath}/resources/zhengAdmin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zhengAdmin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zhengAdmin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zhengAdmin/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zhengAdmin/css/admin.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-admin/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-admin/css/admin.css" rel="stylesheet"/>
 </head>
 <body>
 <header id="header">
@@ -31,7 +31,7 @@
 		</li>
 		<li id="logo" class="hidden-xs">
 			<a href="index.jsp">
-				<img src="${basePath}/resources/zhengAdmin/images/logo.png"/>
+				<img src="${basePath}/resources/zheng-admin/images/logo.png"/>
 			</a>
 		</li>
 		<li class="pull-right">
@@ -108,7 +108,7 @@
 		<div class="s-profile">
 			<a class="waves-effect waves-light" href="javascript:;">
 				<div class="sp-pic">
-					<img src="${basePath}/resources/zhengAdmin/images/avatar.jpg"/>
+					<img src="${basePath}/resources/zheng-admin/images/avatar.jpg"/>
 				</div>
 				<div class="sp-info">
 					张恕征,您好!
@@ -217,13 +217,13 @@
 </section>
 <footer id="footer"></footer>
 
-<script src="${basePath}/resources/zhengAdmin/plugins/jquery.1.12.4.min.js"></script>
-<script src="${basePath}/resources/zhengAdmin/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
-<script src="${basePath}/resources/zhengAdmin/plugins/waves-0.7.5/waves.min.js"></script>
-<script src="${basePath}/resources/zhengAdmin/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js"></script>
-<script src="${basePath}/resources/zhengAdmin/plugins/BootstrapMenu.min.js"></script>
-<script src="${basePath}/resources/zhengAdmin/plugins/device.min.js"></script>
+<script src="${basePath}/resources/zheng-admin/plugins/jquery.1.12.4.min.js"></script>
+<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
+<script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
+<script src="${basePath}/resources/zheng-admin/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js"></script>
+<script src="${basePath}/resources/zheng-admin/plugins/BootstrapMenu.min.js"></script>
+<script src="${basePath}/resources/zheng-admin/plugins/device.min.js"></script>
 
-<script src="${basePath}/resources/zhengAdmin/js/admin.js"></script>
+<script src="${basePath}/resources/zheng-admin/js/admin.js"></script>
 </body>
 </html>

+ 12 - 12
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/system/index.jsp

@@ -13,12 +13,12 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>系统注册</title>
 
-	<link href="${basePath}/resources/zhengAdmin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zhengAdmin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zhengAdmin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zhengAdmin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zhengAdmin/css/common.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
 </head>
 <body>
 <div id="main">
@@ -29,19 +29,19 @@
 	</div>
 	<table id="table"></table>
 </div>
-<script src="${basePath}/resources/zhengAdmin/plugins/jquery.1.12.4.min.js"></script>
-<script src="${basePath}/resources/zhengAdmin/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
-<script src="${basePath}/resources/zhengAdmin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
-<script src="${basePath}/resources/zhengAdmin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
-<script src="${basePath}/resources/zhengAdmin/plugins/waves-0.7.5/waves.min.js"></script>
+<script src="${basePath}/resources/zheng-admin/plugins/jquery.1.12.4.min.js"></script>
+<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
+<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
+<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
+<script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
 
-<script src="${basePath}/resources/zhengAdmin/js/common.js"></script>
+<script src="${basePath}/resources/zheng-admin/js/common.js"></script>
 <script>
 $(function() {
 	// bootstrap table初始化
 	$('#table').bootstrapTable({
 		idField: 'id',
-		url: '${basePath}/resources/zhengAdmin/data/data1.json',
+		url: '${basePath}/resources/zheng-admin/data/data1.json',
 		height: getHeight(),
 		striped: true,
 		search: true,