Преглед на файлове

添加小图字段,展示。调整选择缩略图逻辑。

huangct преди 8 години
родител
ревизия
bceee2a21f

+ 12 - 4
jpress-model/src/main/java/io/jpress/model/base/BaseContent.java

@@ -15,15 +15,15 @@
  */
 package io.jpress.model.base;
 
+import com.jfinal.plugin.activerecord.IBean;
+import com.jfinal.plugin.ehcache.CacheKit;
+import com.jfinal.plugin.ehcache.IDataLoader;
 import io.jpress.message.MessageKit;
 import io.jpress.model.Metadata;
 import io.jpress.model.core.JModel;
 import io.jpress.model.query.MetaDataQuery;
-import java.math.BigInteger;
 
-import com.jfinal.plugin.activerecord.IBean;
-import com.jfinal.plugin.ehcache.CacheKit;
-import com.jfinal.plugin.ehcache.IDataLoader;
+import java.math.BigInteger;
 
 /**
  *  Auto generated by JPress, do not modify this file.
@@ -420,4 +420,12 @@ public abstract class BaseContent<M extends BaseContent<M>> extends JModel<M> im
 		return get("remarks");
 	}
 
+	public void setSmallThumbnail(java.lang.String smallThumbnail) {
+		set("small_thumbnail", smallThumbnail);
+	}
+
+	public java.lang.String getSmallThumbnail() {
+		return get("small_thumbnail");
+	}
+
 }

+ 1 - 1
jpress-web-admin/src/main/java/io/jpress/admin/controller/_ContentController.java

@@ -491,7 +491,7 @@ public class _ContentController extends JBaseCRUDController<Content> {
 		bodyJO.put("type", 1);
 		bodyJO.put("timeSend", "");
 		String imageUrl = requestUrlMessage + content.getThumbnail();
-		String iconUrl = requestUrlMessage + content.getThumbnail();
+		String iconUrl = requestUrlMessage + content.getSmallThumbnail();
 		String linkUrl = requestUrlMessage + content.getUrl();
 		if (content.getThumbnail() == null) {
 			imageUrl = null;

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

@@ -285,7 +285,8 @@
         <h1>${(module.addTitle)!}</h1>
     </section>
     <!-- Main content -->
-    <section class="content" style="z-index: 9999">
+	<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!}">
             <input type="hidden" id="content_id" name="content.id" value="${(content.id)!}">
@@ -298,7 +299,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>浏览</span></div>
+						<div><span onclick="saveAsDraft()">保存</span><span onclick="save()">发送</span><span onclick="doPreview()">浏览</span></div>
 					</div>
 					<div class="row">
 						<div class="col-md-9">
@@ -392,7 +393,7 @@
 								<input type="hidden" name="content.thumbnail" value="${(content.thumbnail)!}" id="content_thumbnail">
 								<span class="inputUas" onclick="doSelectThumbnail('bigImage')" onchange="Javascript:validImg(this);"><em>从图库选择</em><!--<input type="file">--></span>
 								<!--小图-->
-								<input type="hidden" name="content.thumbnail" value="${(content.thumbnail)!}" id="content_thumbnail">
+								<input type="hidden" name="content.small_thumbnail" value="${(content.small_thumbnail)!}" id="content_smallThumbnail">
 								<span class="inputUas" onclick="doSelectThumbnail('smallImage')" onchange="Javascript:validImg(this);"><em>从图库选择</em><!--<input type="file">--></span>
 							</div>
 							<!--大图-->
@@ -401,7 +402,7 @@
 							</div>
 							<!--小图-->
 							<div class="showImgs">
-								<img src="${(content.thumbnail)!CPATH+'/static/jpress/admin/image/nothumbnail.jpg'}" id="thumbnail" class="jp-content-thumbnail content-thumbnail"/>
+								<img src="${(content.small_thumbnail)!CPATH+'/static/jpress/admin/image/nothumbnail.jpg'}" id="smallThumbnail" class="jp-content-thumbnail content-thumbnail"/>
 							</div>
 						</div>
 						<div class="detailUas">

+ 8 - 2
jpress-web-admin/src/main/webapp/WEB-INF/admin/content/edit.html

@@ -166,8 +166,14 @@ function doSelectThumbnail(size){
 			    content: '${CPATH}/admin/attachment/choose_layer?size=' + size,
 			    end:function(){
 			    	if(''!=data.url && null != data.url){
-			    		$("#thumbnail").attr("src",data.url);
-			    		$("#content_thumbnail").attr("value",data.url);
+						if(''!=size && null != size && 'smallImage'==size){
+							$("#smallThumbnail").attr("src",data.url);
+							$("#content_smallThumbnail").attr("value",data.url);
+						} else {
+							$("#thumbnail").attr("src",data.url);
+							$("#content_thumbnail").attr("value",data.url);
+						}
+
 			    	}
 			    }
 			});