Эх сурвалжийг харах

Merge branch 'master' of http://git.choozmo.com:3000/syuanyuri/news_aimedium_org

root 11 цаг өмнө
parent
commit
30a7220213

+ 7 - 3
static/css/style.css

@@ -145,11 +145,14 @@ body {
   line-height: 20px;
 }
 .news-info a {
-  font-size: 14px;
+  padding: 0.1rem 0.3rem 0.2rem;
+  font-size: 12px !important;
   font-weight: 500;
-  color: var(--gray-color);
+  color: #fff;
   text-decoration: none;
   transition: all 0.3s;
+  background-color: #7a7a7a;
+  border-radius: 5px;
 }
 .news-info a:hover {
   opacity: 0.8;
@@ -484,7 +487,7 @@ body {
   margin: 5px auto;
 }
 .news-all .post-title a {
-  font-size: 1.5rem;
+  font-size: 1.25rem;
   display: -webkit-box;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;
@@ -574,6 +577,7 @@ body {
 }
 
 .tags-list .cover-img {
+  width: 100%;
   height: 230px;
   -o-object-fit: cover;
      object-fit: cover;

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
static/css/style.css.map


+ 7 - 3
static/css/style.scss

@@ -157,11 +157,14 @@ body {
   line-height: 20px;
 
   a {
-    font-size: 14px;
+    padding: 0.1rem .3rem .2rem;
+    font-size: 12px !important;
     font-weight: 500;
-    color: var(--gray-color);
+    color: #fff;
     text-decoration: none;
     transition: all 0.3s;
+    background-color: #7a7a7a;
+    border-radius: 5px;
 
     &:hover {
       opacity: 0.8;
@@ -598,7 +601,7 @@ body {
     margin: 5px auto;
 
     a {
-      font-size: 1.5rem;
+      font-size: 1.25rem;
 
       display: -webkit-box;
       -webkit-box-orient: vertical;
@@ -740,6 +743,7 @@ body {
 
 .tags-list {
   .cover-img {
+    width: 100%;
     height: 230px;
     object-fit: cover;
     object-position: 0 25%;

+ 1 - 1
themes/hugo-bootstrap-5/layouts/partials/header.html

@@ -40,7 +40,7 @@
                     <a href="/categories/影音新聞/" class="nav-link" style="color: white;">影音新聞</a>
                 </li>
                 <li class="nav-item">
-                    <a href="/tags/室內設計/" class="nav-link" style="color: white;">民生消費</a>
+                    <a href="/tags/生活/" class="nav-link" style="color: white;">民生消費</a>
                 </li>
                 <li class="nav-item">
                     <a href="/tags/esg/" class="nav-link" style="color: white;">ESG新聞</a>

+ 37 - 1
themes/hugo-bootstrap-5/layouts/partials/news-main.html

@@ -76,6 +76,42 @@
 
     <!-- tags 生活 -->
     <div class="col-lg-2 d-none d-lg-block">
+      <div class="local-video" id="local-news">
+        <h3 class="post-block-title">
+          <span>Local News</span>
+        </h3>
+
+        <!-- 收集前 6 則已經顯示過的文章(index 0~5) -->
+        {{ $shownPermalinks := slice }}
+        {{ range first 6 $pages }}
+        {{ $shownPermalinks = $shownPermalinks | append .Permalink }}
+        {{ end }}
+
+        <!-- 先抓 tags 含「生活」的文章 -->
+        {{ $lifeAll := where .Site.RegularPages "Params.tags" "intersect" (slice "生活") }}
+
+        <!-- 排除掉前 6 則已顯示的文章 -->
+        {{ $lifePages := where $lifeAll "Permalink" "not in" $shownPermalinks }}
+
+        <!-- JS 處理隨機 -->
+        {{ range first 12 $lifePages }}
+        <div class="row align-items-center mb-2 local-item">
+          <div class="col-12">
+            <a href="{{ .Permalink }}">
+              <img class="img-fluid" src="{{ .Params.image | relURL }}" alt="{{ .Params.title }}" />
+            </a>
+
+            <h2 class="mt-2 mb-1 post-title">
+              <a href="{{ .Permalink }}">{{ .Params.title }}</a>
+            </h2>
+          </div>
+        </div>
+        {{ end }}
+
+      </div>
+    </div>
+
+    <!-- <div class="col-lg-2 d-none d-lg-block">
       <div class="local-video" id="local-news">
         <h3 class="post-block-title">
           <span>Local News</span>
@@ -101,7 +137,7 @@
         {{ end }}
 
       </div>
-    </div>
+    </div> -->
 
     <!-- 影片 -->
     <!-- <div class="col-lg-2 d-none d-lg-block">

+ 158 - 32
tmp/news_aimedium_org/sitemap.xml

@@ -2,31 +2,178 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
   xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <url>
-    <loc>http://localhost:1313/news/news_content_2FF5EC0137DFB090/</loc>
-    <lastmod>2025-11-13T10:00:16+08:00</lastmod>
-  </url><url>
     <loc>http://localhost:1313/categories/</loc>
-    <lastmod>2025-11-13T10:00:16+08:00</lastmod>
+    <lastmod>2025-11-19T10:00:32+08:00</lastmod>
   </url><url>
     <loc>http://localhost:1313/news/</loc>
-    <lastmod>2025-11-13T10:00:16+08:00</lastmod>
+    <lastmod>2025-11-19T10:00:32+08:00</lastmod>
   </url><url>
     <loc>http://localhost:1313/tags/</loc>
-    <lastmod>2025-11-13T10:00:16+08:00</lastmod>
+    <lastmod>2025-11-19T10:00:32+08:00</lastmod>
   </url><url>
     <loc>http://localhost:1313/tags/%E5%8F%B0%E5%8C%97/</loc>
-    <lastmod>2025-11-13T10:00:16+08:00</lastmod>
+    <lastmod>2025-11-19T10:00:32+08:00</lastmod>
   </url><url>
     <loc>http://localhost:1313/categories/%E5%8F%B0%E5%8C%97%E5%B8%82%E6%94%BF%E5%BA%9C/</loc>
-    <lastmod>2025-11-13T10:00:16+08:00</lastmod>
+    <lastmod>2025-11-19T10:00:32+08:00</lastmod>
   </url><url>
     <loc>http://localhost:1313/tags/%E7%94%9F%E6%B4%BB/</loc>
-    <lastmod>2025-11-13T10:00:16+08:00</lastmod>
+    <lastmod>2025-11-19T10:00:32+08:00</lastmod>
   </url><url>
-    <loc>http://localhost:1313/news/news_content_37D2D78FEFDD759E/</loc>
+    <loc>http://localhost:1313/</loc>
+    <lastmod>2025-11-19T10:00:32+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_B9147CD564072371/</loc>
+    <lastmod>2025-11-19T10:00:32+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_tainan_114-11-18_8780661/</loc>
+    <lastmod>2025-11-18T10:00:31+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/tags/%E5%8F%B0%E5%8D%97/</loc>
+    <lastmod>2025-11-18T10:00:31+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/categories/%E5%8F%B0%E5%8D%97%E5%B8%82%E6%94%BF%E5%BA%9C/</loc>
+    <lastmod>2025-11-18T10:00:31+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_tainan_114-11-18_8780666/</loc>
+    <lastmod>2025-11-18T10:00:31+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_tainan_114-11-18_8780669/</loc>
+    <lastmod>2025-11-18T10:00:29+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_FAD1EFFA79830C85/</loc>
+    <lastmod>2025-11-18T10:00:17+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_2F7CEF6008AD3F48/</loc>
+    <lastmod>2025-11-18T10:00:17+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_3DF86614E9B4EB98/</loc>
+    <lastmod>2025-11-18T10:00:16+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_6A2C4564A2EA76A9/</loc>
+    <lastmod>2025-11-18T10:00:15+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_6679937F69D1EAB6/</loc>
+    <lastmod>2025-11-18T10:00:12+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/tags/%E5%8F%B0%E4%B8%AD/</loc>
+    <lastmod>2025-11-18T10:00:02+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_3145567/</loc>
+    <lastmod>2025-11-18T10:00:02+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/categories/%E5%8F%B0%E4%B8%AD%E6%94%BF%E5%BA%9C/</loc>
+    <lastmod>2025-11-18T10:00:02+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_3145544/</loc>
+    <lastmod>2025-11-18T10:00:02+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/tags/5in/</loc>
+    <lastmod>2025-11-17T15:45:57+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/categories/ai/</loc>
+    <lastmod>2025-11-17T15:45:57+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/tags/%E5%AF%A6%E9%A9%97%E6%95%99%E8%82%B2/</loc>
+    <lastmod>2025-11-17T15:45:57+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/future-education-trend/</loc>
+    <lastmod>2025-11-17T15:45:57+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/tags/%E6%9C%AA%E4%BE%86%E6%95%99%E8%82%B2%E8%B6%A8%E5%8B%A2/</loc>
+    <lastmod>2025-11-17T15:45:57+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_tainan_114-11-17_8780403/</loc>
+    <lastmod>2025-11-17T10:00:14+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_5E135DA77E672601/</loc>
+    <lastmod>2025-11-17T10:00:13+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_2D6081B381A946EF/</loc>
+    <lastmod>2025-11-17T10:00:12+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_DD16D53DC4F563B3/</loc>
+    <lastmod>2025-11-17T10:00:12+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_A5B9C37909DEA16F/</loc>
+    <lastmod>2025-11-17T10:00:11+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_7013974650EF7DE0/</loc>
+    <lastmod>2025-11-17T10:00:11+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_B0AAB2BE05A13A0D/</loc>
+    <lastmod>2025-11-16T10:00:16+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_616D097BDBA3E778/</loc>
+    <lastmod>2025-11-16T10:00:16+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_09B3A7DA62EF35FE/</loc>
+    <lastmod>2025-11-16T10:00:12+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_3144392/</loc>
+    <lastmod>2025-11-16T10:00:02+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_3144401/</loc>
+    <lastmod>2025-11-16T10:00:02+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_390EC8333EA06487/</loc>
+    <lastmod>2025-11-15T10:00:17+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_0C5BDFBE35222291/</loc>
+    <lastmod>2025-11-15T10:00:16+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_0D92220FCEB704FA/</loc>
+    <lastmod>2025-11-15T10:00:15+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_2ADB94ECFC18D1AC/</loc>
+    <lastmod>2025-11-15T10:00:14+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_3144035/</loc>
+    <lastmod>2025-11-15T10:00:02+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_3144048/</loc>
+    <lastmod>2025-11-15T10:00:02+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_3144057/</loc>
+    <lastmod>2025-11-15T10:00:02+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/tags/%E7%B4%A0%E9%A4%8A%E5%B0%8E%E5%90%91%E6%95%99%E8%82%B2/</loc>
+    <lastmod>2025-11-14T16:07:57+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/competency-oriented-education/</loc>
+    <lastmod>2025-11-14T16:07:57+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_tainan_114-11-14_8780100/</loc>
+    <lastmod>2025-11-14T10:00:19+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_302F632BCDBC2A0D/</loc>
+    <lastmod>2025-11-14T10:00:19+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_E767519A69002EB1/</loc>
+    <lastmod>2025-11-14T10:00:18+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_F0073F3453AD2D5E/</loc>
+    <lastmod>2025-11-14T10:00:17+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_FDA49408F1BA108B/</loc>
+    <lastmod>2025-11-14T10:00:17+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_61BAD79620446F5D/</loc>
+    <lastmod>2025-11-14T10:00:13+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_3143048/</loc>
+    <lastmod>2025-11-14T10:00:03+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_3143104/</loc>
+    <lastmod>2025-11-14T10:00:02+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_3143088/</loc>
+    <lastmod>2025-11-14T10:00:02+08:00</lastmod>
+  </url><url>
+    <loc>http://localhost:1313/news/news_content_2FF5EC0137DFB090/</loc>
     <lastmod>2025-11-13T10:00:16+08:00</lastmod>
   </url><url>
-    <loc>http://localhost:1313/</loc>
+    <loc>http://localhost:1313/news/news_content_37D2D78FEFDD759E/</loc>
     <lastmod>2025-11-13T10:00:16+08:00</lastmod>
   </url><url>
     <loc>http://localhost:1313/news/news_content_77416E614FEF7534/</loc>
@@ -37,21 +184,9 @@
   </url><url>
     <loc>http://localhost:1313/news/news_content_2079CB17E57DDC97/</loc>
     <lastmod>2025-11-13T10:00:13+08:00</lastmod>
-  </url><url>
-    <loc>http://localhost:1313/tags/%E5%8F%B0%E4%B8%AD/</loc>
-    <lastmod>2025-11-13T10:00:01+08:00</lastmod>
-  </url><url>
-    <loc>http://localhost:1313/categories/%E5%8F%B0%E4%B8%AD%E6%94%BF%E5%BA%9C/</loc>
-    <lastmod>2025-11-13T10:00:01+08:00</lastmod>
   </url><url>
     <loc>http://localhost:1313/news/news_content_3142128/</loc>
     <lastmod>2025-11-13T10:00:01+08:00</lastmod>
-  </url><url>
-    <loc>http://localhost:1313/tags/%E5%8F%B0%E5%8D%97/</loc>
-    <lastmod>2025-11-12T10:00:27+08:00</lastmod>
-  </url><url>
-    <loc>http://localhost:1313/categories/%E5%8F%B0%E5%8D%97%E5%B8%82%E6%94%BF%E5%BA%9C/</loc>
-    <lastmod>2025-11-12T10:00:27+08:00</lastmod>
   </url><url>
     <loc>http://localhost:1313/news/news_content_tainan_114-11-12_8779687/</loc>
     <lastmod>2025-11-12T10:00:27+08:00</lastmod>
@@ -454,15 +589,6 @@
   </url><url>
     <loc>http://localhost:1313/news/news_content_hsinchu_114-10-29_276005/</loc>
     <lastmod>2025-10-29T10:00:37+08:00</lastmod>
-  </url><url>
-    <loc>http://localhost:1313/tags/5in/</loc>
-    <lastmod>2025-10-28T15:33:57+08:00</lastmod>
-  </url><url>
-    <loc>http://localhost:1313/categories/ai/</loc>
-    <lastmod>2025-10-28T15:33:57+08:00</lastmod>
-  </url><url>
-    <loc>http://localhost:1313/tags/%E5%AF%A6%E9%A9%97%E6%95%99%E8%82%B2/</loc>
-    <lastmod>2025-10-28T15:33:57+08:00</lastmod>
   </url><url>
     <loc>http://localhost:1313/news/experimental_education/</loc>
     <lastmod>2025-10-28T15:33:57+08:00</lastmod>

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно