Skip to content

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

✨ #19 搜索入口处理

parent 0fce73d3
Hide whitespace changes
Inline Side-by-side
Showing with 538 additions and 467 deletions
src/main/resources/skins/9IPHP/header.ftl
View file @ b657bbd3
...@@ -75,12 +75,14 @@ ...@@ -75,12 +75,14 @@
<i class="icon-rss"></i> RSS <i class="icon-rss"></i> RSS
</a> </a>
</nav> </nav>
<#if !staticSite>
<div class="fn-right"> <div class="fn-right">
<form class="form" action="${servePath}/search"> <form class="form" action="${servePath}/search">
<input placeholder="${searchLabel}" id="search" type="text" name="keyword"/> <input placeholder="${searchLabel}" id="search" type="text" name="keyword"/>
<button type="submit"><i class="icon-search"></i></button> <button type="submit"><i class="icon-search"></i></button>
</form> </form>
</div> </div>
</#if>
</div> </div>
</div> </div>
</header> </header>
......
src/main/resources/skins/Andrea/header.ftl
View file @ b657bbd3
...@@ -28,9 +28,11 @@ ...@@ -28,9 +28,11 @@
</div> </div>
<div class="right"> <div class="right">
<ul> <ul>
<li> <#if !staticSite>
<a rel="nofollow" class="home" href="${servePath}/search?keyword=">Search</a> <li>
</li> <a rel="nofollow" class="home" href="${servePath}/search?keyword=">Search</a>
</li>
</#if>
<li> <li>
<a href="${servePath}/tags.html">Tags</a> <a href="${servePath}/tags.html">Tags</a>
</li> </li>
......
src/main/resources/skins/Bruce/header.ftl
View file @ b657bbd3
...@@ -26,13 +26,18 @@ ${topBarReplacement} ...@@ -26,13 +26,18 @@ ${topBarReplacement}
<a class="nav-item" href="${servePath}">${indexLabel}</a> <a class="nav-item" href="${servePath}">${indexLabel}</a>
<#list pageNavigations as page> <#list pageNavigations as page>
<a class="nav-item" href="${page.pagePermalink}" target="${page.pageOpenTarget}"><#if page.pageIcon != ''><img class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}</a> <a class="nav-item" href="${page.pagePermalink}"
target="${page.pageOpenTarget}"><#if page.pageIcon != ''><img class="page-icon"
src="${page.pageIcon}"></#if>${page.pageTitle}
</a>
</#list> </#list>
<a class="nav-item" href="${servePath}/links.html">${friendLinkLabel}</a> <a class="nav-item" href="${servePath}/links.html">${friendLinkLabel}</a>
<a class="nav-item" href="${servePath}/tags.html">${tagLabel}</a> <a class="nav-item" href="${servePath}/tags.html">${tagLabel}</a>
<a class="nav-item" href="${servePath}/archives.html">${archiveLabel}</a> <a class="nav-item" href="${servePath}/archives.html">${archiveLabel}</a>
<a href="${servePath}/search?keyword=">Search</a> <#if !staticSite>
<a href="${servePath}/search?keyword=">Search</a>
</#if>
</nav> </nav>
<div class="col-sm-2"></div> <div class="col-sm-2"></div>
</div> </div>
......
src/main/resources/skins/Bubble/macro-header.ftl
View file @ b657bbd3
...@@ -96,9 +96,11 @@ ...@@ -96,9 +96,11 @@
<li> <li>
<a rel="alternate" href="${servePath}/rss.xml">RSS</a> <a rel="alternate" href="${servePath}/rss.xml">RSS</a>
</li> </li>
<li> <#if !staticSite>
<a href="${servePath}/search?keyword=">Search</a> <li>
</li> <a href="${servePath}/search?keyword=">Search</a>
</li>
</#if>
<#if !staticSite> <#if !staticSite>
<#if isLoggedIn> <#if isLoggedIn>
<li> <li>
......
src/main/resources/skins/Casper/macro-header.ftl
View file @ b657bbd3
...@@ -41,9 +41,11 @@ ...@@ -41,9 +41,11 @@
</a> </a>
</#list> </#list>
<a href="${servePath}/search"> <#if !staticSite>
${searchLabel} <a href="${servePath}/search">
</a> ${searchLabel}
</a>
</#if>
<div class="fn__right"> <div class="fn__right">
<#include "../../common-template/macro-user_site.ftl"> <#include "../../common-template/macro-user_site.ftl">
......
src/main/resources/skins/Community/header.ftl
View file @ b657bbd3
...@@ -18,17 +18,17 @@ ...@@ -18,17 +18,17 @@
--> -->
<#if 1 != users?size> <#if 1 != users?size>
<div class="header-user"> <div class="header-user">
<div class="content"> <div class="content">
<div class="moon-current-icon"></div> <div class="moon-current-icon"></div>
<#list users as user> <#list users as user>
<a class="star-icon" href="${servePath}/authors/${user.oId}"> <a class="star-icon" href="${servePath}/authors/${user.oId}">
${user.userName} ${user.userName}
</a> </a>
</#list> </#list>
<div class="clear"></div> <div class="clear"></div>
</div>
</div> </div>
</div>
</#if> </#if>
<div class="header-navi"> <div class="header-navi">
<div class="header-navi-main content"> <div class="header-navi-main content">
...@@ -47,22 +47,25 @@ ...@@ -47,22 +47,25 @@
<a href="${servePath}/tags.html">${allTagsLabel}</a> <a href="${servePath}/tags.html">${allTagsLabel}</a>
</li> </li>
<#if 0 != pageNavigations?size> <#if 0 != pageNavigations?size>
<li class="tab" id="header-pages"> <li class="tab" id="header-pages">
<a href="${servePath}"> <a href="${servePath}">
<span class="left"> <span class="left">
${pageLabel} ${pageLabel}
</span> </span>
<span class="arrow-dowm-icon"></span> <span class="arrow-dowm-icon"></span>
<span class="clear"></span> <span class="clear"></span>
</a> </a>
<ul class="sub-tabs none"> <ul class="sub-tabs none">
<#list pageNavigations as page> <#list pageNavigations as page>
<li class="sub-tab"> <li class="sub-tab">
<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}"
</li> target="${page.pageOpenTarget}"><#if page.pageIcon != ''><img class="page-icon"
</#list> src="${page.pageIcon}"></#if>${page.pageTitle}
</ul> </a>
</li> </li>
</#list>
</ul>
</li>
</#if> </#if>
<li class="tab"> <li class="tab">
<a rel="alternate" href="${servePath}/rss.xml"> <a rel="alternate" href="${servePath}/rss.xml">
...@@ -71,9 +74,11 @@ ...@@ -71,9 +74,11 @@
<span class="clear"></span> <span class="clear"></span>
</a> </a>
</li> </li>
<li class="tab"> <#if !staticSite>
<a href="${servePath}/search?keyword=">Search</a> <li class="tab">
</li> <a href="${servePath}/search?keyword=">Search</a>
</li>
</#if>
</ul> </ul>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
......
src/main/resources/skins/Finding/side.ftl
View file @ b657bbd3
...@@ -60,9 +60,11 @@ ...@@ -60,9 +60,11 @@
<li> <li>
<a rel="alternate" href="${servePath}/rss.xml">${subscribeLabel}</a> <a rel="alternate" href="${servePath}/rss.xml">${subscribeLabel}</a>
</li> </li>
<Li> <#if !staticSite>
<a href="${servePath}/search?keyword=">Search</a> <li>
</Li> <a href="${servePath}/search?keyword=">Search</a>
</li>
</#if>
</ul> </ul>
</#if> </#if>
<div class="count"> <div class="count">
......
src/main/resources/skins/Jane/header.ftl
View file @ b657bbd3
...@@ -48,9 +48,11 @@ ...@@ -48,9 +48,11 @@
class="vditor-tooltipped vditor-tooltipped__w"> 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}"> <#if !staticSite>
<i class="icon__search"></i> <a href="${servePath}/search" class="vditor-tooltipped__w vditor-tooltipped" aria-label="${searchLabel}">
</a> <i class="icon__search"></i>
</a>
</#if>
<a rel="alternate" href="${servePath}/rss.xml" rel="section" aria-label="RSS" <a rel="alternate" href="${servePath}/rss.xml" rel="section" aria-label="RSS"
class="vditor-tooltipped vditor-tooltipped__w"> class="vditor-tooltipped vditor-tooltipped__w">
<i class="icon__rss"></i> <i class="icon__rss"></i>
......
src/main/resources/skins/Medium/header.ftl
View file @ b657bbd3
...@@ -22,35 +22,35 @@ ...@@ -22,35 +22,35 @@
<defs> <defs>
<symbol id="icon-tag" viewBox="0 0 32 32"> <symbol id="icon-tag" viewBox="0 0 32 32">
<path <path
d="M29.021 0h-8.936c-1.638 0-3.927 0.948-5.085 2.106l-13.842 13.842c-1.158 1.158-1.158 3.054 0 4.213l10.681 10.681c1.158 1.158 3.054 1.158 4.212 0l13.842-13.842c1.158-1.158 2.106-3.447 2.106-5.085v-8.936c0-1.638-1.34-2.979-2.979-2.979zM25.063 9.91c-1.642 0-2.973-1.331-2.973-2.973s1.331-2.973 2.973-2.973 2.973 1.331 2.973 2.973-1.331 2.973-2.973 2.973z"></path> d="M29.021 0h-8.936c-1.638 0-3.927 0.948-5.085 2.106l-13.842 13.842c-1.158 1.158-1.158 3.054 0 4.213l10.681 10.681c1.158 1.158 3.054 1.158 4.212 0l13.842-13.842c1.158-1.158 2.106-3.447 2.106-5.085v-8.936c0-1.638-1.34-2.979-2.979-2.979zM25.063 9.91c-1.642 0-2.973-1.331-2.973-2.973s1.331-2.973 2.973-2.973 2.973 1.331 2.973 2.973-1.331 2.973-2.973 2.973z"></path>
</symbol> </symbol>
<symbol id="icon-feed" viewBox="0 0 28 28"> <symbol id="icon-feed" viewBox="0 0 28 28">
<path <path
d="M8.542 22.72c0 1.805-1.465 3.27-3.27 3.27s-3.27-1.465-3.27-3.27 1.465-3.27 3.27-3.27 3.27 1.465 3.27 3.27zM17.262 24.815c0.017 0.307-0.085 0.596-0.29 0.817-0.204 0.238-0.494 0.358-0.8 0.358h-2.299c-0.562 0-1.022-0.426-1.073-0.988-0.494-5.195-4.615-9.316-9.81-9.81-0.562-0.051-0.988-0.511-0.988-1.073v-2.299c0-0.307 0.119-0.596 0.358-0.8 0.187-0.187 0.46-0.29 0.732-0.29h0.085c3.628 0.29 7.051 1.873 9.623 4.462 2.589 2.572 4.173 5.995 4.462 9.623zM25.982 24.849c0.017 0.29-0.085 0.579-0.307 0.8-0.204 0.221-0.477 0.341-0.783 0.341h-2.435c-0.579 0-1.056-0.443-1.090-1.022-0.562-9.895-8.448-17.781-18.343-18.36-0.579-0.034-1.022-0.511-1.022-1.073v-2.435c0-0.307 0.119-0.579 0.341-0.783 0.204-0.204 0.477-0.307 0.749-0.307h0.051c5.961 0.307 11.564 2.81 15.788 7.051 4.241 4.224 6.744 9.827 7.051 15.788z"></path> d="M8.542 22.72c0 1.805-1.465 3.27-3.27 3.27s-3.27-1.465-3.27-3.27 1.465-3.27 3.27-3.27 3.27 1.465 3.27 3.27zM17.262 24.815c0.017 0.307-0.085 0.596-0.29 0.817-0.204 0.238-0.494 0.358-0.8 0.358h-2.299c-0.562 0-1.022-0.426-1.073-0.988-0.494-5.195-4.615-9.316-9.81-9.81-0.562-0.051-0.988-0.511-0.988-1.073v-2.299c0-0.307 0.119-0.596 0.358-0.8 0.187-0.187 0.46-0.29 0.732-0.29h0.085c3.628 0.29 7.051 1.873 9.623 4.462 2.589 2.572 4.173 5.995 4.462 9.623zM25.982 24.849c0.017 0.29-0.085 0.579-0.307 0.8-0.204 0.221-0.477 0.341-0.783 0.341h-2.435c-0.579 0-1.056-0.443-1.090-1.022-0.562-9.895-8.448-17.781-18.343-18.36-0.579-0.034-1.022-0.511-1.022-1.073v-2.435c0-0.307 0.119-0.579 0.341-0.783 0.204-0.204 0.477-0.307 0.749-0.307h0.051c5.961 0.307 11.564 2.81 15.788 7.051 4.241 4.224 6.744 9.827 7.051 15.788z"></path>
</symbol> </symbol>
<symbol id="icon-folders" viewBox="0 0 28 28"> <symbol id="icon-folders" viewBox="0 0 28 28">
<path <path
d="M28.68 15.875c0 0.375-0.234 0.75-0.484 1.031l-5.25 6.188c-0.906 1.062-2.75 1.906-4.125 1.906h-17c-0.562 0-1.359-0.172-1.359-0.875 0-0.375 0.234-0.75 0.484-1.031l5.25-6.188c0.906-1.062 2.75-1.906 4.125-1.906h17c0.562 0 1.359 0.172 1.359 0.875zM23.32 10.5v2.5h-13c-1.953 0-4.375 1.109-5.641 2.609l-5.344 6.281c0-0.125-0.016-0.266-0.016-0.391v-15c0-1.922 1.578-3.5 3.5-3.5h5c1.922 0 3.5 1.578 3.5 3.5v0.5h8.5c1.922 0 3.5 1.578 3.5 3.5z"></path> d="M28.68 15.875c0 0.375-0.234 0.75-0.484 1.031l-5.25 6.188c-0.906 1.062-2.75 1.906-4.125 1.906h-17c-0.562 0-1.359-0.172-1.359-0.875 0-0.375 0.234-0.75 0.484-1.031l5.25-6.188c0.906-1.062 2.75-1.906 4.125-1.906h17c0.562 0 1.359 0.172 1.359 0.875zM23.32 10.5v2.5h-13c-1.953 0-4.375 1.109-5.641 2.609l-5.344 6.281c0-0.125-0.016-0.266-0.016-0.391v-15c0-1.922 1.578-3.5 3.5-3.5h5c1.922 0 3.5 1.578 3.5 3.5v0.5h8.5c1.922 0 3.5 1.578 3.5 3.5z"></path>
</symbol> </symbol>
<symbol id="icon-bookmark" viewBox="0 0 28 28"> <symbol id="icon-bookmark" viewBox="0 0 28 28">
<path <path
d="M17.231 12.923c0-0.589-0.488-1.077-1.077-1.077h-4.308c-0.589 0-1.077 0.488-1.077 1.077s0.488 1.077 1.077 1.077h4.308c0.589 0 1.077-0.488 1.077-1.077zM26.923 9.692v16.154c0 0.589-0.488 1.077-1.077 1.077h-23.692c-0.589 0-1.077-0.488-1.077-1.077v-16.154c0-0.589 0.488-1.077 1.077-1.077h23.692c0.589 0 1.077 0.488 1.077 1.077zM28 2.154v4.308c0 0.589-0.488 1.077-1.077 1.077h-25.846c-0.589 0-1.077-0.488-1.077-1.077v-4.308c0-0.589 0.488-1.077 1.077-1.077h25.846c0.589 0 1.077 0.488 1.077 1.077z"></path> d="M17.231 12.923c0-0.589-0.488-1.077-1.077-1.077h-4.308c-0.589 0-1.077 0.488-1.077 1.077s0.488 1.077 1.077 1.077h4.308c0.589 0 1.077-0.488 1.077-1.077zM26.923 9.692v16.154c0 0.589-0.488 1.077-1.077 1.077h-23.692c-0.589 0-1.077-0.488-1.077-1.077v-16.154c0-0.589 0.488-1.077 1.077-1.077h23.692c0.589 0 1.077 0.488 1.077 1.077zM28 2.154v4.308c0 0.589-0.488 1.077-1.077 1.077h-25.846c-0.589 0-1.077-0.488-1.077-1.077v-4.308c0-0.589 0.488-1.077 1.077-1.077h25.846c0.589 0 1.077 0.488 1.077 1.077z"></path>
</symbol> </symbol>
<symbol id="icon-group" viewBox="0 0 28 28"> <symbol id="icon-group" viewBox="0 0 28 28">
<path <path
d="M8.665 14c-1.512 0.044-2.879 0.698-3.853 1.861h-1.948c-1.454 0-2.82-0.698-2.82-2.312 0-1.178-0.044-5.132 1.803-5.132 0.305 0 1.817 1.236 3.78 1.236 0.669 0 1.308-0.116 1.934-0.334-0.044 0.32-0.073 0.64-0.073 0.959 0 1.323 0.422 2.631 1.178 3.722zM24.235 23.261c0 2.355-1.556 3.765-3.882 3.765h-12.706c-2.326 0-3.882-1.41-3.882-3.765 0-3.286 0.771-8.33 5.030-8.33 0.494 0 2.297 2.021 5.205 2.021s4.71-2.021 5.205-2.021c4.26 0 5.030 5.045 5.030 8.33zM9.348 4.696c0 2.050-1.672 3.722-3.722 3.722s-3.722-1.672-3.722-3.722 1.672-3.722 3.722-3.722 3.722 1.672 3.722 3.722zM19.583 10.278c0 3.082-2.501 5.583-5.583 5.583s-5.583-2.501-5.583-5.583 2.501-5.583 5.583-5.583 5.583 2.501 5.583 5.583zM27.956 13.549c0 1.614-1.367 2.312-2.82 2.312h-1.948c-0.974-1.163-2.341-1.817-3.853-1.861 0.756-1.090 1.178-2.399 1.178-3.722 0-0.32-0.029-0.64-0.073-0.959 0.625 0.218 1.265 0.334 1.934 0.334 1.963 0 3.475-1.236 3.78-1.236 1.846 0 1.803 3.954 1.803 5.132zM26.096 4.696c0 2.050-1.672 3.722-3.722 3.722s-3.722-1.672-3.722-3.722 1.672-3.722 3.722-3.722 3.722 1.672 3.722 3.722z"></path> d="M8.665 14c-1.512 0.044-2.879 0.698-3.853 1.861h-1.948c-1.454 0-2.82-0.698-2.82-2.312 0-1.178-0.044-5.132 1.803-5.132 0.305 0 1.817 1.236 3.78 1.236 0.669 0 1.308-0.116 1.934-0.334-0.044 0.32-0.073 0.64-0.073 0.959 0 1.323 0.422 2.631 1.178 3.722zM24.235 23.261c0 2.355-1.556 3.765-3.882 3.765h-12.706c-2.326 0-3.882-1.41-3.882-3.765 0-3.286 0.771-8.33 5.030-8.33 0.494 0 2.297 2.021 5.205 2.021s4.71-2.021 5.205-2.021c4.26 0 5.030 5.045 5.030 8.33zM9.348 4.696c0 2.050-1.672 3.722-3.722 3.722s-3.722-1.672-3.722-3.722 1.672-3.722 3.722-3.722 3.722 1.672 3.722 3.722zM19.583 10.278c0 3.082-2.501 5.583-5.583 5.583s-5.583-2.501-5.583-5.583 2.501-5.583 5.583-5.583 5.583 2.501 5.583 5.583zM27.956 13.549c0 1.614-1.367 2.312-2.82 2.312h-1.948c-0.974-1.163-2.341-1.817-3.853-1.861 0.756-1.090 1.178-2.399 1.178-3.722 0-0.32-0.029-0.64-0.073-0.959 0.625 0.218 1.265 0.334 1.934 0.334 1.963 0 3.475-1.236 3.78-1.236 1.846 0 1.803 3.954 1.803 5.132zM26.096 4.696c0 2.050-1.672 3.722-3.722 3.722s-3.722-1.672-3.722-3.722 1.672-3.722 3.722-3.722 3.722 1.672 3.722 3.722z"></path>
</symbol> </symbol>
<symbol id="icon-search" viewBox="0 0 32 32"> <symbol id="icon-search" viewBox="0 0 32 32">
<path <path
d="M31.008 27.231l-7.58-6.447c-0.784-0.705-1.622-1.029-2.299-0.998 1.789-2.096 2.87-4.815 2.87-7.787 0-6.627-5.373-12-12-12s-12 5.373-12 12 5.373 12 12 12c2.972 0 5.691-1.081 7.787-2.87-0.031 0.677 0.293 1.515 0.998 2.299l6.447 7.58c1.104 1.226 2.907 1.33 4.007 0.23s0.997-2.903-0.23-4.007zM12 20c-4.418 0-8-3.582-8-8s3.582-8 8-8 8 3.582 8 8-3.582 8-8 8z"></path> d="M31.008 27.231l-7.58-6.447c-0.784-0.705-1.622-1.029-2.299-0.998 1.789-2.096 2.87-4.815 2.87-7.787 0-6.627-5.373-12-12-12s-12 5.373-12 12 5.373 12 12 12c2.972 0 5.691-1.081 7.787-2.87-0.031 0.677 0.293 1.515 0.998 2.299l6.447 7.58c1.104 1.226 2.907 1.33 4.007 0.23s0.997-2.903-0.23-4.007zM12 20c-4.418 0-8-3.582-8-8s3.582-8 8-8 8 3.582 8 8-3.582 8-8 8z"></path>
</symbol> </symbol>
<symbol id="icon-home" viewBox="0 0 32 32"> <symbol id="icon-home" viewBox="0 0 32 32">
<path <path
d="M32 18.967l-16-12.42-16 12.42v-5.064l16-12.42 16 12.42zM28 18.516v12h-8v-8h-8v8h-8v-12l12-9z"></path> d="M32 18.967l-16-12.42-16 12.42v-5.064l16-12.42 16 12.42zM28 18.516v12h-8v-8h-8v8h-8v-12l12-9z"></path>
</symbol> </symbol>
<symbol id="icon-setting" viewBox="0 0 32 32"> <symbol id="icon-setting" viewBox="0 0 32 32">
<path <path
d="M29.181 19.070c-1.679-2.908-0.669-6.634 2.255-8.328l-3.145-5.447c-0.898 0.527-1.943 0.829-3.058 0.829-3.36 0-6.085-2.742-6.085-6.125h-6.289c0.008 1.044-0.252 2.103-0.811 3.070-1.679 2.908-5.411 3.897-8.339 2.211l-3.144 5.447c0.905 0.515 1.689 1.268 2.246 2.234 1.676 2.903 0.672 6.623-2.241 8.319l3.145 5.447c0.895-0.522 1.935-0.82 3.044-0.82 3.35 0 6.067 2.725 6.084 6.092h6.289c-0.003-1.034 0.259-2.080 0.811-3.038 1.676-2.903 5.399-3.894 8.325-2.219l3.145-5.447c-0.899-0.515-1.678-1.266-2.232-2.226zM16 22.479c-3.578 0-6.479-2.901-6.479-6.479s2.901-6.479 6.479-6.479c3.578 0 6.479 2.901 6.479 6.479s-2.901 6.479-6.479 6.479z"></path> d="M29.181 19.070c-1.679-2.908-0.669-6.634 2.255-8.328l-3.145-5.447c-0.898 0.527-1.943 0.829-3.058 0.829-3.36 0-6.085-2.742-6.085-6.125h-6.289c0.008 1.044-0.252 2.103-0.811 3.070-1.679 2.908-5.411 3.897-8.339 2.211l-3.144 5.447c0.905 0.515 1.689 1.268 2.246 2.234 1.676 2.903 0.672 6.623-2.241 8.319l3.145 5.447c0.895-0.522 1.935-0.82 3.044-0.82 3.35 0 6.067 2.725 6.084 6.092h6.289c-0.003-1.034 0.259-2.080 0.811-3.038 1.676-2.903 5.399-3.894 8.325-2.219l3.145-5.447c-0.899-0.515-1.678-1.266-2.232-2.226zM16 22.479c-3.578 0-6.479-2.901-6.479-6.479s2.901-6.479 6.479-6.479c3.578 0 6.479 2.901 6.479 6.479s-2.901 6.479-6.479 6.479z"></path>
</symbol> </symbol>
<symbol id="icon-out" viewBox="0 0 28 32"> <symbol id="icon-out" viewBox="0 0 28 32">
<path d="M11.429 25.714c0 0.5 0.232 1.714-0.571 1.714h-5.714c-2.839 0-5.143-2.304-5.143-5.143v-12.571c0-2.839 2.304-5.143 5.143-5.143h5.714c0.304 0 0.571 0.268 0.571 0.571 0 0.5 0.232 1.714-0.571 1.714h-5.714c-1.571 0-2.857 1.286-2.857 2.857v12.571c0 1.571 1.286 2.857 2.857 2.857h5.143c0.446 0 1.143-0.089 1.143 0.571zM28 16c0 0.304-0.125 0.589-0.339 0.804l-9.714 9.714c-0.214 0.214-0.5 0.339-0.804 0.339-0.625 0-1.143-0.518-1.143-1.143v-5.143h-8c-0.625 0-1.143-0.518-1.143-1.143v-6.857c0-0.625 0.518-1.143 1.143-1.143h8v-5.143c0-0.625 0.518-1.143 1.143-1.143 0.304 0 0.589 0.125 0.804 0.339l9.714 9.714c0.214 0.214 0.339 0.5 0.339 0.804z"></path> <path d="M11.429 25.714c0 0.5 0.232 1.714-0.571 1.714h-5.714c-2.839 0-5.143-2.304-5.143-5.143v-12.571c0-2.839 2.304-5.143 5.143-5.143h5.714c0.304 0 0.571 0.268 0.571 0.571 0 0.5 0.232 1.714-0.571 1.714h-5.714c-1.571 0-2.857 1.286-2.857 2.857v12.571c0 1.571 1.286 2.857 2.857 2.857h5.143c0.446 0 1.143-0.089 1.143 0.571zM28 16c0 0.304-0.125 0.589-0.339 0.804l-9.714 9.714c-0.214 0.214-0.5 0.339-0.804 0.339-0.625 0-1.143-0.518-1.143-1.143v-5.143h-8c-0.625 0-1.143-0.518-1.143-1.143v-6.857c0-0.625 0.518-1.143 1.143-1.143h8v-5.143c0-0.625 0.518-1.143 1.143-1.143 0.304 0 0.589 0.125 0.804 0.339l9.714 9.714c0.214 0.214 0.339 0.5 0.339 0.804z"></path>
...@@ -71,9 +71,18 @@ ...@@ -71,9 +71,18 @@
<symbol id="icon-qqz" viewBox="0 0 32 32"> <symbol id="icon-qqz" viewBox="0 0 32 32">
<path d="M22.824 13.989l-8.348 6.287s3.351 0.522 8.404 0.461l-0.23-1.040 7.2-6.549c0.132-0.12 0.183-0.312 0.129-0.487s-0.203-0.299-0.377-0.314l-9.492-0.856-3.708-9.213c-0.068-0.169-0.226-0.279-0.401-0.279s-0.333 0.11-0.401 0.279l-3.708 9.213-9.492 0.856c-0.174 0.015-0.323 0.139-0.377 0.314s-0.004 0.366 0.129 0.487l7.2 6.549-2.158 9.742c-0.040 0.178 0.026 0.365 0.168 0.474 0.142 0.107 0.331 0.115 0.481 0.021l8.158-5.165 8.158 5.165c0.070 0.045 0.147 0.066 0.225 0.066 0.090 0 0.18-0.029 0.256-0.086 0.142-0.109 0.208-0.295 0.168-0.474l-1.707-7.704c0.732-0.386 1.538-1.040 1.538-1.040s-3.195 1.638-14.664 0.838l8.312-6.325s-0.327-0.534-10.744-0.914c-0.697-0.026 8.493-1.83 15.281-0.305z"></path> <path d="M22.824 13.989l-8.348 6.287s3.351 0.522 8.404 0.461l-0.23-1.040 7.2-6.549c0.132-0.12 0.183-0.312 0.129-0.487s-0.203-0.299-0.377-0.314l-9.492-0.856-3.708-9.213c-0.068-0.169-0.226-0.279-0.401-0.279s-0.333 0.11-0.401 0.279l-3.708 9.213-9.492 0.856c-0.174 0.015-0.323 0.139-0.377 0.314s-0.004 0.366 0.129 0.487l7.2 6.549-2.158 9.742c-0.040 0.178 0.026 0.365 0.168 0.474 0.142 0.107 0.331 0.115 0.481 0.021l8.158-5.165 8.158 5.165c0.070 0.045 0.147 0.066 0.225 0.066 0.090 0 0.18-0.029 0.256-0.086 0.142-0.109 0.208-0.295 0.168-0.474l-1.707-7.704c0.732-0.386 1.538-1.040 1.538-1.040s-3.195 1.638-14.664 0.838l8.312-6.325s-0.327-0.534-10.744-0.914c-0.697-0.026 8.493-1.83 15.281-0.305z"></path>
</symbol> </symbol>
<symbol id="icon-wechat" viewBox="0 0 32 32"><path d="M9.062 9.203q0-0.641-0.391-1.031t-1.031-0.391q-0.672 0-1.188 0.398t-0.516 1.023q0 0.609 0.516 1.008t1.188 0.398q0.641 0 1.031-0.383t0.391-1.023zM20.672 17.125q0-0.438-0.398-0.781t-1.023-0.344q-0.422 0-0.773 0.352t-0.352 0.773q0 0.438 0.352 0.789t0.773 0.352q0.625 0 1.023-0.344t0.398-0.797zM16.984 9.203q0-0.641-0.383-1.031t-1.023-0.391q-0.672 0-1.188 0.398t-0.516 1.023q0 0.609 0.516 1.008t1.188 0.398q0.641 0 1.023-0.383t0.383-1.023zM26.906 17.125q0-0.438-0.406-0.781t-1.016-0.344q-0.422 0-0.773 0.352t-0.352 0.773q0 0.438 0.352 0.789t0.773 0.352q0.609 0 1.016-0.344t0.406-0.797zM22.75 10.922q-0.484-0.063-1.094-0.063-2.641 0-4.859 1.203t-3.492 3.258-1.273 4.492q0 1.219 0.359 2.375-0.547 0.047-1.062 0.047-0.406 0-0.781-0.023t-0.859-0.102-0.695-0.109-0.852-0.164-0.781-0.164l-3.953 1.984 1.125-3.406q-4.531-3.172-4.531-7.656 0-2.641 1.523-4.859t4.125-3.492 5.68-1.273q2.75 0 5.195 1.031t4.094 2.852 2.133 4.070zM32 19.688q0 1.828-1.070 3.492t-2.898 3.023l0.859 2.828-3.109-1.703q-2.344 0.578-3.406 0.578-2.641 0-4.859-1.102t-3.492-2.992-1.273-4.125 1.273-4.125 3.492-2.992 4.859-1.102q2.516 0 4.734 1.102t3.555 3 1.336 4.117z"></path></symbol> <symbol id="icon-wechat" viewBox="0 0 32 32">
<symbol id="icon-weibo" viewBox="0 0 32 32"><path d="M13.242 27.106c-5.22 0.517-9.727-1.847-10.065-5.27-0.339-3.429 3.62-6.618 8.834-7.135 5.22-0.517 9.727 1.847 10.059 5.27 0.345 3.429-3.614 6.624-8.828 7.135zM23.677 15.735c-0.443-0.135-0.751-0.222-0.517-0.806 0.505-1.268 0.554-2.358 0.006-3.14-1.022-1.459-3.823-1.385-7.030-0.037 0 0-1.010 0.437-0.751-0.357 0.492-1.588 0.419-2.912-0.351-3.681-1.742-1.742-6.372 0.068-10.342 4.038-2.967 2.961-4.691 6.119-4.691 8.846 0 5.208 6.686 8.379 13.224 8.379 8.569 0 14.276-4.98 14.276-8.933 0-2.395-2.013-3.749-3.823-4.309z"></path><path d="M29.371 6.193c-2.069-2.296-5.122-3.17-7.942-2.573v0c-0.653 0.142-1.065 0.782-0.923 1.428 0.142 0.653 0.776 1.065 1.428 0.923 2.007-0.425 4.174 0.197 5.645 1.828s1.872 3.854 1.237 5.799v0c-0.203 0.634 0.142 1.311 0.776 1.521 0.634 0.203 1.311-0.142 1.521-0.776v-0.006c0.887-2.721 0.326-5.848-1.742-8.145z"></path><path d="M26.189 9.068c-1.010-1.12-2.499-1.545-3.866-1.25-0.56 0.117-0.917 0.677-0.8 1.237 0.123 0.56 0.677 0.917 1.231 0.794v0c0.671-0.142 1.397 0.068 1.89 0.609 0.492 0.548 0.628 1.293 0.412 1.945v0c-0.172 0.542 0.123 1.133 0.671 1.311 0.548 0.172 1.133-0.123 1.311-0.671 0.431-1.336 0.16-2.863-0.85-3.977z"></path><path d="M13.531 20.907c-0.185 0.314-0.585 0.462-0.899 0.332-0.314-0.123-0.406-0.48-0.228-0.782 0.185-0.302 0.573-0.449 0.88-0.332 0.308 0.111 0.419 0.462 0.246 0.782zM11.863 23.037c-0.505 0.806-1.588 1.157-2.401 0.788-0.8-0.363-1.040-1.299-0.536-2.087 0.499-0.782 1.545-1.133 2.352-0.794 0.819 0.351 1.084 1.28 0.585 2.093zM13.759 17.336c-2.481-0.646-5.288 0.591-6.366 2.776-1.102 2.229-0.037 4.709 2.469 5.522 2.598 0.837 5.664-0.449 6.729-2.85 1.053-2.358-0.259-4.777-2.832-5.448z"></path></symbol> <path d="M9.062 9.203q0-0.641-0.391-1.031t-1.031-0.391q-0.672 0-1.188 0.398t-0.516 1.023q0 0.609 0.516 1.008t1.188 0.398q0.641 0 1.031-0.383t0.391-1.023zM20.672 17.125q0-0.438-0.398-0.781t-1.023-0.344q-0.422 0-0.773 0.352t-0.352 0.773q0 0.438 0.352 0.789t0.773 0.352q0.625 0 1.023-0.344t0.398-0.797zM16.984 9.203q0-0.641-0.383-1.031t-1.023-0.391q-0.672 0-1.188 0.398t-0.516 1.023q0 0.609 0.516 1.008t1.188 0.398q0.641 0 1.023-0.383t0.383-1.023zM26.906 17.125q0-0.438-0.406-0.781t-1.016-0.344q-0.422 0-0.773 0.352t-0.352 0.773q0 0.438 0.352 0.789t0.773 0.352q0.609 0 1.016-0.344t0.406-0.797zM22.75 10.922q-0.484-0.063-1.094-0.063-2.641 0-4.859 1.203t-3.492 3.258-1.273 4.492q0 1.219 0.359 2.375-0.547 0.047-1.062 0.047-0.406 0-0.781-0.023t-0.859-0.102-0.695-0.109-0.852-0.164-0.781-0.164l-3.953 1.984 1.125-3.406q-4.531-3.172-4.531-7.656 0-2.641 1.523-4.859t4.125-3.492 5.68-1.273q2.75 0 5.195 1.031t4.094 2.852 2.133 4.070zM32 19.688q0 1.828-1.070 3.492t-2.898 3.023l0.859 2.828-3.109-1.703q-2.344 0.578-3.406 0.578-2.641 0-4.859-1.102t-3.492-2.992-1.273-4.125 1.273-4.125 3.492-2.992 4.859-1.102q2.516 0 4.734 1.102t3.555 3 1.336 4.117z"></path>
<symbol id="icon-twitter" viewBox="0 0 32 32"><path d="M32 6.077c-1.175 0.525-2.443 0.875-3.768 1.031 1.356-0.812 2.393-2.1 2.887-3.631-1.268 0.75-2.674 1.3-4.168 1.593-1.2-1.275-2.906-2.068-4.793-2.068-3.624 0-6.561 2.937-6.561 6.561 0 0.512 0.056 1.012 0.169 1.493-5.455-0.275-10.292-2.887-13.529-6.861-0.562 0.969-0.887 2.1-0.887 3.299 0 2.275 1.156 4.287 2.918 5.461-1.075-0.031-2.087-0.331-2.974-0.819 0 0.025 0 0.056 0 0.081 0 3.181 2.262 5.836 5.268 6.436-0.55 0.15-1.131 0.231-1.731 0.231-0.425 0-0.831-0.044-1.237-0.119 0.837 2.606 3.262 4.505 6.13 4.562-2.25 1.762-5.074 2.812-8.155 2.812-0.531 0-1.050-0.031-1.568-0.094 2.912 1.868 6.361 2.949 10.067 2.949 12.073 0 18.678-10.004 18.678-18.678 0-0.287-0.006-0.569-0.019-0.85 1.281-0.919 2.393-2.075 3.274-3.393z"></path></symbol> </symbol>
<symbol id="icon-weibo" viewBox="0 0 32 32">
<path d="M13.242 27.106c-5.22 0.517-9.727-1.847-10.065-5.27-0.339-3.429 3.62-6.618 8.834-7.135 5.22-0.517 9.727 1.847 10.059 5.27 0.345 3.429-3.614 6.624-8.828 7.135zM23.677 15.735c-0.443-0.135-0.751-0.222-0.517-0.806 0.505-1.268 0.554-2.358 0.006-3.14-1.022-1.459-3.823-1.385-7.030-0.037 0 0-1.010 0.437-0.751-0.357 0.492-1.588 0.419-2.912-0.351-3.681-1.742-1.742-6.372 0.068-10.342 4.038-2.967 2.961-4.691 6.119-4.691 8.846 0 5.208 6.686 8.379 13.224 8.379 8.569 0 14.276-4.98 14.276-8.933 0-2.395-2.013-3.749-3.823-4.309z"></path>
<path d="M29.371 6.193c-2.069-2.296-5.122-3.17-7.942-2.573v0c-0.653 0.142-1.065 0.782-0.923 1.428 0.142 0.653 0.776 1.065 1.428 0.923 2.007-0.425 4.174 0.197 5.645 1.828s1.872 3.854 1.237 5.799v0c-0.203 0.634 0.142 1.311 0.776 1.521 0.634 0.203 1.311-0.142 1.521-0.776v-0.006c0.887-2.721 0.326-5.848-1.742-8.145z"></path>
<path d="M26.189 9.068c-1.010-1.12-2.499-1.545-3.866-1.25-0.56 0.117-0.917 0.677-0.8 1.237 0.123 0.56 0.677 0.917 1.231 0.794v0c0.671-0.142 1.397 0.068 1.89 0.609 0.492 0.548 0.628 1.293 0.412 1.945v0c-0.172 0.542 0.123 1.133 0.671 1.311 0.548 0.172 1.133-0.123 1.311-0.671 0.431-1.336 0.16-2.863-0.85-3.977z"></path>
<path d="M13.531 20.907c-0.185 0.314-0.585 0.462-0.899 0.332-0.314-0.123-0.406-0.48-0.228-0.782 0.185-0.302 0.573-0.449 0.88-0.332 0.308 0.111 0.419 0.462 0.246 0.782zM11.863 23.037c-0.505 0.806-1.588 1.157-2.401 0.788-0.8-0.363-1.040-1.299-0.536-2.087 0.499-0.782 1.545-1.133 2.352-0.794 0.819 0.351 1.084 1.28 0.585 2.093zM13.759 17.336c-2.481-0.646-5.288 0.591-6.366 2.776-1.102 2.229-0.037 4.709 2.469 5.522 2.598 0.837 5.664-0.449 6.729-2.85 1.053-2.358-0.259-4.777-2.832-5.448z"></path>
</symbol>
<symbol id="icon-twitter" viewBox="0 0 32 32">
<path d="M32 6.077c-1.175 0.525-2.443 0.875-3.768 1.031 1.356-0.812 2.393-2.1 2.887-3.631-1.268 0.75-2.674 1.3-4.168 1.593-1.2-1.275-2.906-2.068-4.793-2.068-3.624 0-6.561 2.937-6.561 6.561 0 0.512 0.056 1.012 0.169 1.493-5.455-0.275-10.292-2.887-13.529-6.861-0.562 0.969-0.887 2.1-0.887 3.299 0 2.275 1.156 4.287 2.918 5.461-1.075-0.031-2.087-0.331-2.974-0.819 0 0.025 0 0.056 0 0.081 0 3.181 2.262 5.836 5.268 6.436-0.55 0.15-1.131 0.231-1.731 0.231-0.425 0-0.831-0.044-1.237-0.119 0.837 2.606 3.262 4.505 6.13 4.562-2.25 1.762-5.074 2.812-8.155 2.812-0.531 0-1.050-0.031-1.568-0.094 2.912 1.868 6.361 2.949 10.067 2.949 12.073 0 18.678-10.004 18.678-18.678 0-0.287-0.006-0.569-0.019-0.85 1.281-0.919 2.393-2.075 3.274-3.393z"></path>
</symbol>
<symbol id="icon-register" viewBox="0 0 32 32"> <symbol id="icon-register" viewBox="0 0 32 32">
<path d="M16 0c8.839 0 16 7.161 16 16 0 8.786-7.125 16-16 16-8.857 0-16-7.196-16-16 0-8.839 7.161-16 16-16zM27.054 24.125c1.661-2.286 2.661-5.089 2.661-8.125 0-7.554-6.161-13.714-13.714-13.714s-13.714 6.161-13.714 13.714c0 3.036 1 5.839 2.661 8.125 0.643-3.196 2.196-5.839 5.464-5.839 1.446 1.411 3.411 2.286 5.589 2.286s4.143-0.875 5.589-2.286c3.268 0 4.821 2.643 5.464 5.839zM22.857 12.571c0-3.786-3.071-6.857-6.857-6.857s-6.857 3.071-6.857 6.857 3.071 6.857 6.857 6.857 6.857-3.071 6.857-6.857z"></path> <path d="M16 0c8.839 0 16 7.161 16 16 0 8.786-7.125 16-16 16-8.857 0-16-7.196-16-16 0-8.839 7.161-16 16-16zM27.054 24.125c1.661-2.286 2.661-5.089 2.661-8.125 0-7.554-6.161-13.714-13.714-13.714s-13.714 6.161-13.714 13.714c0 3.036 1 5.839 2.661 8.125 0.643-3.196 2.196-5.839 5.464-5.839 1.446 1.411 3.411 2.286 5.589 2.286s4.143-0.875 5.589-2.286c3.268 0 4.821 2.643 5.464 5.839zM22.857 12.571c0-3.786-3.071-6.857-6.857-6.857s-6.857 3.071-6.857 6.857 3.071 6.857 6.857 6.857 6.857-3.071 6.857-6.857z"></path>
</symbol> </symbol>
...@@ -83,22 +92,24 @@ ...@@ -83,22 +92,24 @@
<div class="wrapper fn-clear"> <div class="wrapper fn-clear">
<h1><a href="${servePath}" rel="start" class="header__title">${blogTitle}</a></h1> <h1><a href="${servePath}" rel="start" class="header__title">${blogTitle}</a></h1>
<div class="fn-right"> <#if !staticSite>
<a href="${servePath}/search" aria-label="${searchLabel}" <div class="fn-right">
class="vditor-tooltipped vditor-tooltipped__w header__icon"> <a href="${servePath}/search" aria-label="${searchLabel}"
<svg> class="vditor-tooltipped vditor-tooltipped__w header__icon">
<use xlink:href="#icon-search"></use> <svg>
</svg> <use xlink:href="#icon-search"></use>
</a> </svg>
<#if isLoggedIn> </a>
<a class="avatar vditor-tooltipped vditor-tooltipped__w header__icon" aria-label="${adminLabel}" <#if isLoggedIn>
href="${servePath}/admin-index.do#main" <a class="avatar vditor-tooltipped vditor-tooltipped__w header__icon" aria-label="${adminLabel}"
style="background-image: url(${adminUser.userAvatar});"></a> href="${servePath}/admin-index.do#main"
<#else> style="background-image: url(${adminUser.userAvatar});"></a>
<a href="${servePath}/start" class="header__a"> <#else>
${startToUseLabel} <a href="${servePath}/start" class="header__a">
</a> ${startToUseLabel}
</a>
</#if>
</div>
</#if> </#if>
</div>
</div> </div>
</header> </header>
\ No newline at end of file
src/main/resources/skins/NeoEase/header.ftl
View file @ b657bbd3
...@@ -27,10 +27,12 @@ ...@@ -27,10 +27,12 @@
</h1> </h1>
<span class="sub-title">${blogSubtitle}</span> <span class="sub-title">${blogSubtitle}</span>
</div> </div>
<form class="right" action="${servePath}/search"> <#if !staticSite>
<input id="search" type="text" name="keyword" /> <form class="right" action="${servePath}/search">
<input type="submit" value="" class="none" /> <input id="search" type="text" name="keyword"/>
</form> <input type="submit" value="" class="none"/>
</form>
</#if>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
</div> </div>
...@@ -41,15 +43,17 @@ ...@@ -41,15 +43,17 @@
<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>
<a href="${page.pagePermalink}" target="${page.pageOpenTarget}"><#if page.pageIcon != ''><img
class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}</a>
</li>
</#list>
<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="${servePath}/tags.html">${allTagsLabel}</a>
</li> </li>
</#list>
<li> <li>
<a href="${servePath}/tags.html">${allTagsLabel}</a> <a rel="alternate" href="${servePath}/rss.xml">RSS<img src="${staticServePath}/images/feed.png"
</li> alt="RSS"/></a>
<li>
<a rel="alternate" href="${servePath}/rss.xml">RSS<img src="${staticServePath}/images/feed.png" alt="RSS"/></a>
</li> </li>
</ul> </ul>
<div class="right"> <div class="right">
...@@ -65,9 +69,9 @@ ...@@ -65,9 +69,9 @@
${statistic.statisticPublishedBlogArticleCount} ${statistic.statisticPublishedBlogArticleCount}
</span> </span>
<#if commentable> <#if commentable>
&nbsp;&nbsp; &nbsp;&nbsp;
${commentCount1Label} ${commentCount1Label}
<span class="tip"> <span class="tip">
${statistic.statisticPublishedBlogCommentCount} ${statistic.statisticPublishedBlogCommentCount}
</span> </span>
</#if> </#if>
......
src/main/resources/skins/Pinghsu/header.ftl
View file @ b657bbd3
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<div class="wrapper"> <div class="wrapper">
<a href="${servePath}" rel="start" class="header__logo"> <a href="${servePath}" rel="start" class="header__logo">
<img src="${adminUser.userAvatar}"/> <img src="${adminUser.userAvatar}"/>
${blogTitle} ${blogTitle}
</a> </a>
<nav class="header__nav mobile__none"> <nav class="header__nav mobile__none">
...@@ -34,11 +34,14 @@ ...@@ -34,11 +34,14 @@
<a rel="archive" href="${servePath}/links.html"> <a rel="archive" href="${servePath}/links.html">
Links Links
</a> </a>
<a href="${servePath}/search" class="search"> <#if !staticSite>
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28"> <a href="${servePath}/search" class="search">
<path fill="#444" d="M19.385 11.846c0-4.156-3.382-7.538-7.538-7.538s-7.538 3.382-7.538 7.538 3.382 7.538 7.538 7.538 7.538-3.382 7.538-7.538zM28 25.846c0 1.178-0.976 2.154-2.154 2.154-0.572 0-1.127-0.236-1.514-0.639l-5.772-5.755c-1.969 1.363-4.325 2.087-6.714 2.087-6.546 0-11.846-5.3-11.846-11.846s5.3-11.846 11.846-11.846 11.846 5.3 11.846 11.846c0 2.389-0.724 4.745-2.087 6.714l5.772 5.772c0.387 0.387 0.623 0.942 0.623 1.514z"></path> <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28">
</svg> <path fill="#444"
</a> d="M19.385 11.846c0-4.156-3.382-7.538-7.538-7.538s-7.538 3.382-7.538 7.538 3.382 7.538 7.538 7.538 7.538-3.382 7.538-7.538zM28 25.846c0 1.178-0.976 2.154-2.154 2.154-0.572 0-1.127-0.236-1.514-0.639l-5.772-5.755c-1.969 1.363-4.325 2.087-6.714 2.087-6.546 0-11.846-5.3-11.846-11.846s5.3-11.846 11.846-11.846 11.846 5.3 11.846 11.846c0 2.389-0.724 4.745-2.087 6.714l5.772 5.772c0.387 0.387 0.623 0.942 0.623 1.514z"></path>
</svg>
</a>
</#if>
</nav> </nav>
<div class="header__bar fn__none" onclick="$(this).next().slideToggle()"> <div class="header__bar fn__none" onclick="$(this).next().slideToggle()">
...@@ -48,31 +51,33 @@ ...@@ -48,31 +51,33 @@
</div> </div>
<main class="header__menu fn__none"> <main class="header__menu fn__none">
<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>
<li> <#else>
<a href="${servePath}/start"> <li>
<i class="icon__login"></i> ${startToUseLabel} <a href="${servePath}/start">
</a> <i class="icon__login"></i> ${startToUseLabel}
</li> </a>
</#if> </li>
<#list pageNavigations as page> </#if>
<li> </#if>
<a href="${page.pagePermalink}" target="${page.pageOpenTarget}" rel="section"> <#list pageNavigations as page>
${page.pageTitle} <li>
</a> <a href="${page.pagePermalink}" target="${page.pageOpenTarget}" rel="section">
</li> ${page.pageTitle}
</#list> </a>
</li>
</#list>
<li> <li>
<a href="${servePath}/tags.html" rel="section"> <a href="${servePath}/tags.html" rel="section">
Tags Tags
...@@ -88,11 +93,13 @@ ...@@ -88,11 +93,13 @@
Links Links
</a> </a>
</li> </li>
<li> <#if !staticSite>
<a href="${servePath}/search"> <li>
Search <a href="${servePath}/search">
</a> Search
</li> </a>
</li>
</#if>
<li> <li>
<a rel="alternate" href="${servePath}/rss.xml" rel="section"> <a rel="alternate" href="${servePath}/rss.xml" rel="section">
RSS RSS
......
src/main/resources/skins/favourite/nav.ftl
View file @ b657bbd3
...@@ -22,10 +22,13 @@ ...@@ -22,10 +22,13 @@
<a rel="nofollow" href="${servePath}" class="home">${homeLabel}</a> <a rel="nofollow" href="${servePath}" class="home">${homeLabel}</a>
<a href="${servePath}/tags.html" class="about">${allTagsLabel}</a> <a href="${servePath}/tags.html" class="about">${allTagsLabel}</a>
<#list pageNavigations as page> <#list pageNavigations as page>
<a href="${page.pagePermalink}" class="Guestbook" target="${page.pageOpenTarget}" class="${page.pageTitle}">${page.pageTitle}</a> <a href="${page.pagePermalink}" class="Guestbook" target="${page.pageOpenTarget}"
class="${page.pageTitle}">${page.pageTitle}</a>
</#list> </#list>
<a rel="alternate" href="${servePath}/rss.xml" class="classifiche">RSS</a> <a rel="alternate" href="${servePath}/rss.xml" class="classifiche">RSS</a>
<a href="${servePath}/search?keyword=">Search</a> <#if !staticSite>
<a href="${servePath}/search?keyword=">Search</a>
</#if>
</div> </div>
<div class="thinks"></div> <div class="thinks"></div>
</div> </div>
\ No newline at end of file
src/main/resources/skins/i-nove/header.ftl
View file @ b657bbd3
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
--> -->
<div class="header"> <div class="header">
<h1 class="title"> <h1 class="title">
<a href="${servePath}" id="logoTitle" > <a href="${servePath}" id="logoTitle">
${blogTitle} ${blogTitle}
</a> </a>
</h1> </h1>
...@@ -32,11 +32,11 @@ ...@@ -32,11 +32,11 @@
<a rel="nofollow" class="home" href="${servePath}"></a> <a rel="nofollow" class="home" href="${servePath}"></a>
</li> </li>
<#list pageNavigations as page> <#list pageNavigations as page>
<li> <li>
<a href="${page.pagePermalink}" target="${page.pageOpenTarget}"> <a href="${page.pagePermalink}" target="${page.pageOpenTarget}">
<#if page.pageIcon != ''><img class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle} <#if page.pageIcon != ''><img class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}
</a> </a>
</li> </li>
</#list> </#list>
<li> <li>
<a href="${servePath}/tags.html">${allTagsLabel}</a> <a href="${servePath}/tags.html">${allTagsLabel}</a>
...@@ -47,11 +47,13 @@ ...@@ -47,11 +47,13 @@
<img src="${staticServePath}/images/feed.png" alt="RSS"/> <img src="${staticServePath}/images/feed.png" alt="RSS"/>
</a> </a>
</li> </li>
<li> <#if !staticSite>
<a href="${servePath}/search?keyword="> <li>
Search <a href="${servePath}/search?keyword=">
</a> Search
</li> </a>
</li>
</#if>
<li> <li>
<a class="lastNavi" href="javascript:void(0);"></a> <a class="lastNavi" href="javascript:void(0);"></a>
</li> </li>
...@@ -73,7 +75,7 @@ ...@@ -73,7 +75,7 @@
&nbsp;&nbsp; &nbsp;&nbsp;
</span> </span>
<#if commentable> <#if commentable>
<span> <span>
${commentCount1Label} ${commentCount1Label}
<span class='error-msg'> <span class='error-msg'>
${statistic.statisticPublishedBlogCommentCount} ${statistic.statisticPublishedBlogCommentCount}
......
src/main/resources/skins/metro-hot/macro-side.ftl
View file @ b657bbd3
...@@ -18,186 +18,191 @@ ...@@ -18,186 +18,191 @@
--> -->
<#macro side isArticle> <#macro side isArticle>
<div class="side"> <div class="side">
<div class="fn-clear"> <div class="fn-clear">
<#if !isArticle> <#if !isArticle>
<form action="${servePath}/search"> <#if !staticSite>
<input placeholder="Search" id="search" type="text" name="keyword" /><span onclick="$(this).parent().submit()" data-ico="&#x0067;"></span> <form action="${servePath}/search">
<input type="submit" value="" class="fn-none" /> <input placeholder="Search" id="search" type="text" name="keyword"/><span
</form> onclick="$(this).parent().submit()" data-ico="&#x0067;"></span>
<input type="submit" value="" class="fn-none"/>
<#if "" != noticeBoard> </form>
<div class="notice-board side-tile"> </#if>
<div class="title">
${noticeBoard} <#if "" != noticeBoard>
<div class="notice-board side-tile">
<div class="title">
${noticeBoard}
</div>
</div>
</#if>
<div class="online-count side-tile">
<span data-ico="&#xe037;"></span>
<div class="text">
${viewCount1Label}
<span data-uvstaturl="${servePath}">0</span><br/>
${articleCount1Label}
${statistic.statisticPublishedBlogArticleCount}<br/>
<#if commentable>
${commentCount1Label}
${statistic.statisticPublishedBlogCommentCount}<br/>
</#if>
</div>
</div> </div>
</div>
</#if> </#if>
<div class="online-count side-tile"> <#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
<span data-ico="&#xe037;"></span> <div class="vditor-reset" style="margin-top: 20px">
<div class="text"> <#include "../../common-template/toc.ftl"/>
${viewCount1Label}
<span data-uvstaturl="${servePath}">0</span><br/>
${articleCount1Label}
${statistic.statisticPublishedBlogArticleCount}<br/>
<#if commentable>
${commentCount1Label}
${statistic.statisticPublishedBlogCommentCount}<br/>
</#if>
</div> </div>
</div> </#if>
</#if>
<#if article?? && article.articleToC?? && article.articleToC?size &gt; 0> <a rel="alternate" href="${servePath}/rss.xml" class="atom side-tile">
<div class="vditor-reset" style="margin-top: 20px"> <span data-ico="&#xe135;"></span>
<#include "../../common-template/toc.ftl"/> <div class="title">
</div> RSS
</#if> </div>
</a>
<a rel="alternate" href="${servePath}/rss.xml" class="atom side-tile"> <a href="javascript: MetroHot.goTranslate();" class="translate side-tile">
<span data-ico="&#xe135;"></span> <span data-ico="&#x0038;"></span>
<div class="title"> <div class="title">
RSS ${translateLabel}
</div> </div>
</a> </a>
<a href="javascript: MetroHot.goTranslate();" class="translate side-tile"> <#if isArticle>
<span data-ico="&#x0038;"></span> <div class="share side-tile">
<div class="title"> <span data-ico="&#xe1fe;"></span>
${translateLabel} <div class="title">
</div> ${shareLabel}
</a> </div>
<div class="text">
<#if article??>
<span class="icon-wechat"
data-type="wechat"
data-title="${article.articleTitle}"
data-blogtitle="${blogTitle}"
data-url="${servePath}${article.articlePermalink}"
data-avatar="${article.authorThumbnailURL}">微信</span>
<#else>
<span class="icon-wechat"
data-type="wechat"
data-title="${page.pageTitle}"
data-blogtitle="${blogTitle}"
data-url="${servePath}${page.pagePermalink}"
data-avatar="${adminUser.userAvatar}">微信</span>
</#if>
<span data-type="weibo">微博</span>
<span data-type="twitter">Twitter</span>
<span data-type="qqz">QQ</span>
</div>
</div>
<#if isArticle> <#if relevantArticlesDisplayCount??>
<div class="share side-tile"> <#if nextArticlePermalink??>
<span data-ico="&#xe1fe;"></span> <a class="next side-tile" title="${nextArticleTitle}"
<div class="title"> href="${servePath}${nextArticlePermalink}">
${shareLabel} <span data-ico="&#xe107;"></span>
</div> <div class="title">
<div class="text"> ${nextArticleLabel}
<#if article??> </div>
<span class="icon-wechat" </a>
data-type="wechat" <#else>
data-title="${article.articleTitle}" <div class="next-disabled side-tile">
data-blogtitle="${blogTitle}" <span data-ico="&#xe107;"></span>
data-url="${servePath}${article.articlePermalink}" <div class="title">
data-avatar="${article.authorThumbnailURL}">微信</span> ${newestArticleLabel}
<#else> </div>
<span class="icon-wechat" </div>
data-type="wechat" </#if>
data-title="${page.pageTitle}"
data-blogtitle="${blogTitle}"
data-url="${servePath}${page.pagePermalink}"
data-avatar="${adminUser.userAvatar}">微信</span>
</#if>
<span data-type="weibo">微博</span>
<span data-type="twitter">Twitter</span>
<span data-type="qqz">QQ</span>
</div>
</div>
<#if relevantArticlesDisplayCount??> <#if previousArticlePermalink??>
<#if nextArticlePermalink??> <a class="prev side-tile" title="${previousArticleTitle}" rel="prev"
<a class="next side-tile" title="${nextArticleTitle}" href="${servePath}${previousArticlePermalink}">
href="${servePath}${nextArticlePermalink}"> <span data-ico="&#xe106;"></span>
<span data-ico="&#xe107;"></span> <div class="title">
<div class="title"> ${previousArticleLabel}
${nextArticleLabel} </div>
</div> </a>
</a> <#else>
<#else> <div class="prev-disabled side-tile">
<div class="next-disabled side-tile"> <span data-ico="&#xe106;"></span>
<span data-ico="&#xe107;"></span> <div class="title">
<div class="title"> ${lastArticleLabel}
${newestArticleLabel} </div>
</div> </div>
</div> </#if>
</#if>
<#if previousArticlePermalink??>
<a class="prev side-tile" title="${previousArticleTitle}" rel="prev"
href="${servePath}${previousArticlePermalink}">
<span data-ico="&#xe106;"></span>
<div class="title">
${previousArticleLabel}
</div>
</a>
<#else>
<div class="prev-disabled side-tile">
<span data-ico="&#xe106;"></span>
<div class="title">
${lastArticleLabel}
</div>
</div>
</#if>
<#if 0 != relevantArticlesDisplayCount> <#if 0 != relevantArticlesDisplayCount>
<div id="relevantArticles" class="side-tile article-relative"> <div id="relevantArticles" class="side-tile article-relative">
<span data-ico="&#xe020;"></span> <span data-ico="&#xe020;"></span>
<div class="title"> <div class="title">
${relevantArticlesLabel} ${relevantArticlesLabel}
</div> </div>
<div class="text"> <div class="text">
</div> </div>
</div> </div>
</#if> </#if>
<#if 0 != randomArticlesDisplayCount> <#if 0 != randomArticlesDisplayCount>
<div id="randomArticles" class="side-tile article-relative"> <div id="randomArticles" class="side-tile article-relative">
<span data-ico="&#xe024;"></span> <span data-ico="&#xe024;"></span>
<div class="title"> <div class="title">
${randomArticlesLabel} ${randomArticlesLabel}
</div> </div>
<div class="text"> <div class="text">
</div> </div>
</div> </div>
</#if> </#if>
<#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount> <#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount>
<div id="externalRelevantArticles" class="side-tile article-relative"> <div id="externalRelevantArticles" class="side-tile article-relative">
<span data-ico="&#xe021;"></span> <span data-ico="&#xe021;"></span>
<div class="title"> <div class="title">
${externalRelevantArticlesLabel} ${externalRelevantArticlesLabel}
</div> </div>
<div class="text"> <div class="text">
</div> </div>
</div> </div>
</#if> </#if>
</#if> </#if>
</#if> </#if>
<div class="user side-tile"> <div class="user side-tile">
<span> <span>
<img src="${faviconURL}"/> <img src="${faviconURL}"/>
</span> </span>
<div class="text fn-clear"> <div class="text fn-clear">
<#include "../../common-template/macro-user_site.ftl"/> <#include "../../common-template/macro-user_site.ftl"/>
<@userSite dir="n"/> <@userSite dir="n"/>
</div>
</div> </div>
</div>
<#if isLoggedIn> <#if !staticSite>
<a href="${servePath}/admin-index.do#main" class="settings side-tile"> <#if isLoggedIn>
<span data-ico="&#x0070;"></span> <a href="${servePath}/admin-index.do#main" class="settings side-tile">
<div class="title"> <span data-ico="&#x0070;"></span>
${adminLabel} <div class="title">
</div> ${adminLabel}
</a> </div>
<a class="logout side-tile" href="${logoutURL}"> </a>
<span data-ico="&#xe040;"></span> <a class="logout side-tile" href="${logoutURL}">
<div class="title"> <span data-ico="&#xe040;"></span>
${logoutLabel} <div class="title">
</div> ${logoutLabel}
</a> </div>
<#else> </a>
<a href="${servePath}/start" class="register side-tile"> <#else>
<span data-ico="&#xe040;"></span> <a href="${servePath}/start" class="register side-tile">
<div class="title"> <span data-ico="&#xe040;"></span>
${startToUseLabel} <div class="title">
</div> ${startToUseLabel}
</a> </div>
</#if> </a>
</#if>
</#if>
</div>
</div> </div>
</div>
</#macro> </#macro>
\ No newline at end of file
src/main/resources/skins/next/header.ftl
View file @ b657bbd3
...@@ -28,7 +28,8 @@ ...@@ -28,7 +28,8 @@
</a> </a>
</div> </div>
<div class="site-nav-toggle fn-right" onclick="$('.header-line').toggle();$('nav').children('.menu').slideToggle();"> <div class="site-nav-toggle fn-right"
onclick="$('.header-line').toggle();$('nav').children('.menu').slideToggle();">
<span class="btn-bar"></span> <span class="btn-bar"></span>
<span class="btn-bar"></span> <span class="btn-bar"></span>
<span class="btn-bar"></span> <span class="btn-bar"></span>
...@@ -37,20 +38,22 @@ ...@@ -37,20 +38,22 @@
<nav> <nav>
<ul class="menu"> <ul class="menu">
<#list pageNavigations as page> <#list pageNavigations as page>
<li class="menu-item"> <li class="menu-item">
<a href="${page.pagePermalink}" target="${page.pageOpenTarget}" rel="section"> <a href="${page.pagePermalink}" target="${page.pageOpenTarget}" rel="section">
${page.pageTitle} ${page.pageTitle}
</a> </a>
</li> </li>
</#list> </#list>
</ul> </ul>
<div class="site-search"> <#if !staticSite>
<form action="${servePath}/search"> <div class="site-search">
<input placeholder="${searchLabel}" id="search" type="text" name="keyword"/> <form action="${servePath}/search">
<input type="submit" value="" class="fn-none" /> <input placeholder="${searchLabel}" id="search" type="text" name="keyword"/>
</form> <input type="submit" value="" class="fn-none"/>
</div> </form>
</div>
</#if>
</nav> </nav>
</div> </div>
</header> </header>
\ No newline at end of file
src/main/resources/skins/nijigen/side.ftl
View file @ b657bbd3
...@@ -19,32 +19,34 @@ ...@@ -19,32 +19,34 @@
--> -->
<aside class="side"> <aside class="side">
<#if article?? && article.articleToC?? && article.articleToC?size &gt; 0> <#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
<div class="module"> <div class="module">
<div class="module__list"> <div class="module__list">
<#include "../../common-template/toc.ftl"/> <#include "../../common-template/toc.ftl"/>
</div>
</div> </div>
</div>
</#if> </#if>
<#if noticeBoard??> <#if noticeBoard??>
<section class="vditor-reset module"> <section class="vditor-reset module">
<main class="module__content"> <main class="module__content">
${noticeBoard} ${noticeBoard}
</main> </main>
</section> </section>
</#if> </#if>
<section class="module"> <#if !staticSite>
<header class="module__header"> <section class="module">
<form class="form" action="${servePath}/search"> <header class="module__header">
<input placeholder="${searchLabel}" class="form__input" type="text" name="keyword"/> <form class="form" action="${servePath}/search">
<button class="side__btn" type="submit"><i class="icon__search"></i></button> <input placeholder="${searchLabel}" class="form__input" type="text" name="keyword"/>
</form> <button class="side__btn" type="submit"><i class="icon__search"></i></button>
</header> </form>
</section> </header>
</section>
</#if>
<div class="module item"> <div class="module item">
<header class="module__header ft__center"> <header class="module__header ft__center">
${adminUser.userName} ${adminUser.userName}
</header> </header>
<main class="module__content ft__center"> <main class="module__content ft__center">
<img class="side__avatar" src="${adminUser.userAvatar}" alt="${adminUser.userName}"/> <img class="side__avatar" src="${adminUser.userAvatar}" alt="${adminUser.userName}"/>
...@@ -125,23 +127,23 @@ ...@@ -125,23 +127,23 @@
<div class="module__header"> <div class="module__header">
<div class="fn__flex"> <div class="fn__flex">
<a href="${servePath}/archives.html" class="fn__flex-1 ft__center"> <a href="${servePath}/archives.html" class="fn__flex-1 ft__center">
${statistic.statisticPublishedBlogArticleCount} ${statistic.statisticPublishedBlogArticleCount}
${articleLabel} ${articleLabel}
</a> </a>
<#if commentable> <#if commentable>
<a href="${servePath}/dynamic.html" class="fn__flex-1 ft__center"> <a href="${servePath}/dynamic.html" class="fn__flex-1 ft__center">
${statistic.statisticPublishedBlogCommentCount} ${statistic.statisticPublishedBlogCommentCount}
${commentLabel} ${commentLabel}
</a> </a>
</#if> </#if>
</div> </div>
<br/> <br/>
<div class="fn__flex"> <div class="fn__flex">
<div class="fn__flex-1 ft__center"> <div class="fn__flex-1 ft__center">
<span data-uvstaturl="${servePath}">0</span> <span class="ft-gray">${viewLabel}</span> <span data-uvstaturl="${servePath}">0</span> <span class="ft-gray">${viewLabel}</span>
</div> </div>
<div class="fn__flex-1 ft__center"> <div class="fn__flex-1 ft__center">
${onlineVisitorCnt} <span class="ft-gray">${onlineVisitorLabel}</span> ${onlineVisitorCnt} <span class="ft-gray">${onlineVisitorLabel}</span>
</div> </div>
</div> </div>
</div> </div>
......
src/main/resources/skins/owmx-3.0/side.ftl
View file @ b657bbd3
...@@ -18,13 +18,15 @@ ...@@ -18,13 +18,15 @@
--> -->
<aside> <aside>
<nav> <#if !staticSite>
<h4 class="h4">Search</h4> <nav>
<form action="${servePath}/search"> <h4 class="h4">Search</h4>
<input style="width: 194px" id="search" type="text" name="keyword" /> <form action="${servePath}/search">
<input type="submit" value="" class="none" /> <input style="width: 194px" id="search" type="text" name="keyword"/>
</form> <input type="submit" value="" class="none"/>
</nav> </form>
</nav>
</#if>
<nav> <nav>
<h4 class="h4">Navigation</h4> <h4 class="h4">Navigation</h4>
<ul> <ul>
...@@ -32,11 +34,11 @@ ...@@ -32,11 +34,11 @@
<a rel="nofollow" class="home" href="${servePath}">${indexLabel}</a> <a rel="nofollow" class="home" href="${servePath}">${indexLabel}</a>
</li> </li>
<#list pageNavigations as page> <#list pageNavigations as page>
<li> <li>
<a href="${page.pagePermalink}" target="${page.pageOpenTarget}"> <a href="${page.pagePermalink}" target="${page.pageOpenTarget}">
<#if page.pageIcon != ''><img class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle} <#if page.pageIcon != ''><img class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}
</a> </a>
</li> </li>
</#list> </#list>
<li> <li>
<a href="${servePath}/tags.html">${allTagsLabel}</a> <a href="${servePath}/tags.html">${allTagsLabel}</a>
...@@ -53,12 +55,12 @@ ...@@ -53,12 +55,12 @@
</ul> </ul>
</nav> </nav>
<#if "" != noticeBoard> <#if "" != noticeBoard>
<h4 class="h4">${noticeBoardLabel}</h4> <h4 class="h4">${noticeBoardLabel}</h4>
<div id="c"> <div id="c">
<p> <p>
${noticeBoard} ${noticeBoard}
</p> </p>
</div> </div>
</#if> </#if>
<#if article?? && article.articleToC?? && article.articleToC?size &gt; 0> <#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
...@@ -66,57 +68,57 @@ ...@@ -66,57 +68,57 @@
<#else> <#else>
<#if 0 != recentComments?size> <#if 0 != recentComments?size>
<h4 class="h4">${recentCommentsLabel}</h4> <h4 class="h4">${recentCommentsLabel}</h4>
<ul class="aside-comments"> <ul class="aside-comments">
<#list recentComments as comment> <#list recentComments as comment>
<li> <li>
<img class="left" title='${comment.commentName}' <img class="left" title='${comment.commentName}'
alt='${comment.commentName}' alt='${comment.commentName}'
src='${comment.commentThumbnailURL}' width="32" height="32"/> src='${comment.commentThumbnailURL}' width="32" height="32"/>
<div class="left"> <div class="left">
<div> <div>
<a target="_blank" href="${comment.commentURL}"> <a target="_blank" href="${comment.commentURL}">
${comment.commentName} ${comment.commentName}
</a> </a>
</div> </div>
<div> <div>
<a rel="nofollow" class='side-comment' href="${servePath}${comment.commentSharpURL}"> <a rel="nofollow" class='side-comment' href="${servePath}${comment.commentSharpURL}">
${comment.commentContent} ${comment.commentContent}
</a> </a>
</div> </div>
</div> </div>
<div class='clear'></div> <div class='clear'></div>
</li> </li>
</#list> </#list>
</ul> </ul>
</#if> </#if>
<#if 0 != mostCommentArticles?size> <#if 0 != mostCommentArticles?size>
<h4 class="h4">${mostCommentArticlesLabel}</h4> <h4 class="h4">${mostCommentArticlesLabel}</h4>
<ul id="mostCommentArticles"> <ul id="mostCommentArticles">
<#list mostCommentArticles as article> <#list mostCommentArticles as article>
<li> <li>
<a rel="nofollow" title="${article.articleTitle}" <a rel="nofollow" title="${article.articleTitle}"
href="${servePath}${article.articlePermalink}"> href="${servePath}${article.articlePermalink}">
<sup>[${article.articleCommentCount}]</sup> <sup>[${article.articleCommentCount}]</sup>
${article.articleTitle} ${article.articleTitle}
</a> </a>
</li> </li>
</#list> </#list>
</ul> </ul>
</#if> </#if>
<#if 0 != mostViewCountArticles?size> <#if 0 != mostViewCountArticles?size>
<h4 class="h4">${mostViewCountArticlesLabel}</h4> <h4 class="h4">${mostViewCountArticlesLabel}</h4>
<ul id="mostViewCountArticles"> <ul id="mostViewCountArticles">
<#list mostViewCountArticles as article> <#list mostViewCountArticles as article>
<li> <li>
<a rel="nofollow" title="${article.articleTitle}" <a rel="nofollow" title="${article.articleTitle}"
href="${servePath}${article.articlePermalink}"> href="${servePath}${article.articlePermalink}">
<sup>[<span data-uvstaturl="${servePath}${article.articlePermalink}">0</span>]</sup> <sup>[<span data-uvstaturl="${servePath}${article.articlePermalink}">0</span>]</sup>
${article.articleTitle} ${article.articleTitle}
</a> </a>
</li> </li>
</#list> </#list>
</ul> </ul>
</#if> </#if>
<#if 0 != mostUsedCategories?size> <#if 0 != mostUsedCategories?size>
...@@ -133,51 +135,53 @@ ...@@ -133,51 +135,53 @@
</#if> </#if>
<#if 0 != mostUsedTags?size> <#if 0 != mostUsedTags?size>
<h4 class="h4">${tagsLabel}</h4> <h4 class="h4">${tagsLabel}</h4>
<ul class="navi-tags"> <ul class="navi-tags">
<#list mostUsedTags as tag> <#list mostUsedTags as tag>
<li> <li>
<a rel="tag" title="${tag.tagTitle}(${tag.tagPublishedRefCount})" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}"> <a rel="tag" title="${tag.tagTitle}(${tag.tagPublishedRefCount})"
<sup>[${tag.tagPublishedRefCount}]</sup> href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
${tag.tagTitle}</a> <sup>[${tag.tagPublishedRefCount}]</sup>
</li> ${tag.tagTitle}</a>
</#list> </li>
</ul> </#list>
</ul>
</#if> </#if>
<#if 0 != links?size> <#if 0 != links?size>
<h4 class="h4">${linkLabel}</h4> <h4 class="h4">${linkLabel}</h4>
<ul id="sideLink" class="navi-tags"> <ul id="sideLink" class="navi-tags">
<#list links as link> <#list links as link>
<li> <li>
<a rel="friend" href="${link.linkAddress}" title="${link.linkTitle}" target="_blank"> <a rel="friend" href="${link.linkAddress}" title="${link.linkTitle}" target="_blank">
<img alt="${link.linkTitle}" <img alt="${link.linkTitle}"
src="${faviconAPI}<#list link.linkAddress?split('/') as x><#if x_index=2>${x}<#break></#if></#list>" width="16" height="16" /></a> src="${faviconAPI}<#list link.linkAddress?split('/') as x><#if x_index=2>${x}<#break></#if></#list>"
<a rel="friend" href="${link.linkAddress}" title="${link.linkTitle}" target="_blank"> width="16" height="16"/></a>
${link.linkTitle} <a rel="friend" href="${link.linkAddress}" title="${link.linkTitle}" target="_blank">
</a> ${link.linkTitle}
</li> </a>
</#list> </li>
</ul> </#list>
</ul>
</#if> </#if>
<#if 0 != archiveDates?size> <#if 0 != archiveDates?size>
<h4 class="h4"><a href="${servePath}/archives.html">${archiveLabel}</a></h4> <h4 class="h4"><a href="${servePath}/archives.html">${archiveLabel}</a></h4>
<ul> <ul>
<#list archiveDates as archiveDate> <#list archiveDates as archiveDate>
<#if archiveDate_index < 10> <#if archiveDate_index < 10>
<li> <li>
<#if "en" == localeString?substring(0, 2)> <#if "en" == localeString?substring(0, 2)>
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}" <a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
title="${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})"> title="${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})">
${archiveDate.monthName} ${archiveDate.archiveDateYear}</a>(${archiveDate.archiveDatePublishedArticleCount}) ${archiveDate.monthName} ${archiveDate.archiveDateYear}</a>(${archiveDate.archiveDatePublishedArticleCount})
<#else> <#else>
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}" <a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})"> title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})">
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}</a>(${archiveDate.archiveDatePublishedArticleCount}) ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}</a>(${archiveDate.archiveDatePublishedArticleCount})
</#if>
</li>
</#if> </#if>
</li> </#list>
</#if> </ul>
</#list>
</ul>
</#if> </#if>
</#if> </#if>
</aside> </aside>
src/main/resources/skins/timeline/header.ftl
View file @ b657bbd3
...@@ -40,25 +40,29 @@ ...@@ -40,25 +40,29 @@
</div> </div>
<ul class="left"> <ul class="left">
<#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}/tags.html">${allTagsLabel}</a> <a href="${servePath}/tags.html">${allTagsLabel}</a>
</li> </li>
<li> <li>
<a rel="alternate" href="${servePath}/rss.xml">RSS <img src="${staticServePath}/images/feed.png" alt="RSS"/></a> <a rel="alternate" href="${servePath}/rss.xml">RSS <img src="${staticServePath}/images/feed.png"
alt="RSS"/></a>
</li> </li>
</ul> </ul>
<form class="right" action="${servePath}/search"> <#if !staticSite>
<input placeholder="${searchLabel}" id="search" type="text" name="keyword" /> <form class="right" action="${servePath}/search">
<input type="submit" value="" class="none" /> <input placeholder="${searchLabel}" id="search" type="text" name="keyword"/>
</form> <input type="submit" value="" class="none"/>
</form>
</#if>
</div> </div>
</div> </div>
\ No newline at end of file
src/main/resources/skins/tree-house/header.ftl
View file @ b657bbd3
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<div class="header-navi right"> <div class="header-navi right">
<ul> <ul>
<#list pageNavigations as page> <#list pageNavigations as page>
<li> <li>
<a href="${page.pagePermalink}" target="${page.pageOpenTarget}"> <a href="${page.pagePermalink}" target="${page.pageOpenTarget}">
<#if page.pageIcon != ''><img class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle} <#if page.pageIcon != ''><img class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}
</a>&nbsp;&nbsp; </a>&nbsp;&nbsp;
</li> </li>
</#list> </#list>
<li> <li>
<a href="${servePath}/tags.html">${allTagsLabel}</a>&nbsp;&nbsp; <a href="${servePath}/tags.html">${allTagsLabel}</a>&nbsp;&nbsp;
...@@ -34,14 +34,16 @@ ...@@ -34,14 +34,16 @@
<img class="page-icon" src="${staticServePath}/images/feed.png" alt="RSS"/>RSS</a> <img class="page-icon" src="${staticServePath}/images/feed.png" alt="RSS"/>RSS</a>
</a> &nbsp;&nbsp; </a> &nbsp;&nbsp;
</li> </li>
<li> <#if !staticSite>
<a href="${servePath}/search?keyword=">Search</a> <li>
</li> <a href="${servePath}/search?keyword=">Search</a>
</li>
</#if>
</ul> </ul>
</div> </div>
<div class="header-title"> <div class="header-title">
<h1> <h1>
<a href="${servePath}" id="logoTitle" > <a href="${servePath}" id="logoTitle">
${blogTitle} ${blogTitle}
</a> </a>
</h1> </h1>
......
src/main/resources/skins/yilia/side.ftl
View file @ b657bbd3
...@@ -54,13 +54,15 @@ ...@@ -54,13 +54,15 @@
&nbsp; &nbsp; &nbsp; &nbsp;
<a href="${servePath}/archives.html">${archiveLabel}</a> <a href="${servePath}/archives.html">${archiveLabel}</a>
</li> </li>
<li> <#if !staticSite>
<a href="${servePath}/links.html">${linkLabel}</a> <li>
&nbsp; &nbsp; <a href="${servePath}/links.html">${linkLabel}</a>
<a href="${servePath}/search?keyword="> &nbsp; &nbsp;
Search <a href="${servePath}/search?keyword=">
</a> Search
</li> </a>
</li>
</#if>
</ul> </ul>
</nav> </nav>
</header> </header>
......
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