change: 新着情報のサムネイル表示処理追加

NetCommons3/NetCommons3#1620
NetCommons3 · Jan 8, 2021 · d2995b7 · d2995b7
1 parent 4f6496d
commit d2995b7
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 9 deletions.
diff --git a/Locale/eng/LC_MESSAGES/topics.pot b/Locale/eng/LC_MESSAGES/topics.pot
@@ -83,6 +83,9 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
+msgid "Thumbnail"
+msgstr ""
+
 #: Topics/View/Elements/TopicFrameSettings/edit_form.ctp:103
 msgid "Detail"
 msgstr ""

diff --git a/Locale/jpn/LC_MESSAGES/topics.po b/Locale/jpn/LC_MESSAGES/topics.po
@@ -93,6 +93,9 @@ msgstr "プライベート"
 msgid "Title"
 msgstr "件名"
 
+msgid "Thumbnail"
+msgstr "サムネイル画像"
+
 msgid "Detail"
 msgstr "詳細"
 

diff --git a/View/Elements/TopicFrameSettings/edit_form.ctp b/View/Elements/TopicFrameSettings/edit_form.ctp
@@ -99,6 +99,16 @@
 					?>
 				</div>
 
+				<div class="form-group">
+					<?php
+						echo $this->NetCommonsForm->checkbox('TopicFrameSetting.display_thumbnail', array(
+							'type' => 'checkbox',
+							'label' => __d('topics', 'Thumbnail'),
+							'inline' => false,
+						));
+					?>
+				</div>
+
 				<div class="form-group">
 					<?php
 						echo $this->NetCommonsForm->checkbox('TopicFrameSetting.display_summary', array(

diff --git a/View/Elements/Topics/item.ctp b/View/Elements/Topics/item.ctp
@@ -57,10 +57,18 @@
 			</div>
 		<?php endif; ?>
 	</div>
-
-	<?php if ($topicFrameSetting['display_summary']) : ?>
-		<div class="text-muted topic-summary">
-			<?php echo h($item['Topic']['display_summary']); ?>
+	<div class="media">
+		<div class="media-body">
+			<?php if ($topicFrameSetting['display_summary']) : ?>
+				<div class="text-muted topic-summary">
+					<?php echo h($item['Topic']['display_summary']); ?>
+				</div>
+			<?php endif; ?>
 		</div>
-	<?php endif; ?>
+		<?php if ($topicFrameSetting['display_thumbnail'] && !empty($item['Topic']['thumbnail_url'])) : ?>
+			<div class="media-right">
+				<img src="<?php echo h($item['Topic']['thumbnail_url']); ?>" alt="">
+			</div>
+		<?php endif; ?>
+	</div>
 </article>
diff --git a/View/Elements/Topics/item_angularjs.ctp b/View/Elements/Topics/item_angularjs.ctp
@@ -58,9 +58,18 @@
 		<?php endif; ?>
 	</div>
 
-	<?php if ($topicFrameSetting['display_summary']) : ?>
-		<div class="text-muted topic-summary">
-			{{item.Topic.display_summary}}
+	<div class="media">
+		<div class="media-body">
+			<?php if ($topicFrameSetting['display_summary']) : ?>
+				<div class="text-muted topic-summary">
+					{{item.Topic.display_summary}}
+				</div>
+			<?php endif; ?>
 		</div>
-	<?php endif; ?>
+		<?php if ($topicFrameSetting['display_thumbnail']) : ?>
+			<div class="media-right" ng-show="item.Topic.thumbnail_path">
+				<img ng-src="{{item.Topic.thumbnail_url}}" alt="">
+			</div>
+		<?php endif; ?>
+	</div>
 </article>