https://github.com/b3log/solo/issues/12720 Andrea

2019-03-21 17:55:48 +08:00
parent 8c9b13c393
commit 1558900384
209 changed files with 1077 additions and 2176 deletions
--- a/nijigen/archive-articles.ftl
+++ b/nijigen/archive-articles.ftl
@@ -17,16 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
 <head>
-<@head title="${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - ${blogTitle}">
-    <meta name="keywords"
-          content="${metaKeywords},${archiveDate.archiveDateYear}${archiveDate.archiveDateMonth}"/>
-    <meta name="description"
-          content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
-</@head>
+ <@head title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} ${archiveLabel} - ${blogTitle}">
+     <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
+ </@head>
 </head>
 <body>
 <#include "header.ftl">
--- a/nijigen/archives.ftl
+++ b/nijigen/archives.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
 <head>
 <@head title="${archiveLabel} - ${blogTitle}">
-    <meta name="keywords" content="${metaKeywords},${archiveLabel}"/>
-    <meta name="description" content="${metaDescription},${archiveLabel}"/>
+    <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
 </@head>
 </head>
 <body>
--- a/nijigen/article.ftl
+++ b/nijigen/article.ftl
@@ -17,36 +17,22 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <#include "macro-comments.ftl">
 <#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
 <head>
-    <@head title="${article.articleTitle} - ${blogTitle}">
-    <meta name="keywords" content="${article.articleTags}"/>
-    <meta name="description" content="${article.articleAbstract?html}"/>
+    <@head title="${article.articleTitle} - ${blogTitle}" description="${article.articleAbstract?html}">
+        <link rel="stylesheet"
+              href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
+        <#if previousArticlePermalink??>
+            <link rel="prev" title="${previousArticleTitle}" href="${servePath}${previousArticlePermalink}">
+        </#if>
+        <#if nextArticlePermalink??>
+            <link rel="next" title="${nextArticleTitle}" href="${servePath}${nextArticlePermalink}">
+        </#if>
    </@head>
-    <#if previousArticlePermalink??>
-        <link rel="prev" title="${previousArticleTitle}" href="${servePath}${previousArticlePermalink}">
-    </#if>
-    <#if nextArticlePermalink??>
-        <link rel="next" title="${nextArticleTitle}" href="${servePath}${nextArticlePermalink}">
-    </#if>
-    <!-- Open Graph -->
-    <meta property="og:locale" content="zh_CN"/>
-    <meta property="og:type" content="article"/>
-    <meta property="og:title" content="${article.articleTitle}"/>
-    <meta property="og:description" content="${article.articleAbstract?html}"/>
-    <meta property="og:image" content="${article.authorThumbnailURL}"/>
-    <meta property="og:url" content="${servePath}${article.articlePermalink}"/>
-    <meta property="og:site_name" content="Solo"/>
-    <!-- Twitter Card -->
-    <meta name="twitter:card" content="summary"/>
-    <meta name="twitter:description" content="${article.articleAbstract?html}"/>
-    <meta name="twitter:title" content="${article.articleTitle}"/>
-    <meta name="twitter:image" content="${article.authorThumbnailURL}"/>
-    <meta name="twitter:url" content="${servePath}${article.articlePermalink}"/>
 </head>
 <body>
 <#include "header.ftl">
--- a/nijigen/category-articles.ftl
+++ b/nijigen/category-articles.ftl
@@ -17,14 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
 <head>
 <@head title="${category.categoryTitle} - ${blogTitle}">
-    <meta name="keywords" content="${metaKeywords},${category.categoryTitle}"/>
-    <meta name="description"
-          content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+    <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
 </@head>
 </head>
 <body>
--- a/nijigen/css/base.css
+++ b/nijigen/css/base.css
--- a/nijigen/css/base.scss
+++ b/nijigen/css/base.scss
@@ -599,47 +599,6 @@ a {
  }
 }

-.content .b3-solo-list {
-  display: none !important;
-}
-
-.b3-solo-list {
-  margin: 0 !important;
-  font-size: 14px !important;
-}
-
-.b3-solo-list-h1 {
-  margin: 0 !important;
-}
-
-.b3-solo-list-h2 {
-  margin: 0 !important;
-  a {
-    padding-left: 30px !important;
-  }
-}
-
-.b3-solo-list-h3 {
-  margin: 0 !important;
-  a {
-    padding-left: 45px !important;
-  }
-}
-
-.b3-solo-list-h4 {
-  margin: 0 !important;
-  a {
-    padding-left: 60px !important;
-  }
-}
-
-.b3-solo-list-h5 {
-  margin: 0 !important;
-  a {
-    padding-left: 75px !important;
-  }
-}
-
 .article__relevant {
  margin-bottom: 30px;
  .module {
--- a/nijigen/dynamic.ftl
+++ b/nijigen/dynamic.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
 <head>
-<@head title="${blogTitle}">
-    <meta name="keywords" content="${metaKeywords},${dynamicLabel}"/>
-    <meta name="description" content="${metaDescription},${dynamicLabel}"/>
+<@head title="${dynamicLabel} - ${blogTitle}">
+    <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
 </@head>
 </head>
 <body>
--- a/nijigen/footer.ftl
+++ b/nijigen/footer.ftl
@@ -37,5 +37,5 @@
 <script type="text/javascript" src="${staticServePath}/js/lib/compress/pjax.min.js" charset="utf-8"></script>
 <script type="text/javascript" src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
 <script type="text/javascript" src="${staticServePath}/skins/${skinDirName}/js/common${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
-<#include "../../common-template/skin-script.ftl">
+<#include "../../common-template/label.ftl">
 ${plugins}
--- a/nijigen/index.ftl
+++ b/nijigen/index.ftl
@@ -17,17 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
 <head>
    <@head title="${blogTitle}">
-    <#if metaKeywords??>
-    <meta name="keywords" content="${metaKeywords}"/>
-    </#if>
-    <#if metaDescription??>
-    <meta name="description" content="${metaDescription}"/>
-    </#if>
+        <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
    </@head>
 </head>
 <body>
--- a/nijigen/js/isotope.pkgd.js
+++ b/nijigen/js/isotope.pkgd.js
--- a/nijigen/js/isotope.pkgd.min.js
+++ b/nijigen/js/isotope.pkgd.min.js
--- a/nijigen/links.ftl
+++ b/nijigen/links.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
 <head>
 <@head title="${linkLabel} - ${blogTitle}">
-    <meta name="keywords" content="${metaKeywords},${linkLabel}"/>
-    <meta name="description" content="${metaDescription},${linkLabel}"/>
+    <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
 </@head>
 </head>
 <body>
--- a/nijigen/macro-head.ftl
+++ b/nijigen/macro-head.ftl
@@ -1,37 +0,0 @@
-<#--
-
-    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-->
-<#macro head title>
-<meta charset="utf-8" />
-<title>${title}</title>
-<#nested>
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-<meta name="author" content="${blogTitle?html}" />
-<meta name="generator" content="Solo" />
-<meta name="owner" content="B3log Team" />
-<meta name="revised" content="${blogTitle?html}, ${year}" />
-<meta name="copyright" content="B3log" />
-<meta http-equiv="Window-target" content="_top" />
-<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
-<link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${faviconURL}" />
-<link rel="manifest" href="${servePath}/manifest.json">
-<link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
-${htmlHead}
-</#macro>
--- a/nijigen/page.ftl
+++ b/nijigen/page.ftl
@@ -17,15 +17,14 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <#include "macro-comments.ftl">
 <#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
 <head>
 <@head title="${page.pageTitle} - ${blogTitle}">
-    <meta name="keywords" content="${metaKeywords},${page.pageTitle}"/>
-    <meta name="description" content="${metaDescription}"/>
+    <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
 </@head>
 </head>
 <body>
--- a/nijigen/tag-articles.ftl
+++ b/nijigen/tag-articles.ftl
@@ -17,14 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
 <head>
-<@head title="${tag.tagTitle} - ${blogTitle}">
-    <meta name="keywords" content="${metaKeywords},${tag.tagTitle}"/>
-    <meta name="description"
-          content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+<@head title="${tag.tagTitle} ${tagLabel} - ${blogTitle}">
+    <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
 </@head>
 </head>
 <body>
--- a/nijigen/tags.ftl
+++ b/nijigen/tags.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
 <head>
 <@head title="${allTagsLabel} - ${blogTitle}">
-    <meta name="keywords" content="${metaKeywords},${allTagsLabel}"/>
-    <meta name="description" content="<#list tags as tag>${tag.tagTitle}<#if tag_has_next>,</#if></#list>"/>
+    <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
 </@head>
 </head>
 <body>
@@ -58,22 +57,5 @@
    <#include "side.ftl">
 </div>
 <#include "footer.ftl">
-<#if pjax><!---- pjax {#pjax} start ----></#if>
-<script type="text/javascript" src="${staticServePath}/skins/${skinDirName}/js/isotope.pkgd.min.js"
-        charset="utf-8"></script>
-<script>
-    $('.tags').isotope({
-        transitionDuration: '1.5s',
-        itemSelector: '.tag',
-        layoutMode: 'fitRows',
-        getSortData: {
-            name: '.name'
-        }
-    })
-    $('.tags').isotope({
-        sortBy: 'name',
-    })
-</script>
-<#if pjax><!---- pjax {#pjax} end ----></#if>
 </body>
 </html>