This commit is contained in:
Liang Ding 2018-09-26 21:28:52 +08:00
parent 982110525f
commit 4bd78b7cfa
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
14 changed files with 13 additions and 24 deletions

View File

@ -99,13 +99,11 @@
<#if 0 != mostUsedTags?size> <#if 0 != mostUsedTags?size>
<dd> <dd>
<h4>${tagsLabel}</h4> <h4>${tagsLabel}</h4>
<ul class="navi-tags"> <ul>
<#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})" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
${tag.tagTitle} (${tag.tagPublishedRefCount})</a> ${tag.tagTitle} (${tag.tagPublishedRefCount})</a>
<img onclick="window.location='${servePath}/tag-articles-feed.do?oId=${tag.oId}'"
alt="${tag.tagTitle}" src="${staticServePath}/images/feed.png"/>
</li> </li>
</#list> </#list>
</ul> </ul>

View File

@ -36,7 +36,7 @@
<div class="main-content"> <div class="main-content">
<h2> <h2>
${tag1Label} ${tag1Label}
<a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}">${tag.tagTitle}(${tag.tagPublishedRefCount})</a> <a rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">${tag.tagTitle}(${tag.tagPublishedRefCount})</a>
</h2> </h2>
<#include "article-list.ftl"> <#include "article-list.ftl">
</div> </div>

View File

@ -34,7 +34,7 @@
<div class="col-sm-2"></div> <div class="col-sm-2"></div>
<div class="col-sm-8 site article-list"> <div class="col-sm-8 site article-list">
<h2> <h2>
<a id="tag" rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}"> <a id="tag" rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
${tag.tagTitle} ${tag.tagTitle}
(${tag.tagPublishedRefCount}) (${tag.tagPublishedRefCount})
</a> </a>

View File

@ -103,7 +103,6 @@
</div> </div>
</#if> </#if>
<#if 0 != mostUsedTags?size> <#if 0 != mostUsedTags?size>
<div class="left footer-block"> <div class="left footer-block">
<h4><span class="left">${tagsLabel}</span></h4> <h4><span class="left">${tagsLabel}</span></h4>
@ -114,8 +113,6 @@
<a rel="tag" title="${tag.tagTitle}(${tag.tagPublishedRefCount})" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}"> <a rel="tag" title="${tag.tagTitle}(${tag.tagPublishedRefCount})" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
${tag.tagTitle}(${tag.tagPublishedRefCount}) ${tag.tagTitle}(${tag.tagPublishedRefCount})
</a> </a>
<img onclick="window.location='${servePath}/tag-articles-feed.do?oId=${tag.oId}'"
alt="${tag.tagTitle}" src="${staticServePath}/images/feed.png"/>
</li> </li>
</#list> </#list>
</ul> </ul>

View File

@ -33,7 +33,7 @@
</div> </div>
<div class="content"> <div class="content">
<h2>${tag1Label} <h2>${tag1Label}
<a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}"> <a rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
<span id="tagArticlesTag"> <span id="tagArticlesTag">
${tag.tagTitle} ${tag.tagTitle}
</span>(${tag.tagPublishedRefCount}) </span>(${tag.tagPublishedRefCount})

View File

@ -35,7 +35,7 @@
<main id="content"> <main id="content">
<h2 class="fn-wrap"> <h2 class="fn-wrap">
${tag1Label} ${tag1Label}
<a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}"> <a rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
${tag.tagTitle} ${tag.tagTitle}
(${tag.tagPublishedRefCount}) (${tag.tagPublishedRefCount})
</a> </a>

View File

@ -114,8 +114,7 @@
<ul> <ul>
<#list mostUsedTags as tag> <#list mostUsedTags as tag>
<li> <li>
<a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}" class="no-underline"> <a rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}" class="no-underline">
<img alt="${tag.tagTitle}" src="${staticServePath}/images/feed.png"/>
</a> </a>
<a rel="tag" title="${tag.tagTitle}(${tag.tagPublishedRefCount})" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}"> <a rel="tag" title="${tag.tagTitle}(${tag.tagPublishedRefCount})" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
${tag.tagTitle}</a> ${tag.tagTitle}</a>

View File

@ -36,7 +36,7 @@
<div class="left main"> <div class="left main">
<div> <div>
<h2 class="marginLeft12 marginBottom12">${tag1Label} <h2 class="marginLeft12 marginBottom12">${tag1Label}
<a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}"><span id="tagArticlesTag"> <a rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}"><span id="tagArticlesTag">
${tag.tagTitle} ${tag.tagTitle}
</span>(${tag.tagPublishedRefCount})</a> </span>(${tag.tagPublishedRefCount})</a>
</h2> </h2>

View File

@ -32,7 +32,7 @@
<div class="main"> <div class="main">
<div class="wrapper"> <div class="wrapper">
<h2> <h2>
<a id="tag" rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}"> <a id="tag" rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
${tag1Label} ${tag1Label}
${tag.tagTitle} ${tag.tagTitle}
(${tag.tagPublishedRefCount}) (${tag.tagPublishedRefCount})

View File

@ -119,11 +119,10 @@
<div class="tags"> <div class="tags">
<h4>${tagsLabel}</h4> <h4>${tagsLabel}</h4>
</div> </div>
<ul class="navi-tags"> <ul class="mostViewCountArticles">
<#list mostUsedTags as tag> <#list mostUsedTags as tag>
<li> <li>
<a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}" class="no-underline"> <a rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}" class="no-underline">
<img alt="${tag.tagTitle}" src="${staticServePath}/images/feed.png"/>
</a> </a>
<a rel="tag" title="${tag.tagTitle}" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}"> <a rel="tag" title="${tag.tagTitle}" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
${tag.tagTitle}(${tag.tagPublishedRefCount}) ${tag.tagTitle}(${tag.tagPublishedRefCount})

View File

@ -39,7 +39,7 @@
${tag1Label} ${tag1Label}
</div> </div>
<div class="kind-panel"> <div class="kind-panel">
<a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}"><span id="tagArticlesTag"> <a rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}"><span id="tagArticlesTag">
${tag.tagTitle} ${tag.tagTitle}
</span>(${tag.tagPublishedRefCount})</a> </span>(${tag.tagPublishedRefCount})</a>
</div> </div>

View File

@ -94,9 +94,6 @@
<ul> <ul>
<#list mostUsedTags as tag> <#list mostUsedTags as tag>
<li> <li>
<a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}" class="no-underline">
<img alt="${tag.tagTitle}" src="${staticServePath}/images/feed.png"/>
</a>
<a rel="tag" title="${tag.tagTitle}(${tag.tagPublishedRefCount})" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}"> <a rel="tag" title="${tag.tagTitle}(${tag.tagPublishedRefCount})" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
${tag.tagTitle}</a> ${tag.tagTitle}</a>
(${tag.tagPublishedRefCount}) (${tag.tagPublishedRefCount})

View File

@ -30,10 +30,9 @@
${topBarReplacement} ${topBarReplacement}
<#include "header.ftl"> <#include "header.ftl">
<h3 id="tag" style="cursor: pointer" class="nav-abs" <h3 id="tag" style="cursor: pointer" class="nav-abs"
onclick="window.location.href='${servePath}/tag-articles-rss.do?oId=${tag.oId}'"> onclick="window.location.href='${servePath}/tags/${tag.tagTitle?url("UTF-8")}'">
${tag.tagTitle} ${tag.tagTitle}
(${tag.tagPublishedRefCount}) (${tag.tagPublishedRefCount})
<img src="${staticServePath}/images/feed.png" alt="RSS"/>
</h3> </h3>
<#include "article-list.ftl"> <#include "article-list.ftl">
<#include "footer.ftl"> <#include "footer.ftl">

View File

@ -31,7 +31,7 @@
<main> <main>
<h2 class="classify-name"> <h2 class="classify-name">
${tag1Label} ${tag1Label}
<a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}"> <a rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
${tag.tagTitle} ${tag.tagTitle}
(${tag.tagPublishedRefCount}) (${tag.tagPublishedRefCount})
</a> </a>