Browse Source

列表页展示分类标签

huangct 8 years ago
parent
commit
913e167699

+ 14 - 2
jpress-web-admin/src/main/webapp/WEB-INF/admin/attachment/choose_layer.html

@@ -25,6 +25,8 @@ $(document).ready(function(){
     $(this).parent().addClass("jp-borwer-active-li");
     $(this).parent().addClass("jp-borwer-active-li");
     $(this).next().show();
     $(this).next().show();
   });
   });
+
+    $('.jp-grids-photos').imgAreaSelect({ maxWidth: 200, maxHeight: 170, handles: true });
 });
 });
 
 
 $('#fine-uploader-gallery').fineUploader({
 $('#fine-uploader-gallery').fineUploader({
@@ -47,9 +49,11 @@ $('#fine-uploader-gallery').fineUploader({
 </#macro> 
 </#macro> 
 <#macro script_import>
 <#macro script_import>
 <script src="${CPATH}/static/plugins/fine-uploader/jquery.fine-uploader.js"></script>
 <script src="${CPATH}/static/plugins/fine-uploader/jquery.fine-uploader.js"></script>
+<script src="${CTPATH}/assets/js/jquery.imgareaselect.pack.js"></script>
 </#macro>
 </#macro>
 <#macro css_import>
 <#macro css_import>
 <link href="${CPATH}/static/plugins/fine-uploader/fine-uploader-new.css" rel="stylesheet">
 <link href="${CPATH}/static/plugins/fine-uploader/fine-uploader-new.css" rel="stylesheet">
+<link rel="stylesheet" type="text/css" href="${CTPATH}/assets/css/imgareaselect-default.css"/>
 </#macro>
 </#macro>
 <#macro css>
 <#macro css>
 .list-inline>li {
 .list-inline>li {
@@ -80,10 +84,16 @@ $('#fine-uploader-gallery').fineUploader({
 					</div>
 					</div>
 
 
 				</div>
 				</div>
-
-
 				<div class="tab-pane active" id="tab_2">
 				<div class="tab-pane active" id="tab_2">
 					<div class="jp-borwer">
 					<div class="jp-borwer">
+                        <form action="${CPATH}/admin/attachment/doUpload" method="post">
+                            <input type="hidden" name="x1" value="" />
+                            <input type="hidden" name="y1" value="" />
+                            <input type="hidden" name="x2" value="" />
+                            <input type="hidden" name="y2" value="" />
+                            <input type="hidden" name="sourceId" value="" />
+                            <!--<input type="submit" name="submit" value="截取" />-->
+
 							<ul class="list-inline list-unstyled">
 							<ul class="list-inline list-unstyled">
 								<#if page??> 
 								<#if page??> 
 								<#list page.getList() as bean>
 								<#list page.getList() as bean>
@@ -100,6 +110,7 @@ $('#fine-uploader-gallery').fineUploader({
 								</#list>
 								</#list>
 								</#if>
 								</#if>
 							</ul>
 							</ul>
+                        </form>
 					</div>
 					</div>
 					<#include "../_inc/_paginate_wrapper.html" />
 					<#include "../_inc/_paginate_wrapper.html" />
 				</div>
 				</div>
@@ -107,6 +118,7 @@ $('#fine-uploader-gallery').fineUploader({
 		</div>
 		</div>
 	</div>
 	</div>
 </div>
 </div>
+
 <button class="btn btn-block btn-primary jp-submiti-button" onclick="doConfirm()"> 确&nbsp;定 </button>
 <button class="btn btn-block btn-primary jp-submiti-button" onclick="doConfirm()"> 确&nbsp;定 </button>
 <script type="text/template" id="qq-template-gallery">
 <script type="text/template" id="qq-template-gallery">
         <div class="qq-uploader-selector qq-uploader qq-gallery" qq-drop-area-text="或拖动文件到此上传">
         <div class="qq-uploader-selector qq-uploader qq-gallery" qq-drop-area-text="或拖动文件到此上传">

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

@@ -274,12 +274,14 @@
 		height: 30px;
 		height: 30px;
 	}
 	}
 </style>
 </style>
+
 <#if module ?? && module.name=="uuhelper">
 <#if module ?? && module.name=="uuhelper">
 	<!-- 软文发布界面 -->
 	<!-- 软文发布界面 -->
     <section class="content-header">
     <section class="content-header">
         <h1>${(module.addTitle)!}</h1>
         <h1>${(module.addTitle)!}</h1>
     </section>
     </section>
     <!-- Main content -->
     <!-- Main content -->
+	<input type="hidden" id="content_url" name="content.url" value="${(content.url)!}">
     <section class="content" style="z-index: 9999">
     <section class="content" style="z-index: 9999">
         <form action="${CPATH}/admin/content/save" id="form" method="post">
         <form action="${CPATH}/admin/content/save" id="form" method="post">
             <input type="hidden" name="content.module" value="${(content.module)!m!}">
             <input type="hidden" name="content.module" value="${(content.module)!m!}">
@@ -293,7 +295,7 @@
                 <div class="col-md-12">
                 <div class="col-md-12">
 					<div class="editUas">
 					<div class="editUas">
 						<div class="pull-right"><span><a href="${CPATH}/admin/content/edit?m=uuhelper&p=uuhelper&c=edit">取消</a></span></div>
 						<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>浏览</span></div>
+						<div><span onclick="saveAsDraft()">保存</span><span onclick="save()">发送</span><span onclick="doPreview()">浏览</span></div>
 					</div>
 					</div>
 					<div class="row">
 					<div class="row">
 						<div class="col-md-9">
 						<div class="col-md-9">

+ 26 - 13
jpress-web-admin/src/main/webapp/WEB-INF/admin/content/edit.html

@@ -92,14 +92,14 @@ if("tinymce" == _editor){
 	initMarkdownEditor();
 	initMarkdownEditor();
 }
 }
     
     
-function save(){
+function save(turnpage){
 	
 	
 	 $('#content_slug').attr('value',$("#slug_text").text());
 	 $('#content_slug').attr('value',$("#slug_text").text());
 
 
 	if("tinymce" == _editor){
 	if("tinymce" == _editor){
 		tinymce.activeEditor.uploadImages(function(success) {
 		tinymce.activeEditor.uploadImages(function(success) {
 			tinymce.triggerSave();
 			tinymce.triggerSave();
-	 		doSubmit();
+	 		doSubmit(turnpage);
 		});
 		});
 	}else{
 	}else{
 		$("#textarea").text(simplemde.markdown(simplemde.value()));
 		$("#textarea").text(simplemde.markdown(simplemde.value()));
@@ -109,27 +109,39 @@ function save(){
  }
  }
 
 
 function doPreview(){
 function doPreview(){
-	saveAsDraft();
-	var slug = $('#content_slug').attr('value');
+	saveAsDraft(turnPage);
+
+	/*var slug = $('#content_slug').val();
 	if("" == slug) {
 	if("" == slug) {
-		slug = $('#title').attr('value')
-	}
-	window.location.href="${CPATH}/c/"+slug;
+		slug = $('#title').val();
+	}*/
+
+
+
+}
+
+function turnPage(){
+	var contentId = $("#content_id").val();
+	window.location.href = "${CPATH}/admin/content/edit?id="+contentId+"&c=edit&p=uuhelper&m=uuhelper";
 }
 }
 
 
- function saveAsDraft(){
+ function saveAsDraft(turnpage){
  	$("#content_status").attr("value","draft");
  	$("#content_status").attr("value","draft");
- 	save();
+ 	save(turnpage);
  }
  }
  
  
- function doSubmit(){
+ function doSubmit(turnpage){
  	$("#form").ajaxSubmit({
  	$("#form").ajaxSubmit({
 			type : "post", 
 			type : "post", 
 			dataType : "json", 
 			dataType : "json", 
-			success : function(data) { 
+			success : function(data) {
+
 				if(data.errorCode == 0){
 				if(data.errorCode == 0){
 					$("#content_id").attr("value",data.data);
 					$("#content_id").attr("value",data.data);
 					toastr.success('保存成功!','操作成功');
 					toastr.success('保存成功!','操作成功');
+					if(turnpage) {
+						turnpage();
+					}
 				}else{
 				}else{
 					toastr.error(data.message,'操作失败');
 					toastr.error(data.message,'操作失败');
 				}
 				}
@@ -207,8 +219,9 @@ $(document).ready(function(){
     	 $('#content_slug').attr('value',params.newValue);
     	 $('#content_slug').attr('value',params.newValue);
 	 });
 	 });
 
 
-    /*$('#thumbnail').imgAreaSelect({ maxWidth: 200, maxHeight: 170, handles: true });
-    });*/
+	<#if content?? && "uuhelper" == content.module>
+		window.open($("#content_url").val());
+	</#if>
 });
 });
 </#macro> 
 </#macro> 
 <#macro script_import>
 <#macro script_import>