Merge composer/master into availability

.github/workflows/release.yml

@@ -0,0 +1,28 @@
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - '3*'
+
+name: Create Release
+
+jobs:
+  build:
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          body: |
+            NetCommons ${{ github.ref }} released.
+          draft: false
+          prerelease: false

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 ""

Locale/jpn/LC_MESSAGES/topics.po

@@ -93,6 +93,9 @@ msgstr "プライベート"
 msgid "Title"
 msgstr "件名"
 
+msgid "Thumbnail"
+msgstr "サムネイル画像"
+
 msgid "Detail"
 msgstr "詳細"
 

VERSION.txt

@@ -1 +1 @@
-3.3.2
+3.3.3

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(

View/Elements/Topics/item.ctp

@@ -57,10 +57,20 @@
 			</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">
+				<a href="<?php echo $item['Topic']['url']; ?>" ng-click="link($event)">
+					<img src="<?php echo h($item['Topic']['thumbnail_url']); ?>" alt="" />
+				</a>
+			</div>
+		<?php endif; ?>
+	</div>
 </article>

View/Elements/Topics/item_angularjs.ctp

@@ -58,9 +58,20 @@
 		<?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">
+				<a ng-href="{{item.Topic.url}}" ng-click="link($event)">
+					<img ng-src="{{item.Topic.thumbnail_url}}" alt="">
+				</a>
+			</div>
+		<?php endif; ?>
+	</div>
 </article>

webroot/js/topics.js

@@ -117,7 +117,7 @@ NetCommonsApp.controller('TopicsController',
           $location.hash(
               'page:' + ($scope.paging['page']) + '&' + 'frame_id:' + $scope.params['frame_id']
           );
-          $window.location.href = $event.target.href;
+          $window.location.href = $event.currentTarget.href;
           $event.preventDefault();
         };