Commit b657bbd3 authored by Liang Ding's avatar Liang Ding

#19 搜索入口处理

parent 0fce73d3
...@@ -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>
......
...@@ -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>
......
...@@ -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>
......
...@@ -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>
......
...@@ -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">
......
...@@ -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>
......
...@@ -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">
......
...@@ -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>
......
This diff is collapsed.
...@@ -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>
......
...@@ -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
......
...@@ -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
...@@ -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}
......
...@@ -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
...@@ -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>
......
This diff is collapsed.
...@@ -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
...@@ -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>
......
...@@ -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