From b4a38b7cb93012ac9ff9a8210e660ad719315e5f Mon Sep 17 00:00:00 2001 From: oncereply Date: Wed, 9 Jan 2013 17:25:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A1=B5,=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bootstyle/archives.ftl | 36 ------------ bootstyle/css/bootstyle.css | 53 ++++++++++++++++- bootstyle/dynamic.ftl | 108 ----------------------------------- bootstyle/header.ftl | 3 - bootstyle/links.ftl | 32 ----------- bootstyle/macro-comments.ftl | 21 ++++++- bootstyle/tags.ftl | 32 ++++++----- 7 files changed, 90 insertions(+), 195 deletions(-) delete mode 100644 bootstyle/archives.ftl delete mode 100644 bootstyle/dynamic.ftl delete mode 100644 bootstyle/links.ftl diff --git a/bootstyle/archives.ftl b/bootstyle/archives.ftl deleted file mode 100644 index 26405b2..0000000 --- a/bootstyle/archives.ftl +++ /dev/null @@ -1,36 +0,0 @@ -<#include "macro-head.ftl"> - - - - <@head title="${blogTitle}"> - - - - - - ${topBarReplacement} - <#include "header.ftl"> -
-
- <#if 0 != archiveDates?size> -
- <#list archiveDates as archiveDate> - - <#if "en" == localeString?substring(0, 2)> - - ${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount}) - <#else> - - ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount}) - - - -
- -
-
- <#include "footer.ftl"> - - diff --git a/bootstyle/css/bootstyle.css b/bootstyle/css/bootstyle.css index 5b25f04..d2fdc1d 100644 --- a/bootstyle/css/bootstyle.css +++ b/bootstyle/css/bootstyle.css @@ -154,4 +154,55 @@ a:hover { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; -} \ No newline at end of file +} + +/* start tags */ +#tags.other-main { + list-style: none; +} + +#tags li { + float: left; + height: 38px; +} + +#tags a { + margin: 3px 6px; + padding: 3px 12px; + background-color: #FCFCFC; + box-shadow: 0 0 2px #D5D5D5; + float: left; +} + +#tags a:hover { + text-shadow: 0 0 2px; + text-decoration: none; + box-shadow: 0 0 4px #D5D5D5; + color: #769abb; +} + +.tags1, .tags1:visited { + font-size: 12px; + color: #a7a7a7; +} + +.tags2, .tags2:visited { + font-size: 14px; + color: #808080; +} + +.tags3, .tags3:visited { + font-size: 16px; + color: #595959; +} + +.tags4, .tags4:visited { + font-size: 18px; + color: #323232; +} + +.tags5, .tags5:visited { + font-size: 20px; + color: #0a0a0a; +} +/* end tags */ \ No newline at end of file diff --git a/bootstyle/dynamic.ftl b/bootstyle/dynamic.ftl deleted file mode 100644 index 0d68546..0000000 --- a/bootstyle/dynamic.ftl +++ /dev/null @@ -1,108 +0,0 @@ -<#include "macro-head.ftl"> - - - - <@head title="${blogTitle}"> - - - - - - ${topBarReplacement} - <#include "header.ftl"> -
-
-
- <#if 0 != recentComments?size> -
-

${recentCommentsLabel}

-
    - <#list recentComments as comment> -
  • - ${comment.commentName} -
    - - <#if "http://" == comment.commentURL> - ${comment.commentName} - <#else> - ${comment.commentName} - - -
    - ${comment.commentDate?string("yyyy-MM-dd HH:mm:ss")} - ${viewLabel} -
    - -
    - ${comment.commentContent} -
    -
    -
    -
    • - -
-
- - <#if 0 != mostUsedTags?size> -
-

${popTagsLabel}

- -
-
- -
- <#if 0 != mostCommentArticles?size> -
-

${mostCommentArticlesLabel}

- -
- - <#if 0 != mostViewCountArticles?size> -
-

${mostViewCountArticlesLabel}

- -
- -
-
-
-
- <#include "footer.ftl"> - - diff --git a/bootstyle/header.ftl b/bootstyle/header.ftl index a5cfcde..5db8c3f 100644 --- a/bootstyle/header.ftl +++ b/bootstyle/header.ftl @@ -16,9 +16,6 @@
  • ${allTagsLabel}
    • -
  • - ${archiveLabel} -
  • AtomAtom
    • diff --git a/bootstyle/links.ftl b/bootstyle/links.ftl deleted file mode 100644 index 9db046d..0000000 --- a/bootstyle/links.ftl +++ /dev/null @@ -1,32 +0,0 @@ -<#include "macro-head.ftl"> - - - - <@head title="${blogTitle}"> - - - - - - ${topBarReplacement} - <#include "header.ftl"> -
    -
    - <#if 0 != links?size> - - -
    -
    - <#include "footer.ftl"> - - diff --git a/bootstyle/macro-comments.ftl b/bootstyle/macro-comments.ftl index 5cd6086..675237b 100644 --- a/bootstyle/macro-comments.ftl +++ b/bootstyle/macro-comments.ftl @@ -115,7 +115,26 @@ }); var addComment = function (result, state) { - return ""; + var html = new Array(); + html.push('
    '); + html.push(''); + html.push(''); + html.push(''); + html.push('
    '); + html.push('

    '); + html.push(result.replyNameHTML); + if (state !== "") { + html.push(' '); + html.push(' '+page.currentCommentId+''); + } + html.push(''); + html.push(' '+ result.commentDate.substring(0, 19)); + html.push(' '); + html.push('${replyLabel}'); + html.push(''); + html.push('

    '); + html.push(Util.replaceEmString($("#comment" + state).val().replace(//g, ">").replace(/\n/g,"
    "))); + return html.join(''); } var replyTo = function (id) { diff --git a/bootstyle/tags.ftl b/bootstyle/tags.ftl index 95f0b71..e9a600b 100644 --- a/bootstyle/tags.ftl +++ b/bootstyle/tags.ftl @@ -7,23 +7,27 @@ - - ${topBarReplacement} + <#include "header.ftl"> -
    -
    - +
    +
    +
    <#include "footer.ftl">