Browse Source

向下滑动屏幕时操作调整

huangct 8 years ago
parent
commit
2457acbbff

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

@@ -89,7 +89,7 @@
 							<td class="chooseUas">
 								<select style="position: absolute;z-index: 1; width: 110px;"  class="choose choosePushTime"
 										onmousedown="if(this.options.length>5){this.size=6}" onblur="this.size=0" onchange="this.size=0;choosePushTime()">
-									<option></option>
+									<option value="">所有</option>
 									<#if push_time_list??>
 										<#list push_time_list as push_time>
 											<option <#if defaultPushTime?? && push_time?? && defaultPushTime == push_time>selected="selected"</#if> value="${push_time!}">${push_time!}</option>
@@ -100,7 +100,7 @@
 							<td class="chooseUas">
 								<select style="position: absolute;z-index: 1; width: 110px;"  class="choose chooseAuthor"
 										onmousedown="if(this.options.length>5){this.size=6}" onblur="this.size=0" onchange="this.size=0;chooseAuthor()">
-									<option></option>
+									<option value="">所有</option>
 									<#if author_list??>
 										<#list author_list as author>
 											<option <#if defaultAuthor?? && author?? && defaultAuthor == author>selected="selected"</#if> value="${author!}">${author!}</option>
@@ -111,7 +111,7 @@
 							<td class="chooseUas">
 								<select style="position: absolute;z-index: 1;"  class="choose chooseCopyRight"
 										onmousedown="if(this.options.length>5){this.size=6}" onblur="this.size=0" onchange="this.size=0;chooseCopyRight()">
-									<option></option>
+									<option value="">所有</option>
 									<#if copy_right_list??>
 										<#list copy_right_list as copy_right>
 											<option <#if defaultCopyRight?? && copy_right?? && defaultCopyRight == copy_right>selected="selected"</#if> value="${copy_right!}">${copy_right!}</option>
@@ -122,7 +122,7 @@
 							<td class="chooseUas">
 								<select style="position: absolute;z-index: 1;width: 110px;"  class="choose chooseTaxonomy"
 										onmousedown="if(this.options.length>5){this.size=6}" onblur="this.size=0" onchange="this.size=0;chooseTaxonomy()">
-									<option></option>
+									<option value="">所有</option>
 									<#if tag_list??>
 										<#list tag_list as tag>
 											<option <#if defaultTaxonomy?? && tag?? && defaultTaxonomy == tag>selected="selected"</#if> value="${tag!}">${tag!}</option>

+ 11 - 3
jpress-web-admin/src/main/webapp/WEB-INF/admin/content/edit.html

@@ -95,7 +95,7 @@ if("tinymce" == _editor){
 function save(){
 	
 	 $('#content_slug').attr('value',$("#slug_text").text());
-	
+
 	if("tinymce" == _editor){
 		tinymce.activeEditor.uploadImages(function(success) {
 			tinymce.triggerSave();
@@ -107,7 +107,16 @@ function save(){
 	}
 	return false;
  }
- 
+
+function doPreview(){
+	saveAsDraft();
+	var slug = $('#content_slug').attr('value');
+	if("" == slug) {
+		slug = $('#title').attr('value')
+	}
+	window.location.href="${CPATH}/c/"+slug;
+}
+
  function saveAsDraft(){
  	$("#content_status").attr("value","draft");
  	save();
@@ -200,7 +209,6 @@ $(document).ready(function(){
 });
 </#macro> 
 <#macro script_import>
-<script src="${CTPATH}/assets/js/jquery.min.js"></script>
 <script src="${CPATH}/static/tinymce/tinymce.min.js"></script>
 <script src="${CPATH}/static/plugins/tag/jquery.caret.min.js"></script>
 <script src="${CPATH}/static/plugins/tag/jquery.tag-editor.min.js"></script>

+ 5 - 4
jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/content_uuhelper.html

@@ -287,7 +287,7 @@
                         <div class="message">
                             <div class="left">
                                 <div class="img" >
-                                    <img src="${comment.uu_user_avatar!(CPATH/jpress/static/jpress/admin/image/dot.png)}" alt="用户头像">
+                                    <img src="${comment.uu_user_avatar!'/jpress/static/jpress/admin/image/dot.png'}" alt="用户头像">
                                 </div>
                             </div>
                             <div class="right">
@@ -358,10 +358,11 @@
     timers = null;
     //加载数据
     var LoadingDataFn = function() {
-        $.get("${CPATH}/comment/lazyLoad?contId=${(content.id)!}&pagesize=3&pagenumber="+aa+"&userId=${userId!0}&uuUserId=${userid!0}", function(result){
+        $.get("${CPATH}/comment/lazyLoad?contId=${(content.id)!}&pagesize=1&pagenumber="+aa+"&userId=${userId!0}&uuUserId=${userid!0}", function(result){
             var dom = '';
-            if (result.data == null){
+            if ("" == result.message){
                 $('.pull').text("没有更多数据了");
+                $('.loading').css('display','none');
             }
             dom += result.message;
             $('.footer-section').append(dom);
@@ -382,8 +383,8 @@
             clearTimeout(timers);
             timers = setTimeout(function() {
                 aa++;
-                LoadingDataFn();
                 $('.loading').css('display','block');
+                LoadingDataFn();
             }, 300);
         }
     });