Merge remote-tracking branch 'origin/dev' into uuhelper/01

jpress-web-admin/src/main/webapp/WEB-INF/admin/content/_edit_include.html

@@ -4,6 +4,10 @@
 		height: 45px;
 		background: #dbdddf;
 	}
+    .editUas .leftContent span:hover{
+        background: #C9C5C5;
+        color: #fff;
+    }
 	.editUas span{
 		display: inline-block;
 		margin-right: 10px;
@@ -281,7 +285,6 @@
         <h1>${(module.addTitle)!}</h1>
     </section>
     <!-- Main content -->
-	<input type="hidden" id="content_url" name="content.url" value="${(content.url)!}">
     <section class="content" style="z-index: 9999">
         <form action="${CPATH}/admin/content/save" id="form" method="post">
             <input type="hidden" name="content.module" value="${(content.module)!m!}">
@@ -295,7 +298,7 @@
                 <div class="col-md-12">
 					<div class="editUas">
 						<div class="pull-right"><span><a href="${CPATH}/admin/content/edit?m=uuhelper&p=uuhelper&c=edit">取消</a></span></div>
-						<div><span onclick="saveAsDraft()">保存</span><span onclick="save()">发送</span><span onclick="doPreview()">浏览</span></div>
+						<div><span onclick="saveAsDraft()">保存</span><span onclick="save()">发送</span><span>浏览</span></div>
 					</div>
 					<div class="row">
 						<div class="col-md-9">

jpress-web/pom.xml

@@ -84,6 +84,11 @@
 							<scanDir>../jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina</scanDir>
 							<copyDir>${basedir}/target/${project.artifactId}-${project.version}/templates/usoftchina</copyDir>
 						</observer>
+						<observer>
+							<scanDir>../jpress-web-admin/src/main/webapp/WEB-INF/admin</scanDir>
+							<copyDir>${basedir}/target/${project.artifactId}-${project.version}/WEB-INF/admin</copyDir>
+						</observer>
+
 					</observers>
 				</configuration>
 				<executions>