From b9a2074f111873d60b946730cd7c19ece550deea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B1=E5=8D=9A=E4=BA=9E?= <naruto0426@rulingcom.com>
Date: Sat, 20 Jul 2024 10:58:47 +0800
Subject: [PATCH] add new show layout

---
 app/controllers/event_news_mods_controller.rb |  6 +-
 modules/event_news_mod/info.json              | 18 +++++
 modules/event_news_mod/show2.html.erb         | 65 +++++++++++++++++++
 3 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 modules/event_news_mod/show2.html.erb

diff --git a/app/controllers/event_news_mods_controller.rb b/app/controllers/event_news_mods_controller.rb
index 1afb3ad..1d6deed 100644
--- a/app/controllers/event_news_mods_controller.rb
+++ b/app/controllers/event_news_mods_controller.rb
@@ -681,7 +681,8 @@ class EventNewsModsController < ApplicationController
         "next_btn_title" => next_btn_title,
         "carousel_display_style" => (event_carousel_images.count == 0 ? 'display: none' : "width: #{event_news.carousel_image_width};margin: auto;"),
         "carousel_count" => event_carousel_images.count,
-        "place_text" => (event_news.place.present? rescue false) ? "#{EventNewsCustomTitle.get_trans("place")}: #{event_news.place}" : ""
+        "place_text" => (event_news.place.blank? ? "" : "#{EventNewsCustomTitle.get_trans("place")}: #{event_news.place}"),
+        "place-css" => (event_news.place.blank? ? "display: none;" : "")
       },
       "impressionist" => (event_news.is_preview ? nil : event_news),
       "url_to_edit"=>url_to_edit
@@ -779,7 +780,8 @@ class EventNewsModsController < ApplicationController
         "next_btn_title" => next_btn_title,
         "carousel_display_style" => (event_carousel_images.count == 0 ? 'display: none' : "width: #{EventNewsSetting.last.carousel_image_width};margin: auto;"),
         "carousel_count" => event_carousel_images.count,
-        "place_text" => (event_news["place"].present? rescue false) ? "#{I18n.t("event_news.place")}: #{event_news["place"]}" : ""
+        "place_text" => (event_news["place"].blank? ? "" : "#{I18n.t("event_news.place")}: #{event_news["place"]}"),
+        "place-css" => (event_news["place"].blank? ? "display: none;" : "")
       },
       "impressionist" => nil,
       "url_to_edit" => url_to_edit
diff --git a/modules/event_news_mod/info.json b/modules/event_news_mod/info.json
index 7cdae46..4f19e06 100644
--- a/modules/event_news_mod/info.json
+++ b/modules/event_news_mod/info.json
@@ -317,5 +317,23 @@
 				},
 			"thumbnail" : "event_news_widget7_thumbs.png"
 		}
+	],
+	"show" : [
+		{
+			"filename" : "show",
+			"name" : {
+				"zh_tw" : "1. 標準內容頁",
+				"en" : "1. Standard Content Page"
+				},
+			"thumbnail" : "event_news_widget1_thumbs.png"
+		},
+		{
+			"filename" : "show2",
+			"name" : {
+				"zh_tw" : "2. 內容頁樣式2",
+				"en" : "2. Standard Content Page Style 2"
+				},
+			"thumbnail" : "event_news_widget1_thumbs.png"
+		}
 	]
 }
\ No newline at end of file
diff --git a/modules/event_news_mod/show2.html.erb b/modules/event_news_mod/show2.html.erb
new file mode 100644
index 0000000..e09ec6f
--- /dev/null
+++ b/modules/event_news_mod/show2.html.erb
@@ -0,0 +1,65 @@
+<article class="s-annc show-annc2">
+  <h1 class="s-annc__show-title">{{title}}</h1>
+  
+  <ul class="s-annc__meta-wrap list-unstyled no-print">
+    <li class="s-annc__tag-wrap s-annc__meta--item ">
+      <i class="fa fa-tags"></i>
+      <span data-list="tags" data-level="0">
+        <a href="{{url}}"><span class="s-annc__tag label label-default">{{tag}}</span></a>
+      </span>
+    </li>
+    <li class="s-annc__date-wrap s-annc__meta--item">
+      <span style="display: inline-block;{{event-time-css}}">
+        <span>{{event_date-head}}</span>
+        <span class="s-annc__date" date-format="%Y-%m-%d">{{updated_at}}</span>
+      </span>
+    </li>
+    <li class="s-annc__extra_info-wrap s-annc__meta--item ">
+      <span style="display: inline-block;{{speaker-css}}">
+        <span>{{speaker-head}}</span>
+        <span>{{speaker}}</span>
+      </span>
+    </li>
+    <li class="s-annc__extra_info-wrap s-annc__meta--item ">
+      <span style="display: inline-block;{{host-css}}">
+        <span>{{host-head}}:</span>
+        <span>{{host}}</span>
+      </span>
+    </li>
+    <li class="s-annc__extra_info-wrap s-annc__meta--item ">
+      <span style="display: inline-block;{{place-css}}">
+        <span>{{place-head}}:</span>
+        <span>{{place_text}}</span>
+      </span>
+    </li>
+  </ul>
+
+  <section class="s-annc__post-wrap">
+    <div class="s-annc__sub-img {{hide_class}}">
+    <img src="{{img_src}}"></img>
+    <span class="s-annc__img_description">{{img_description}}</span>
+    </div>
+    <div class="s-annc__subtitle">{{subtitle_ann}}</div>
+    <p class="s-annc__post-body">{{body}}</p>
+  </section>
+  <hr>
+  <section class="s-annc__post-wrap">
+    <p class="s-annc__post-notes">{{notes}}</p>
+  </section>
+  <ul class="s-annc__related-wrap list-unstyled no-print">
+    <li class="s-annc__related-file">
+      <i class="fa fa-fw fa-paperclip"></i>
+      <div class="s-annc__related-file-list" data-list="event_news_files" data-level="0">
+        <a class="s-annc__flie-title  btn  btn-default  btn-sm" href="{{file_url}}">{{file_title}}</a>
+      </div>
+    </li>
+
+    <li class="s-annc__related-link">
+      <i class="fa fa-fw fa-link"></i>
+      <div class="s-annc__related-link-list" data-list="event_news_links" data-level="0">
+        <a class="s-annc__link-title  btn  btn-default  btn-sm" href="{{link_url}}" target="_blank">{{link_title}}</a>
+      </div>
+    </li>
+  </ul>
+</article>
+{{link_to_edit}}
\ No newline at end of file