From be7823315458c0ff6e0b99655df23af8f03fbd34 Mon Sep 17 00:00:00 2001
From: ken <poopooken11@gmail.com>
Date: Mon, 3 Aug 2026 10:29:30 +0800
Subject: [PATCH] tag

---
 .../template/modules/announcement.scss           |  4 ++++
 assets/stylesheets/template/modules/hashtag.scss | 16 ++++++++++++++++
 modules/announcement/_annc_widget4.html.erb      |  2 +-
 modules/announcement/_annc_widget7.html.erb      |  1 -
 modules/announcement/annc_index7.html.erb        |  4 +++-
 .../event_news_mod/_event_news_widget7.html.erb  |  1 +
 .../event_news_mod/event_news_index7.html.erb    |  3 ++-
 modules/event_news_mod/show.html.erb             |  1 +
 8 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss
index 7a57bd7..b7ab454 100644
--- a/assets/stylesheets/template/modules/announcement.scss
+++ b/assets/stylesheets/template/modules/announcement.scss
@@ -301,6 +301,10 @@ strong.carousel__description{
 
 // Widget-4
 .widget-announcement-4 {
+  .w-annc__list{
+    display: flex;
+    flex-wrap: wrap;
+  }
   .w-annc__title {
     font-family: $main-font;
     display: -webkit-box;
diff --git a/assets/stylesheets/template/modules/hashtag.scss b/assets/stylesheets/template/modules/hashtag.scss
index cfdd4c8..0361afb 100644
--- a/assets/stylesheets/template/modules/hashtag.scss
+++ b/assets/stylesheets/template/modules/hashtag.scss
@@ -22,4 +22,20 @@ a.orbit-hash-tag {
         transition: transform 0.4s;
         color: #fff;
     }
+}
+.widget-tag{
+        list-style: none;
+    background: #e0edff;
+    color: #0a84ff;
+    margin-right: 0.5em;
+    border-radius: 0.5em;
+    padding: 0.2em 0.5em;
+    margin-bottom: 0.5em;
+    display: inline-block;
+    &:hover{
+        background: #0a84ff;
+        transform: translatey(-2px);
+        transition: transform 0.4s;
+        color: #fff;
+    }
 }
\ No newline at end of file
diff --git a/modules/announcement/_annc_widget4.html.erb b/modules/announcement/_annc_widget4.html.erb
index 5fb4743..6e1038d 100644
--- a/modules/announcement/_annc_widget4.html.erb
+++ b/modules/announcement/_annc_widget4.html.erb
@@ -6,7 +6,7 @@
     <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %></a>
   </div>
   <ul class="w-annc__list  row" data-level="0" data-list="announcements">
-    <li class="w-annc__item  col-md-4">
+    <li class="w-annc__item  col-sm-4">
       <div class="w-annc__img-wrap bullseye" style="position:relative">
 	  <a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
         <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
diff --git a/modules/announcement/_annc_widget7.html.erb b/modules/announcement/_annc_widget7.html.erb
index fc16cf3..187842e 100644
--- a/modules/announcement/_annc_widget7.html.erb
+++ b/modules/announcement/_annc_widget7.html.erb
@@ -15,7 +15,6 @@
           <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
         </h4>         
         <span class="w-annc__category-wrap  col-sm-2">
-           
           <span class="w-annc__category">{{category}}</span>
         </span>
     </li>
diff --git a/modules/announcement/annc_index7.html.erb b/modules/announcement/annc_index7.html.erb
index 8dfc394..af7320e 100644
--- a/modules/announcement/annc_index7.html.erb
+++ b/modules/announcement/annc_index7.html.erb
@@ -18,7 +18,9 @@
           <span class="i-annc__category-wrap">
             <i class="fa-solid fa-list"></i>
             <span class="i-annc__category">{{category}}</span>
-            </span>
+          </span>
+          {{orbithashtags}}
+          {{tag}}
         </div>
         <h4 class="i-annc__entry-title">
           <span class="i-annc__title">{{title}}</span>
diff --git a/modules/event_news_mod/_event_news_widget7.html.erb b/modules/event_news_mod/_event_news_widget7.html.erb
index e41b889..a9c1978 100644
--- a/modules/event_news_mod/_event_news_widget7.html.erb
+++ b/modules/event_news_mod/_event_news_widget7.html.erb
@@ -18,6 +18,7 @@
           <i class="fa-solid fa-list"></i>
           <span class="w-annc__category">{{category}}</span>
         </span>
+        <a href="{{url}}"><span class="s-annc__tag label label-default">{{tag}}</span></a>
     </li>
   </ul>
   <div class="w-annc__more-wrap clearfix">
diff --git a/modules/event_news_mod/event_news_index7.html.erb b/modules/event_news_mod/event_news_index7.html.erb
index fc35668..d734fb5 100644
--- a/modules/event_news_mod/event_news_index7.html.erb
+++ b/modules/event_news_mod/event_news_index7.html.erb
@@ -18,7 +18,8 @@
         <span class="i-annc__category-wrap">
           <i class="fa-solid fa-list"></i>
           <span class="i-annc__category">{{category}}</span>
-          </span>
+        </span>
+		{{tag}}
       </div>
       <h4 class="i-annc__entry-title">
         <span class="i-annc__title">{{title}}</span>
diff --git a/modules/event_news_mod/show.html.erb b/modules/event_news_mod/show.html.erb
index a0c4bc6..6ba0713 100644
--- a/modules/event_news_mod/show.html.erb
+++ b/modules/event_news_mod/show.html.erb
@@ -18,6 +18,7 @@
         <a href="{{url}}"><span class="s-annc__tag label label-default">{{tag}}</span></a>
       </span>
     </li>
+    {{orbithashtags}}
     <li class="s-annc__extra_info-wrap s-annc__meta--item ">
       <span style="display: inline-block;{{speaker-css}}">
         <span>{{speaker-head}}:</span>