Skip to content

S
solo-1
Commit 0fce73d3 authored by Liang Ding's avatar Liang Ding
Browse files
Options

✨ #19 开始使用入口处理

parent 8c365bd6
Hide whitespace changes
Inline Side-by-side
Showing with 290 additions and 250 deletions
src/main/java/org/b3log/solo/service/DataModelService.java
View file @ 0fce73d3
...@@ -59,7 +59,7 @@ import static org.b3log.solo.model.Article.ARTICLE_CONTENT; ...@@ -59,7 +59,7 @@ import static org.b3log.solo.model.Article.ARTICLE_CONTENT;
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 1.7.0.12, Jan 2, 2020 * @version 1.7.0.13, Jan 9, 2020
* @since 0.3.1 * @since 0.3.1
*/ */
@Service @Service
...@@ -1081,6 +1081,10 @@ public class DataModelService { ...@@ -1081,6 +1081,10 @@ public class DataModelService {
* @throws ServiceException service exception * @throws ServiceException service exception
*/ */
public String getTopBarHTML(final RequestContext context) throws ServiceException { public String getTopBarHTML(final RequestContext context) throws ServiceException {
if (Solos.GEN_STATIC_SITE) {
return "";
}
Stopwatchs.start("Gens Top Bar HTML"); Stopwatchs.start("Gens Top Bar HTML");
try { try {
......
src/main/resources/skins/9IPHP/header.ftl
View file @ 0fce73d3
...@@ -26,20 +26,22 @@ ...@@ -26,20 +26,22 @@
</a> </a>
</h1> </h1>
<small> &nbsp; ${blogSubtitle}</small> <small> &nbsp; ${blogSubtitle}</small>
<div class="fn-right"> <#if !staticSite>
<#if isLoggedIn> <div class="fn-right">
<a class="fn__flex-inline" href="${servePath}/admin-index.do#main" title="${adminLabel}"> <#if isLoggedIn>
<i class="icon-setting"></i>&nbsp;${adminLabel} <a class="fn__flex-inline" href="${servePath}/admin-index.do#main" title="${adminLabel}">
</a> <i class="icon-setting"></i>&nbsp;${adminLabel}
<a class="fn__flex-inline" href="${logoutURL}"> </a>
<i class="icon-logout"></i>&nbsp;${logoutLabel} <a class="fn__flex-inline" href="${logoutURL}">
</a> <i class="icon-logout"></i>&nbsp;${logoutLabel}
</a>
<#else> <#else>
<a class="fn__flex-inline" href="${servePath}/start"> <a class="fn__flex-inline" href="${servePath}/start">
<i class="icon-login"></i>&nbsp;${startToUseLabel} <i class="icon-login"></i>&nbsp;${startToUseLabel}
</a> </a>
</#if> </#if>
</div> </div>
</#if>
</div> </div>
</div> </div>
...@@ -56,9 +58,9 @@ ...@@ -56,9 +58,9 @@
</a> </a>
</#list> </#list>
<#if commentable> <#if commentable>
<a href="${servePath}/dynamic.html" rel="section"> <a href="${servePath}/dynamic.html" rel="section">
<i class="icon-refresh"></i> ${dynamicLabel} <i class="icon-refresh"></i> ${dynamicLabel}
</a> </a>
</#if> </#if>
<a href="${servePath}/tags.html" rel="section"> <a href="${servePath}/tags.html" rel="section">
<i class="icon-tags"></i> ${allTagsLabel} <i class="icon-tags"></i> ${allTagsLabel}
...@@ -85,23 +87,25 @@ ...@@ -85,23 +87,25 @@
<div class="responsive fn-none"> <div class="responsive fn-none">
<i class="icon-list"></i> <i class="icon-list"></i>
<ul class="list"> <ul class="list">
<#if isLoggedIn> <#if !staticSite>
<li> <#if isLoggedIn>
<a href="${servePath}/admin-index.do#main" title="${adminLabel}"> <li>
<i class="icon-setting"></i> ${adminLabel} <a href="${servePath}/admin-index.do#main" title="${adminLabel}">
</a> <i class="icon-setting"></i> ${adminLabel}
</li> </a>
<li> </li>
<a href="${logoutURL}"> <li>
<i class="icon-logout"></i> ${logoutLabel} <a href="${logoutURL}">
</a> <i class="icon-logout"></i> ${logoutLabel}
</li> </a>
</li>
<#else> <#else>
<li> <li>
<a href="${servePath}/start"> <a href="${servePath}/start">
<i class="icon-login"></i> ${startToUseLabel} <i class="icon-login"></i> ${startToUseLabel}
</a> </a>
</li> </li>
</#if>
</#if> </#if>
<li> <li>
<a href="${servePath}"> <a href="${servePath}">
...@@ -117,11 +121,11 @@ ...@@ -117,11 +121,11 @@
</li> </li>
</#list> </#list>
<#if commentable> <#if commentable>
<li> <li>
<a href="${servePath}/dynamic.html" rel="section"> <a href="${servePath}/dynamic.html" rel="section">
<i class="icon-refresh"></i> ${dynamicLabel} <i class="icon-refresh"></i> ${dynamicLabel}
</a> </a>
</li> </li>
</#if> </#if>
<li> <li>
<a href="${servePath}/tags.html" rel="section"> <a href="${servePath}/tags.html" rel="section">
......
src/main/resources/skins/Bubble/macro-header.ftl
View file @ 0fce73d3
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<div class="side__meta"> <div class="side__meta">
${statistic.statisticPublishedBlogArticleCount} ${articleLabel} <br> ${statistic.statisticPublishedBlogArticleCount} ${articleLabel} <br>
<#if commentable> <#if commentable>
${statistic.statisticPublishedBlogCommentCount} ${commentLabel} <br> ${statistic.statisticPublishedBlogCommentCount} ${commentLabel} <br>
</#if> </#if>
<span data-uvstaturl="${servePath}">0</span> ${viewLabel} <br> <span data-uvstaturl="${servePath}">0</span> ${viewLabel} <br>
${onlineVisitorCnt} ${onlineVisitorLabel} ${onlineVisitorCnt} ${onlineVisitorLabel}
...@@ -99,23 +99,25 @@ ...@@ -99,23 +99,25 @@
<li> <li>
<a href="${servePath}/search?keyword=">Search</a> <a href="${servePath}/search?keyword=">Search</a>
</li> </li>
<#if isLoggedIn> <#if !staticSite>
<li> <#if isLoggedIn>
<a href="${servePath}/admin-index.do#main"> <li>
${adminLabel} <a href="${servePath}/admin-index.do#main">
</a> ${adminLabel}
</li> </a>
<li> </li>
<a href="${logoutURL}"> <li>
${logoutLabel} <a href="${logoutURL}">
</a> ${logoutLabel}
</li> </a>
<#else> </li>
<li> <#else>
<a rel="alternate" href="${servePath}/start"> <li>
${startToUseLabel} <a rel="alternate" href="${servePath}/start">
</a> ${startToUseLabel}
</li> </a>
</li>
</#if>
</#if> </#if>
</ul> </ul>
</div> </div>
......
src/main/resources/skins/Casper/macro-header.ftl
View file @ 0fce73d3
...@@ -18,53 +18,55 @@ ...@@ -18,53 +18,55 @@
--> -->
<#macro header type> <#macro header type>
<header class="header header--${type}"> <header class="header header--${type}">
<div class="wrapper header__title"> <div class="wrapper header__title">
<h1 class="header__h1 fn__flex-inline"> <h1 class="header__h1 fn__flex-inline">
<img src="${faviconURL}"> <img src="${faviconURL}">
<a href="${servePath}" rel="start" class="header__title">${blogTitle}</a> <a href="${servePath}" rel="start" class="header__title">${blogTitle}</a>
</h1> </h1>
<h2 class="header__h2">${blogSubtitle}</h2> <h2 class="header__h2">${blogSubtitle}</h2>
</div> </div>
<nav class="wrapper header__nav fn__clear"> <nav class="wrapper header__nav fn__clear">
<a href="${servePath}" rel="start"> <a href="${servePath}" rel="start">
<#if type == 'article'> <#if type == 'article'>
${blogTitle} ${blogTitle}
<#else> <#else>
${indexLabel} ${indexLabel}
</#if> </#if>
</a>
<#list pageNavigations as page>
<a class="fn__flex-inline" href="${page.pagePermalink}" target="${page.pageOpenTarget}" rel="section">
<#if page.pageIcon != ''><img src="${page.pageIcon}"></#if> ${page.pageTitle}
</a> </a>
</#list>
<a href="${servePath}/search"> <#list pageNavigations as page>
${searchLabel} <a class="fn__flex-inline" href="${page.pagePermalink}" target="${page.pageOpenTarget}" rel="section">
</a> <#if page.pageIcon != ''><img src="${page.pageIcon}"></#if> ${page.pageTitle}
</a>
</#list>
<div class="fn__right"> <a href="${servePath}/search">
<#include "../../common-template/macro-user_site.ftl"> ${searchLabel}
<@userSite dir=""></@userSite>
<a rel="alternate" href="${servePath}/rss.xml">
RSS
</a> </a>
<#if isLoggedIn> <div class="fn__right">
<a href="${servePath}/admin-index.do#main"> <#include "../../common-template/macro-user_site.ftl">
${adminLabel} <@userSite dir=""></@userSite>
</a> <a rel="alternate" href="${servePath}/rss.xml">
<a href="${logoutURL}"> RSS
${logoutLabel} </a>
</a>
<#else> <#if !staticSite>
<a rel="alternate" href="${servePath}/start"> <#if isLoggedIn>
${startToUseLabel} <a href="${servePath}/admin-index.do#main">
</a> ${adminLabel}
</#if> </a>
</div> <a href="${logoutURL}">
</nav> ${logoutLabel}
</header> </a>
<#else>
<a rel="alternate" href="${servePath}/start">
${startToUseLabel}
</a>
</#if>
</#if>
</div>
</nav>
</header>
</#macro> </#macro>
\ No newline at end of file
src/main/resources/skins/Finding/side.ftl
View file @ 0fce73d3
...@@ -17,30 +17,33 @@ ...@@ -17,30 +17,33 @@
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
--> -->
<div class="fn-clear"> <#if !staticSite>
<div class="fn-clear">
<span class="fn-right"> <span class="fn-right">
<#if isLoggedIn> <#if isLoggedIn>
<a href="${servePath}/admin-index.do#main" title="${adminLabel}" class="icon-setting"></a> <a href="${servePath}/admin-index.do#main" title="${adminLabel}" class="icon-setting"></a>
&nbsp; &nbsp;
<a title="${logoutLabel}" class="icon-logout" href="${logoutURL}"></a> <a title="${logoutLabel}" class="icon-logout" href="${logoutURL}"></a>
<#else> <#else>
<a href="${servePath}/start" title="${startToUseLabel}" class="icon-login"></a> <a href="${servePath}/start" title="${startToUseLabel}" class="icon-login"></a>
</#if> </#if>
</span> </span>
</div> </div>
</#if>
<#if article?? && article.articleToC?? && article.articleToC?size &gt; 0> <#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
<#include "../../common-template/toc.ftl"/> <#include "../../common-template/toc.ftl"/>
<#else> <#else>
<ul> <ul>
<#list pageNavigations as page> <#list pageNavigations as page>
<li> <li>
<a href="${page.pagePermalink}" target="${page.pageOpenTarget}"><#if page.pageIcon != ''><img class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}</a> <a href="${page.pagePermalink}" target="${page.pageOpenTarget}"><#if page.pageIcon != ''><img
</li> class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}</a>
</li>
</#list> </#list>
<#if commentable> <#if commentable>
<li> <li>
<a href="${servePath}/dynamic.html">${dynamicLabel}</a> <a href="${servePath}/dynamic.html">${dynamicLabel}</a>
</li> </li>
</#if> </#if>
<li> <li>
<a href="${servePath}/categories.html">${categoryLabel}</a> <a href="${servePath}/categories.html">${categoryLabel}</a>
...@@ -76,9 +79,9 @@ ...@@ -76,9 +79,9 @@
${statistic.statisticPublishedBlogArticleCount} ${statistic.statisticPublishedBlogArticleCount}
</span><br/> </span><br/>
<#if commentable> <#if commentable>
<span> <span>
${commentCount1Label} ${commentCount1Label}
${statistic.statisticPublishedBlogCommentCount} ${statistic.statisticPublishedBlogCommentCount}
</span> &nbsp; &nbsp; </span> &nbsp; &nbsp;
</#if> </#if>
<span> <span>
......
src/main/resources/skins/Jane/header.ftl
View file @ 0fce73d3
...@@ -32,45 +32,52 @@ ...@@ -32,45 +32,52 @@
</a> </a>
</#list> </#list>
<a href="${servePath}/categories.html" rel="section" aria-label="${categoryLabel}" class="vditor-tooltipped vditor-tooltipped__w"> <a href="${servePath}/categories.html" rel="section" aria-label="${categoryLabel}"
class="vditor-tooltipped vditor-tooltipped__w">
<i class="icon__category"></i> <i class="icon__category"></i>
</a> </a>
<a href="${servePath}/tags.html" rel="section" aria-label="${allTagsLabel}" class="vditor-tooltipped vditor-tooltipped__w"> <a href="${servePath}/tags.html" rel="section" aria-label="${allTagsLabel}"
class="vditor-tooltipped vditor-tooltipped__w">
<i class="icon__tags"></i> <i class="icon__tags"></i>
</a> </a>
<a href="${servePath}/archives.html" aria-label="${archiveLabel}" class="vditor-tooltipped vditor-tooltipped__w"> <a href="${servePath}/archives.html" aria-label="${archiveLabel}"
class="vditor-tooltipped vditor-tooltipped__w">
<i class="icon__inbox"></i> <i class="icon__inbox"></i>
</a> </a>
<a rel="archive" href="${servePath}/links.html" aria-label="${linkLabel}" class="vditor-tooltipped vditor-tooltipped__w"> <a rel="archive" href="${servePath}/links.html" aria-label="${linkLabel}"
class="vditor-tooltipped vditor-tooltipped__w">
<i class="icon__link"></i> <i class="icon__link"></i>
</a> </a>
<a href="${servePath}/search" class="vditor-tooltipped__w vditor-tooltipped" aria-label="${searchLabel}"> <a href="${servePath}/search" class="vditor-tooltipped__w vditor-tooltipped" aria-label="${searchLabel}">
<i class="icon__search"></i> <i class="icon__search"></i>
</a> </a>
<a rel="alternate" href="${servePath}/rss.xml" rel="section" aria-label="RSS" class="vditor-tooltipped vditor-tooltipped__w"> <a rel="alternate" href="${servePath}/rss.xml" rel="section" aria-label="RSS"
class="vditor-tooltipped vditor-tooltipped__w">
<i class="icon__rss"></i> <i class="icon__rss"></i>
</a> </a>
</div> </div>
<div> <#if !staticSite>
<#if isLoggedIn> <div>
<a href="${servePath}/admin-index.do#main" <#if isLoggedIn>
aria-label="${adminLabel}" class="vditor-tooltipped vditor-tooltipped__w"> <a href="${servePath}/admin-index.do#main"
<i class="icon__setting"></i> aria-label="${adminLabel}" class="vditor-tooltipped vditor-tooltipped__w">
</a> <i class="icon__setting"></i>
<a href="${logoutURL}" </a>
aria-label="${logoutLabel}" class="vditor-tooltipped vditor-tooltipped__w"> <a href="${logoutURL}"
<i class="icon__logout"></i> aria-label="${logoutLabel}" class="vditor-tooltipped vditor-tooltipped__w">
</a> <i class="icon__logout"></i>
<#else> </a>
<a href="${servePath}/start" <#else>
aria-label="${startToUseLabel}" class="vditor-tooltipped vditor-tooltipped__w"> <a href="${servePath}/start"
<i class="icon__login"></i> aria-label="${startToUseLabel}" class="vditor-tooltipped vditor-tooltipped__w">
</a> <i class="icon__login"></i>
</#if> </a>
<span onclick="Util.goTop()" </#if>
aria-label="${putTopLabel}" class="vditor-tooltipped vditor-tooltipped__w"> <span onclick="Util.goTop()"
aria-label="${putTopLabel}" class="vditor-tooltipped vditor-tooltipped__w">
<i class="icon__up"></i> <i class="icon__up"></i>
</span> </span>
</div> </div>
</#if>
</header> </header>
\ No newline at end of file
src/main/resources/skins/Medium/nav.ftl
View file @ 0fce73d3
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<svg> <svg>
<use xlink:href="#icon-home"></use> <use xlink:href="#icon-home"></use>
</svg> </svg>
${indexLabel} ${indexLabel}
</a> </a>
<a href="${servePath}/tags.html" rel="section"> <a href="${servePath}/tags.html" rel="section">
<svg> <svg>
...@@ -36,11 +36,11 @@ ...@@ -36,11 +36,11 @@
</svg> ${archiveLabel} </svg> ${archiveLabel}
</a> </a>
<#list pageNavigations as page> <#list pageNavigations as page>
<a href="${page.pagePermalink}" target="${page.pageOpenTarget}" rel="section"> <a href="${page.pagePermalink}" target="${page.pageOpenTarget}" rel="section">
<#if page.pageIcon != ''><img src="${page.pageIcon}"></#if> ${page.pageTitle} <#if page.pageIcon != ''><img src="${page.pageIcon}"></#if> ${page.pageTitle}
</a> </a>
</#list> </#list>
<a rel="archive" href="${servePath}/links.html"> <a rel="archive" href="${servePath}/links.html">
<svg> <svg>
...@@ -54,25 +54,27 @@ ...@@ -54,25 +54,27 @@
</svg> </svg>
RSS RSS
</a> </a>
<#if isLoggedIn> <#if !staticSite>
<a href="${servePath}/admin-index.do#main"> <#if isLoggedIn>
<svg> <a href="${servePath}/admin-index.do#main">
<use xlink:href="#icon-setting"></use> <svg>
</svg> ${adminLabel} <use xlink:href="#icon-setting"></use>
</a> </svg> ${adminLabel}
<a href="${logoutURL}"> </a>
<svg> <a href="${logoutURL}">
<use xlink:href="#icon-out"></use> <svg>
</svg> <use xlink:href="#icon-out"></use>
${logoutLabel} </svg>
</a> ${logoutLabel}
<#else> </a>
<a rel="alternate" href="${servePath}/start" rel="section"> <#else>
<svg> <a rel="alternate" href="${servePath}/start" rel="section">
<use xlink:href="#icon-enter"></use> <svg>
</svg> <use xlink:href="#icon-enter"></use>
${startToUseLabel} </svg>
</a> ${startToUseLabel}
</#if> </a>
</#if>
</#if>
</div> </div>
</nav> </nav>
\ No newline at end of file
src/main/resources/skins/Pinghsu/footer.ftl
View file @ 0fce73d3
...@@ -29,17 +29,20 @@ ...@@ -29,17 +29,20 @@
</a> </a>
</#list> </#list>
<a class="ft__link" rel="alternate" href="${servePath}/rss.xml" rel="section">RSS</a> <a class="ft__link" rel="alternate" href="${servePath}/rss.xml" rel="section">RSS</a>
<#if isLoggedIn> <#if !staticSite>
<a class="ft__link" href="${servePath}/admin-index.do#main" title="${adminLabel}">${adminLabel}</a> <#if isLoggedIn>
<a class="ft__link" href="${logoutURL}">${logoutLabel}</a> <a class="ft__link" href="${servePath}/admin-index.do#main" title="${adminLabel}">${adminLabel}</a>
<#else> <a class="ft__link" href="${logoutURL}">${logoutLabel}</a>
<a class="ft__link" href="${servePath}/start">${startToUseLabel}</a> <#else>
<a class="ft__link" href="${servePath}/start">${startToUseLabel}</a>
</#if>
</#if> </#if>
</nav> </nav>
<div class="footer__border mobile__none"></div> <div class="footer__border mobile__none"></div>
<div class="wrapper fn__flex"> <div class="wrapper fn__flex">
<div class="fn__flex-1 mobile__none"> <div class="fn__flex-1 mobile__none">
<div class="ft__fade">${adminUser.userName} - ${blogSubtitle}</div><br> <div class="ft__fade">${adminUser.userName} - ${blogSubtitle}</div>
<br>
<#if noticeBoard??> <#if noticeBoard??>
${noticeBoard} ${noticeBoard}
</#if> </#if>
...@@ -47,7 +50,8 @@ ...@@ -47,7 +50,8 @@
<#if 0 != mostUsedCategories?size> <#if 0 != mostUsedCategories?size>
<div class="footer__mid fn__flex-1 mobile__none"> <div class="footer__mid fn__flex-1 mobile__none">
<div class="ft__fade">${categoryLabel}</div> <br> <div class="ft__fade">${categoryLabel}</div>
<br>
<#list mostUsedCategories as category> <#list mostUsedCategories as category>
<a href="${servePath}/category/${category.categoryURI}" <a href="${servePath}/category/${category.categoryURI}"
aria-label="${category.categoryTagCnt} ${cntLabel}${tagsLabel}" aria-label="${category.categoryTagCnt} ${cntLabel}${tagsLabel}"
...@@ -59,12 +63,12 @@ ...@@ -59,12 +63,12 @@
<div class="fn__flex-1 footer__copyright"> <div class="fn__flex-1 footer__copyright">
<a class="ft__link" href="${servePath}/archives.html"> <a class="ft__link" href="${servePath}/archives.html">
${statistic.statisticPublishedBlogArticleCount} ${statistic.statisticPublishedBlogArticleCount}
${articleLabel} ${articleLabel}
</a> &nbsp; &nbsp; </a> &nbsp; &nbsp;
<#if commentable> <#if commentable>
${statistic.statisticPublishedBlogCommentCount} ${statistic.statisticPublishedBlogCommentCount}
${commentLabel}</#if> <br> ${commentLabel}</#if> <br>
<span data-uvstaturl="${servePath}">0</span> <span class="ft-gray">${viewLabel}</span> &nbsp; &nbsp; <span data-uvstaturl="${servePath}">0</span> <span class="ft-gray">${viewLabel}</span> &nbsp; &nbsp;
${onlineVisitorCnt} <span class="ft-gray">${onlineVisitorLabel}</span> <br> ${onlineVisitorCnt} <span class="ft-gray">${onlineVisitorLabel}</span> <br>
&copy; ${year} &copy; ${year}
......
src/main/resources/skins/metro-hot/header.ftl
View file @ 0fce73d3
...@@ -29,14 +29,15 @@ ...@@ -29,14 +29,15 @@
<a rel="nofollow" href="${servePath}/">${indexLabel}</a> <a rel="nofollow" href="${servePath}/">${indexLabel}</a>
</li> </li>
<#list pageNavigations as page> <#list pageNavigations as page>
<li> <li>
<a href="${page.pagePermalink}" target="${page.pageOpenTarget}"><#if page.pageIcon != ''><img class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}</a> <a href="${page.pagePermalink}" target="${page.pageOpenTarget}"><#if page.pageIcon != ''><img
</li> class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}</a>
</li>
</#list> </#list>
<#if commentable> <#if commentable>
<li> <li>
<a href="${servePath}/dynamic.html">${dynamicLabel}</a> <a href="${servePath}/dynamic.html">${dynamicLabel}</a>
</li> </li>
</#if> </#if>
<li> <li>
<a href="${servePath}/categories.html">${categoryLabel}</a> <a href="${servePath}/categories.html">${categoryLabel}</a>
...@@ -51,13 +52,15 @@ ...@@ -51,13 +52,15 @@
<a href="${servePath}/links.html">${linkLabel}</a> <a href="${servePath}/links.html">${linkLabel}</a>
</li> </li>
</ul> </ul>
<div class="fn-right top-info"> <#if !staticSite>
<#if isLoggedIn> <div class="fn-right top-info">
<a href="${servePath}/admin-index.do#main" title="${adminLabel}" data-ico="&#x0070;"></a> <#if isLoggedIn>
<hr> <a href="${servePath}/admin-index.do#main" title="${adminLabel}" data-ico="&#x0070;"></a>
<a href="${logoutURL}" title="${logoutLabel}" data-ico="&#xe040;"></a> <hr>
<#else> <a href="${logoutURL}" title="${logoutLabel}" data-ico="&#xe040;"></a>
<a href="${servePath}/start" title="${startToUseLabel}" data-ico="&#xe03f;"></a> <#else>
</#if> <a href="${servePath}/start" title="${startToUseLabel}" data-ico="&#xe03f;"></a>
</div> </#if>
</div>
</#if>
</div> </div>
\ No newline at end of file
src/main/resources/skins/next/side.ftl
View file @ 0fce73d3
...@@ -73,27 +73,29 @@ ...@@ -73,27 +73,29 @@
</a> </a>
</div> </div>
<div class="links-of-author"> <#if !staticSite>
<#if isLoggedIn> <div class="links-of-author">
<span class="links-of-author-item"> <#if isLoggedIn>
<span class="links-of-author-item">
<a href="${servePath}/admin-index.do#main" title="${adminLabel}"> <a href="${servePath}/admin-index.do#main" title="${adminLabel}">
<i class="icon-setting"></i> ${adminLabel} <i class="icon-setting"></i> ${adminLabel}
</a> </a>
</span> </span>
<span class="links-of-author-item"> <span class="links-of-author-item">
<a href="${logoutURL}"> <a href="${logoutURL}">
<i class="icon-logout"></i> ${logoutLabel} <i class="icon-logout"></i> ${logoutLabel}
</a> </a>
</span> </span>
<#else> <#else>
<span class="links-of-author-item"> <span class="links-of-author-item">
<a href="${servePath}/start"> <a href="${servePath}/start">
${startToUseLabel} ${startToUseLabel}
</a> </a>
</span> </span>
</#if> </#if>
</div> </div>
</#if>
<#if noticeBoard??> <#if noticeBoard??>
<div class="links-of-author"> <div class="links-of-author">
......
src/main/resources/skins/nijigen/header.ftl
View file @ 0fce73d3
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<header class="header"> <header class="header">
<div class="header__wrap"> <div class="header__wrap">
<a href="${servePath}" rel="start" class="header__logo"> <a href="${servePath}" rel="start" class="header__logo">
<i class="icon__home"></i> ${blogTitle} <i class="icon__home"></i> ${blogTitle}
</a> </a>
<nav class="mobile__hidden header__nav"> <nav class="mobile__hidden header__nav">
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
</a> </a>
</#list> </#list>
<#if commentable> <#if commentable>
<a href="${servePath}/dynamic.html" rel="section"> <a href="${servePath}/dynamic.html" rel="section">
<i class="icon__refresh"></i> ${dynamicLabel} <i class="icon__refresh"></i> ${dynamicLabel}
</a> </a>
</#if> </#if>
<a href="${servePath}/tags.html" rel="section"> <a href="${servePath}/tags.html" rel="section">
<i class="icon__tags"></i> ${allTagsLabel} <i class="icon__tags"></i> ${allTagsLabel}
...@@ -54,20 +54,22 @@ ...@@ -54,20 +54,22 @@
</a> </a>
</nav> </nav>
<div class="header__login"> <#if !staticSite>
<#if isLoggedIn> <div class="header__login">
<a href="${servePath}/admin-index.do#main" title="${adminLabel}"> <#if isLoggedIn>
<i class="icon__setting"></i> ${adminLabel} <a href="${servePath}/admin-index.do#main" title="${adminLabel}">
</a> <i class="icon__setting"></i> ${adminLabel}
<a href="${logoutURL}"> </a>
<i class="icon__logout"></i> ${logoutLabel} <a href="${logoutURL}">
</a> <i class="icon__logout"></i> ${logoutLabel}
<#else> </a>
<#else>
<a href="${servePath}/start"> <a href="${servePath}/start">
<i class="icon__login"></i> ${startToUseLabel} <i class="icon__login"></i> ${startToUseLabel}
</a> </a>
</#if> </#if>
</div> </div>
</#if>
</div> </div>
</header> </header>
<div class="header__m fn__none"> <div class="header__m fn__none">
...@@ -76,37 +78,39 @@ ...@@ -76,37 +78,39 @@
<i class="icon__more" onclick="$(this).next().slideToggle()"></i> <i class="icon__more" onclick="$(this).next().slideToggle()"></i>
<main class="module__list"> <main class="module__list">
<ul> <ul>
<#if isLoggedIn> <#if !staticSite>
<li> <#if isLoggedIn>
<a href="${servePath}/admin-index.do#main" title="${adminLabel}"> <li>
<i class="icon__setting"></i> ${adminLabel} <a href="${servePath}/admin-index.do#main" title="${adminLabel}">
</a> <i class="icon__setting"></i> ${adminLabel}
</li> </a>
<li> </li>
<a href="${logoutURL}"> <li>
<i class="icon__logout"></i> ${logoutLabel} <a href="${logoutURL}">
</a> <i class="icon__logout"></i> ${logoutLabel}
</li> </a>
<#else> </li>
<#else>
<li>
<a href="${servePath}/start">
<i class="icon__login"></i> ${startToUseLabel}
</a>
</li>
</#if>
</#if>
<#list pageNavigations as page>
<li> <li>
<a href="${servePath}/start"> <a href="${page.pagePermalink}" target="${page.pageOpenTarget}" rel="section">
<i class="icon__login"></i> ${startToUseLabel} <#if page.pageIcon != ''><img class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}
</a> </a>
</li> </li>
</#if> </#list>
<#list pageNavigations as page>
<li>
<a href="${page.pagePermalink}" target="${page.pageOpenTarget}" rel="section">
<#if page.pageIcon != ''><img class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}
</a>
</li>
</#list>
<#if commentable> <#if commentable>
<li> <li>
<a href="${servePath}/dynamic.html" rel="section"> <a href="${servePath}/dynamic.html" rel="section">
<i class="icon__refresh"></i> ${dynamicLabel} <i class="icon__refresh"></i> ${dynamicLabel}
</a> </a>
</li> </li>
</#if> </#if>
<li> <li>
<a href="${servePath}/tags.html" rel="section"> <a href="${servePath}/tags.html" rel="section">
......
src/main/resources/skins/yilia/side.ftl
View file @ 0fce73d3
...@@ -40,14 +40,15 @@ ...@@ -40,14 +40,15 @@
<nav> <nav>
<ul> <ul>
<#list pageNavigations as page> <#list pageNavigations as page>
<li> <li>
<a href="${page.pagePermalink}" target="${page.pageOpenTarget}"><#if page.pageIcon != ''><img class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}</a> <a href="${page.pagePermalink}" target="${page.pageOpenTarget}"><#if page.pageIcon != ''><img
</li> class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}</a>
</li>
</#list> </#list>
<li> <li>
<#if commentable> <#if commentable>
<a href="${servePath}/dynamic.html">${dynamicLabel}</a> <a href="${servePath}/dynamic.html">${dynamicLabel}</a>
&nbsp; &nbsp; &nbsp; &nbsp;
</#if> </#if>
<a href="${servePath}/tags.html">${allTagsLabel}</a> <a href="${servePath}/tags.html">${allTagsLabel}</a>
&nbsp; &nbsp; &nbsp; &nbsp;
...@@ -65,21 +66,23 @@ ...@@ -65,21 +66,23 @@
</header> </header>
<footer> <footer>
<#if noticeBoard??> <#if noticeBoard??>
<div class="vditor-reset">${noticeBoard}</div> <div class="vditor-reset">${noticeBoard}</div>
</#if>
<#if !staticSite>
<#if isLoggedIn>
<a href="${servePath}/admin-index.do#main" title="${adminLabel}" class="icon-setting"></a>
&nbsp; &nbsp;
<a title="${logoutLabel}" class="icon-logout" href="${logoutURL}"></a>
<#else>
<a href="${servePath}/start" title="${startToUseLabel}" class="icon-login"></a>
</#if> &nbsp; &nbsp;
</#if> </#if>
<#if isLoggedIn>
<a href="${servePath}/admin-index.do#main" title="${adminLabel}" class="icon-setting"></a>
&nbsp; &nbsp;
<a title="${logoutLabel}" class="icon-logout" href="${logoutURL}"></a>
<#else>
<a href="${servePath}/start" title="${startToUseLabel}" class="icon-login"></a>
</#if> &nbsp; &nbsp;
<a rel="alternate" href="${servePath}/rss.xml" title="${subscribeLabel}" class="icon-rss"></a> <a rel="alternate" href="${servePath}/rss.xml" title="${subscribeLabel}" class="icon-rss"></a>
</footer> </footer>
<#if article?? && article.articleToC?? && article.articleToC?size &gt; 0> <#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
<div class="toc"> <div class="toc">
<a onclick="$('.side .toc').hide();" href="javascript:void(0)" class="close">X</a> <a onclick="$('.side .toc').hide();" href="javascript:void(0)" class="close">X</a>
<#include "../../common-template/toc.ftl"/> <#include "../../common-template/toc.ftl"/>
</div> </div>
</#if> </#if>
</div> </div>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment