From 02e16ad40aebbde9415d5e3c2f1073a8373df34b Mon Sep 17 00:00:00 2001 From: Van Date: Mon, 25 Jun 2018 11:22:35 +0800 Subject: [PATCH] https://github.com/b3log/solo/issues/12459 --- skins/Medium/archive-articles.ftl | 4 ++ skins/Medium/archives.ftl | 4 ++ skins/Medium/article.ftl | 35 ++++++++------ skins/Medium/category-articles.ftl | 4 ++ skins/Medium/css/base.css | 75 ++++++++++++++++++++++++++++++ skins/Medium/footer.ftl | 2 +- skins/Medium/index.ftl | 4 ++ skins/Medium/js/common.js | 36 ++++++++++++++ skins/Medium/js/common.min.js | 2 +- skins/Medium/links.ftl | 8 +++- skins/Medium/page.ftl | 1 - skins/Medium/tag-articles.ftl | 4 ++ skins/Medium/tags.ftl | 30 ++---------- toolers/header.txt | 20 ++++---- 14 files changed, 177 insertions(+), 52 deletions(-) diff --git a/skins/Medium/archive-articles.ftl b/skins/Medium/archive-articles.ftl index 511437c..b4bf99f 100644 --- a/skins/Medium/archive-articles.ftl +++ b/skins/Medium/archive-articles.ftl @@ -29,6 +29,8 @@ <#include "header.ftl"> +
+ <#if pjax> <#include "nav.ftl">
<#if noticeBoard??> @@ -54,6 +56,8 @@
<#include "bottom2.ftl">
+<#if pjax> + <#include "footer.ftl"> diff --git a/skins/Medium/archives.ftl b/skins/Medium/archives.ftl index 958d6a5..5e5f297 100644 --- a/skins/Medium/archives.ftl +++ b/skins/Medium/archives.ftl @@ -28,6 +28,8 @@ <#include "header.ftl"> +
+ <#if pjax> <#include "nav.ftl">
<#if noticeBoard??> @@ -66,6 +68,8 @@
<#include "bottom.ftl"> +
+ <#if pjax> <#include "footer.ftl"> diff --git a/skins/Medium/article.ftl b/skins/Medium/article.ftl index 377481f..9ef4ee6 100644 --- a/skins/Medium/article.ftl +++ b/skins/Medium/article.ftl @@ -51,6 +51,8 @@ <#include "header.ftl"> +
+ <#if pjax>
<#if noticeBoard??>
@@ -82,7 +84,9 @@
-
+
${articleTag}<#if articleTag_has_next>,"> <#list article.articleTags?split(",") as articleTag> @@ -212,7 +216,10 @@ data-avatar="${article.authorThumbnailURL}">
- + + <#if pjax> + + + diff --git a/toolers/header.txt b/toolers/header.txt index bcf231b..a7d1301 100644 --- a/toolers/header.txt +++ b/toolers/header.txt @@ -1,15 +1,17 @@ /** + * Solo - A beautiful, simple, stable, fast Java blogging system. * Copyright (c) 2010-<%= year %>, b3log.org & hacpai.com * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * 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. * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ \ No newline at end of file