Merge pull request #239 from mashirozx/issue-237

Issue 237

Author: spirit1431007

cdn/js/lib.js

@@ -424,7 +424,7 @@ function akina_comment_format($comment, $args, $depth)
 								</div>
 								<?php comment_reply_link(array_merge($args, array('depth' => $depth, 'max_depth' => $args['max_depth'])));?>
 								<div class="right">
-									<div class="info"><time datetime="<?php comment_date('Y-m-d');?>"><?php echo poi_time_since(strtotime($comment->comment_date_gmt), true); //comment_date(get_option('date_format'));  ?></time><?php echo siren_get_useragent($comment->comment_agent); ?><?php echo mobile_get_useragent_icon($comment->comment_agent); ?>&nbsp;<?php _e('Location', 'sakura'); /*来自*/?>: <?php echo convertip(get_comment_author_ip()); ?>
+									<div class="info"><time datetime="<?php comment_date('Y-m-d');?>"><?php echo poi_time_since(strtotime($comment->comment_date_gmt), true); //comment_date(get_option('date_format'));  ?></time><?php echo siren_get_useragent($comment->comment_agent); ?><?php echo mobile_get_useragent_icon($comment->comment_agent); ?>&nbsp;<?php if(akina_option('open_location')){ _e('Location', 'sakura'); /*来自*/?>: <?php echo convertip(get_comment_author_ip());} ?>
     									<?php if (current_user_can('manage_options') and (wp_is_mobile() == false)) {
             $comment_ID = $comment->comment_ID;
             $i_private = get_comment_meta($comment_ID, '_private', true);
@@ -969,11 +969,11 @@ function comment_mail_notify($comment_id)
         <h3>您有一条来自<a style="text-decoration: none;color: orange " target="_blank" href="' . home_url() . '/">' . get_option("blogname") . '</a>的回复</h3>
         <br>
         <p style="font-size: 14px;">您在文章《' . get_the_title($comment->comment_post_ID) . '》上发表的评论：</p>
-        <p style="border-bottom:#ddd 1px solid;border-left:#ddd 1px solid;padding-bottom:20px;background-color:#eee;margin:15px 0px;padding-left:20px;padding-right:20px;border-top:#ddd 1px solid;border-right:#ddd 1px solid;padding-top:20px">'
-        . trim(get_comment($parent_id)->comment_content) . '</p>
+        <div style="border-bottom:#ddd 1px solid;border-left:#ddd 1px solid;padding-bottom:20px;background-color:#eee;margin:15px 0px;padding-left:20px;padding-right:20px;border-top:#ddd 1px solid;border-right:#ddd 1px solid;padding-top:20px">'
+        . trim(get_comment($parent_id)->comment_content) . '</div>
         <p style="font-size: 14px;">' . trim($comment->comment_author) . ' 给您的回复如下：</p>
-        <p style="border-bottom:#ddd 1px solid;border-left:#ddd 1px solid;padding-bottom:20px;background-color:#eee;margin:15px 0px;padding-left:20px;padding-right:20px;border-top:#ddd 1px solid;border-right:#ddd 1px solid;padding-top:20px">'
-        . trim($comment->comment_content) . '</p>
+        <div style="border-bottom:#ddd 1px solid;border-left:#ddd 1px solid;padding-bottom:20px;background-color:#eee;margin:15px 0px;padding-left:20px;padding-right:20px;border-top:#ddd 1px solid;border-right:#ddd 1px solid;padding-top:20px">'
+        . trim($comment->comment_content) . '</div>
 
       <div style="text-align: center;">
           <img src="https://cdn.jsdelivr.net/gh/moezx/cdn@3.1.4/img/other/hr.png" alt="hr" style="width:100%;
@@ -1762,16 +1762,6 @@ function DEFAULT_FEATURE_IMAGE()
     return rest_url('sakura/v1/image/feature') . '?' . rand(1, 1000);
 }
 
-//防止设置置顶文章造成的图片同侧bug
-add_action( 'pre_get_posts', function( $q ){
-    if ( $q->is_home() && $q->is_main_query() ){
-        $q->set( 'posts_per_page', 10 - sizeof(get_option( 'sticky_posts' )) );
-        if ( $q->get( 'paged' ) > 1 )
-            $q->set( 'post__not_in', get_option( 'sticky_posts' ) );
-    }
-    
-});
-
 //评论回复
 function sakura_comment_notify($comment_id)
 {

cdn/js/src/01.jquery.min.js

@@ -120,7 +120,12 @@ function cover_gallery() {
  * @rest api接口路径：https://sakura.2heng.xin/wp-json/sakura/v1/image/feature
  */
 function feature_gallery() {
-    return cover_gallery();
+    $imgurl = Images::feature_gallery();
+    $data = array('feature image');
+    $response = new WP_REST_Response($data);
+    $response->set_status(302);
+    $response->header('Location', $imgurl);
+    return $response;
 }
 
 /*

functions.php

@@ -162,4 +162,13 @@ public static function cover_gallery() {
         }
         return $imgurl;
     }
+
+    public static function feature_gallery() {
+        if (akina_option('post_cover_options') == "type_2") {
+            $imgurl = akina_option('post_cover');
+        } else {
+            $imgurl = self::cover_gallery();
+        }
+        return $imgurl;
+    }
 }

inc/api.php

@@ -8,7 +8,7 @@ body {
 
 .nav-tab-wrapper {
 	position: relative;
-    max-width: 860px;
+    max-width: 900px;
     margin: auto !important;
 }
 
@@ -37,7 +37,7 @@ body {
 .nav-tab {
 	background: none;
 	border:none;
-	padding: 10px 20px;
+	padding: 10px 15px;
 	font-weight: 300;
     font-size: 15px;
     color: darkgoldenrod;
@@ -74,17 +74,23 @@ a#options-group-4-tab:before {
 
 a#options-group-5-tab:before {
     font-family: "dashicons";
-    content: "\f110";
+    content: "\f101";
     float: left;
 }
 
 a#options-group-6-tab:before {
+    font-family: "dashicons";
+    content: "\f110";
+    float: left;
+}
+
+a#options-group-7-tab:before {
     font-family: "dashicons";
     content: "\f325";
     float: left;
 }
 
-a#options-group-7-tab:before { 
+a#options-group-8-tab:before { 
     font-family: "dashicons";
     content: "\f487";
     float: left;

inc/classes/Images.php

@@ -1051,12 +1051,14 @@ function load_bangumi() {
             var xhr = new XMLHttpRequest();
             xhr.open('POST', this.href + "&_wpnonce=" + Poi.nonce, true);
             xhr.onreadystatechange = function() {
-                if (xhr.readyState == 4 && xhr.status == 200) {
-                    var html = JSON.parse(xhr.responseText);
-                    $("#bangumi-pagination").remove();
-                    $(".row").append(html);
-                }else{
-                    $("#bangumi-pagination a").removeClass("loading").html('<i class="fa fa-exclamation-triangle" aria-hidden="true"></i> ERROR ');
+                if (xhr.readyState == 4 ) {
+                    if(xhr.status == 200){
+                        var html = JSON.parse(xhr.responseText);
+                        $("#bangumi-pagination").remove();
+                        $(".row").append(html);
+                    }else{
+                        $("#bangumi-pagination a").removeClass("loading").html('<i class="fa fa-exclamation-triangle" aria-hidden="true"></i> ERROR ');
+                    }
                 }
             };
             xhr.send();