【ご要望】新着記事、人気記事、新着情報にコメント数を表示するオプションの追加

amp.css

@@ -2675,6 +2675,17 @@ label.screen-reader-text {
   opacity: 0.8;
 }
 
+.widget-entry-card-info {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.widget-entry-card-comment {
+  font-size: 0.7em;
+  padding: 4px 2px 2px 2px;
+}
+
 .widget-entry-card-pv {
   margin-left: 5px;
   font-style: italic;
@@ -9615,6 +9626,11 @@ https://codepen.io/nxworld/pen/oLdoWb
   margin-right: 18px;
 }
 
+.info-list-item-comment {
+  margin-left: -10px;
+  margin-right: 12px;
+}
+
 .info-list-item-categorys .entry-category {
   padding: 1px 18px;
   margin-right: 8px;

blocks/dist/blocks.build.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-primitives', 'wp-rich-text'), 'version' => '9170b8f56ec55d77b928');
+<?php return array('dependencies' => array('lodash', 'react', 'react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-primitives', 'wp-rich-text'), 'version' => '00f20c3925f2a5f21758');

blocks/src/block/info-list/block.json

@@ -36,6 +36,10 @@
     "modified": {
       "type": "boolean",
       "default": false
+    },
+    "comment": {
+      "type": "boolean",
+      "default": false
     }
   },
   "example": {},

blocks/src/block/info-list/edit.js

@@ -34,7 +34,7 @@ import { THEME_NAME, CreateCategoryList } from '../../helpers';
 
 export default function edit( props ) {
   const { attributes, setAttributes, className } = props;
-  const { count, showAllCats, cats, caption, showFrame, showDivider, modified } =
+  const { count, showAllCats, cats, caption, showFrame, showDivider, modified, comment } =
     attributes;
 
   const classes = classnames( 'info-list-box', 'block-box', {
@@ -112,6 +112,13 @@ export default function edit( props ) {
               setAttributes( { showDivider: isChecked } )
             }
           />
+          <ToggleControl
+            label={ __( 'コメント数を表示する', THEME_NAME ) }
+            checked={ comment }
+            onChange={ ( isChecked ) =>
+              setAttributes( { comment: isChecked } )
+            }
+          />
           <ToggleControl
             label={ __( '更新日順に並び替える', THEME_NAME ) }
             checked={ modified }

blocks/src/block/info-list/index.php

@@ -25,6 +25,7 @@ function render_block_cocoon_block_info_list($attributes, $content)
 		'frame' => $attributes['showFrame'] ? 1 : 0,
 		'divider' => $attributes['showDivider'] ? 1 : 0,
 		'modified' => $attributes['modified'] ? 1 : 0,
+		'comment' => $attributes['comment'] ? 1 : 0,
 	];
 
 	ob_start();

blocks/src/block/new-list/block.json

@@ -84,6 +84,10 @@
     "author": {
       "type": "string",
       "default": ""
+    },
+    "comment": {
+      "type": "boolean",
+      "default": false
     }
   },
   "example": {},

blocks/src/block/new-list/edit.js

@@ -56,6 +56,7 @@ export default function edit( props ) {
     post_type,
     taxonomy,
     author,
+    comment,
   } = attributes;
 
   const classes = classnames( 'new-list-box', 'block-box', {
@@ -235,6 +236,13 @@ export default function edit( props ) {
               setAttributes({ date: isChecked })
             }
           />
+          <ToggleControl
+            label={__('コメント数を表示する', THEME_NAME)}
+            checked={comment}
+            onChange={(isChecked) =>
+              setAttributes({ comment: isChecked })
+            }
+          />
         </PanelBody>
         <PanelBody title={ __( 'フィルタ', THEME_NAME ) } initialOpen={ false }>
           <ToggleControl

blocks/src/block/new-list/index.php

@@ -36,6 +36,7 @@ function render_block_cocoon_block_new_list($attributes, $content)
 		'author' => $attributes['author'],
 		'offset' => $attributes['offset'],
 		'horizontal' => $attributes['horizontal'] ? 1 : 0,
+		'comment' => $attributes['comment'] ? 1 : 0,
 	];
 
 	$new_list_content = new_entries_shortcode($atts);

blocks/src/block/popular-list/block.json

@@ -72,6 +72,10 @@
     "ex_cats": {
       "type": "string",
       "default": ""
+    },
+    "comment": {
+      "type": "boolean",
+      "default": false
     }
   },
   "example": {},

blocks/src/block/popular-list/edit.js

@@ -53,6 +53,7 @@ export default function edit( props ) {
     horizontal,
     ex_posts,
     ex_cats,
+    comment,
   } = attributes;
 
   const classes = classnames( 'popular-list-box', 'block-box', {
@@ -278,6 +279,11 @@ export default function edit( props ) {
             checked={date}
             onChange={(isChecked) => setAttributes({ date: isChecked })}
           />
+          <ToggleControl
+            label={__('コメント数を表示する', THEME_NAME)}
+            checked={comment}
+            onChange={(isChecked) => setAttributes({ comment: isChecked })}
+          />
         </PanelBody>
         <PanelBody title={ __( 'フィルタ', THEME_NAME ) } initialOpen={ false }>
           <ToggleControl

blocks/src/block/popular-list/index.php

@@ -33,6 +33,7 @@ function render_block_cocoon_block_popular_list($attributes, $content)
 		'date' => $attributes['date'] ? 1 : 0,
 		'post_type' => $attributes['post_type'],
 		'horizontal' => $attributes['horizontal'] ? 1 : 0,
+		'comment' => $attributes['comment'] ? 1 : 0,
 	];
 
 	$popular_list_content = popular_entries_shortcode($atts);

css/admin.css

@@ -2914,6 +2914,15 @@ body.wp-admin {
   font-size: 12px;
   opacity: 0.8;
 }
+.admin-settings .demo .widget-entry-card-info {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+.admin-settings .demo .widget-entry-card-comment {
+  font-size: 0.7em;
+  padding: 4px 2px 2px 2px;
+}
 .admin-settings .demo .widget-entry-card-pv {
   margin-left: 5px;
   font-style: italic;
@@ -8883,6 +8892,10 @@ body.wp-admin {
 .admin-settings .demo .info-list-item-date {
   margin-right: 18px;
 }
+.admin-settings .demo .info-list-item-comment {
+  margin-left: -10px;
+  margin-right: 12px;
+}
 .admin-settings .demo .info-list-item-categorys .entry-category {
   padding: 1px 18px;
   margin-right: 8px;
@@ -11478,6 +11491,15 @@ body.wp-admin {
   font-size: 12px;
   opacity: 0.8;
 }
+.admin-settings .demo .widget-entry-card-info {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+.admin-settings .demo .widget-entry-card-comment {
+  font-size: 0.7em;
+  padding: 4px 2px 2px 2px;
+}
 .admin-settings .demo .widget-entry-card-pv {
   margin-left: 5px;
   font-style: italic;
@@ -17447,6 +17469,10 @@ body.wp-admin {
 .admin-settings .demo .info-list-item-date {
   margin-right: 18px;
 }
+.admin-settings .demo .info-list-item-comment {
+  margin-left: -10px;
+  margin-right: 12px;
+}
 .admin-settings .demo .info-list-item-categorys .entry-category {
   padding: 1px 18px;
   margin-right: 8px;

css/entry-content.css

@@ -4891,6 +4891,17 @@ label.screen-reader-text {
   opacity: 0.8;
 }
 
+.widget-entry-card-info {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.widget-entry-card-comment {
+  font-size: 0.7em;
+  padding: 4px 2px 2px 2px;
+}
+
 .widget-entry-card-pv {
   margin-left: 5px;
   font-style: italic;
@@ -5370,6 +5381,11 @@ https://codepen.io/nxworld/pen/oLdoWb
   margin-right: 18px;
 }
 
+.info-list-item-comment {
+  margin-left: -10px;
+  margin-right: 12px;
+}
+
 .info-list-item-categorys .entry-category {
   padding: 1px 18px;
   margin-right: 8px;

lib/html-forms.php

@@ -1003,6 +1003,7 @@ function generate_popular_entries_tag($atts){
     'post_type' => 'post',
     'horizontal' => 0,
     'action' => null,
+    'comment' => 0,
   ), $atts, 'generate_popular_entries_tag'));
 
   //Swiperスクリプトコードを呼び出すかどうか
@@ -1052,7 +1053,6 @@ function generate_popular_entries_tag($atts){
       } else {
         $post_thumbnail_img = get_original_image_tag($no_thumbnail_url, $w, $h, 'no-image popular-entry-card-thumb-no-image widget-entry-card-thumb-no-image', '');
       }
-
       //スニペット表示
       $snippet_tag = '';
       //「タイトルを重ねた大きなサムネイル」の時はスニペットを表示させない
@@ -1085,7 +1085,15 @@ function generate_popular_entries_tag($atts){
         <?php if ($entry_type != ET_LARGE_THUMB_ON): ?>
           <?php echo $pv_tag; ?>
         <?php endif ?>
-        <?php generate_widget_entry_card_date('popular', $post->ID, $display = $date); ?>
+        <?php do_action( 'widget_entry_card_date_before', 'popular', $post->ID); ?>
+        <div class="popular-entry-card-meta widget-entry-card-meta card-meta">
+          <div class="popular-entry-card-info widget-entry-card-info card-info">
+        <?php generate_widget_entry_card_date('popular', $post->ID, $display = $date);
+        if ($comment): ?>
+          <span class="popular-entry-card-comment widget-entry-card-comment card-comment post-comment-count"><span class="fa fa-comment-o comment-icon" aria-hidden="true"></span><?php echo get_comments_number( $post->ID ); ?></span>
+        <?php endif; ?>
+          </div>
+        </div>
       </div><!-- /.popular-entry-content -->
       <?php if ($entry_type == ET_LARGE_THUMB_ON): ?>
         <?php echo $pv_tag; ?>
@@ -1145,6 +1153,7 @@ function generate_widget_entries_tag($atts){
     'ex_posts' => null,
     'ex_cats' => null,
     'ordered_posts' => null,
+    'comment' => 0,
   ), $atts, 'generate_widget_entries_tag'));
 
   //Swiperスクリプトコードを呼び出すかどうか
@@ -1322,6 +1331,8 @@ function generate_widget_entries_tag($atts){
       'type' => $type,
       'horizontal' => $horizontal,
       'date' => $date,
+      'comment' => $comment,
+      'post_id' => get_the_ID(),
     );
 
     if ($snippet) {
@@ -1406,7 +1417,6 @@ function generate_widget_entry_card_date($prefix, $post_id = null, $display = fa
 // クラスのON/OFFを制御するオプション
 $display_class = $display ? '' : ' display-none';
 ?>
-<?php do_action( 'widget_entry_card_date_before', $prefix, $post_id); ?>
 <div class="<?php echo $prefix; ?>-entry-card-date widget-entry-card-date<?php echo $display_class; ?>">
   <span class="<?php echo $prefix; ?>-entry-card-post-date widget-entry-card-post-date post-date"><span class="fa fa-clock-o" aria-hidden="true"></span><span class="entry-date"><?php echo get_the_time(get_site_date_format(), $post_id); ?></span></span><?php
     //更新日の取得
@@ -1573,8 +1583,10 @@ function get_widget_entry_card_link_tag($atts){
     'classes' => null,
     'object' => 'post',
     'object_id' => null,
+    'post_id' => null,
     'horizontal' => 0,
     'target' => null,
+    'comment' => null,
   ), $atts, 'get_widget_entry_card_link_tag'));
 
   $class_text = null;
@@ -1647,12 +1659,22 @@ function get_widget_entry_card_link_tag($atts){
         <div class="<?php echo $prefix; ?>-entry-card-title widget-entry-card-title card-title"><?php echo $title;?></div>
         <?php if ($snippet): ?>
         <div class="<?php echo $prefix; ?>-entry-card-snippet widget-entry-card-snippet card-snippet"><?php echo $snippet; ?></div>
-        <?php endif; ?>
+        <?php endif;
+        if (!is_widget_navi_entry_card_prefix($prefix)) {
+          do_action( 'widget_entry_card_date_before', $prefix, $post_id);
+        }
+        ?>
+        <div class="<?php echo $prefix; ?>-entry-card-meta widget-entry-card-meta card-meta">
+          <div class="<?php echo $prefix; ?>-entry-card-info widget-entry-card-info card-info">
         <?php
         if (!is_widget_navi_entry_card_prefix($prefix)) {
           generate_widget_entry_card_date($prefix, null, $display = $date);
-        } ?>
-
+        }
+        if ($comment): ?>
+          <span class="<?php echo $prefix; ?>-entry-card-comment widget-entry-card-comment card-comment post-comment-count"><span class="fa fa-comment-o comment-icon" aria-hidden="true"></span><?php echo get_comments_number(); ?></span>
+        <?php endif; ?>
+          </div>
+        </div>
       </div><!-- /.entry-content -->
     </div><!-- /.entry-card -->
   </a><!-- /.entry-card-link -->
@@ -1828,6 +1850,7 @@ function generate_info_list_tag($atts){
     'action' => null,
     'post_type' => 'post',
     'taxonomy' => 'category',
+    'comment' => 0,
   ), $atts, 'generate_info_list_tag'));
 
   $args = array(
@@ -1894,6 +1917,9 @@ function generate_info_list_tag($atts){
           <?php do_action('info_list_item_meta_before'); ?>
           <div class="info-list-item-meta">
             <span class="info-list-item-date"><?php echo $date; ?></span>
+            <?php if ($comment): ?>
+              <span class="info-list-item-comment post-comment-count"><span class="fa fa-comment-o comment-icon" aria-hidden="true"></span><?php echo get_comments_number(); ?></span>
+            <?php endif; ?>
             <span class="info-list-item-categorys"><?php the_nolink_categories() ?></span>
           </div>
         </div>

lib/shortcodes.php

@@ -56,6 +56,7 @@ function new_entries_shortcode($atts) {
     'ex_posts' => null,
     'ex_cats' => null,
     'ordered_posts' => null,
+    'comment' => 0,
   ), $atts, 'new_list'));
 
   //countオプションに異常値が入っていた場合
@@ -113,6 +114,7 @@ function new_entries_shortcode($atts) {
     'ex_posts' => $exclude_post_ids,
     'ex_cats' => $exclude_cat_ids,
     'ordered_posts' => $ordered_post_ids,
+    'comment' => $comment,
   );
   ob_start();
   generate_widget_entries_tag($atts);
@@ -146,6 +148,7 @@ function popular_entries_shortcode($atts) {
     'post_type' => 'post',
     'horizontal' => 0,
     'action' => null,
+    'comment' => 0,
   ), $atts, 'popular_list'));
 
   //countオプションに異常値が入っていた場合
@@ -188,6 +191,7 @@ function popular_entries_shortcode($atts) {
     'post_type' => $post_type,
     'horizontal' => $horizontal,
     'action' => $action,
+    'comment' => $comment,
   );
   ob_start();
   generate_popular_entries_tag($atts);
@@ -998,6 +1002,7 @@ function get_info_list_shortcode($atts){
     'action' => null,
     'post_type' => 'post',
     'taxonomy' => null,
+    'comment' => 0,
   ), $atts, 'info_list'));
 
   //countオプションに異常値が入っていた場合
@@ -1022,6 +1027,7 @@ function get_info_list_shortcode($atts){
     'action' => $action,
     'post_type' => $post_type,
     'taxonomy' => $taxonomy,
+    'comment' => $comment,
   );
   ob_start();
   generate_info_list_tag($atts);