diff --git a/README.md b/README.md index 6a094db..b98f885 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,88 @@ -# Solo 官方皮肤 - -1. [开发步骤](https://hacpai.com/article/1493814851007) -2. [模板变量](https://hacpai.com/article/1493814851007#toc_h2_4) -3. [皮肤定制](https://github.com/b3log/solo/wiki/skins_custom) -4. [版本更新](https://github.com/b3log/solo/wiki/Skins_change_log) - ----- - -皮肤按照名称命名后存放于 skins 文件夹中。 - -其中 skin-preview 存放皮肤的预览图片，toolers 存放更新版本和压缩 js、css 的 NodeJS 脚本，部署时请**注意不要拷贝这两个目录**。 - -## 社区 - -* [讨论区](https://hacpai.com/tag/solo) - +# Solo 官方皮肤 + +🎸 A small and beautiful blogging system written in Java. 一款小而美的 Java 博客系统。 https://solo.b3log.org + +## 简介 + +[Solo](https://github.com/b3log/solo) 是**一个命令**就能搭建好的 Java 开源博客系统，并内置了 18+ 套精心制作的皮肤。除此之外，Solo 还有着非常活跃的[社区](https://hacpai.com)，文章分享到社区后可以让很多人看到，产生丰富的交流互动。 + +**如果你不想自己维护服务器，可以购买我们运维的 Solo 直接使用，细节请联系 QQ845765。** + +## 文档 + +* [用户指南](https://hacpai.com/article/1492881378588) +* [开发指南](https://hacpai.com/article/1493822943172) +* [皮肤开发](https://hacpai.com/article/1493814851007) +* [插件开发](https://docs.google.com/document/pub?id=15H7Q3EBo-44v61Xp_epiYY7vK_gPJLkQaT7T1gkE64w&pli=1) + +## 社区 + +* [讨论区](https://hacpai.com/tag/solo) +* [报告问题](https://github.com/b3log/solo/issues/new/choose) + + +## 皮肤 + +* [Medium](https://github.com/b3log/solo-skins/tree/master/Medium) +![Medium](https://solo.b3log.org/images/themes/medium.png) + +* [9IPHP](https://github.com/b3log/solo-skins/tree/master/9IPHP) +![9IPHP](https://solo.b3log.org/images/themes/9IPHP.jpg) + + +* [next](https://github.com/b3log/solo-skins/tree/master/next) +![next](https://solo.b3log.org/images/themes/next.jpg) + +* [yilia](https://github.com/b3log/solo-skins/tree/master/yilia) +![yilia](https://solo.b3log.org/images/themes/yilia.jpg) + +* [Finding](https://github.com/b3log/solo-skins/tree/master/Finding) +![Finding](https://solo.b3log.org/images/themes/finding.jpg) + +* [metro-hot](https://github.com/b3log/solo-skins/tree/master/metro-hot) +![metro-hot](https://solo.b3log.org/images/themes/metro-hot.jpg) + +* [timeline](https://github.com/b3log/solo-skins/tree/master/timeline) +![timeline](https://solo.b3log.org/images/themes/timeline.jpg) + +* [ease](https://github.com/b3log/solo-skins/tree/master/ease) +![ease](https://solo.b3log.org/images/themes/ease.jpg) + +* [mobile](https://github.com/b3log/solo-skins/tree/master/mobile)
+![mobile](https://solo.b3log.org/images/themes/mobile.jpg) + +* [Andrea](https://github.com/b3log/solo-skins/tree/master/Andrea) +![Andrea](https://solo.b3log.org/images/themes/andrea.jpg) + +* [classic](https://github.com/b3log/solo-skins/tree/master/classic) +![classic](https://solo.b3log.org/images/themes/classic.jpg) + +* [Community](https://github.com/b3log/solo-skins/tree/master/Community) +![Community](https://solo.b3log.org/images/themes/community.jpg) + +* [favourite](https://github.com/b3log/solo-skins/tree/master/favourite) +![favourite](https://solo.b3log.org/images/themes/favourite.jpg) + +* [tree-house](https://github.com/b3log/solo-skins/tree/master/tree-house) +![tree-house](https://solo.b3log.org/images/themes/tree-house.jpg) + +* [i-nove](https://github.com/b3log/solo-skins/tree/master/i-nove) +![i-nove](https://solo.b3log.org/images/themes/i-nove.jpg) + +* [NeoEase](https://github.com/b3log/solo-skins/tree/master/NeoEase) +![NeoEase](https://solo.b3log.org/images/themes/neoease.jpg) + +* [owmx-3.0](https://github.com/b3log/solo-skins/tree/master/owmx-3.0) +![owmx-3.0](https://solo.b3log.org/images/themes/owmx-3.0.jpg) + +* [bruce](https://github.com/b3log/solo-skins/tree/master/bruce) +![bruce](https://solo.b3log.org/images/themes/bruce.jpg) + +---- + +

+小而美博客系统 +

+ +

+ diff --git a/nijigen/archive-articles.ftl b/nijigen/archive-articles.ftl index c48b2e1..d7c5c73 100644 --- a/nijigen/archive-articles.ftl +++ b/nijigen/archive-articles.ftl @@ -20,34 +20,38 @@ <#include "macro-head.ftl"> - - <@head title="${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - ${blogTitle}"> - - - - - - <#include "header.ftl"> -
-
-
-
-

- -   - <#if "en" == localeString?substring(0, 2)> - ${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} - <#else> - ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} - - - ${archiveDate.archiveDatePublishedArticleCount} ${articleLabel} -

-
- <#include "article-list.ftl"> -
- <#include "side.ftl"> + +<@head title="${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - ${blogTitle}"> + + + + + +<#include "header.ftl"> +
+
+
+
+ + ${blogTitle} +   >   + + ${archiveLabel} +   >   + <#if "en" == localeString?substring(0, 2)> + ${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} + <#else> + ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} + + - ${archiveDate.archiveDatePublishedArticleCount} ${articleLabel}
- <#include "footer.ftl"> - + <#include "article-list.ftl"> +
+ <#include "side.ftl"> +
+<#include "footer.ftl"> + diff --git a/nijigen/archives.ftl b/nijigen/archives.ftl index 24b18d7..baa3515 100644 --- a/nijigen/archives.ftl +++ b/nijigen/archives.ftl @@ -20,42 +20,51 @@ <#include "macro-head.ftl"> - - <@head title="${blogTitle}"> - - - - - - <#include "header.ftl"> -
-
-
- -

-  ${statistic.statisticPublishedBlogArticleCount} ${articleLabel}

- - <#if 0 != archiveDates?size> - - -
- <#include "side.ftl"> + +<@head title="${blogTitle}"> + + + + + +<#include "header.ftl"> +
+
+
+
+ + ${blogTitle} +   >   + + ${statistic.statisticPublishedBlogArticleCount} ${archiveLabel}${articleLabel}
- <#include "footer.ftl"> - +
+
+ <#if 0 != archiveDates?size> + + +
+
+
+ <#include "side.ftl"> +
+<#include "footer.ftl"> + diff --git a/nijigen/article-list.ftl b/nijigen/article-list.ftl index f162666..d0668dd 100644 --- a/nijigen/article-list.ftl +++ b/nijigen/article-list.ftl @@ -19,7 +19,7 @@ -->
<#list articles as article> -
+
+ <@comments commentList=pageComments article=page> + + <#include "side.ftl"> +
+<#include "footer.ftl"> +<@comment_script oId=page.oId> + diff --git a/nijigen/side.ftl b/nijigen/side.ftl index c350f7f..20acb4f 100644 --- a/nijigen/side.ftl +++ b/nijigen/side.ftl @@ -35,7 +35,7 @@ -
+
${adminUser.userName}
@@ -46,7 +46,7 @@
<#if 0 != mostUsedCategories?size> -
+
${categoryLabel}
@@ -62,7 +62,7 @@ <#if 0 != mostUsedTags?size> -
+
${tagsLabel}
<#list mostUsedTags as tag> @@ -77,7 +77,7 @@ <#if 0 != mostCommentArticles?size> -
+
${mostCommentArticlesLabel}