From 0795843b84fb6a9ccdb9a2a4197171e3718e1d36 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Thu, 4 Jan 2018 14:16:34 +0800 Subject: [PATCH] rm skins --- {9IPHP => skins/9IPHP}/archive-articles.ftl | 0 {9IPHP => skins/9IPHP}/archives.ftl | 0 {9IPHP => skins/9IPHP}/article-list.ftl | 0 {9IPHP => skins/9IPHP}/article.ftl | 0 {9IPHP => skins/9IPHP}/category-articles.ftl | 0 {9IPHP => skins/9IPHP}/common-comment.ftl | 0 {9IPHP => skins/9IPHP}/css/base.css | 0 {9IPHP => skins/9IPHP}/css/base.min.css | 0 {9IPHP => skins/9IPHP}/css/fonts/icomoon.eot | Bin {9IPHP => skins/9IPHP}/css/fonts/icomoon.svg | 0 {9IPHP => skins/9IPHP}/css/fonts/icomoon.ttf | Bin {9IPHP => skins/9IPHP}/css/fonts/icomoon.woff | Bin {9IPHP => skins/9IPHP}/css/selection.json | 0 {9IPHP => skins/9IPHP}/dynamic.ftl | 0 {9IPHP => skins/9IPHP}/footer.ftl | 0 {9IPHP => skins/9IPHP}/header.ftl | 0 {9IPHP => skins/9IPHP}/images/code-bg.png | Bin {9IPHP => skins/9IPHP}/index.ftl | 0 {9IPHP => skins/9IPHP}/js/common.js | 0 {9IPHP => skins/9IPHP}/js/common.min.js | 0 {9IPHP => skins/9IPHP}/js/isotope.pkgd.js | 0 {9IPHP => skins/9IPHP}/js/isotope.pkgd.min.js | 0 .../9IPHP}/lang/lang_en_US.properties | 0 .../9IPHP}/lang/lang_zh_CN.properties | 0 {9IPHP => skins/9IPHP}/links.ftl | 0 {9IPHP => skins/9IPHP}/macro-comments.ftl | 0 {9IPHP => skins/9IPHP}/macro-head.ftl | 0 {9IPHP => skins/9IPHP}/page.ftl | 0 {9IPHP => skins/9IPHP}/preview.png | Bin {9IPHP => skins/9IPHP}/side.ftl | 0 {9IPHP => skins/9IPHP}/skin.properties | 0 {9IPHP => skins/9IPHP}/tag-articles.ftl | 0 {9IPHP => skins/9IPHP}/tags.ftl | 0 {Andrea => skins/Andrea}/archive-articles.ftl | 0 {Andrea => skins/Andrea}/article-list.ftl | 0 {Andrea => skins/Andrea}/article.ftl | 0 {Andrea => skins/Andrea}/author-articles.ftl | 0 .../Andrea}/category-articles.ftl | 0 {Andrea => skins/Andrea}/common-comment.ftl | 0 {Andrea => skins/Andrea}/css/Andrea.css | 0 {Andrea => skins/Andrea}/css/Andrea.min.css | 0 {Andrea => skins/Andrea}/footer.ftl | 0 {Andrea => skins/Andrea}/header.ftl | 0 {Andrea => skins/Andrea}/images/bg-blue.jpg | Bin {Andrea => skins/Andrea}/images/bg-brown.jpg | Bin {Andrea => skins/Andrea}/images/bg-grey.jpg | Bin .../Andrea}/images/bg-transparent.png | Bin {Andrea => skins/Andrea}/images/bgs.png | Bin {Andrea => skins/Andrea}/images/footer.png | Bin {Andrea => skins/Andrea}/images/icon.png | Bin {Andrea => skins/Andrea}/images/paint.png | Bin {Andrea => skins/Andrea}/index.ftl | 0 .../Andrea}/lang/lang_en_US.properties | 0 .../Andrea}/lang/lang_zh_CN.properties | 0 {Andrea => skins/Andrea}/macro-comments.ftl | 0 {Andrea => skins/Andrea}/macro-head.ftl | 0 {Andrea => skins/Andrea}/page.ftl | 0 {Andrea => skins/Andrea}/preview.png | Bin {Andrea => skins/Andrea}/side-tool.ftl | 0 {Andrea => skins/Andrea}/side.ftl | 0 {Andrea => skins/Andrea}/skin.properties | 0 {Andrea => skins/Andrea}/tag-articles.ftl | 0 {Andrea => skins/Andrea}/tags.ftl | 0 {Bruce => skins/Bruce}/archive-articles.ftl | 0 {Bruce => skins/Bruce}/archives.ftl | 0 {Bruce => skins/Bruce}/article-list.ftl | 0 {Bruce => skins/Bruce}/article.ftl | 0 {Bruce => skins/Bruce}/category-articles.ftl | 0 {Bruce => skins/Bruce}/common-comment.ftl | 0 {Bruce => skins/Bruce}/css/Bruce.css | 0 {Bruce => skins/Bruce}/css/Bruce.min.css | 0 .../Bruce}/css/bootstrap-theme.css | 0 .../Bruce}/css/bootstrap-theme.css.map | 0 .../Bruce}/css/bootstrap-theme.min.css | 0 {Bruce => skins/Bruce}/css/bootstrap.css | 0 {Bruce => skins/Bruce}/css/bootstrap.css.map | 0 {Bruce => skins/Bruce}/css/bootstrap.min.css | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin {Bruce => skins/Bruce}/footer.ftl | 0 {Bruce => skins/Bruce}/header.ftl | 0 {Bruce => skins/Bruce}/index.ftl | 0 {Bruce => skins/Bruce}/js/bootstrap.js | 0 {Bruce => skins/Bruce}/js/bootstrap.min.js | 0 .../Bruce}/lang/lang_en_US.properties | 0 .../Bruce}/lang/lang_zh_CN.properties | 0 {Bruce => skins/Bruce}/links.ftl | 0 {Bruce => skins/Bruce}/macro-comments.ftl | 0 {Bruce => skins/Bruce}/macro-head.ftl | 0 {Bruce => skins/Bruce}/page.ftl | 0 {Bruce => skins/Bruce}/preview.png | Bin {Bruce => skins/Bruce}/skin.properties | 0 {Bruce => skins/Bruce}/tag-articles.ftl | 0 {Bruce => skins/Bruce}/tags.ftl | 0 .../Community}/archive-articles.ftl | 0 .../Community}/article-list.ftl | 0 {Community => skins/Community}/article.ftl | 0 .../Community}/author-articles.ftl | 0 .../Community}/category-articles.ftl | 0 .../Community}/common-comment.ftl | 0 .../Community}/css/Community.css | 0 .../Community}/css/Community.min.css | 0 {Community => skins/Community}/footer.ftl | 0 {Community => skins/Community}/header.ftl | 0 .../Community}/images/author-header.png | Bin .../Community}/images/icon.png | Bin .../Community}/images/indentline-light.png | Bin .../Community}/images/indentline.png | Bin {Community => skins/Community}/index.ftl | 0 .../Community}/lang/lang_en_US.properties | 0 .../Community}/lang/lang_zh_CN.properties | 0 .../Community}/macro-comments.ftl | 0 {Community => skins/Community}/macro-head.ftl | 0 {Community => skins/Community}/page.ftl | 0 {Community => skins/Community}/preview.png | Bin {Community => skins/Community}/side.ftl | 0 .../Community}/skin.properties | 0 .../Community}/tag-articles.ftl | 0 {Community => skins/Community}/tags.ftl | 0 .../Finding}/archive-articles.ftl | 0 {Finding => skins/Finding}/archives.ftl | 0 {Finding => skins/Finding}/article-list.ftl | 0 {Finding => skins/Finding}/article.ftl | 0 .../Finding}/author-articles.ftl | 0 .../Finding}/category-articles.ftl | 0 {Finding => skins/Finding}/category.ftl | 0 {Finding => skins/Finding}/common-comment.ftl | 0 {Finding => skins/Finding}/css/Finding.css | 0 .../Finding}/css/Finding.min.css | 0 .../Finding}/css/fonts/icomoon.eot | Bin .../Finding}/css/fonts/icomoon.svg | 0 .../Finding}/css/fonts/icomoon.ttf | Bin .../Finding}/css/fonts/icomoon.woff | Bin .../Finding}/css/fonts/selection.json | 0 {Finding => skins/Finding}/dynamic.ftl | 0 {Finding => skins/Finding}/footer.ftl | 0 {Finding => skins/Finding}/header.ftl | 0 .../Finding}/images/header-bg.jpg | Bin {Finding => skins/Finding}/images/next.jpg | Bin {Finding => skins/Finding}/images/preview.jpg | Bin {Finding => skins/Finding}/index.ftl | 0 {Finding => skins/Finding}/js/Finding.js | 0 {Finding => skins/Finding}/js/Finding.min.js | 0 .../Finding}/lang/lang_en_US.properties | 0 .../Finding}/lang/lang_zh_CN.properties | 0 {Finding => skins/Finding}/links.ftl | 0 {Finding => skins/Finding}/macro-comments.ftl | 0 {Finding => skins/Finding}/macro-head.ftl | 0 {Finding => skins/Finding}/page.ftl | 0 {Finding => skins/Finding}/preview.png | Bin {Finding => skins/Finding}/side.ftl | 0 {Finding => skins/Finding}/skin.properties | 0 {Finding => skins/Finding}/tag-articles.ftl | 0 {Finding => skins/Finding}/tags.ftl | 0 .../NeoEase}/archive-articles.ftl | 0 {NeoEase => skins/NeoEase}/article-list.ftl | 0 {NeoEase => skins/NeoEase}/article.ftl | 0 .../NeoEase}/author-articles.ftl | 0 .../NeoEase}/category-articles.ftl | 0 {NeoEase => skins/NeoEase}/common-comment.ftl | 0 {NeoEase => skins/NeoEase}/css/NeoEase.css | 0 .../NeoEase}/css/NeoEase.min.css | 0 {NeoEase => skins/NeoEase}/footer.ftl | 0 {NeoEase => skins/NeoEase}/header.ftl | 0 {NeoEase => skins/NeoEase}/images/404.png | Bin .../NeoEase}/images/ajax-loader.gif | Bin {NeoEase => skins/NeoEase}/images/icons.png | Bin {NeoEase => skins/NeoEase}/index.ftl | 0 {NeoEase => skins/NeoEase}/js/NeoEase.js | 0 {NeoEase => skins/NeoEase}/js/NeoEase.min.js | 0 .../NeoEase}/lang/lang_en_US.properties | 0 .../NeoEase}/lang/lang_zh_CN.properties | 0 {NeoEase => skins/NeoEase}/macro-comments.ftl | 0 {NeoEase => skins/NeoEase}/macro-head.ftl | 0 {NeoEase => skins/NeoEase}/page.ftl | 0 {NeoEase => skins/NeoEase}/preview.png | Bin {NeoEase => skins/NeoEase}/side.ftl | 0 {NeoEase => skins/NeoEase}/skin.properties | 0 {NeoEase => skins/NeoEase}/tag-articles.ftl | 0 {NeoEase => skins/NeoEase}/tags.ftl | 0 .../classic}/archive-articles.ftl | 78 +- {classic => skins/classic}/article-list.ftl | 172 +- {classic => skins/classic}/article.ftl | 384 ++--- .../classic}/author-articles.ftl | 70 +- .../classic}/category-articles.ftl | 0 {classic => skins/classic}/common-comment.ftl | 0 {classic => skins/classic}/css/classic.css | 830 ++++----- .../classic}/css/classic.min.css | 0 {classic => skins/classic}/footer.ftl | 158 +- {classic => skins/classic}/header.ftl | 78 +- {classic => skins/classic}/index.ftl | 68 +- .../classic}/lang/lang_en_US.properties | 520 +++--- .../classic}/lang/lang_zh_CN.properties | 532 +++--- {classic => skins/classic}/macro-comments.ftl | 250 +-- {classic => skins/classic}/macro-head.ftl | 0 {classic => skins/classic}/page.ftl | 78 +- {classic => skins/classic}/preview.png | Bin {classic => skins/classic}/side.ftl | 314 ++-- {classic => skins/classic}/skin.properties | 0 {classic => skins/classic}/tag-articles.ftl | 74 +- {classic => skins/classic}/tags.ftl | 90 +- {ease => skins/ease}/archive-articles.ftl | 54 +- {ease => skins/ease}/archives.ftl | 72 +- {ease => skins/ease}/article-list.ftl | 112 +- {ease => skins/ease}/article.ftl | 224 +-- {ease => skins/ease}/author-articles.ftl | 42 +- {ease => skins/ease}/category-articles.ftl | 0 {ease => skins/ease}/common-comment.ftl | 0 {ease => skins/ease}/css/ease.css | 1502 ++++++++--------- {ease => skins/ease}/css/ease.min.css | 0 {ease => skins/ease}/dynamic.ftl | 250 +-- {ease => skins/ease}/footer.ftl | 140 +- {ease => skins/ease}/header.ftl | 102 +- {ease => skins/ease}/images/ajax-loader.gif | Bin {ease => skins/ease}/images/icons.png | Bin {ease => skins/ease}/index.ftl | 48 +- {ease => skins/ease}/js/ease.js | 586 +++---- {ease => skins/ease}/js/ease.min.js | 0 .../ease}/lang/lang_en_US.properties | 150 +- .../ease}/lang/lang_zh_CN.properties | 152 +- {ease => skins/ease}/links.ftl | 64 +- {ease => skins/ease}/macro-comments.ftl | 228 +-- {ease => skins/ease}/macro-head.ftl | 0 {ease => skins/ease}/page.ftl | 50 +- {ease => skins/ease}/preview.png | Bin {ease => skins/ease}/skin.properties | 0 {ease => skins/ease}/tag-articles.ftl | 54 +- {ease => skins/ease}/tags.ftl | 68 +- .../favourite}/archive-articles.ftl | 0 .../favourite}/article-list.ftl | 0 {favourite => skins/favourite}/article.ftl | 0 .../favourite}/author-articles.ftl | 0 .../favourite}/category-articles.ftl | 0 .../favourite}/common-comment.ftl | 0 .../favourite}/css/favourite.css | 1318 +++++++-------- .../favourite}/css/favourite.min.css | 0 {favourite => skins/favourite}/footer.ftl | 90 +- {favourite => skins/favourite}/header.ftl | 0 .../favourite}/images/Guestbook.png | Bin .../favourite}/images/about.png | Bin {favourite => skins/favourite}/images/ads.png | Bin .../favourite}/images/anelli.png | Bin .../favourite}/images/antefatto.png | Bin .../favourite}/images/archivio.png | Bin {favourite => skins/favourite}/images/bg.jpg | Bin .../favourite}/images/blog.png | Bin {favourite => skins/favourite}/images/box.gif | Bin .../favourite}/images/categorie.png | Bin .../favourite}/images/category.jpg | Bin .../favourite}/images/classifiche.png | Bin .../favourite}/images/comment.gif | Bin .../favourite}/images/comment.jpg | Bin .../favourite}/images/commentpoint.png | Bin .../favourite}/images/cont-bg.png | Bin .../favourite}/images/cont-bg_2.png | Bin .../favourite}/images/corner.png | Bin .../favourite}/images/cuore.png | Bin .../favourite}/images/default.png | Bin .../favourite}/images/esclamativo.png | Bin .../favourite}/images/footer-ico.png | Bin .../favourite}/images/header.jpg | Bin .../favourite}/images/home.png | Bin .../favourite}/images/icons.gif | Bin .../favourite}/images/info.png | Bin {favourite => skins/favourite}/images/pl.png | Bin .../favourite}/images/roundbottom.png | Bin .../favourite}/images/roundtop.png | Bin .../favourite}/images/tagsIcon.png | Bin .../favourite}/images/textfield.gif | Bin .../favourite}/images/thinks.png | Bin .../favourite}/images/top-bg.jpg | Bin .../favourite}/images/twitter.png | Bin {favourite => skins/favourite}/index.ftl | 0 .../favourite}/lang/lang_en_US.properties | 0 .../favourite}/lang/lang_zh_CN.properties | 0 .../favourite}/macro-comments.ftl | 224 +-- {favourite => skins/favourite}/macro-head.ftl | 0 {favourite => skins/favourite}/nav.ftl | 0 {favourite => skins/favourite}/page.ftl | 0 {favourite => skins/favourite}/preview.png | Bin {favourite => skins/favourite}/side.ftl | 0 .../favourite}/skin.properties | 0 {favourite => skins/favourite}/statistic.ftl | 0 .../favourite}/tag-articles.ftl | 0 {favourite => skins/favourite}/tags.ftl | 0 {i-nove => skins/i-nove}/archive-articles.ftl | 0 {i-nove => skins/i-nove}/article-list.ftl | 0 {i-nove => skins/i-nove}/article.ftl | 0 {i-nove => skins/i-nove}/author-articles.ftl | 0 .../i-nove}/category-articles.ftl | 0 {i-nove => skins/i-nove}/common-comment.ftl | 0 {i-nove => skins/i-nove}/css/i-nove.css | 0 {i-nove => skins/i-nove}/css/i-nove.min.css | 0 {i-nove => skins/i-nove}/footer.ftl | 116 +- {i-nove => skins/i-nove}/header.ftl | 0 {i-nove => skins/i-nove}/images/bg.jpg | Bin {i-nove => skins/i-nove}/images/box.gif | Bin {i-nove => skins/i-nove}/images/comment.gif | Bin .../i-nove}/images/commentpoint.png | Bin {i-nove => skins/i-nove}/images/footer.jpg | Bin {i-nove => skins/i-nove}/images/header.jpg | Bin {i-nove => skins/i-nove}/images/icons.gif | Bin {i-nove => skins/i-nove}/images/light.gif | Bin .../i-nove}/images/main_shadow.gif | Bin {i-nove => skins/i-nove}/images/menu.gif | Bin .../i-nove}/images/sidebar_shadow.gif | Bin {i-nove => skins/i-nove}/images/sidesep.gif | Bin {i-nove => skins/i-nove}/images/textfield.gif | Bin {i-nove => skins/i-nove}/images/widgetsep.png | Bin {i-nove => skins/i-nove}/index.ftl | 0 .../i-nove}/lang/lang_en_US.properties | 0 .../i-nove}/lang/lang_zh_CN.properties | 0 {i-nove => skins/i-nove}/macro-comments.ftl | 228 +-- {i-nove => skins/i-nove}/macro-head.ftl | 0 {i-nove => skins/i-nove}/page.ftl | 0 {i-nove => skins/i-nove}/preview.png | Bin {i-nove => skins/i-nove}/side.ftl | 0 {i-nove => skins/i-nove}/skin.properties | 0 {i-nove => skins/i-nove}/tag-articles.ftl | 0 {i-nove => skins/i-nove}/tags.ftl | 0 .../metro-hot}/archive-articles.ftl | 0 {metro-hot => skins/metro-hot}/archives.ftl | 0 .../metro-hot}/article-list.ftl | 0 {metro-hot => skins/metro-hot}/article.ftl | 0 .../metro-hot}/author-articles.ftl | 0 .../metro-hot}/category-articles.ftl | 0 {metro-hot => skins/metro-hot}/category.ftl | 0 .../metro-hot}/common-comment.ftl | 0 {metro-hot => skins/metro-hot}/copyright.ftl | 0 .../metro-hot}/css/font/IcoMoon.eot | Bin .../metro-hot}/css/font/IcoMoon.svg | 0 .../metro-hot}/css/font/IcoMoon.ttf | Bin .../metro-hot}/css/font/IcoMoon.woff | Bin .../metro-hot}/css/metro-hot-responsive.css | 0 .../css/metro-hot-responsive.min.css | 0 .../metro-hot}/css/metro-hot.css | 0 .../metro-hot}/css/metro-hot.min.css | 0 {metro-hot => skins/metro-hot}/dynamic.ftl | 0 {metro-hot => skins/metro-hot}/footer.ftl | 0 {metro-hot => skins/metro-hot}/header.ftl | 0 .../metro-hot}/images/ajax-loader.gif | Bin .../metro-hot}/images/icons.png | Bin {metro-hot => skins/metro-hot}/index.ftl | 0 .../metro-hot}/js/metro-hot.js | 0 .../metro-hot}/js/metro-hot.min.js | 0 .../metro-hot}/lang/lang_en_US.properties | 0 .../metro-hot}/lang/lang_zh_CN.properties | 0 {metro-hot => skins/metro-hot}/links.ftl | 0 .../metro-hot}/macro-comments.ftl | 0 {metro-hot => skins/metro-hot}/macro-head.ftl | 0 {metro-hot => skins/metro-hot}/macro-side.ftl | 0 {metro-hot => skins/metro-hot}/page.ftl | 0 {metro-hot => skins/metro-hot}/preview.png | Bin .../metro-hot}/skin.properties | 0 .../metro-hot}/tag-articles.ftl | 0 {metro-hot => skins/metro-hot}/tags.ftl | 0 {mobile => skins/mobile}/archive-articles.ftl | 0 {mobile => skins/mobile}/article-list.ftl | 0 {mobile => skins/mobile}/article.ftl | 0 {mobile => skins/mobile}/author-articles.ftl | 0 .../mobile}/category-articles.ftl | 0 {mobile => skins/mobile}/common-comment.ftl | 0 {mobile => skins/mobile}/footer.ftl | 0 {mobile => skins/mobile}/header.ftl | 0 {mobile => skins/mobile}/images/good.png | Bin .../mobile}/images/icon-pool/Apps.png | Bin .../mobile}/images/icon-pool/Archives.png | Bin .../mobile}/images/icon-pool/Home.png | Bin .../mobile}/images/icon-pool/Mail.png | Bin .../mobile}/images/icon-pool/Pages.png | Bin .../mobile}/images/icon-pool/RSS.png | Bin .../mobile}/images/icon-pool/Tags.png | Bin .../mobile}/images/icon-pool/category.png | Bin {mobile => skins/mobile}/index.ftl | 0 {mobile => skins/mobile}/js/l10n.js | 0 {mobile => skins/mobile}/js/l10n.min.js | 0 .../mobile}/lang/lang_en_US.properties | 0 .../mobile}/lang/lang_zh_CN.properties | 0 {mobile => skins/mobile}/macro-comments.ftl | 0 {mobile => skins/mobile}/macro-head.ftl | 0 {mobile => skins/mobile}/page.ftl | 0 {mobile => skins/mobile}/preview.png | Bin {mobile => skins/mobile}/side.ftl | 0 {mobile => skins/mobile}/skin.properties | 0 {mobile => skins/mobile}/tag-articles.ftl | 0 {mobile => skins/mobile}/tags.ftl | 0 .../mobile}/themes/core/core-images/arrow.png | Bin .../core/core-images/bookmarks/delicious.jpg | Bin .../core/core-images/bookmarks/digg.jpg | Bin .../core/core-images/bookmarks/magnolia.jpg | Bin .../core/core-images/bookmarks/newsvine.jpg | Bin .../core/core-images/bookmarks/reddit.jpg | Bin .../core/core-images/bookmarks/technorati.jpg | Bin .../themes/core/core-images/com_arrow.png | Bin .../core/core-images/comment-ajax-loader.gif | Bin .../themes/core/core-images/head-close.png | Bin .../themes/core/core-images/head-fade-bk.png | Bin .../themes/core/core-images/menu-sprite.png | Bin .../mobile}/themes/core/core-images/onoff.jpg | Bin .../core/core-images/pinstripes-classic.gif | Bin .../themes/core/core-images/post-arrow.png | Bin .../themes/core/core-images/post-options.png | Bin .../themes/core/core-images/push-icon.png | Bin .../core/core-images/wptouch-menu-dropper.png | Bin {mobile => skins/mobile}/themes/core/core.js | 0 .../mobile}/themes/default/style.css | 0 {next => skins/next}/archive-articles.ftl | 0 {next => skins/next}/archives.ftl | 0 {next => skins/next}/article-list.ftl | 0 {next => skins/next}/article.ftl | 0 {next => skins/next}/category-articles.ftl | 0 {next => skins/next}/common-comment.ftl | 0 {next => skins/next}/css/fonts/icomoon.eot | Bin {next => skins/next}/css/fonts/icomoon.svg | 0 {next => skins/next}/css/fonts/icomoon.ttf | Bin {next => skins/next}/css/fonts/icomoon.woff | Bin {next => skins/next}/css/fonts/selection.json | 0 {next => skins/next}/css/next.css | 0 {next => skins/next}/css/next.min.css | 0 {next => skins/next}/dynamic.ftl | 0 {next => skins/next}/footer.ftl | 0 {next => skins/next}/header.ftl | 0 {next => skins/next}/images/code-bg.png | Bin {next => skins/next}/index.ftl | 0 {next => skins/next}/js/next.js | 0 {next => skins/next}/js/next.min.js | 0 .../next}/lang/lang_en_US.properties | 0 .../next}/lang/lang_zh_CN.properties | 0 {next => skins/next}/macro-comments.ftl | 0 {next => skins/next}/macro-head.ftl | 0 {next => skins/next}/page.ftl | 0 {next => skins/next}/preview.png | Bin {next => skins/next}/side.ftl | 0 {next => skins/next}/skin.properties | 0 {next => skins/next}/tag-articles.ftl | 0 {next => skins/next}/tags.ftl | 0 .../owmx-3.0}/archive-articles.ftl | 0 {owmx-3.0 => skins/owmx-3.0}/article-list.ftl | 0 {owmx-3.0 => skins/owmx-3.0}/article.ftl | 0 .../owmx-3.0}/author-articles.ftl | 0 .../owmx-3.0}/category-articles.ftl | 0 .../owmx-3.0}/common-comment.ftl | 0 {owmx-3.0 => skins/owmx-3.0}/css/owmx-3.0.css | 1142 ++++++------- .../owmx-3.0}/css/owmx-3.0.min.css | 0 {owmx-3.0 => skins/owmx-3.0}/footer.ftl | 82 +- {owmx-3.0 => skins/owmx-3.0}/header.ftl | 0 {owmx-3.0 => skins/owmx-3.0}/images/ai1.png | Bin {owmx-3.0 => skins/owmx-3.0}/images/ai2.png | Bin {owmx-3.0 => skins/owmx-3.0}/images/ai3.png | Bin {owmx-3.0 => skins/owmx-3.0}/images/ai4.png | Bin {owmx-3.0 => skins/owmx-3.0}/images/ai5.png | Bin {owmx-3.0 => skins/owmx-3.0}/images/ai6.png | Bin {owmx-3.0 => skins/owmx-3.0}/images/ai7.png | Bin {owmx-3.0 => skins/owmx-3.0}/images/ai8.png | Bin .../owmx-3.0}/images/comment.gif | Bin .../owmx-3.0}/images/commentpoint.png | Bin {owmx-3.0 => skins/owmx-3.0}/images/hd.jpg | Bin {owmx-3.0 => skins/owmx-3.0}/images/icons.gif | Bin .../owmx-3.0}/images/textfield.gif | Bin {owmx-3.0 => skins/owmx-3.0}/index.ftl | 0 .../owmx-3.0}/lang/lang_en_US.properties | 0 .../owmx-3.0}/lang/lang_zh_CN.properties | 0 .../owmx-3.0}/macro-comments.ftl | 226 +-- {owmx-3.0 => skins/owmx-3.0}/macro-head.ftl | 0 {owmx-3.0 => skins/owmx-3.0}/page.ftl | 0 {owmx-3.0 => skins/owmx-3.0}/preview.png | Bin {owmx-3.0 => skins/owmx-3.0}/side.ftl | 0 {owmx-3.0 => skins/owmx-3.0}/skin.properties | 0 {owmx-3.0 => skins/owmx-3.0}/tag-articles.ftl | 0 {owmx-3.0 => skins/owmx-3.0}/tags.ftl | 0 {timeline => skins/timeline}/article-list.ftl | 116 +- {timeline => skins/timeline}/article.ftl | 0 .../timeline}/author-articles.ftl | 42 +- .../timeline}/category-articles.ftl | 0 .../timeline}/common-comment.ftl | 0 {timeline => skins/timeline}/css/timeline.css | 0 .../timeline}/css/timeline.min.css | 0 {timeline => skins/timeline}/dynamic.ftl | 274 +-- {timeline => skins/timeline}/footer.ftl | 0 {timeline => skins/timeline}/header.ftl | 0 .../timeline}/images/ajax-loader.gif | Bin {timeline => skins/timeline}/images/bg.png | Bin {timeline => skins/timeline}/images/icons.png | Bin .../timeline}/images/nav-bg.png | Bin {timeline => skins/timeline}/index.ftl | 210 +-- {timeline => skins/timeline}/js/timeline.js | 906 +++++----- .../timeline}/js/timeline.min.js | 0 .../timeline}/lang/lang_en_US.properties | 154 +- .../timeline}/lang/lang_zh_CN.properties | 156 +- .../timeline}/macro-comments.ftl | 220 +-- {timeline => skins/timeline}/macro-head.ftl | 0 {timeline => skins/timeline}/page.ftl | 54 +- {timeline => skins/timeline}/preview.png | Bin {timeline => skins/timeline}/skin.properties | 0 {timeline => skins/timeline}/tag-articles.ftl | 44 +- {timeline => skins/timeline}/tags.ftl | 96 +- .../tree-house}/archive-articles.ftl | 0 .../tree-house}/article-list.ftl | 0 {tree-house => skins/tree-house}/article.ftl | 0 .../tree-house}/author-articles.ftl | 0 .../tree-house}/category-articles.ftl | 0 .../tree-house}/common-comment.ftl | 0 .../tree-house}/css/tree-house.css | 0 .../tree-house}/css/tree-house.min.css | 0 {tree-house => skins/tree-house}/footer.ftl | 80 +- {tree-house => skins/tree-house}/header.ftl | 0 .../tree-house}/images/balloons.png | Bin .../tree-house}/images/bg-branch-small.png | Bin .../tree-house}/images/bg-branch.png | Bin .../tree-house}/images/bg-comments-body.png | Bin .../tree-house}/images/bg-comments-bottom.png | Bin .../tree-house}/images/bg-comments-top.png | Bin .../tree-house}/images/bg-comments.png | Bin .../tree-house}/images/bg-footer2.jpg | Bin .../tree-house}/images/bg-header.jpg | Bin .../images/bg-heading-about-us.png | Bin .../images/bg-heading-categories.png | Bin .../images/bg-heading-portfolio.png | Bin .../images/bg-heading-resources.png | Bin .../tree-house}/images/bg-heading.png | Bin .../images/bg-menu-active-tags.png | Bin .../tree-house}/images/bg-menu-active.png | Bin .../tree-house}/images/bg-tree.jpg | Bin {tree-house => skins/tree-house}/index.ftl | 0 .../tree-house}/lang/lang_en_US.properties | 0 .../tree-house}/lang/lang_zh_CN.properties | 0 .../tree-house}/macro-comments.ftl | 252 +-- .../tree-house}/macro-head.ftl | 0 {tree-house => skins/tree-house}/page.ftl | 0 {tree-house => skins/tree-house}/preview.png | Bin {tree-house => skins/tree-house}/side.ftl | 0 .../tree-house}/skin.properties | 0 .../tree-house}/tag-articles.ftl | 0 {tree-house => skins/tree-house}/tags.ftl | 0 {yilia => skins/yilia}/archive-articles.ftl | 0 {yilia => skins/yilia}/archives.ftl | 0 {yilia => skins/yilia}/article-list.ftl | 0 {yilia => skins/yilia}/article.ftl | 0 {yilia => skins/yilia}/author-articles.ftl | 0 {yilia => skins/yilia}/category-articles.ftl | 0 {yilia => skins/yilia}/common-comment.ftl | 0 {yilia => skins/yilia}/css/fonts/icomoon.eot | Bin {yilia => skins/yilia}/css/fonts/icomoon.svg | 0 {yilia => skins/yilia}/css/fonts/icomoon.ttf | Bin {yilia => skins/yilia}/css/fonts/icomoon.woff | Bin .../yilia}/css/fonts/selection.json | 0 {yilia => skins/yilia}/css/yilia.css | 0 {yilia => skins/yilia}/css/yilia.min.css | 0 {yilia => skins/yilia}/dynamic.ftl | 0 {yilia => skins/yilia}/footer.ftl | 0 {yilia => skins/yilia}/index.ftl | 0 {yilia => skins/yilia}/js/yilia.js | 0 {yilia => skins/yilia}/js/yilia.min.js | 0 .../yilia}/lang/lang_en_US.properties | 0 .../yilia}/lang/lang_zh_CN.properties | 0 {yilia => skins/yilia}/links.ftl | 0 {yilia => skins/yilia}/macro-comments.ftl | 0 {yilia => skins/yilia}/macro-head.ftl | 0 {yilia => skins/yilia}/page.ftl | 0 {yilia => skins/yilia}/preview.png | Bin {yilia => skins/yilia}/side.ftl | 0 {yilia => skins/yilia}/skin.properties | 0 {yilia => skins/yilia}/tag-articles.ftl | 0 {yilia => skins/yilia}/tags.ftl | 0 566 files changed, 6812 insertions(+), 6812 deletions(-) rename {9IPHP => skins/9IPHP}/archive-articles.ftl (100%) rename {9IPHP => skins/9IPHP}/archives.ftl (100%) rename {9IPHP => skins/9IPHP}/article-list.ftl (100%) rename {9IPHP => skins/9IPHP}/article.ftl (100%) rename {9IPHP => skins/9IPHP}/category-articles.ftl (100%) rename {9IPHP => skins/9IPHP}/common-comment.ftl (100%) rename {9IPHP => skins/9IPHP}/css/base.css (100%) rename {9IPHP => skins/9IPHP}/css/base.min.css (100%) rename {9IPHP => skins/9IPHP}/css/fonts/icomoon.eot (100%) rename {9IPHP => skins/9IPHP}/css/fonts/icomoon.svg (100%) rename {9IPHP => skins/9IPHP}/css/fonts/icomoon.ttf (100%) rename {9IPHP => skins/9IPHP}/css/fonts/icomoon.woff (100%) rename {9IPHP => skins/9IPHP}/css/selection.json (100%) rename {9IPHP => skins/9IPHP}/dynamic.ftl (100%) rename {9IPHP => skins/9IPHP}/footer.ftl (100%) rename {9IPHP => skins/9IPHP}/header.ftl (100%) rename {9IPHP => skins/9IPHP}/images/code-bg.png (100%) rename {9IPHP => skins/9IPHP}/index.ftl (100%) rename {9IPHP => skins/9IPHP}/js/common.js (100%) rename {9IPHP => skins/9IPHP}/js/common.min.js (100%) rename {9IPHP => skins/9IPHP}/js/isotope.pkgd.js (100%) rename {9IPHP => skins/9IPHP}/js/isotope.pkgd.min.js (100%) rename {9IPHP => skins/9IPHP}/lang/lang_en_US.properties (100%) rename {9IPHP => skins/9IPHP}/lang/lang_zh_CN.properties (100%) rename {9IPHP => skins/9IPHP}/links.ftl (100%) rename {9IPHP => skins/9IPHP}/macro-comments.ftl (100%) rename {9IPHP => skins/9IPHP}/macro-head.ftl (100%) rename {9IPHP => skins/9IPHP}/page.ftl (100%) rename {9IPHP => skins/9IPHP}/preview.png (100%) rename {9IPHP => skins/9IPHP}/side.ftl (100%) rename {9IPHP => skins/9IPHP}/skin.properties (100%) rename {9IPHP => skins/9IPHP}/tag-articles.ftl (100%) rename {9IPHP => skins/9IPHP}/tags.ftl (100%) rename {Andrea => skins/Andrea}/archive-articles.ftl (100%) rename {Andrea => skins/Andrea}/article-list.ftl (100%) rename {Andrea => skins/Andrea}/article.ftl (100%) rename {Andrea => skins/Andrea}/author-articles.ftl (100%) rename {Andrea => skins/Andrea}/category-articles.ftl (100%) rename {Andrea => skins/Andrea}/common-comment.ftl (100%) rename {Andrea => skins/Andrea}/css/Andrea.css (100%) rename {Andrea => skins/Andrea}/css/Andrea.min.css (100%) rename {Andrea => skins/Andrea}/footer.ftl (100%) rename {Andrea => skins/Andrea}/header.ftl (100%) rename {Andrea => skins/Andrea}/images/bg-blue.jpg (100%) rename {Andrea => skins/Andrea}/images/bg-brown.jpg (100%) rename {Andrea => skins/Andrea}/images/bg-grey.jpg (100%) rename {Andrea => skins/Andrea}/images/bg-transparent.png (100%) rename {Andrea => skins/Andrea}/images/bgs.png (100%) rename {Andrea => skins/Andrea}/images/footer.png (100%) rename {Andrea => skins/Andrea}/images/icon.png (100%) rename {Andrea => skins/Andrea}/images/paint.png (100%) rename {Andrea => skins/Andrea}/index.ftl (100%) rename {Andrea => skins/Andrea}/lang/lang_en_US.properties (100%) rename {Andrea => skins/Andrea}/lang/lang_zh_CN.properties (100%) rename {Andrea => skins/Andrea}/macro-comments.ftl (100%) rename {Andrea => skins/Andrea}/macro-head.ftl (100%) rename {Andrea => skins/Andrea}/page.ftl (100%) rename {Andrea => skins/Andrea}/preview.png (100%) rename {Andrea => skins/Andrea}/side-tool.ftl (100%) rename {Andrea => skins/Andrea}/side.ftl (100%) rename {Andrea => skins/Andrea}/skin.properties (100%) rename {Andrea => skins/Andrea}/tag-articles.ftl (100%) rename {Andrea => skins/Andrea}/tags.ftl (100%) rename {Bruce => skins/Bruce}/archive-articles.ftl (100%) rename {Bruce => skins/Bruce}/archives.ftl (100%) rename {Bruce => skins/Bruce}/article-list.ftl (100%) rename {Bruce => skins/Bruce}/article.ftl (100%) rename {Bruce => skins/Bruce}/category-articles.ftl (100%) rename {Bruce => skins/Bruce}/common-comment.ftl (100%) rename {Bruce => skins/Bruce}/css/Bruce.css (100%) rename {Bruce => skins/Bruce}/css/Bruce.min.css (100%) rename {Bruce => skins/Bruce}/css/bootstrap-theme.css (100%) rename {Bruce => skins/Bruce}/css/bootstrap-theme.css.map (100%) rename {Bruce => skins/Bruce}/css/bootstrap-theme.min.css (100%) rename {Bruce => skins/Bruce}/css/bootstrap.css (100%) rename {Bruce => skins/Bruce}/css/bootstrap.css.map (100%) rename {Bruce => skins/Bruce}/css/bootstrap.min.css (100%) rename {Bruce => skins/Bruce}/fonts/glyphicons-halflings-regular.eot (100%) rename {Bruce => skins/Bruce}/fonts/glyphicons-halflings-regular.svg (100%) rename {Bruce => skins/Bruce}/fonts/glyphicons-halflings-regular.ttf (100%) rename {Bruce => skins/Bruce}/fonts/glyphicons-halflings-regular.woff (100%) rename {Bruce => skins/Bruce}/footer.ftl (100%) rename {Bruce => skins/Bruce}/header.ftl (100%) rename {Bruce => skins/Bruce}/index.ftl (100%) rename {Bruce => skins/Bruce}/js/bootstrap.js (100%) rename {Bruce => skins/Bruce}/js/bootstrap.min.js (100%) rename {Bruce => skins/Bruce}/lang/lang_en_US.properties (100%) rename {Bruce => skins/Bruce}/lang/lang_zh_CN.properties (100%) rename {Bruce => skins/Bruce}/links.ftl (100%) rename {Bruce => skins/Bruce}/macro-comments.ftl (100%) rename {Bruce => skins/Bruce}/macro-head.ftl (100%) rename {Bruce => skins/Bruce}/page.ftl (100%) rename {Bruce => skins/Bruce}/preview.png (100%) rename {Bruce => skins/Bruce}/skin.properties (100%) rename {Bruce => skins/Bruce}/tag-articles.ftl (100%) rename {Bruce => skins/Bruce}/tags.ftl (100%) rename {Community => skins/Community}/archive-articles.ftl (100%) rename {Community => skins/Community}/article-list.ftl (100%) rename {Community => skins/Community}/article.ftl (100%) rename {Community => skins/Community}/author-articles.ftl (100%) rename {Community => skins/Community}/category-articles.ftl (100%) rename {Community => skins/Community}/common-comment.ftl (100%) rename {Community => skins/Community}/css/Community.css (100%) rename {Community => skins/Community}/css/Community.min.css (100%) rename {Community => skins/Community}/footer.ftl (100%) rename {Community => skins/Community}/header.ftl (100%) rename {Community => skins/Community}/images/author-header.png (100%) rename {Community => skins/Community}/images/icon.png (100%) rename {Community => skins/Community}/images/indentline-light.png (100%) rename {Community => skins/Community}/images/indentline.png (100%) rename {Community => skins/Community}/index.ftl (100%) rename {Community => skins/Community}/lang/lang_en_US.properties (100%) rename {Community => skins/Community}/lang/lang_zh_CN.properties (100%) rename {Community => skins/Community}/macro-comments.ftl (100%) rename {Community => skins/Community}/macro-head.ftl (100%) rename {Community => skins/Community}/page.ftl (100%) rename {Community => skins/Community}/preview.png (100%) rename {Community => skins/Community}/side.ftl (100%) rename {Community => skins/Community}/skin.properties (100%) rename {Community => skins/Community}/tag-articles.ftl (100%) rename {Community => skins/Community}/tags.ftl (100%) rename {Finding => skins/Finding}/archive-articles.ftl (100%) rename {Finding => skins/Finding}/archives.ftl (100%) rename {Finding => skins/Finding}/article-list.ftl (100%) rename {Finding => skins/Finding}/article.ftl (100%) rename {Finding => skins/Finding}/author-articles.ftl (100%) rename {Finding => skins/Finding}/category-articles.ftl (100%) rename {Finding => skins/Finding}/category.ftl (100%) rename {Finding => skins/Finding}/common-comment.ftl (100%) rename {Finding => skins/Finding}/css/Finding.css (100%) rename {Finding => skins/Finding}/css/Finding.min.css (100%) rename {Finding => skins/Finding}/css/fonts/icomoon.eot (100%) rename {Finding => skins/Finding}/css/fonts/icomoon.svg (100%) rename {Finding => skins/Finding}/css/fonts/icomoon.ttf (100%) rename {Finding => skins/Finding}/css/fonts/icomoon.woff (100%) rename {Finding => skins/Finding}/css/fonts/selection.json (100%) rename {Finding => skins/Finding}/dynamic.ftl (100%) rename {Finding => skins/Finding}/footer.ftl (100%) rename {Finding => skins/Finding}/header.ftl (100%) rename {Finding => skins/Finding}/images/header-bg.jpg (100%) rename {Finding => skins/Finding}/images/next.jpg (100%) rename {Finding => skins/Finding}/images/preview.jpg (100%) rename {Finding => skins/Finding}/index.ftl (100%) rename {Finding => skins/Finding}/js/Finding.js (100%) rename {Finding => skins/Finding}/js/Finding.min.js (100%) rename {Finding => skins/Finding}/lang/lang_en_US.properties (100%) rename {Finding => skins/Finding}/lang/lang_zh_CN.properties (100%) rename {Finding => skins/Finding}/links.ftl (100%) rename {Finding => skins/Finding}/macro-comments.ftl (100%) rename {Finding => skins/Finding}/macro-head.ftl (100%) rename {Finding => skins/Finding}/page.ftl (100%) rename {Finding => skins/Finding}/preview.png (100%) rename {Finding => skins/Finding}/side.ftl (100%) rename {Finding => skins/Finding}/skin.properties (100%) rename {Finding => skins/Finding}/tag-articles.ftl (100%) rename {Finding => skins/Finding}/tags.ftl (100%) rename {NeoEase => skins/NeoEase}/archive-articles.ftl (100%) rename {NeoEase => skins/NeoEase}/article-list.ftl (100%) rename {NeoEase => skins/NeoEase}/article.ftl (100%) rename {NeoEase => skins/NeoEase}/author-articles.ftl (100%) rename {NeoEase => skins/NeoEase}/category-articles.ftl (100%) rename {NeoEase => skins/NeoEase}/common-comment.ftl (100%) rename {NeoEase => skins/NeoEase}/css/NeoEase.css (100%) rename {NeoEase => skins/NeoEase}/css/NeoEase.min.css (100%) rename {NeoEase => skins/NeoEase}/footer.ftl (100%) rename {NeoEase => skins/NeoEase}/header.ftl (100%) rename {NeoEase => skins/NeoEase}/images/404.png (100%) rename {NeoEase => skins/NeoEase}/images/ajax-loader.gif (100%) rename {NeoEase => skins/NeoEase}/images/icons.png (100%) rename {NeoEase => skins/NeoEase}/index.ftl (100%) rename {NeoEase => skins/NeoEase}/js/NeoEase.js (100%) rename {NeoEase => skins/NeoEase}/js/NeoEase.min.js (100%) rename {NeoEase => skins/NeoEase}/lang/lang_en_US.properties (100%) rename {NeoEase => skins/NeoEase}/lang/lang_zh_CN.properties (100%) rename {NeoEase => skins/NeoEase}/macro-comments.ftl (100%) rename {NeoEase => skins/NeoEase}/macro-head.ftl (100%) rename {NeoEase => skins/NeoEase}/page.ftl (100%) rename {NeoEase => skins/NeoEase}/preview.png (100%) rename {NeoEase => skins/NeoEase}/side.ftl (100%) rename {NeoEase => skins/NeoEase}/skin.properties (100%) rename {NeoEase => skins/NeoEase}/tag-articles.ftl (100%) rename {NeoEase => skins/NeoEase}/tags.ftl (100%) rename {classic => skins/classic}/archive-articles.ftl (97%) rename {classic => skins/classic}/article-list.ftl (97%) rename {classic => skins/classic}/article.ftl (98%) rename {classic => skins/classic}/author-articles.ftl (97%) rename {classic => skins/classic}/category-articles.ftl (100%) rename {classic => skins/classic}/common-comment.ftl (100%) rename {classic => skins/classic}/css/classic.css (95%) rename {classic => skins/classic}/css/classic.min.css (100%) rename {classic => skins/classic}/footer.ftl (97%) rename {classic => skins/classic}/header.ftl (95%) rename {classic => skins/classic}/index.ftl (96%) rename {classic => skins/classic}/lang/lang_en_US.properties (97%) rename {classic => skins/classic}/lang/lang_zh_CN.properties (97%) rename {classic => skins/classic}/macro-comments.ftl (97%) rename {classic => skins/classic}/macro-head.ftl (100%) rename {classic => skins/classic}/page.ftl (97%) rename {classic => skins/classic}/preview.png (100%) rename {classic => skins/classic}/side.ftl (97%) rename {classic => skins/classic}/skin.properties (100%) rename {classic => skins/classic}/tag-articles.ftl (97%) rename {classic => skins/classic}/tags.ftl (97%) rename {ease => skins/ease}/archive-articles.ftl (97%) rename {ease => skins/ease}/archives.ftl (98%) rename {ease => skins/ease}/article-list.ftl (97%) rename {ease => skins/ease}/article.ftl (97%) rename {ease => skins/ease}/author-articles.ftl (97%) rename {ease => skins/ease}/category-articles.ftl (100%) rename {ease => skins/ease}/common-comment.ftl (100%) rename {ease => skins/ease}/css/ease.css (94%) rename {ease => skins/ease}/css/ease.min.css (100%) rename {ease => skins/ease}/dynamic.ftl (98%) rename {ease => skins/ease}/footer.ftl (97%) rename {ease => skins/ease}/header.ftl (97%) rename {ease => skins/ease}/images/ajax-loader.gif (100%) rename {ease => skins/ease}/images/icons.png (100%) rename {ease => skins/ease}/index.ftl (96%) rename {ease => skins/ease}/js/ease.js (97%) rename {ease => skins/ease}/js/ease.min.js (100%) rename {ease => skins/ease}/lang/lang_en_US.properties (96%) rename {ease => skins/ease}/lang/lang_zh_CN.properties (98%) rename {ease => skins/ease}/links.ftl (97%) rename {ease => skins/ease}/macro-comments.ftl (97%) rename {ease => skins/ease}/macro-head.ftl (100%) rename {ease => skins/ease}/page.ftl (96%) rename {ease => skins/ease}/preview.png (100%) rename {ease => skins/ease}/skin.properties (100%) rename {ease => skins/ease}/tag-articles.ftl (97%) rename {ease => skins/ease}/tags.ftl (97%) rename {favourite => skins/favourite}/archive-articles.ftl (100%) rename {favourite => skins/favourite}/article-list.ftl (100%) rename {favourite => skins/favourite}/article.ftl (100%) rename {favourite => skins/favourite}/author-articles.ftl (100%) rename {favourite => skins/favourite}/category-articles.ftl (100%) rename {favourite => skins/favourite}/common-comment.ftl (100%) rename {favourite => skins/favourite}/css/favourite.css (95%) rename {favourite => skins/favourite}/css/favourite.min.css (100%) rename {favourite => skins/favourite}/footer.ftl (97%) rename {favourite => skins/favourite}/header.ftl (100%) rename {favourite => skins/favourite}/images/Guestbook.png (100%) rename {favourite => skins/favourite}/images/about.png (100%) rename {favourite => skins/favourite}/images/ads.png (100%) rename {favourite => skins/favourite}/images/anelli.png (100%) rename {favourite => skins/favourite}/images/antefatto.png (100%) rename {favourite => skins/favourite}/images/archivio.png (100%) rename {favourite => skins/favourite}/images/bg.jpg (100%) rename {favourite => skins/favourite}/images/blog.png (100%) rename {favourite => skins/favourite}/images/box.gif (100%) rename {favourite => skins/favourite}/images/categorie.png (100%) rename {favourite => skins/favourite}/images/category.jpg (100%) rename {favourite => skins/favourite}/images/classifiche.png (100%) rename {favourite => skins/favourite}/images/comment.gif (100%) rename {favourite => skins/favourite}/images/comment.jpg (100%) rename {favourite => skins/favourite}/images/commentpoint.png (100%) rename {favourite => skins/favourite}/images/cont-bg.png (100%) rename {favourite => skins/favourite}/images/cont-bg_2.png (100%) rename {favourite => skins/favourite}/images/corner.png (100%) rename {favourite => skins/favourite}/images/cuore.png (100%) rename {favourite => skins/favourite}/images/default.png (100%) rename {favourite => skins/favourite}/images/esclamativo.png (100%) rename {favourite => skins/favourite}/images/footer-ico.png (100%) rename {favourite => skins/favourite}/images/header.jpg (100%) rename {favourite => skins/favourite}/images/home.png (100%) rename {favourite => skins/favourite}/images/icons.gif (100%) rename {favourite => skins/favourite}/images/info.png (100%) rename {favourite => skins/favourite}/images/pl.png (100%) rename {favourite => skins/favourite}/images/roundbottom.png (100%) rename {favourite => skins/favourite}/images/roundtop.png (100%) rename {favourite => skins/favourite}/images/tagsIcon.png (100%) rename {favourite => skins/favourite}/images/textfield.gif (100%) rename {favourite => skins/favourite}/images/thinks.png (100%) rename {favourite => skins/favourite}/images/top-bg.jpg (100%) rename {favourite => skins/favourite}/images/twitter.png (100%) rename {favourite => skins/favourite}/index.ftl (100%) rename {favourite => skins/favourite}/lang/lang_en_US.properties (100%) rename {favourite => skins/favourite}/lang/lang_zh_CN.properties (100%) rename {favourite => skins/favourite}/macro-comments.ftl (97%) rename {favourite => skins/favourite}/macro-head.ftl (100%) rename {favourite => skins/favourite}/nav.ftl (100%) rename {favourite => skins/favourite}/page.ftl (100%) rename {favourite => skins/favourite}/preview.png (100%) rename {favourite => skins/favourite}/side.ftl (100%) rename {favourite => skins/favourite}/skin.properties (100%) rename {favourite => skins/favourite}/statistic.ftl (100%) rename {favourite => skins/favourite}/tag-articles.ftl (100%) rename {favourite => skins/favourite}/tags.ftl (100%) rename {i-nove => skins/i-nove}/archive-articles.ftl (100%) rename {i-nove => skins/i-nove}/article-list.ftl (100%) rename {i-nove => skins/i-nove}/article.ftl (100%) rename {i-nove => skins/i-nove}/author-articles.ftl (100%) rename {i-nove => skins/i-nove}/category-articles.ftl (100%) rename {i-nove => skins/i-nove}/common-comment.ftl (100%) rename {i-nove => skins/i-nove}/css/i-nove.css (100%) rename {i-nove => skins/i-nove}/css/i-nove.min.css (100%) rename {i-nove => skins/i-nove}/footer.ftl (97%) rename {i-nove => skins/i-nove}/header.ftl (100%) rename {i-nove => skins/i-nove}/images/bg.jpg (100%) rename {i-nove => skins/i-nove}/images/box.gif (100%) rename {i-nove => skins/i-nove}/images/comment.gif (100%) rename {i-nove => skins/i-nove}/images/commentpoint.png (100%) rename {i-nove => skins/i-nove}/images/footer.jpg (100%) rename {i-nove => skins/i-nove}/images/header.jpg (100%) rename {i-nove => skins/i-nove}/images/icons.gif (100%) rename {i-nove => skins/i-nove}/images/light.gif (100%) rename {i-nove => skins/i-nove}/images/main_shadow.gif (100%) rename {i-nove => skins/i-nove}/images/menu.gif (100%) rename {i-nove => skins/i-nove}/images/sidebar_shadow.gif (100%) rename {i-nove => skins/i-nove}/images/sidesep.gif (100%) rename {i-nove => skins/i-nove}/images/textfield.gif (100%) rename {i-nove => skins/i-nove}/images/widgetsep.png (100%) rename {i-nove => skins/i-nove}/index.ftl (100%) rename {i-nove => skins/i-nove}/lang/lang_en_US.properties (100%) rename {i-nove => skins/i-nove}/lang/lang_zh_CN.properties (100%) rename {i-nove => skins/i-nove}/macro-comments.ftl (97%) rename {i-nove => skins/i-nove}/macro-head.ftl (100%) rename {i-nove => skins/i-nove}/page.ftl (100%) rename {i-nove => skins/i-nove}/preview.png (100%) rename {i-nove => skins/i-nove}/side.ftl (100%) rename {i-nove => skins/i-nove}/skin.properties (100%) rename {i-nove => skins/i-nove}/tag-articles.ftl (100%) rename {i-nove => skins/i-nove}/tags.ftl (100%) rename {metro-hot => skins/metro-hot}/archive-articles.ftl (100%) rename {metro-hot => skins/metro-hot}/archives.ftl (100%) rename {metro-hot => skins/metro-hot}/article-list.ftl (100%) rename {metro-hot => skins/metro-hot}/article.ftl (100%) rename {metro-hot => skins/metro-hot}/author-articles.ftl (100%) rename {metro-hot => skins/metro-hot}/category-articles.ftl (100%) rename {metro-hot => skins/metro-hot}/category.ftl (100%) rename {metro-hot => skins/metro-hot}/common-comment.ftl (100%) rename {metro-hot => skins/metro-hot}/copyright.ftl (100%) rename {metro-hot => skins/metro-hot}/css/font/IcoMoon.eot (100%) rename {metro-hot => skins/metro-hot}/css/font/IcoMoon.svg (100%) rename {metro-hot => skins/metro-hot}/css/font/IcoMoon.ttf (100%) rename {metro-hot => skins/metro-hot}/css/font/IcoMoon.woff (100%) rename {metro-hot => skins/metro-hot}/css/metro-hot-responsive.css (100%) rename {metro-hot => skins/metro-hot}/css/metro-hot-responsive.min.css (100%) rename {metro-hot => skins/metro-hot}/css/metro-hot.css (100%) rename {metro-hot => skins/metro-hot}/css/metro-hot.min.css (100%) rename {metro-hot => skins/metro-hot}/dynamic.ftl (100%) rename {metro-hot => skins/metro-hot}/footer.ftl (100%) rename {metro-hot => skins/metro-hot}/header.ftl (100%) rename {metro-hot => skins/metro-hot}/images/ajax-loader.gif (100%) rename {metro-hot => skins/metro-hot}/images/icons.png (100%) rename {metro-hot => skins/metro-hot}/index.ftl (100%) rename {metro-hot => skins/metro-hot}/js/metro-hot.js (100%) rename {metro-hot => skins/metro-hot}/js/metro-hot.min.js (100%) rename {metro-hot => skins/metro-hot}/lang/lang_en_US.properties (100%) rename {metro-hot => skins/metro-hot}/lang/lang_zh_CN.properties (100%) rename {metro-hot => skins/metro-hot}/links.ftl (100%) rename {metro-hot => skins/metro-hot}/macro-comments.ftl (100%) rename {metro-hot => skins/metro-hot}/macro-head.ftl (100%) rename {metro-hot => skins/metro-hot}/macro-side.ftl (100%) rename {metro-hot => skins/metro-hot}/page.ftl (100%) rename {metro-hot => skins/metro-hot}/preview.png (100%) rename {metro-hot => skins/metro-hot}/skin.properties (100%) rename {metro-hot => skins/metro-hot}/tag-articles.ftl (100%) rename {metro-hot => skins/metro-hot}/tags.ftl (100%) rename {mobile => skins/mobile}/archive-articles.ftl (100%) rename {mobile => skins/mobile}/article-list.ftl (100%) rename {mobile => skins/mobile}/article.ftl (100%) rename {mobile => skins/mobile}/author-articles.ftl (100%) rename {mobile => skins/mobile}/category-articles.ftl (100%) rename {mobile => skins/mobile}/common-comment.ftl (100%) rename {mobile => skins/mobile}/footer.ftl (100%) rename {mobile => skins/mobile}/header.ftl (100%) rename {mobile => skins/mobile}/images/good.png (100%) rename {mobile => skins/mobile}/images/icon-pool/Apps.png (100%) rename {mobile => skins/mobile}/images/icon-pool/Archives.png (100%) rename {mobile => skins/mobile}/images/icon-pool/Home.png (100%) rename {mobile => skins/mobile}/images/icon-pool/Mail.png (100%) rename {mobile => skins/mobile}/images/icon-pool/Pages.png (100%) rename {mobile => skins/mobile}/images/icon-pool/RSS.png (100%) rename {mobile => skins/mobile}/images/icon-pool/Tags.png (100%) rename {mobile => skins/mobile}/images/icon-pool/category.png (100%) rename {mobile => skins/mobile}/index.ftl (100%) rename {mobile => skins/mobile}/js/l10n.js (100%) rename {mobile => skins/mobile}/js/l10n.min.js (100%) rename {mobile => skins/mobile}/lang/lang_en_US.properties (100%) rename {mobile => skins/mobile}/lang/lang_zh_CN.properties (100%) rename {mobile => skins/mobile}/macro-comments.ftl (100%) rename {mobile => skins/mobile}/macro-head.ftl (100%) rename {mobile => skins/mobile}/page.ftl (100%) rename {mobile => skins/mobile}/preview.png (100%) rename {mobile => skins/mobile}/side.ftl (100%) rename {mobile => skins/mobile}/skin.properties (100%) rename {mobile => skins/mobile}/tag-articles.ftl (100%) rename {mobile => skins/mobile}/tags.ftl (100%) rename {mobile => skins/mobile}/themes/core/core-images/arrow.png (100%) rename {mobile => skins/mobile}/themes/core/core-images/bookmarks/delicious.jpg (100%) rename {mobile => skins/mobile}/themes/core/core-images/bookmarks/digg.jpg (100%) rename {mobile => skins/mobile}/themes/core/core-images/bookmarks/magnolia.jpg (100%) rename {mobile => skins/mobile}/themes/core/core-images/bookmarks/newsvine.jpg (100%) rename {mobile => skins/mobile}/themes/core/core-images/bookmarks/reddit.jpg (100%) rename {mobile => skins/mobile}/themes/core/core-images/bookmarks/technorati.jpg (100%) rename {mobile => skins/mobile}/themes/core/core-images/com_arrow.png (100%) rename {mobile => skins/mobile}/themes/core/core-images/comment-ajax-loader.gif (100%) rename {mobile => skins/mobile}/themes/core/core-images/head-close.png (100%) rename {mobile => skins/mobile}/themes/core/core-images/head-fade-bk.png (100%) rename {mobile => skins/mobile}/themes/core/core-images/menu-sprite.png (100%) rename {mobile => skins/mobile}/themes/core/core-images/onoff.jpg (100%) rename {mobile => skins/mobile}/themes/core/core-images/pinstripes-classic.gif (100%) rename {mobile => skins/mobile}/themes/core/core-images/post-arrow.png (100%) rename {mobile => skins/mobile}/themes/core/core-images/post-options.png (100%) rename {mobile => skins/mobile}/themes/core/core-images/push-icon.png (100%) rename {mobile => skins/mobile}/themes/core/core-images/wptouch-menu-dropper.png (100%) rename {mobile => skins/mobile}/themes/core/core.js (100%) rename {mobile => skins/mobile}/themes/default/style.css (100%) rename {next => skins/next}/archive-articles.ftl (100%) rename {next => skins/next}/archives.ftl (100%) rename {next => skins/next}/article-list.ftl (100%) rename {next => skins/next}/article.ftl (100%) rename {next => skins/next}/category-articles.ftl (100%) rename {next => skins/next}/common-comment.ftl (100%) rename {next => skins/next}/css/fonts/icomoon.eot (100%) rename {next => skins/next}/css/fonts/icomoon.svg (100%) rename {next => skins/next}/css/fonts/icomoon.ttf (100%) rename {next => skins/next}/css/fonts/icomoon.woff (100%) rename {next => skins/next}/css/fonts/selection.json (100%) rename {next => skins/next}/css/next.css (100%) rename {next => skins/next}/css/next.min.css (100%) rename {next => skins/next}/dynamic.ftl (100%) rename {next => skins/next}/footer.ftl (100%) rename {next => skins/next}/header.ftl (100%) rename {next => skins/next}/images/code-bg.png (100%) rename {next => skins/next}/index.ftl (100%) rename {next => skins/next}/js/next.js (100%) rename {next => skins/next}/js/next.min.js (100%) rename {next => skins/next}/lang/lang_en_US.properties (100%) rename {next => skins/next}/lang/lang_zh_CN.properties (100%) rename {next => skins/next}/macro-comments.ftl (100%) rename {next => skins/next}/macro-head.ftl (100%) rename {next => skins/next}/page.ftl (100%) rename {next => skins/next}/preview.png (100%) rename {next => skins/next}/side.ftl (100%) rename {next => skins/next}/skin.properties (100%) rename {next => skins/next}/tag-articles.ftl (100%) rename {next => skins/next}/tags.ftl (100%) rename {owmx-3.0 => skins/owmx-3.0}/archive-articles.ftl (100%) rename {owmx-3.0 => skins/owmx-3.0}/article-list.ftl (100%) rename {owmx-3.0 => skins/owmx-3.0}/article.ftl (100%) rename {owmx-3.0 => skins/owmx-3.0}/author-articles.ftl (100%) rename {owmx-3.0 => skins/owmx-3.0}/category-articles.ftl (100%) rename {owmx-3.0 => skins/owmx-3.0}/common-comment.ftl (100%) rename {owmx-3.0 => skins/owmx-3.0}/css/owmx-3.0.css (95%) rename {owmx-3.0 => skins/owmx-3.0}/css/owmx-3.0.min.css (100%) rename {owmx-3.0 => skins/owmx-3.0}/footer.ftl (97%) rename {owmx-3.0 => skins/owmx-3.0}/header.ftl (100%) rename {owmx-3.0 => skins/owmx-3.0}/images/ai1.png (100%) rename {owmx-3.0 => skins/owmx-3.0}/images/ai2.png (100%) rename {owmx-3.0 => skins/owmx-3.0}/images/ai3.png (100%) rename {owmx-3.0 => skins/owmx-3.0}/images/ai4.png (100%) rename {owmx-3.0 => skins/owmx-3.0}/images/ai5.png (100%) rename {owmx-3.0 => skins/owmx-3.0}/images/ai6.png (100%) rename {owmx-3.0 => skins/owmx-3.0}/images/ai7.png (100%) rename {owmx-3.0 => skins/owmx-3.0}/images/ai8.png (100%) rename {owmx-3.0 => skins/owmx-3.0}/images/comment.gif (100%) rename {owmx-3.0 => skins/owmx-3.0}/images/commentpoint.png (100%) rename {owmx-3.0 => skins/owmx-3.0}/images/hd.jpg (100%) rename {owmx-3.0 => skins/owmx-3.0}/images/icons.gif (100%) rename {owmx-3.0 => skins/owmx-3.0}/images/textfield.gif (100%) rename {owmx-3.0 => skins/owmx-3.0}/index.ftl (100%) rename {owmx-3.0 => skins/owmx-3.0}/lang/lang_en_US.properties (100%) rename {owmx-3.0 => skins/owmx-3.0}/lang/lang_zh_CN.properties (100%) rename {owmx-3.0 => skins/owmx-3.0}/macro-comments.ftl (97%) rename {owmx-3.0 => skins/owmx-3.0}/macro-head.ftl (100%) rename {owmx-3.0 => skins/owmx-3.0}/page.ftl (100%) rename {owmx-3.0 => skins/owmx-3.0}/preview.png (100%) rename {owmx-3.0 => skins/owmx-3.0}/side.ftl (100%) rename {owmx-3.0 => skins/owmx-3.0}/skin.properties (100%) rename {owmx-3.0 => skins/owmx-3.0}/tag-articles.ftl (100%) rename {owmx-3.0 => skins/owmx-3.0}/tags.ftl (100%) rename {timeline => skins/timeline}/article-list.ftl (97%) rename {timeline => skins/timeline}/article.ftl (100%) rename {timeline => skins/timeline}/author-articles.ftl (97%) rename {timeline => skins/timeline}/category-articles.ftl (100%) rename {timeline => skins/timeline}/common-comment.ftl (100%) rename {timeline => skins/timeline}/css/timeline.css (100%) rename {timeline => skins/timeline}/css/timeline.min.css (100%) rename {timeline => skins/timeline}/dynamic.ftl (98%) rename {timeline => skins/timeline}/footer.ftl (100%) rename {timeline => skins/timeline}/header.ftl (100%) rename {timeline => skins/timeline}/images/ajax-loader.gif (100%) rename {timeline => skins/timeline}/images/bg.png (100%) rename {timeline => skins/timeline}/images/icons.png (100%) rename {timeline => skins/timeline}/images/nav-bg.png (100%) rename {timeline => skins/timeline}/index.ftl (97%) rename {timeline => skins/timeline}/js/timeline.js (97%) rename {timeline => skins/timeline}/js/timeline.min.js (100%) rename {timeline => skins/timeline}/lang/lang_en_US.properties (96%) rename {timeline => skins/timeline}/lang/lang_zh_CN.properties (98%) rename {timeline => skins/timeline}/macro-comments.ftl (97%) rename {timeline => skins/timeline}/macro-head.ftl (100%) rename {timeline => skins/timeline}/page.ftl (96%) rename {timeline => skins/timeline}/preview.png (100%) rename {timeline => skins/timeline}/skin.properties (100%) rename {timeline => skins/timeline}/tag-articles.ftl (97%) rename {timeline => skins/timeline}/tags.ftl (97%) rename {tree-house => skins/tree-house}/archive-articles.ftl (100%) rename {tree-house => skins/tree-house}/article-list.ftl (100%) rename {tree-house => skins/tree-house}/article.ftl (100%) rename {tree-house => skins/tree-house}/author-articles.ftl (100%) rename {tree-house => skins/tree-house}/category-articles.ftl (100%) rename {tree-house => skins/tree-house}/common-comment.ftl (100%) rename {tree-house => skins/tree-house}/css/tree-house.css (100%) rename {tree-house => skins/tree-house}/css/tree-house.min.css (100%) rename {tree-house => skins/tree-house}/footer.ftl (97%) rename {tree-house => skins/tree-house}/header.ftl (100%) rename {tree-house => skins/tree-house}/images/balloons.png (100%) rename {tree-house => skins/tree-house}/images/bg-branch-small.png (100%) rename {tree-house => skins/tree-house}/images/bg-branch.png (100%) rename {tree-house => skins/tree-house}/images/bg-comments-body.png (100%) rename {tree-house => skins/tree-house}/images/bg-comments-bottom.png (100%) rename {tree-house => skins/tree-house}/images/bg-comments-top.png (100%) rename {tree-house => skins/tree-house}/images/bg-comments.png (100%) rename {tree-house => skins/tree-house}/images/bg-footer2.jpg (100%) rename {tree-house => skins/tree-house}/images/bg-header.jpg (100%) rename {tree-house => skins/tree-house}/images/bg-heading-about-us.png (100%) rename {tree-house => skins/tree-house}/images/bg-heading-categories.png (100%) rename {tree-house => skins/tree-house}/images/bg-heading-portfolio.png (100%) rename {tree-house => skins/tree-house}/images/bg-heading-resources.png (100%) rename {tree-house => skins/tree-house}/images/bg-heading.png (100%) rename {tree-house => skins/tree-house}/images/bg-menu-active-tags.png (100%) rename {tree-house => skins/tree-house}/images/bg-menu-active.png (100%) rename {tree-house => skins/tree-house}/images/bg-tree.jpg (100%) rename {tree-house => skins/tree-house}/index.ftl (100%) rename {tree-house => skins/tree-house}/lang/lang_en_US.properties (100%) rename {tree-house => skins/tree-house}/lang/lang_zh_CN.properties (100%) rename {tree-house => skins/tree-house}/macro-comments.ftl (97%) rename {tree-house => skins/tree-house}/macro-head.ftl (100%) rename {tree-house => skins/tree-house}/page.ftl (100%) rename {tree-house => skins/tree-house}/preview.png (100%) rename {tree-house => skins/tree-house}/side.ftl (100%) rename {tree-house => skins/tree-house}/skin.properties (100%) rename {tree-house => skins/tree-house}/tag-articles.ftl (100%) rename {tree-house => skins/tree-house}/tags.ftl (100%) rename {yilia => skins/yilia}/archive-articles.ftl (100%) rename {yilia => skins/yilia}/archives.ftl (100%) rename {yilia => skins/yilia}/article-list.ftl (100%) rename {yilia => skins/yilia}/article.ftl (100%) rename {yilia => skins/yilia}/author-articles.ftl (100%) rename {yilia => skins/yilia}/category-articles.ftl (100%) rename {yilia => skins/yilia}/common-comment.ftl (100%) rename {yilia => skins/yilia}/css/fonts/icomoon.eot (100%) rename {yilia => skins/yilia}/css/fonts/icomoon.svg (100%) rename {yilia => skins/yilia}/css/fonts/icomoon.ttf (100%) rename {yilia => skins/yilia}/css/fonts/icomoon.woff (100%) rename {yilia => skins/yilia}/css/fonts/selection.json (100%) rename {yilia => skins/yilia}/css/yilia.css (100%) rename {yilia => skins/yilia}/css/yilia.min.css (100%) rename {yilia => skins/yilia}/dynamic.ftl (100%) rename {yilia => skins/yilia}/footer.ftl (100%) rename {yilia => skins/yilia}/index.ftl (100%) rename {yilia => skins/yilia}/js/yilia.js (100%) rename {yilia => skins/yilia}/js/yilia.min.js (100%) rename {yilia => skins/yilia}/lang/lang_en_US.properties (100%) rename {yilia => skins/yilia}/lang/lang_zh_CN.properties (100%) rename {yilia => skins/yilia}/links.ftl (100%) rename {yilia => skins/yilia}/macro-comments.ftl (100%) rename {yilia => skins/yilia}/macro-head.ftl (100%) rename {yilia => skins/yilia}/page.ftl (100%) rename {yilia => skins/yilia}/preview.png (100%) rename {yilia => skins/yilia}/side.ftl (100%) rename {yilia => skins/yilia}/skin.properties (100%) rename {yilia => skins/yilia}/tag-articles.ftl (100%) rename {yilia => skins/yilia}/tags.ftl (100%) diff --git a/9IPHP/archive-articles.ftl b/skins/9IPHP/archive-articles.ftl similarity index 100% rename from 9IPHP/archive-articles.ftl rename to skins/9IPHP/archive-articles.ftl diff --git a/9IPHP/archives.ftl b/skins/9IPHP/archives.ftl similarity index 100% rename from 9IPHP/archives.ftl rename to skins/9IPHP/archives.ftl diff --git a/9IPHP/article-list.ftl b/skins/9IPHP/article-list.ftl similarity index 100% rename from 9IPHP/article-list.ftl rename to skins/9IPHP/article-list.ftl diff --git a/9IPHP/article.ftl b/skins/9IPHP/article.ftl similarity index 100% rename from 9IPHP/article.ftl rename to skins/9IPHP/article.ftl diff --git a/9IPHP/category-articles.ftl b/skins/9IPHP/category-articles.ftl similarity index 100% rename from 9IPHP/category-articles.ftl rename to skins/9IPHP/category-articles.ftl diff --git a/9IPHP/common-comment.ftl b/skins/9IPHP/common-comment.ftl similarity index 100% rename from 9IPHP/common-comment.ftl rename to skins/9IPHP/common-comment.ftl diff --git a/9IPHP/css/base.css b/skins/9IPHP/css/base.css similarity index 100% rename from 9IPHP/css/base.css rename to skins/9IPHP/css/base.css diff --git a/9IPHP/css/base.min.css b/skins/9IPHP/css/base.min.css similarity index 100% rename from 9IPHP/css/base.min.css rename to skins/9IPHP/css/base.min.css diff --git a/9IPHP/css/fonts/icomoon.eot b/skins/9IPHP/css/fonts/icomoon.eot similarity index 100% rename from 9IPHP/css/fonts/icomoon.eot rename to skins/9IPHP/css/fonts/icomoon.eot diff --git a/9IPHP/css/fonts/icomoon.svg b/skins/9IPHP/css/fonts/icomoon.svg similarity index 100% rename from 9IPHP/css/fonts/icomoon.svg rename to skins/9IPHP/css/fonts/icomoon.svg diff --git a/9IPHP/css/fonts/icomoon.ttf b/skins/9IPHP/css/fonts/icomoon.ttf similarity index 100% rename from 9IPHP/css/fonts/icomoon.ttf rename to skins/9IPHP/css/fonts/icomoon.ttf diff --git a/9IPHP/css/fonts/icomoon.woff b/skins/9IPHP/css/fonts/icomoon.woff similarity index 100% rename from 9IPHP/css/fonts/icomoon.woff rename to skins/9IPHP/css/fonts/icomoon.woff diff --git a/9IPHP/css/selection.json b/skins/9IPHP/css/selection.json similarity index 100% rename from 9IPHP/css/selection.json rename to skins/9IPHP/css/selection.json diff --git a/9IPHP/dynamic.ftl b/skins/9IPHP/dynamic.ftl similarity index 100% rename from 9IPHP/dynamic.ftl rename to skins/9IPHP/dynamic.ftl diff --git a/9IPHP/footer.ftl b/skins/9IPHP/footer.ftl similarity index 100% rename from 9IPHP/footer.ftl rename to skins/9IPHP/footer.ftl diff --git a/9IPHP/header.ftl b/skins/9IPHP/header.ftl similarity index 100% rename from 9IPHP/header.ftl rename to skins/9IPHP/header.ftl diff --git a/9IPHP/images/code-bg.png b/skins/9IPHP/images/code-bg.png similarity index 100% rename from 9IPHP/images/code-bg.png rename to skins/9IPHP/images/code-bg.png diff --git a/9IPHP/index.ftl b/skins/9IPHP/index.ftl similarity index 100% rename from 9IPHP/index.ftl rename to skins/9IPHP/index.ftl diff --git a/9IPHP/js/common.js b/skins/9IPHP/js/common.js similarity index 100% rename from 9IPHP/js/common.js rename to skins/9IPHP/js/common.js diff --git a/9IPHP/js/common.min.js b/skins/9IPHP/js/common.min.js similarity index 100% rename from 9IPHP/js/common.min.js rename to skins/9IPHP/js/common.min.js diff --git a/9IPHP/js/isotope.pkgd.js b/skins/9IPHP/js/isotope.pkgd.js similarity index 100% rename from 9IPHP/js/isotope.pkgd.js rename to skins/9IPHP/js/isotope.pkgd.js diff --git a/9IPHP/js/isotope.pkgd.min.js b/skins/9IPHP/js/isotope.pkgd.min.js similarity index 100% rename from 9IPHP/js/isotope.pkgd.min.js rename to skins/9IPHP/js/isotope.pkgd.min.js diff --git a/9IPHP/lang/lang_en_US.properties b/skins/9IPHP/lang/lang_en_US.properties similarity index 100% rename from 9IPHP/lang/lang_en_US.properties rename to skins/9IPHP/lang/lang_en_US.properties diff --git a/9IPHP/lang/lang_zh_CN.properties b/skins/9IPHP/lang/lang_zh_CN.properties similarity index 100% rename from 9IPHP/lang/lang_zh_CN.properties rename to skins/9IPHP/lang/lang_zh_CN.properties diff --git a/9IPHP/links.ftl b/skins/9IPHP/links.ftl similarity index 100% rename from 9IPHP/links.ftl rename to skins/9IPHP/links.ftl diff --git a/9IPHP/macro-comments.ftl b/skins/9IPHP/macro-comments.ftl similarity index 100% rename from 9IPHP/macro-comments.ftl rename to skins/9IPHP/macro-comments.ftl diff --git a/9IPHP/macro-head.ftl b/skins/9IPHP/macro-head.ftl similarity index 100% rename from 9IPHP/macro-head.ftl rename to skins/9IPHP/macro-head.ftl diff --git a/9IPHP/page.ftl b/skins/9IPHP/page.ftl similarity index 100% rename from 9IPHP/page.ftl rename to skins/9IPHP/page.ftl diff --git a/9IPHP/preview.png b/skins/9IPHP/preview.png similarity index 100% rename from 9IPHP/preview.png rename to skins/9IPHP/preview.png diff --git a/9IPHP/side.ftl b/skins/9IPHP/side.ftl similarity index 100% rename from 9IPHP/side.ftl rename to skins/9IPHP/side.ftl diff --git a/9IPHP/skin.properties b/skins/9IPHP/skin.properties similarity index 100% rename from 9IPHP/skin.properties rename to skins/9IPHP/skin.properties diff --git a/9IPHP/tag-articles.ftl b/skins/9IPHP/tag-articles.ftl similarity index 100% rename from 9IPHP/tag-articles.ftl rename to skins/9IPHP/tag-articles.ftl diff --git a/9IPHP/tags.ftl b/skins/9IPHP/tags.ftl similarity index 100% rename from 9IPHP/tags.ftl rename to skins/9IPHP/tags.ftl diff --git a/Andrea/archive-articles.ftl b/skins/Andrea/archive-articles.ftl similarity index 100% rename from Andrea/archive-articles.ftl rename to skins/Andrea/archive-articles.ftl diff --git a/Andrea/article-list.ftl b/skins/Andrea/article-list.ftl similarity index 100% rename from Andrea/article-list.ftl rename to skins/Andrea/article-list.ftl diff --git a/Andrea/article.ftl b/skins/Andrea/article.ftl similarity index 100% rename from Andrea/article.ftl rename to skins/Andrea/article.ftl diff --git a/Andrea/author-articles.ftl b/skins/Andrea/author-articles.ftl similarity index 100% rename from Andrea/author-articles.ftl rename to skins/Andrea/author-articles.ftl diff --git a/Andrea/category-articles.ftl b/skins/Andrea/category-articles.ftl similarity index 100% rename from Andrea/category-articles.ftl rename to skins/Andrea/category-articles.ftl diff --git a/Andrea/common-comment.ftl b/skins/Andrea/common-comment.ftl similarity index 100% rename from Andrea/common-comment.ftl rename to skins/Andrea/common-comment.ftl diff --git a/Andrea/css/Andrea.css b/skins/Andrea/css/Andrea.css similarity index 100% rename from Andrea/css/Andrea.css rename to skins/Andrea/css/Andrea.css diff --git a/Andrea/css/Andrea.min.css b/skins/Andrea/css/Andrea.min.css similarity index 100% rename from Andrea/css/Andrea.min.css rename to skins/Andrea/css/Andrea.min.css diff --git a/Andrea/footer.ftl b/skins/Andrea/footer.ftl similarity index 100% rename from Andrea/footer.ftl rename to skins/Andrea/footer.ftl diff --git a/Andrea/header.ftl b/skins/Andrea/header.ftl similarity index 100% rename from Andrea/header.ftl rename to skins/Andrea/header.ftl diff --git a/Andrea/images/bg-blue.jpg b/skins/Andrea/images/bg-blue.jpg similarity index 100% rename from Andrea/images/bg-blue.jpg rename to skins/Andrea/images/bg-blue.jpg diff --git a/Andrea/images/bg-brown.jpg b/skins/Andrea/images/bg-brown.jpg similarity index 100% rename from Andrea/images/bg-brown.jpg rename to skins/Andrea/images/bg-brown.jpg diff --git a/Andrea/images/bg-grey.jpg b/skins/Andrea/images/bg-grey.jpg similarity index 100% rename from Andrea/images/bg-grey.jpg rename to skins/Andrea/images/bg-grey.jpg diff --git a/Andrea/images/bg-transparent.png b/skins/Andrea/images/bg-transparent.png similarity index 100% rename from Andrea/images/bg-transparent.png rename to skins/Andrea/images/bg-transparent.png diff --git a/Andrea/images/bgs.png b/skins/Andrea/images/bgs.png similarity index 100% rename from Andrea/images/bgs.png rename to skins/Andrea/images/bgs.png diff --git a/Andrea/images/footer.png b/skins/Andrea/images/footer.png similarity index 100% rename from Andrea/images/footer.png rename to skins/Andrea/images/footer.png diff --git a/Andrea/images/icon.png b/skins/Andrea/images/icon.png similarity index 100% rename from Andrea/images/icon.png rename to skins/Andrea/images/icon.png diff --git a/Andrea/images/paint.png b/skins/Andrea/images/paint.png similarity index 100% rename from Andrea/images/paint.png rename to skins/Andrea/images/paint.png diff --git a/Andrea/index.ftl b/skins/Andrea/index.ftl similarity index 100% rename from Andrea/index.ftl rename to skins/Andrea/index.ftl diff --git a/Andrea/lang/lang_en_US.properties b/skins/Andrea/lang/lang_en_US.properties similarity index 100% rename from Andrea/lang/lang_en_US.properties rename to skins/Andrea/lang/lang_en_US.properties diff --git a/Andrea/lang/lang_zh_CN.properties b/skins/Andrea/lang/lang_zh_CN.properties similarity index 100% rename from Andrea/lang/lang_zh_CN.properties rename to skins/Andrea/lang/lang_zh_CN.properties diff --git a/Andrea/macro-comments.ftl b/skins/Andrea/macro-comments.ftl similarity index 100% rename from Andrea/macro-comments.ftl rename to skins/Andrea/macro-comments.ftl diff --git a/Andrea/macro-head.ftl b/skins/Andrea/macro-head.ftl similarity index 100% rename from Andrea/macro-head.ftl rename to skins/Andrea/macro-head.ftl diff --git a/Andrea/page.ftl b/skins/Andrea/page.ftl similarity index 100% rename from Andrea/page.ftl rename to skins/Andrea/page.ftl diff --git a/Andrea/preview.png b/skins/Andrea/preview.png similarity index 100% rename from Andrea/preview.png rename to skins/Andrea/preview.png diff --git a/Andrea/side-tool.ftl b/skins/Andrea/side-tool.ftl similarity index 100% rename from Andrea/side-tool.ftl rename to skins/Andrea/side-tool.ftl diff --git a/Andrea/side.ftl b/skins/Andrea/side.ftl similarity index 100% rename from Andrea/side.ftl rename to skins/Andrea/side.ftl diff --git a/Andrea/skin.properties b/skins/Andrea/skin.properties similarity index 100% rename from Andrea/skin.properties rename to skins/Andrea/skin.properties diff --git a/Andrea/tag-articles.ftl b/skins/Andrea/tag-articles.ftl similarity index 100% rename from Andrea/tag-articles.ftl rename to skins/Andrea/tag-articles.ftl diff --git a/Andrea/tags.ftl b/skins/Andrea/tags.ftl similarity index 100% rename from Andrea/tags.ftl rename to skins/Andrea/tags.ftl diff --git a/Bruce/archive-articles.ftl b/skins/Bruce/archive-articles.ftl similarity index 100% rename from Bruce/archive-articles.ftl rename to skins/Bruce/archive-articles.ftl diff --git a/Bruce/archives.ftl b/skins/Bruce/archives.ftl similarity index 100% rename from Bruce/archives.ftl rename to skins/Bruce/archives.ftl diff --git a/Bruce/article-list.ftl b/skins/Bruce/article-list.ftl similarity index 100% rename from Bruce/article-list.ftl rename to skins/Bruce/article-list.ftl diff --git a/Bruce/article.ftl b/skins/Bruce/article.ftl similarity index 100% rename from Bruce/article.ftl rename to skins/Bruce/article.ftl diff --git a/Bruce/category-articles.ftl b/skins/Bruce/category-articles.ftl similarity index 100% rename from Bruce/category-articles.ftl rename to skins/Bruce/category-articles.ftl diff --git a/Bruce/common-comment.ftl b/skins/Bruce/common-comment.ftl similarity index 100% rename from Bruce/common-comment.ftl rename to skins/Bruce/common-comment.ftl diff --git a/Bruce/css/Bruce.css b/skins/Bruce/css/Bruce.css similarity index 100% rename from Bruce/css/Bruce.css rename to skins/Bruce/css/Bruce.css diff --git a/Bruce/css/Bruce.min.css b/skins/Bruce/css/Bruce.min.css similarity index 100% rename from Bruce/css/Bruce.min.css rename to skins/Bruce/css/Bruce.min.css diff --git a/Bruce/css/bootstrap-theme.css b/skins/Bruce/css/bootstrap-theme.css similarity index 100% rename from Bruce/css/bootstrap-theme.css rename to skins/Bruce/css/bootstrap-theme.css diff --git a/Bruce/css/bootstrap-theme.css.map b/skins/Bruce/css/bootstrap-theme.css.map similarity index 100% rename from Bruce/css/bootstrap-theme.css.map rename to skins/Bruce/css/bootstrap-theme.css.map diff --git a/Bruce/css/bootstrap-theme.min.css b/skins/Bruce/css/bootstrap-theme.min.css similarity index 100% rename from Bruce/css/bootstrap-theme.min.css rename to skins/Bruce/css/bootstrap-theme.min.css diff --git a/Bruce/css/bootstrap.css b/skins/Bruce/css/bootstrap.css similarity index 100% rename from Bruce/css/bootstrap.css rename to skins/Bruce/css/bootstrap.css diff --git a/Bruce/css/bootstrap.css.map b/skins/Bruce/css/bootstrap.css.map similarity index 100% rename from Bruce/css/bootstrap.css.map rename to skins/Bruce/css/bootstrap.css.map diff --git a/Bruce/css/bootstrap.min.css b/skins/Bruce/css/bootstrap.min.css similarity index 100% rename from Bruce/css/bootstrap.min.css rename to skins/Bruce/css/bootstrap.min.css diff --git a/Bruce/fonts/glyphicons-halflings-regular.eot b/skins/Bruce/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from Bruce/fonts/glyphicons-halflings-regular.eot rename to skins/Bruce/fonts/glyphicons-halflings-regular.eot diff --git a/Bruce/fonts/glyphicons-halflings-regular.svg b/skins/Bruce/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from Bruce/fonts/glyphicons-halflings-regular.svg rename to skins/Bruce/fonts/glyphicons-halflings-regular.svg diff --git a/Bruce/fonts/glyphicons-halflings-regular.ttf b/skins/Bruce/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from Bruce/fonts/glyphicons-halflings-regular.ttf rename to skins/Bruce/fonts/glyphicons-halflings-regular.ttf diff --git a/Bruce/fonts/glyphicons-halflings-regular.woff b/skins/Bruce/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from Bruce/fonts/glyphicons-halflings-regular.woff rename to skins/Bruce/fonts/glyphicons-halflings-regular.woff diff --git a/Bruce/footer.ftl b/skins/Bruce/footer.ftl similarity index 100% rename from Bruce/footer.ftl rename to skins/Bruce/footer.ftl diff --git a/Bruce/header.ftl b/skins/Bruce/header.ftl similarity index 100% rename from Bruce/header.ftl rename to skins/Bruce/header.ftl diff --git a/Bruce/index.ftl b/skins/Bruce/index.ftl similarity index 100% rename from Bruce/index.ftl rename to skins/Bruce/index.ftl diff --git a/Bruce/js/bootstrap.js b/skins/Bruce/js/bootstrap.js similarity index 100% rename from Bruce/js/bootstrap.js rename to skins/Bruce/js/bootstrap.js diff --git a/Bruce/js/bootstrap.min.js b/skins/Bruce/js/bootstrap.min.js similarity index 100% rename from Bruce/js/bootstrap.min.js rename to skins/Bruce/js/bootstrap.min.js diff --git a/Bruce/lang/lang_en_US.properties b/skins/Bruce/lang/lang_en_US.properties similarity index 100% rename from Bruce/lang/lang_en_US.properties rename to skins/Bruce/lang/lang_en_US.properties diff --git a/Bruce/lang/lang_zh_CN.properties b/skins/Bruce/lang/lang_zh_CN.properties similarity index 100% rename from Bruce/lang/lang_zh_CN.properties rename to skins/Bruce/lang/lang_zh_CN.properties diff --git a/Bruce/links.ftl b/skins/Bruce/links.ftl similarity index 100% rename from Bruce/links.ftl rename to skins/Bruce/links.ftl diff --git a/Bruce/macro-comments.ftl b/skins/Bruce/macro-comments.ftl similarity index 100% rename from Bruce/macro-comments.ftl rename to skins/Bruce/macro-comments.ftl diff --git a/Bruce/macro-head.ftl b/skins/Bruce/macro-head.ftl similarity index 100% rename from Bruce/macro-head.ftl rename to skins/Bruce/macro-head.ftl diff --git a/Bruce/page.ftl b/skins/Bruce/page.ftl similarity index 100% rename from Bruce/page.ftl rename to skins/Bruce/page.ftl diff --git a/Bruce/preview.png b/skins/Bruce/preview.png similarity index 100% rename from Bruce/preview.png rename to skins/Bruce/preview.png diff --git a/Bruce/skin.properties b/skins/Bruce/skin.properties similarity index 100% rename from Bruce/skin.properties rename to skins/Bruce/skin.properties diff --git a/Bruce/tag-articles.ftl b/skins/Bruce/tag-articles.ftl similarity index 100% rename from Bruce/tag-articles.ftl rename to skins/Bruce/tag-articles.ftl diff --git a/Bruce/tags.ftl b/skins/Bruce/tags.ftl similarity index 100% rename from Bruce/tags.ftl rename to skins/Bruce/tags.ftl diff --git a/Community/archive-articles.ftl b/skins/Community/archive-articles.ftl similarity index 100% rename from Community/archive-articles.ftl rename to skins/Community/archive-articles.ftl diff --git a/Community/article-list.ftl b/skins/Community/article-list.ftl similarity index 100% rename from Community/article-list.ftl rename to skins/Community/article-list.ftl diff --git a/Community/article.ftl b/skins/Community/article.ftl similarity index 100% rename from Community/article.ftl rename to skins/Community/article.ftl diff --git a/Community/author-articles.ftl b/skins/Community/author-articles.ftl similarity index 100% rename from Community/author-articles.ftl rename to skins/Community/author-articles.ftl diff --git a/Community/category-articles.ftl b/skins/Community/category-articles.ftl similarity index 100% rename from Community/category-articles.ftl rename to skins/Community/category-articles.ftl diff --git a/Community/common-comment.ftl b/skins/Community/common-comment.ftl similarity index 100% rename from Community/common-comment.ftl rename to skins/Community/common-comment.ftl diff --git a/Community/css/Community.css b/skins/Community/css/Community.css similarity index 100% rename from Community/css/Community.css rename to skins/Community/css/Community.css diff --git a/Community/css/Community.min.css b/skins/Community/css/Community.min.css similarity index 100% rename from Community/css/Community.min.css rename to skins/Community/css/Community.min.css diff --git a/Community/footer.ftl b/skins/Community/footer.ftl similarity index 100% rename from Community/footer.ftl rename to skins/Community/footer.ftl diff --git a/Community/header.ftl b/skins/Community/header.ftl similarity index 100% rename from Community/header.ftl rename to skins/Community/header.ftl diff --git a/Community/images/author-header.png b/skins/Community/images/author-header.png similarity index 100% rename from Community/images/author-header.png rename to skins/Community/images/author-header.png diff --git a/Community/images/icon.png b/skins/Community/images/icon.png similarity index 100% rename from Community/images/icon.png rename to skins/Community/images/icon.png diff --git a/Community/images/indentline-light.png b/skins/Community/images/indentline-light.png similarity index 100% rename from Community/images/indentline-light.png rename to skins/Community/images/indentline-light.png diff --git a/Community/images/indentline.png b/skins/Community/images/indentline.png similarity index 100% rename from Community/images/indentline.png rename to skins/Community/images/indentline.png diff --git a/Community/index.ftl b/skins/Community/index.ftl similarity index 100% rename from Community/index.ftl rename to skins/Community/index.ftl diff --git a/Community/lang/lang_en_US.properties b/skins/Community/lang/lang_en_US.properties similarity index 100% rename from Community/lang/lang_en_US.properties rename to skins/Community/lang/lang_en_US.properties diff --git a/Community/lang/lang_zh_CN.properties b/skins/Community/lang/lang_zh_CN.properties similarity index 100% rename from Community/lang/lang_zh_CN.properties rename to skins/Community/lang/lang_zh_CN.properties diff --git a/Community/macro-comments.ftl b/skins/Community/macro-comments.ftl similarity index 100% rename from Community/macro-comments.ftl rename to skins/Community/macro-comments.ftl diff --git a/Community/macro-head.ftl b/skins/Community/macro-head.ftl similarity index 100% rename from Community/macro-head.ftl rename to skins/Community/macro-head.ftl diff --git a/Community/page.ftl b/skins/Community/page.ftl similarity index 100% rename from Community/page.ftl rename to skins/Community/page.ftl diff --git a/Community/preview.png b/skins/Community/preview.png similarity index 100% rename from Community/preview.png rename to skins/Community/preview.png diff --git a/Community/side.ftl b/skins/Community/side.ftl similarity index 100% rename from Community/side.ftl rename to skins/Community/side.ftl diff --git a/Community/skin.properties b/skins/Community/skin.properties similarity index 100% rename from Community/skin.properties rename to skins/Community/skin.properties diff --git a/Community/tag-articles.ftl b/skins/Community/tag-articles.ftl similarity index 100% rename from Community/tag-articles.ftl rename to skins/Community/tag-articles.ftl diff --git a/Community/tags.ftl b/skins/Community/tags.ftl similarity index 100% rename from Community/tags.ftl rename to skins/Community/tags.ftl diff --git a/Finding/archive-articles.ftl b/skins/Finding/archive-articles.ftl similarity index 100% rename from Finding/archive-articles.ftl rename to skins/Finding/archive-articles.ftl diff --git a/Finding/archives.ftl b/skins/Finding/archives.ftl similarity index 100% rename from Finding/archives.ftl rename to skins/Finding/archives.ftl diff --git a/Finding/article-list.ftl b/skins/Finding/article-list.ftl similarity index 100% rename from Finding/article-list.ftl rename to skins/Finding/article-list.ftl diff --git a/Finding/article.ftl b/skins/Finding/article.ftl similarity index 100% rename from Finding/article.ftl rename to skins/Finding/article.ftl diff --git a/Finding/author-articles.ftl b/skins/Finding/author-articles.ftl similarity index 100% rename from Finding/author-articles.ftl rename to skins/Finding/author-articles.ftl diff --git a/Finding/category-articles.ftl b/skins/Finding/category-articles.ftl similarity index 100% rename from Finding/category-articles.ftl rename to skins/Finding/category-articles.ftl diff --git a/Finding/category.ftl b/skins/Finding/category.ftl similarity index 100% rename from Finding/category.ftl rename to skins/Finding/category.ftl diff --git a/Finding/common-comment.ftl b/skins/Finding/common-comment.ftl similarity index 100% rename from Finding/common-comment.ftl rename to skins/Finding/common-comment.ftl diff --git a/Finding/css/Finding.css b/skins/Finding/css/Finding.css similarity index 100% rename from Finding/css/Finding.css rename to skins/Finding/css/Finding.css diff --git a/Finding/css/Finding.min.css b/skins/Finding/css/Finding.min.css similarity index 100% rename from Finding/css/Finding.min.css rename to skins/Finding/css/Finding.min.css diff --git a/Finding/css/fonts/icomoon.eot b/skins/Finding/css/fonts/icomoon.eot similarity index 100% rename from Finding/css/fonts/icomoon.eot rename to skins/Finding/css/fonts/icomoon.eot diff --git a/Finding/css/fonts/icomoon.svg b/skins/Finding/css/fonts/icomoon.svg similarity index 100% rename from Finding/css/fonts/icomoon.svg rename to skins/Finding/css/fonts/icomoon.svg diff --git a/Finding/css/fonts/icomoon.ttf b/skins/Finding/css/fonts/icomoon.ttf similarity index 100% rename from Finding/css/fonts/icomoon.ttf rename to skins/Finding/css/fonts/icomoon.ttf diff --git a/Finding/css/fonts/icomoon.woff b/skins/Finding/css/fonts/icomoon.woff similarity index 100% rename from Finding/css/fonts/icomoon.woff rename to skins/Finding/css/fonts/icomoon.woff diff --git a/Finding/css/fonts/selection.json b/skins/Finding/css/fonts/selection.json similarity index 100% rename from Finding/css/fonts/selection.json rename to skins/Finding/css/fonts/selection.json diff --git a/Finding/dynamic.ftl b/skins/Finding/dynamic.ftl similarity index 100% rename from Finding/dynamic.ftl rename to skins/Finding/dynamic.ftl diff --git a/Finding/footer.ftl b/skins/Finding/footer.ftl similarity index 100% rename from Finding/footer.ftl rename to skins/Finding/footer.ftl diff --git a/Finding/header.ftl b/skins/Finding/header.ftl similarity index 100% rename from Finding/header.ftl rename to skins/Finding/header.ftl diff --git a/Finding/images/header-bg.jpg b/skins/Finding/images/header-bg.jpg similarity index 100% rename from Finding/images/header-bg.jpg rename to skins/Finding/images/header-bg.jpg diff --git a/Finding/images/next.jpg b/skins/Finding/images/next.jpg similarity index 100% rename from Finding/images/next.jpg rename to skins/Finding/images/next.jpg diff --git a/Finding/images/preview.jpg b/skins/Finding/images/preview.jpg similarity index 100% rename from Finding/images/preview.jpg rename to skins/Finding/images/preview.jpg diff --git a/Finding/index.ftl b/skins/Finding/index.ftl similarity index 100% rename from Finding/index.ftl rename to skins/Finding/index.ftl diff --git a/Finding/js/Finding.js b/skins/Finding/js/Finding.js similarity index 100% rename from Finding/js/Finding.js rename to skins/Finding/js/Finding.js diff --git a/Finding/js/Finding.min.js b/skins/Finding/js/Finding.min.js similarity index 100% rename from Finding/js/Finding.min.js rename to skins/Finding/js/Finding.min.js diff --git a/Finding/lang/lang_en_US.properties b/skins/Finding/lang/lang_en_US.properties similarity index 100% rename from Finding/lang/lang_en_US.properties rename to skins/Finding/lang/lang_en_US.properties diff --git a/Finding/lang/lang_zh_CN.properties b/skins/Finding/lang/lang_zh_CN.properties similarity index 100% rename from Finding/lang/lang_zh_CN.properties rename to skins/Finding/lang/lang_zh_CN.properties diff --git a/Finding/links.ftl b/skins/Finding/links.ftl similarity index 100% rename from Finding/links.ftl rename to skins/Finding/links.ftl diff --git a/Finding/macro-comments.ftl b/skins/Finding/macro-comments.ftl similarity index 100% rename from Finding/macro-comments.ftl rename to skins/Finding/macro-comments.ftl diff --git a/Finding/macro-head.ftl b/skins/Finding/macro-head.ftl similarity index 100% rename from Finding/macro-head.ftl rename to skins/Finding/macro-head.ftl diff --git a/Finding/page.ftl b/skins/Finding/page.ftl similarity index 100% rename from Finding/page.ftl rename to skins/Finding/page.ftl diff --git a/Finding/preview.png b/skins/Finding/preview.png similarity index 100% rename from Finding/preview.png rename to skins/Finding/preview.png diff --git a/Finding/side.ftl b/skins/Finding/side.ftl similarity index 100% rename from Finding/side.ftl rename to skins/Finding/side.ftl diff --git a/Finding/skin.properties b/skins/Finding/skin.properties similarity index 100% rename from Finding/skin.properties rename to skins/Finding/skin.properties diff --git a/Finding/tag-articles.ftl b/skins/Finding/tag-articles.ftl similarity index 100% rename from Finding/tag-articles.ftl rename to skins/Finding/tag-articles.ftl diff --git a/Finding/tags.ftl b/skins/Finding/tags.ftl similarity index 100% rename from Finding/tags.ftl rename to skins/Finding/tags.ftl diff --git a/NeoEase/archive-articles.ftl b/skins/NeoEase/archive-articles.ftl similarity index 100% rename from NeoEase/archive-articles.ftl rename to skins/NeoEase/archive-articles.ftl diff --git a/NeoEase/article-list.ftl b/skins/NeoEase/article-list.ftl similarity index 100% rename from NeoEase/article-list.ftl rename to skins/NeoEase/article-list.ftl diff --git a/NeoEase/article.ftl b/skins/NeoEase/article.ftl similarity index 100% rename from NeoEase/article.ftl rename to skins/NeoEase/article.ftl diff --git a/NeoEase/author-articles.ftl b/skins/NeoEase/author-articles.ftl similarity index 100% rename from NeoEase/author-articles.ftl rename to skins/NeoEase/author-articles.ftl diff --git a/NeoEase/category-articles.ftl b/skins/NeoEase/category-articles.ftl similarity index 100% rename from NeoEase/category-articles.ftl rename to skins/NeoEase/category-articles.ftl diff --git a/NeoEase/common-comment.ftl b/skins/NeoEase/common-comment.ftl similarity index 100% rename from NeoEase/common-comment.ftl rename to skins/NeoEase/common-comment.ftl diff --git a/NeoEase/css/NeoEase.css b/skins/NeoEase/css/NeoEase.css similarity index 100% rename from NeoEase/css/NeoEase.css rename to skins/NeoEase/css/NeoEase.css diff --git a/NeoEase/css/NeoEase.min.css b/skins/NeoEase/css/NeoEase.min.css similarity index 100% rename from NeoEase/css/NeoEase.min.css rename to skins/NeoEase/css/NeoEase.min.css diff --git a/NeoEase/footer.ftl b/skins/NeoEase/footer.ftl similarity index 100% rename from NeoEase/footer.ftl rename to skins/NeoEase/footer.ftl diff --git a/NeoEase/header.ftl b/skins/NeoEase/header.ftl similarity index 100% rename from NeoEase/header.ftl rename to skins/NeoEase/header.ftl diff --git a/NeoEase/images/404.png b/skins/NeoEase/images/404.png similarity index 100% rename from NeoEase/images/404.png rename to skins/NeoEase/images/404.png diff --git a/NeoEase/images/ajax-loader.gif b/skins/NeoEase/images/ajax-loader.gif similarity index 100% rename from NeoEase/images/ajax-loader.gif rename to skins/NeoEase/images/ajax-loader.gif diff --git a/NeoEase/images/icons.png b/skins/NeoEase/images/icons.png similarity index 100% rename from NeoEase/images/icons.png rename to skins/NeoEase/images/icons.png diff --git a/NeoEase/index.ftl b/skins/NeoEase/index.ftl similarity index 100% rename from NeoEase/index.ftl rename to skins/NeoEase/index.ftl diff --git a/NeoEase/js/NeoEase.js b/skins/NeoEase/js/NeoEase.js similarity index 100% rename from NeoEase/js/NeoEase.js rename to skins/NeoEase/js/NeoEase.js diff --git a/NeoEase/js/NeoEase.min.js b/skins/NeoEase/js/NeoEase.min.js similarity index 100% rename from NeoEase/js/NeoEase.min.js rename to skins/NeoEase/js/NeoEase.min.js diff --git a/NeoEase/lang/lang_en_US.properties b/skins/NeoEase/lang/lang_en_US.properties similarity index 100% rename from NeoEase/lang/lang_en_US.properties rename to skins/NeoEase/lang/lang_en_US.properties diff --git a/NeoEase/lang/lang_zh_CN.properties b/skins/NeoEase/lang/lang_zh_CN.properties similarity index 100% rename from NeoEase/lang/lang_zh_CN.properties rename to skins/NeoEase/lang/lang_zh_CN.properties diff --git a/NeoEase/macro-comments.ftl b/skins/NeoEase/macro-comments.ftl similarity index 100% rename from NeoEase/macro-comments.ftl rename to skins/NeoEase/macro-comments.ftl diff --git a/NeoEase/macro-head.ftl b/skins/NeoEase/macro-head.ftl similarity index 100% rename from NeoEase/macro-head.ftl rename to skins/NeoEase/macro-head.ftl diff --git a/NeoEase/page.ftl b/skins/NeoEase/page.ftl similarity index 100% rename from NeoEase/page.ftl rename to skins/NeoEase/page.ftl diff --git a/NeoEase/preview.png b/skins/NeoEase/preview.png similarity index 100% rename from NeoEase/preview.png rename to skins/NeoEase/preview.png diff --git a/NeoEase/side.ftl b/skins/NeoEase/side.ftl similarity index 100% rename from NeoEase/side.ftl rename to skins/NeoEase/side.ftl diff --git a/NeoEase/skin.properties b/skins/NeoEase/skin.properties similarity index 100% rename from NeoEase/skin.properties rename to skins/NeoEase/skin.properties diff --git a/NeoEase/tag-articles.ftl b/skins/NeoEase/tag-articles.ftl similarity index 100% rename from NeoEase/tag-articles.ftl rename to skins/NeoEase/tag-articles.ftl diff --git a/NeoEase/tags.ftl b/skins/NeoEase/tags.ftl similarity index 100% rename from NeoEase/tags.ftl rename to skins/NeoEase/tags.ftl diff --git a/classic/archive-articles.ftl b/skins/classic/archive-articles.ftl similarity index 97% rename from classic/archive-articles.ftl rename to skins/classic/archive-articles.ftl index 3f9d16f..81ed52d 100644 --- a/classic/archive-articles.ftl +++ b/skins/classic/archive-articles.ftl @@ -1,39 +1,39 @@ -<#include "macro-head.ftl"> - - - - <@head title="${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - ${blogTitle}"> - - - - - - ${topBarReplacement} -
-
- <#include "header.ftl"> -
-
-
-
-

${archive1Label} - <#if "en" == localeString?substring(0, 2)> - ${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - <#else> - ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} (${archiveDate.archiveDatePublishedArticleCount}) - -

-
- <#include "article-list.ftl"> -
-
- <#include "side.ftl"> -
-
-
- -
- - +<#include "macro-head.ftl"> + + + + <@head title="${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - ${blogTitle}"> + + + + + + ${topBarReplacement} +
+
+ <#include "header.ftl"> +
+
+
+
+

${archive1Label} + <#if "en" == localeString?substring(0, 2)> + ${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) + <#else> + ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} (${archiveDate.archiveDatePublishedArticleCount}) + +

+
+ <#include "article-list.ftl"> +
+
+ <#include "side.ftl"> +
+
+
+ +
+ + diff --git a/classic/article-list.ftl b/skins/classic/article-list.ftl similarity index 97% rename from classic/article-list.ftl rename to skins/classic/article-list.ftl index a7e7130..857d592 100644 --- a/classic/article-list.ftl +++ b/skins/classic/article-list.ftl @@ -1,87 +1,87 @@ -
- <#list articles as article> -
-
- -
-

- - ${article.articleTitle} - - <#if article.hasUpdated> - - ${updatedLabel} - - - <#if article.articlePutTop> - - ${topArticleLabel} - - -

- -
-
-
-
-
- ${article.articleAbstract} -
-
- -
- - <#if 0 != paginationPageCount> - - +
+ <#list articles as article> +
+
+ +
+

+ + ${article.articleTitle} + + <#if article.hasUpdated> + + ${updatedLabel} + + + <#if article.articlePutTop> + + ${topArticleLabel} + + +

+ +
+
+
+
+
+ ${article.articleAbstract} +
+
+ +
+ + <#if 0 != paginationPageCount> + +
\ No newline at end of file diff --git a/classic/article.ftl b/skins/classic/article.ftl similarity index 98% rename from classic/article.ftl rename to skins/classic/article.ftl index f4068e0..5386297 100644 --- a/classic/article.ftl +++ b/skins/classic/article.ftl @@ -1,192 +1,192 @@ -<#include "macro-head.ftl"> -<#include "macro-comments.ftl"> - - - - <@head title="${article.articleTitle} - ${blogTitle}"> - - - - <#if previousArticlePermalink??> - - - <#if nextArticlePermalink??> - - - - - ${topBarReplacement} -
-
- <#include "header.ftl"> -
-
-
-
-
-
- -
-

- ${article.articleTitle} - <#if article.hasUpdated> - - ${updatedLabel} - - - <#if article.articlePutTop> - - ${topArticleLabel} - - -

- -
-
-
-
- ${article.articleContent} - <#if "" != article.articleSign.signHTML?trim> -
- ${article.articleSign.signHTML} -
- -
-
-
- <#if nextArticlePermalink??> - ${nextArticle1Label}${nextArticleTitle}
- - <#if previousArticlePermalink??> - ${previousArticle1Label}${previousArticleTitle} - -
-
- - ${article.articleCreateDate?string("yyyy-MM-dd HH:mm:ss")}   - - - - ${article.articleCommentCount}   - - - - ${article.articleViewCount} - -
-
-
- <#if 0 != relevantArticlesDisplayCount> -
- -
-
-
-
-
- <@comments commentList=articleComments article=article> -
-
-
-
- <#include "side.ftl"> -
-
-
-
- -
- <@comment_script oId=article.oId> - page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}"; - <#if 0 != randomArticlesDisplayCount> - page.loadRandomArticles(); - - <#if 0 != relevantArticlesDisplayCount> - page.loadRelevantArticles('${article.oId}', '

${relevantArticles1Label}

'); - - <#if 0 != externalRelevantArticlesDisplayCount> - page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,"); - - - - - +<#include "macro-head.ftl"> +<#include "macro-comments.ftl"> + + + + <@head title="${article.articleTitle} - ${blogTitle}"> + + + + <#if previousArticlePermalink??> + + + <#if nextArticlePermalink??> + + + + + ${topBarReplacement} +
+
+ <#include "header.ftl"> +
+
+
+
+
+
+ +
+

+ ${article.articleTitle} + <#if article.hasUpdated> + + ${updatedLabel} + + + <#if article.articlePutTop> + + ${topArticleLabel} + + +

+ +
+
+
+
+ ${article.articleContent} + <#if "" != article.articleSign.signHTML?trim> +
+ ${article.articleSign.signHTML} +
+ +
+
+
+ <#if nextArticlePermalink??> + ${nextArticle1Label}${nextArticleTitle}
+ + <#if previousArticlePermalink??> + ${previousArticle1Label}${previousArticleTitle} + +
+
+ + ${article.articleCreateDate?string("yyyy-MM-dd HH:mm:ss")}   + + + + ${article.articleCommentCount}   + + + + ${article.articleViewCount} + +
+
+
+ <#if 0 != relevantArticlesDisplayCount> +
+ +
+
+
+
+
+ <@comments commentList=articleComments article=article> +
+
+
+
+ <#include "side.ftl"> +
+
+
+
+ +
+ <@comment_script oId=article.oId> + page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}"; + <#if 0 != randomArticlesDisplayCount> + page.loadRandomArticles(); + + <#if 0 != relevantArticlesDisplayCount> + page.loadRelevantArticles('${article.oId}', '

${relevantArticles1Label}

'); + + <#if 0 != externalRelevantArticlesDisplayCount> + page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,"); + + + + + diff --git a/classic/author-articles.ftl b/skins/classic/author-articles.ftl similarity index 97% rename from classic/author-articles.ftl rename to skins/classic/author-articles.ftl index c98f290..9bd48d3 100644 --- a/classic/author-articles.ftl +++ b/skins/classic/author-articles.ftl @@ -1,35 +1,35 @@ -<#include "macro-head.ftl"> - - - - <@head title="${authorName} - ${blogTitle}"> - - - - - - ${topBarReplacement} -
-
- <#include "header.ftl"> -
-
-
-
-

- ${author1Label}${authorName} -

-
- <#include "article-list.ftl"> -
-
- <#include "side.ftl"> -
-
-
- -
- - +<#include "macro-head.ftl"> + + + + <@head title="${authorName} - ${blogTitle}"> + + + + + + ${topBarReplacement} +
+
+ <#include "header.ftl"> +
+
+
+
+

+ ${author1Label}${authorName} +

+
+ <#include "article-list.ftl"> +
+
+ <#include "side.ftl"> +
+
+
+ +
+ + diff --git a/classic/category-articles.ftl b/skins/classic/category-articles.ftl similarity index 100% rename from classic/category-articles.ftl rename to skins/classic/category-articles.ftl diff --git a/classic/common-comment.ftl b/skins/classic/common-comment.ftl similarity index 100% rename from classic/common-comment.ftl rename to skins/classic/common-comment.ftl diff --git a/classic/css/classic.css b/skins/classic/css/classic.css similarity index 95% rename from classic/css/classic.css rename to skins/classic/css/classic.css index 6010586..17f6e79 100644 --- a/classic/css/classic.css +++ b/skins/classic/css/classic.css @@ -1,416 +1,416 @@ -/** - * Copyright (c) 2010-2017, b3log.org & hacpai.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -@charset "utf-8"; -/* - * skin classic style - * - * @author Liyuan Li - * @author Liang Ding - * @version 1.2.0.0, Sep 21, 2017 -*/ -a, a:link { - color: #0000CC; -} -a:active { - color: red; -} -a:visited { - color: #551A8B; -} -h5 { - font-size: 12px; -} -.content { - margin: 0 auto; - max-width: 1250px; - padding: 0 12px; -} -.header { - height: 108px; -} - -.header .page-icon { - height: 14px; - width: 14px; - margin: -1px 3px 0 0; -} - -.sub-title { - font-size: 14px; - font-weight: normal; -} -.side { - border-left: 2px solid #E5ECF9; - padding-left: 12px; - width: 280px; -} -.main { - margin-right: -294px; - width: 100%; -} -.main>div { - min-width: 280px; - padding-right: 318px; -} -#logoTitle { - font-family: "Microsoft YaHei"; - font-size: 32px; - line-height: 64px; - text-decoration: none; -} -#statistic span { - font-size: 11px; -} -.article, .comments { - padding-bottom: 24px; -} -.article-title { - background-color: #E3E3FF; - border-top: 1px solid #3366CC; - margin-left: 91px; - padding: 3px 0 6px 12px; -} -.article-title sup { - font-size: 12px; -} -.article-date { - background-color: #E3E3FF; - border: 1px solid #BBCCFF; - float: left; - margin: 0 12px 12px 0; - border-radius: 5px; - padding: 7px 3px; - width: 70px; - text-align: center; - word-break: break-all; -} -.article-abstract { - word-wrap: break-word; -} -.article-body { - margin-left: 12px; - line-height: 145%; -} -.article-footer { - margin-right: 12px; -} -.article-footer a, .article-details-footer a { - text-decoration: none; -} -.article-details-footer { - margin: 36px 12px 0 0; -} -.article-relative { - line-height: 22px; - margin-top: 24px; -} -.comments { - position: relative; -} -.comment-title { - background-color: #E3E3FF; - border-top: 1px solid #3366CC; - padding: 3px 12px 3px 12px; -} -.comment-body-ref { - background-color: #FFFFFF; - border: 1px solid #E3E3FF; - filter: alpha(opacity=90); - left: 88px; - opacity: 0.9; - position: absolute; - top: 27px; - width: 87%; - z-index: 10; -} -.comment-body-ref .comment-title { - border-top: 0px; -} -.comment-body { - padding: 9px 12px 12px; - word-wrap: break-word; - overflow: hidden; -} -.comment-picture { - margin-right: 12px; -} -.comment-picture img { - height: 60px; - width: 60px; -} -.comment-reply { - margin: 0 auto 24px auto; -} -.comment-content { - float: left; - width: 88%; -} - -#commentURL:focus, #commentURLReply:focus { - box-shadow: -3px 1px 2px rgba(0, 0, 0, 0.3) inset; -} - -.error-msg { - color: #3366CC; -} -.error-footer { - bottom: 0px; - position: fixed; - width: 82%; -} -#sideNavi a.selected { - color: #000000; - text-decoration: none; -} -.side-navi ul { - list-style: none; -} -#sideNavi li { - line-height: 22px; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; -} -#sideNavi li.aboutMe, #sideNavi li.side-navi-notice { - white-space: normal; -} -#sideNavi sup { - margin-right: 3px; - color: green; -} -.side-comment { - text-decoration: none; -} -#recentComments p { - display: inline; -} -#recentComments div, #recentComments br { - display: none; -} -.line { - border-top: thin dotted #BBBBBB; - margin-top: 12px; - padding-top: 12px; -} -.pagination { - margin: 16px; - text-align: center; -} -.pagination a, .pagination a:visited { - color: #4272DB; - padding: 0 3px; - text-decoration: none; -} -.pagination a.selected { - color: #000000; - font-weight: bold; -} -#tagsPanel .tagPanel { - border: 2px solid; - cursor: pointer; - float: left; - margin: 3px; - border-radius: 6px; -} -#tagsPanel .tagPanel:hover { - background-color: #EEEEEE; - border: 2px dashed; -} -#tagsPanel .tagPanel { - text-decoration: none; -} -.error-title { - border-top: 1px solid #3366CC; - background-color: #E5ECF9; - margin-left: 12px; - padding: 6px 12px; -} -.error-panel { - margin-left: 12px; - padding: 24px; -} -.commentIcon, .browserIcon { - background-image: url("../../../images/icon.png"); - cursor: pointer; - height: 16px; - margin-right: 3px; - width: 16px; -} -.commentIcon { - background-position: -32px -16px; -} -.browserIcon { - background-position: -128px -16px; -} -.goTopIcon { - background-position: -128px -32px; -} -.goBottomIcon { - background-position: -144px -32px; -} -.footer { - text-align: center; - margin: 30px 0 30px 0; -} - -.content-reset { - font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif; - word-wrap: break-word; - overflow: auto; - line-height: 1.5; - font-size: 16px; - word-break: break-all -} -.content-reset a { - color: #ff4d3a; -} -.content-reset ul, -.content-reset ol { - padding-left: 2em; - margin-top: 0; - margin-bottom: 16px -} -.content-reset li { - margin-top: 0.25em -} -.content-reset h1, -.content-reset h2, -.content-reset h3, -.content-reset h4, -.content-reset h5, -.content-reset h6 { - margin-top: 24px; - margin-bottom: 16px; - font-weight: 600; - line-height: 1.25 -} -.content-reset h1 { - padding-bottom: 0.3em; - font-size: 2em; - border-bottom: 1px solid #eee -} -.content-reset h2 { - padding-bottom: 0.3em; - font-size: 1.5em; - border-bottom: 1px solid #eee -} -.content-reset h3 { - font-size: 1.25em -} -.content-reset h4 { - font-size: 1em -} -.content-reset h5 { - font-size: 0.875em -} -.content-reset h6 { - font-size: 0.85em -} -.content-reset hr { - height: 0.25em; - padding: 0; - margin: 24px 0; - background-color: #e7e7e7; - border: 0 -} -.content-reset p { - margin-top: 0; - margin-bottom: 16px -} -.content-reset blockquote { - padding: 0 1em; - color: #777; - border-left: 0.25em solid #ddd; - margin-bottom: 16px -} -.content-reset blockquote p { - margin: 0 -} -.content-reset iframe { - border: 1px solid #ccc -} -.content-reset table { - width: 100%; - border: 1px solid #dedede; - margin: 15px auto; - border-collapse: collapse; - empty-cells: show -} -.content-reset thead { - text-align: center -} -.content-reset td, -.content-reset th { - height: 35px; - border: 1px solid #dedede; - padding: 0 10px -} -.content-reset th { - font-weight: bold; - text-align: center !important; - background: rgba(158, 188, 226, 0.2) -} -.content-reset tbody tr:nth-child(2n) { - background: rgba(158, 188, 226, 0.12) -} -.content-reset tr:hover { - background: #efefef -} -.content-reset code { - padding: 0.2em 0.4em; - margin: 0; - font-size: 85%; - background-color: rgba(252, 41, 41, 0.12); - border-radius: 3px; - color: #d23f31; - font-family: mononoki, Consolas, "Liberation Mono", Menlo, Courier, monospace -} -.content-reset pre>code { - padding: 0.5em; - border-radius: 0; - color: #333; - background-color: rgba(0, 0, 0, 0.04); - background-image: url(../images/code-bg.png); - background-size: 20px 20px; - border-radius: 5px -} -.content-reset kbd { - display: inline-block; - padding: 3px 5px; - font: 11px Consolas, "Liberation Mono", Menlo, Courier, monospace; - line-height: 10px; - color: #555; - vertical-align: middle; - background-color: #fcfcfc; - border: solid 1px #ccc; - border-bottom-color: #bbb; - border-radius: 3px; - box-shadow: inset 0 -1px 0 #bbb -} - -.has-toc > ul > li { - list-style: none; - float: left; - width: 50%; - text-align: center; - margin: 15px 0; - cursor: pointer; -} - -.has-toc > ul > li.current { - color: #3366CC; +/** + * Copyright (c) 2010-2017, b3log.org & hacpai.com + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +@charset "utf-8"; +/* + * skin classic style + * + * @author Liyuan Li + * @author Liang Ding + * @version 1.2.0.0, Sep 21, 2017 +*/ +a, a:link { + color: #0000CC; +} +a:active { + color: red; +} +a:visited { + color: #551A8B; +} +h5 { + font-size: 12px; +} +.content { + margin: 0 auto; + max-width: 1250px; + padding: 0 12px; +} +.header { + height: 108px; +} + +.header .page-icon { + height: 14px; + width: 14px; + margin: -1px 3px 0 0; +} + +.sub-title { + font-size: 14px; + font-weight: normal; +} +.side { + border-left: 2px solid #E5ECF9; + padding-left: 12px; + width: 280px; +} +.main { + margin-right: -294px; + width: 100%; +} +.main>div { + min-width: 280px; + padding-right: 318px; +} +#logoTitle { + font-family: "Microsoft YaHei"; + font-size: 32px; + line-height: 64px; + text-decoration: none; +} +#statistic span { + font-size: 11px; +} +.article, .comments { + padding-bottom: 24px; +} +.article-title { + background-color: #E3E3FF; + border-top: 1px solid #3366CC; + margin-left: 91px; + padding: 3px 0 6px 12px; +} +.article-title sup { + font-size: 12px; +} +.article-date { + background-color: #E3E3FF; + border: 1px solid #BBCCFF; + float: left; + margin: 0 12px 12px 0; + border-radius: 5px; + padding: 7px 3px; + width: 70px; + text-align: center; + word-break: break-all; +} +.article-abstract { + word-wrap: break-word; +} +.article-body { + margin-left: 12px; + line-height: 145%; +} +.article-footer { + margin-right: 12px; +} +.article-footer a, .article-details-footer a { + text-decoration: none; +} +.article-details-footer { + margin: 36px 12px 0 0; +} +.article-relative { + line-height: 22px; + margin-top: 24px; +} +.comments { + position: relative; +} +.comment-title { + background-color: #E3E3FF; + border-top: 1px solid #3366CC; + padding: 3px 12px 3px 12px; +} +.comment-body-ref { + background-color: #FFFFFF; + border: 1px solid #E3E3FF; + filter: alpha(opacity=90); + left: 88px; + opacity: 0.9; + position: absolute; + top: 27px; + width: 87%; + z-index: 10; +} +.comment-body-ref .comment-title { + border-top: 0px; +} +.comment-body { + padding: 9px 12px 12px; + word-wrap: break-word; + overflow: hidden; +} +.comment-picture { + margin-right: 12px; +} +.comment-picture img { + height: 60px; + width: 60px; +} +.comment-reply { + margin: 0 auto 24px auto; +} +.comment-content { + float: left; + width: 88%; +} + +#commentURL:focus, #commentURLReply:focus { + box-shadow: -3px 1px 2px rgba(0, 0, 0, 0.3) inset; +} + +.error-msg { + color: #3366CC; +} +.error-footer { + bottom: 0px; + position: fixed; + width: 82%; +} +#sideNavi a.selected { + color: #000000; + text-decoration: none; +} +.side-navi ul { + list-style: none; +} +#sideNavi li { + line-height: 22px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; +} +#sideNavi li.aboutMe, #sideNavi li.side-navi-notice { + white-space: normal; +} +#sideNavi sup { + margin-right: 3px; + color: green; +} +.side-comment { + text-decoration: none; +} +#recentComments p { + display: inline; +} +#recentComments div, #recentComments br { + display: none; +} +.line { + border-top: thin dotted #BBBBBB; + margin-top: 12px; + padding-top: 12px; +} +.pagination { + margin: 16px; + text-align: center; +} +.pagination a, .pagination a:visited { + color: #4272DB; + padding: 0 3px; + text-decoration: none; +} +.pagination a.selected { + color: #000000; + font-weight: bold; +} +#tagsPanel .tagPanel { + border: 2px solid; + cursor: pointer; + float: left; + margin: 3px; + border-radius: 6px; +} +#tagsPanel .tagPanel:hover { + background-color: #EEEEEE; + border: 2px dashed; +} +#tagsPanel .tagPanel { + text-decoration: none; +} +.error-title { + border-top: 1px solid #3366CC; + background-color: #E5ECF9; + margin-left: 12px; + padding: 6px 12px; +} +.error-panel { + margin-left: 12px; + padding: 24px; +} +.commentIcon, .browserIcon { + background-image: url("../../../images/icon.png"); + cursor: pointer; + height: 16px; + margin-right: 3px; + width: 16px; +} +.commentIcon { + background-position: -32px -16px; +} +.browserIcon { + background-position: -128px -16px; +} +.goTopIcon { + background-position: -128px -32px; +} +.goBottomIcon { + background-position: -144px -32px; +} +.footer { + text-align: center; + margin: 30px 0 30px 0; +} + +.content-reset { + font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif; + word-wrap: break-word; + overflow: auto; + line-height: 1.5; + font-size: 16px; + word-break: break-all +} +.content-reset a { + color: #ff4d3a; +} +.content-reset ul, +.content-reset ol { + padding-left: 2em; + margin-top: 0; + margin-bottom: 16px +} +.content-reset li { + margin-top: 0.25em +} +.content-reset h1, +.content-reset h2, +.content-reset h3, +.content-reset h4, +.content-reset h5, +.content-reset h6 { + margin-top: 24px; + margin-bottom: 16px; + font-weight: 600; + line-height: 1.25 +} +.content-reset h1 { + padding-bottom: 0.3em; + font-size: 2em; + border-bottom: 1px solid #eee +} +.content-reset h2 { + padding-bottom: 0.3em; + font-size: 1.5em; + border-bottom: 1px solid #eee +} +.content-reset h3 { + font-size: 1.25em +} +.content-reset h4 { + font-size: 1em +} +.content-reset h5 { + font-size: 0.875em +} +.content-reset h6 { + font-size: 0.85em +} +.content-reset hr { + height: 0.25em; + padding: 0; + margin: 24px 0; + background-color: #e7e7e7; + border: 0 +} +.content-reset p { + margin-top: 0; + margin-bottom: 16px +} +.content-reset blockquote { + padding: 0 1em; + color: #777; + border-left: 0.25em solid #ddd; + margin-bottom: 16px +} +.content-reset blockquote p { + margin: 0 +} +.content-reset iframe { + border: 1px solid #ccc +} +.content-reset table { + width: 100%; + border: 1px solid #dedede; + margin: 15px auto; + border-collapse: collapse; + empty-cells: show +} +.content-reset thead { + text-align: center +} +.content-reset td, +.content-reset th { + height: 35px; + border: 1px solid #dedede; + padding: 0 10px +} +.content-reset th { + font-weight: bold; + text-align: center !important; + background: rgba(158, 188, 226, 0.2) +} +.content-reset tbody tr:nth-child(2n) { + background: rgba(158, 188, 226, 0.12) +} +.content-reset tr:hover { + background: #efefef +} +.content-reset code { + padding: 0.2em 0.4em; + margin: 0; + font-size: 85%; + background-color: rgba(252, 41, 41, 0.12); + border-radius: 3px; + color: #d23f31; + font-family: mononoki, Consolas, "Liberation Mono", Menlo, Courier, monospace +} +.content-reset pre>code { + padding: 0.5em; + border-radius: 0; + color: #333; + background-color: rgba(0, 0, 0, 0.04); + background-image: url(../images/code-bg.png); + background-size: 20px 20px; + border-radius: 5px +} +.content-reset kbd { + display: inline-block; + padding: 3px 5px; + font: 11px Consolas, "Liberation Mono", Menlo, Courier, monospace; + line-height: 10px; + color: #555; + vertical-align: middle; + background-color: #fcfcfc; + border: solid 1px #ccc; + border-bottom-color: #bbb; + border-radius: 3px; + box-shadow: inset 0 -1px 0 #bbb +} + +.has-toc > ul > li { + list-style: none; + float: left; + width: 50%; + text-align: center; + margin: 15px 0; + cursor: pointer; +} + +.has-toc > ul > li.current { + color: #3366CC; } \ No newline at end of file diff --git a/classic/css/classic.min.css b/skins/classic/css/classic.min.css similarity index 100% rename from classic/css/classic.min.css rename to skins/classic/css/classic.min.css diff --git a/classic/footer.ftl b/skins/classic/footer.ftl similarity index 97% rename from classic/footer.ftl rename to skins/classic/footer.ftl index b36dcfe..e67beed 100644 --- a/classic/footer.ftl +++ b/skins/classic/footer.ftl @@ -1,79 +1,79 @@ -© ${year} - ${blogTitle}${footerContent}
-Powered by B3log 开源Solo ${version}   -Theme by Vanessa. -
-
- - - -${plugins} +© ${year} - ${blogTitle}${footerContent}
+Powered by B3log 开源Solo ${version}   +Theme by Vanessa. +
+
+ + + +${plugins} diff --git a/classic/header.ftl b/skins/classic/header.ftl similarity index 95% rename from classic/header.ftl rename to skins/classic/header.ftl index 5316f21..c7715af 100644 --- a/classic/header.ftl +++ b/skins/classic/header.ftl @@ -1,40 +1,40 @@ -
-

- - ${blogTitle} - - ${blogSubtitle} -

-
-
- <#list pageNavigations as page> - - <#if page.pageIcon != ''>${page.pageTitle}   - - - ${allTagsLabel}   - RSSRSS -   Search -
-
- ${viewCount1Label} - - ${statistic.statisticBlogViewCount} - -    - - - ${articleCount1Label} - - ${statistic.statisticPublishedBlogArticleCount} - -    - - - ${commentCount1Label} - - ${statistic.statisticPublishedBlogCommentCount} - - -
+
+

+ + ${blogTitle} + + ${blogSubtitle} +

+
+
+ <#list pageNavigations as page> + + <#if page.pageIcon != ''>${page.pageTitle}   + + + ${allTagsLabel}   + RSSRSS +   Search +
+
+ ${viewCount1Label} + + ${statistic.statisticBlogViewCount} + +    + + + ${articleCount1Label} + + ${statistic.statisticPublishedBlogArticleCount} + +    + + + ${commentCount1Label} + + ${statistic.statisticPublishedBlogCommentCount} + + +
\ No newline at end of file diff --git a/classic/index.ftl b/skins/classic/index.ftl similarity index 96% rename from classic/index.ftl rename to skins/classic/index.ftl index 415c971..997c7c3 100644 --- a/classic/index.ftl +++ b/skins/classic/index.ftl @@ -1,34 +1,34 @@ -<#include "macro-head.ftl"> - - - - <@head title="${blogTitle}"> - <#if metaKeywords??> - - - <#if metaDescription??> - - - - - - ${topBarReplacement} -
-
- <#include "header.ftl"> -
-
-
- <#include "article-list.ftl"> -
-
- <#include "side.ftl"> -
-
-
- -
- - +<#include "macro-head.ftl"> + + + + <@head title="${blogTitle}"> + <#if metaKeywords??> + + + <#if metaDescription??> + + + + + + ${topBarReplacement} +
+
+ <#include "header.ftl"> +
+
+
+ <#include "article-list.ftl"> +
+
+ <#include "side.ftl"> +
+
+
+ +
+ + diff --git a/classic/lang/lang_en_US.properties b/skins/classic/lang/lang_en_US.properties similarity index 97% rename from classic/lang/lang_en_US.properties rename to skins/classic/lang/lang_en_US.properties index e72729a..2e6f1d6 100644 --- a/classic/lang/lang_en_US.properties +++ b/skins/classic/lang/lang_en_US.properties @@ -1,260 +1,260 @@ -# -# Copyright (c) 2010-2017, b3log.org & hacpai.com -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# -# Description: Solo language configurations(en_US). -# Version: 1.1.6.5, Mar 14, 2017 -# Author: Liang Ding -# Author: Liyuan Li -# - -tocLabel=Article ToC -siteViewLabel=Site -adminConsoleLabel=Admin -adminIndexLabel=Admin Index -postArticleLabel=Post -articleListLabel=Articles -commentListLabel=Comments -draftListLabel=Drafts -userManageLabel=Users -commonUserLabel=Common User -addUserLabel=Add User -updateUserLabel=Update User -linkManagementLabel=Links -pluginMgmtLabel=Plugins -pluginNameLabel=Name -versionLabel=Version -statusLabel=Status -enabledLabel=Enabled -disabledLabel=Disabled -enableLabel=Enable -disableLabel=Disable -preferenceLabel=Preference -localeString1Label=Language: -timeZoneId1Label=Time Zone: -adminLabel=Admin -administratorLabel=Administrator -loginLabel=Login -logoutLabel=Logout -initLabel=Initial -popTagsLabel=Popular Tags -tag1Label=Tag: -tags1Label=Tags: -recentArticlesLabel=Recent Articles -recentCommentsLabel=Recent Comments -postCommentsLabel=Post Comment -mostCommentArticlesLabel=Most Comment Articles -mostViewCountArticlesLabel=Most View Articles -linkLabel=Friend Links -sumLabel= -pageLabel=Page -commentLabel=Comment -linkTitleLabel=Link Title -linkTitle1Label=Title: -updateLabel=Update -removeLabel=Remove -putTopLabel=Put Top -cancelPutTopLabel=Cancel Put Top -downloadCountLabel=Count -sizeLabel=Size -uploadDateLabel=Upload Date -downloadURLLabel=Download URL -downloadLabel=Download -createDateLabel=Create Date -updateDateLabel=Update Date -titleLabel=Title -title1Label=Title: -content1Label=Content: -abstract1Label=Summary: -publishLabel=Publish -unPublishLabel=Un Publish -urlLabel=URL -url1Label=URL (start protocol, e.g.: http://): -addLinkLabel=Add Link -updateLinkLabel=Update Link -archiveLabel=Archive -archive1Label=archive: -yearLabel= -monthLabel= -pageLabel=Page -pageMgmtLabel=Pages -othersLabel=Others -fileListLabel=Files -submitUploadLabel=Upload -fileNameLabel=File Name -paramSettingsLabel=Parameters -skinLabel=Skins -signLabel=Signs -sign1Label=Signs: -noSignLabel=No Signs -signIsNullLabel=This Sign is Null -statisticLabel=Blog Statistic -viewLabel=View -countLabel=Posts -viewCount1Label=View Count: -articleCount1Label=Article Count: -commentCountLabel=Comment Count -commentCount1Label=Comment Count: -commentEmotions1Label=Emotions: -commentEmotionsLabel=Emotions -commentName1Label=Name: -commentNameLabel=Name -commentEmail1Label=Email: -commentEmailLabel=Email -commentURL1Label=URL: -commentURLLabel=URL -commentContent1Label=Content: -commentContentLabel=Content -getDateLabel=Get Date -getArticleLabel=Get Article -selectDateLabel=Select Date -selectDate1Label=Select Date: -importLabel=Import -chooseBlog1Label=Choose Blog: -blogArticleImportLabel=Article Import -userName1Label=Username: -userPassword1Label=Password: -categoryLabel=Category -noticeBoard1Label=Notice Board: -noticeBoardLabel=Notice Board -htmlhead1Label=HTML head: -indexTagDisplayCnt1Label=Index Tag Display Count: -indexRecentArticleDisplayCnt1Label=Recent Article Display Count: -indexRecentCommentDisplayCnt1Label=Recent Comment Display Count: -indexMostCommentArticleDisplayCnt1Label=Most Comment Article Display Count: -indexMostViewArticleDisplayCnt1Label=Most View Article Display Count: -relevantArticlesDisplayCnt1Label=Relevant Article Display Count: -randomArticlesDisplayCnt1Label=Random Article Display Count: -externalRelevantArticlesDisplayCnt1Label=External Relevant Article Display Count: -windowSize1Label=Pagination Window Size: -pageSize1Label=Pagination Page Size: -blogTitle1Label=Blog Title: -blogSubtitle1Label=Blog Subtitle: -blogHost1Label=Blog Host: -submmitCommentLabel=Commit Comment -saveLabel=Save -tagLabel=Tag -tagsLabel=Tags -importedLabel=Imported -captcha1Label=Captcha: -captchaLabel=Captcha -indexLabel=Index -nextArticle1Label=Next: -previousArticle1Label=Previous: -updatedLabel=Updated! -topArticleLabel=Top! -CSDNBlogLabel=CSDN Blog -BlogJavaLabel=BlogJava -CnBlogsLabel=CnBlogs -previousPageLabel=Previous Page -nextPagePabel=Next Page -firstPageLabel=First Page -lastPageLabel=Last Page -returnTo1Label=Return to: -tencentLabel=Tencent -appKey1Label=App Key: -appSecret1Label=App Secret: -postToTencentMicroblogWhilePublishArticleLabel=Post to Tencent microblog while publish an article: -postToCommunityLabel=Post to Community: -authorizeTencentMicroblog1Label=Click to authorize: -googleLabel=Google -OAuthConsumerSecret1Label=OAuth Consumer Secret: -atomLabel=Atom -relevantArticles1Label=Relevant Articles: -randomArticles1Label=Random Articles: -externalRelevantArticles1Label=External Relevant Articles: -metaKeywords1Label=Meta Keywords: -metaDescription1Label=Meta Description: -removeUnusedTagsLabel=Remove Unused Tags -goTopLabel=Top -permalink1Label=Permalink: -permalinkLabel=Permalink -b3logLabel=B3LOG -killBrowserLabel=

Let's kill outdated and insecure browser!

Let's kill outdated and insecure browser for browser evolution, human progress and better experience.

You can download

-readmoreLabel=Read more\u00BB -readmore2Label=Read more -replyLabel=Reply\u00BB -homeLabel=Home -enableArticleUpdateHint1Label=Enable Article Update Hint: -allowVisitDraftViaPermalink1Label=Allow Visit Draft Via Link: -author1Label=Author: -authorLabel=Author -keyOfSolo1Label=Solo Key: -articleLabel=Article -tagArticlesLabel=Tag Articles -dateArticlesLabel=Archive Date Articles -authorArticlesLabel=Author Articles -indexArticleLabel=Index Articles -allTagsLabel=Tag Cloud -customizedPageLabel=Customized Page -killBrowserPageLabel=Kill Browser Page -pageNumLabel=Page Number -#### -forbiddenLabel=Forbidden Access! -sorryLabel=Sorry! -notFoundLabel=Not Found! -unPulbishSuccLabel=Un Publish Successfully -unPulbishFailLabel=Un Publish Fail -removeSuccLabel=Remove Successfully -removeFailLabel=Remove Fail -removeUserFailSkinNeedMulUsersLabel=Remove Fail, the current skin need multiple users! -putTopSuccLabel=Put Top Successfully -putTopFailLabel=Put Top Fail -cancelTopSuccLabel=Cancel Top Successfully -cancelTopFailLabel=Cancel Top Fail -addSuccLabel=Add Successfully -addFailLabel=Add Fail -updateSuccLabel=Update Successfully -updateFailLabel=Update Fail -updatePreferenceFailNeedMulUsersLabel=Update Fail, the selected skin need multiple users! -setFailLabel=Set Fail -setSuccLabel=Set Successfully -getFailLabel=Get Fail -noSettingLabel=No Setting -getSuccLabel=Get Successfully -importSuccLabel=Import Successfully :-) -importFailLabel=Some Import Fail %>_<% -noCommentLabel=No Comment -captchaErrorLabel=Captcha Error -inputErrorLabel=Input Error! -gotoLabel=Go -nameEmptyLabel=Username is empty -passwordEmptyLabel=Password is empty -blogEmptyLabel=Blogging service is empty -blogArticleEmptyLabel=Please select articles -nameTooLongLabel=Sorry, your username must be between 2 and 20 characters long. -mailCannotEmptyLabel=Mail is empty -mailInvalidLabel=Mail is invalid -commentContentCannotEmptyLabel=Sorry, your content must be between 2 and 500 characters long. -captchaCannotEmptyLabel=Captcha is empty -loadingLabel=Loading.... -titleEmptyLabel=Title is empty -contentEmptyLabel=Content is empty -orderEmptyLabel=Order is empty -abstractEmptyLabel=Abstract is empty -tagsEmptyLabel=Tags is empty -addressEmptyLabel=Address is empty -noAuthorizationURLLabel=Can not retrieve authorization URL from Google, please \ -make sure the Consumer Secret you typed in and then try again. -duplicatedPermalinkLabel=Duplicated permalink! -invalidPermalinkFormatLabel=Invalid permalink format! -duplicatedEmailLabel=Duplicated email! -refreshAndRetryLabel=Please refresh and try again! -editorLeaveLabel=Content is not null, Do you leave\uFF1F -editorPostLabel=Content is not null, Do you clear\uFF1F -#### -confirmRemoveLabel=Are You Sure? -confirmInitLabel=Are You Sure? +# +# Copyright (c) 2010-2017, b3log.org & hacpai.com +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# +# Description: Solo language configurations(en_US). +# Version: 1.1.6.5, Mar 14, 2017 +# Author: Liang Ding +# Author: Liyuan Li +# + +tocLabel=Article ToC +siteViewLabel=Site +adminConsoleLabel=Admin +adminIndexLabel=Admin Index +postArticleLabel=Post +articleListLabel=Articles +commentListLabel=Comments +draftListLabel=Drafts +userManageLabel=Users +commonUserLabel=Common User +addUserLabel=Add User +updateUserLabel=Update User +linkManagementLabel=Links +pluginMgmtLabel=Plugins +pluginNameLabel=Name +versionLabel=Version +statusLabel=Status +enabledLabel=Enabled +disabledLabel=Disabled +enableLabel=Enable +disableLabel=Disable +preferenceLabel=Preference +localeString1Label=Language: +timeZoneId1Label=Time Zone: +adminLabel=Admin +administratorLabel=Administrator +loginLabel=Login +logoutLabel=Logout +initLabel=Initial +popTagsLabel=Popular Tags +tag1Label=Tag: +tags1Label=Tags: +recentArticlesLabel=Recent Articles +recentCommentsLabel=Recent Comments +postCommentsLabel=Post Comment +mostCommentArticlesLabel=Most Comment Articles +mostViewCountArticlesLabel=Most View Articles +linkLabel=Friend Links +sumLabel= +pageLabel=Page +commentLabel=Comment +linkTitleLabel=Link Title +linkTitle1Label=Title: +updateLabel=Update +removeLabel=Remove +putTopLabel=Put Top +cancelPutTopLabel=Cancel Put Top +downloadCountLabel=Count +sizeLabel=Size +uploadDateLabel=Upload Date +downloadURLLabel=Download URL +downloadLabel=Download +createDateLabel=Create Date +updateDateLabel=Update Date +titleLabel=Title +title1Label=Title: +content1Label=Content: +abstract1Label=Summary: +publishLabel=Publish +unPublishLabel=Un Publish +urlLabel=URL +url1Label=URL (start protocol, e.g.: http://): +addLinkLabel=Add Link +updateLinkLabel=Update Link +archiveLabel=Archive +archive1Label=archive: +yearLabel= +monthLabel= +pageLabel=Page +pageMgmtLabel=Pages +othersLabel=Others +fileListLabel=Files +submitUploadLabel=Upload +fileNameLabel=File Name +paramSettingsLabel=Parameters +skinLabel=Skins +signLabel=Signs +sign1Label=Signs: +noSignLabel=No Signs +signIsNullLabel=This Sign is Null +statisticLabel=Blog Statistic +viewLabel=View +countLabel=Posts +viewCount1Label=View Count: +articleCount1Label=Article Count: +commentCountLabel=Comment Count +commentCount1Label=Comment Count: +commentEmotions1Label=Emotions: +commentEmotionsLabel=Emotions +commentName1Label=Name: +commentNameLabel=Name +commentEmail1Label=Email: +commentEmailLabel=Email +commentURL1Label=URL: +commentURLLabel=URL +commentContent1Label=Content: +commentContentLabel=Content +getDateLabel=Get Date +getArticleLabel=Get Article +selectDateLabel=Select Date +selectDate1Label=Select Date: +importLabel=Import +chooseBlog1Label=Choose Blog: +blogArticleImportLabel=Article Import +userName1Label=Username: +userPassword1Label=Password: +categoryLabel=Category +noticeBoard1Label=Notice Board: +noticeBoardLabel=Notice Board +htmlhead1Label=HTML head: +indexTagDisplayCnt1Label=Index Tag Display Count: +indexRecentArticleDisplayCnt1Label=Recent Article Display Count: +indexRecentCommentDisplayCnt1Label=Recent Comment Display Count: +indexMostCommentArticleDisplayCnt1Label=Most Comment Article Display Count: +indexMostViewArticleDisplayCnt1Label=Most View Article Display Count: +relevantArticlesDisplayCnt1Label=Relevant Article Display Count: +randomArticlesDisplayCnt1Label=Random Article Display Count: +externalRelevantArticlesDisplayCnt1Label=External Relevant Article Display Count: +windowSize1Label=Pagination Window Size: +pageSize1Label=Pagination Page Size: +blogTitle1Label=Blog Title: +blogSubtitle1Label=Blog Subtitle: +blogHost1Label=Blog Host: +submmitCommentLabel=Commit Comment +saveLabel=Save +tagLabel=Tag +tagsLabel=Tags +importedLabel=Imported +captcha1Label=Captcha: +captchaLabel=Captcha +indexLabel=Index +nextArticle1Label=Next: +previousArticle1Label=Previous: +updatedLabel=Updated! +topArticleLabel=Top! +CSDNBlogLabel=CSDN Blog +BlogJavaLabel=BlogJava +CnBlogsLabel=CnBlogs +previousPageLabel=Previous Page +nextPagePabel=Next Page +firstPageLabel=First Page +lastPageLabel=Last Page +returnTo1Label=Return to: +tencentLabel=Tencent +appKey1Label=App Key: +appSecret1Label=App Secret: +postToTencentMicroblogWhilePublishArticleLabel=Post to Tencent microblog while publish an article: +postToCommunityLabel=Post to Community: +authorizeTencentMicroblog1Label=Click to authorize: +googleLabel=Google +OAuthConsumerSecret1Label=OAuth Consumer Secret: +atomLabel=Atom +relevantArticles1Label=Relevant Articles: +randomArticles1Label=Random Articles: +externalRelevantArticles1Label=External Relevant Articles: +metaKeywords1Label=Meta Keywords: +metaDescription1Label=Meta Description: +removeUnusedTagsLabel=Remove Unused Tags +goTopLabel=Top +permalink1Label=Permalink: +permalinkLabel=Permalink +b3logLabel=B3LOG +killBrowserLabel=

Let's kill outdated and insecure browser!

Let's kill outdated and insecure browser for browser evolution, human progress and better experience.

You can download

+readmoreLabel=Read more\u00BB +readmore2Label=Read more +replyLabel=Reply\u00BB +homeLabel=Home +enableArticleUpdateHint1Label=Enable Article Update Hint: +allowVisitDraftViaPermalink1Label=Allow Visit Draft Via Link: +author1Label=Author: +authorLabel=Author +keyOfSolo1Label=Solo Key: +articleLabel=Article +tagArticlesLabel=Tag Articles +dateArticlesLabel=Archive Date Articles +authorArticlesLabel=Author Articles +indexArticleLabel=Index Articles +allTagsLabel=Tag Cloud +customizedPageLabel=Customized Page +killBrowserPageLabel=Kill Browser Page +pageNumLabel=Page Number +#### +forbiddenLabel=Forbidden Access! +sorryLabel=Sorry! +notFoundLabel=Not Found! +unPulbishSuccLabel=Un Publish Successfully +unPulbishFailLabel=Un Publish Fail +removeSuccLabel=Remove Successfully +removeFailLabel=Remove Fail +removeUserFailSkinNeedMulUsersLabel=Remove Fail, the current skin need multiple users! +putTopSuccLabel=Put Top Successfully +putTopFailLabel=Put Top Fail +cancelTopSuccLabel=Cancel Top Successfully +cancelTopFailLabel=Cancel Top Fail +addSuccLabel=Add Successfully +addFailLabel=Add Fail +updateSuccLabel=Update Successfully +updateFailLabel=Update Fail +updatePreferenceFailNeedMulUsersLabel=Update Fail, the selected skin need multiple users! +setFailLabel=Set Fail +setSuccLabel=Set Successfully +getFailLabel=Get Fail +noSettingLabel=No Setting +getSuccLabel=Get Successfully +importSuccLabel=Import Successfully :-) +importFailLabel=Some Import Fail %>_<% +noCommentLabel=No Comment +captchaErrorLabel=Captcha Error +inputErrorLabel=Input Error! +gotoLabel=Go +nameEmptyLabel=Username is empty +passwordEmptyLabel=Password is empty +blogEmptyLabel=Blogging service is empty +blogArticleEmptyLabel=Please select articles +nameTooLongLabel=Sorry, your username must be between 2 and 20 characters long. +mailCannotEmptyLabel=Mail is empty +mailInvalidLabel=Mail is invalid +commentContentCannotEmptyLabel=Sorry, your content must be between 2 and 500 characters long. +captchaCannotEmptyLabel=Captcha is empty +loadingLabel=Loading.... +titleEmptyLabel=Title is empty +contentEmptyLabel=Content is empty +orderEmptyLabel=Order is empty +abstractEmptyLabel=Abstract is empty +tagsEmptyLabel=Tags is empty +addressEmptyLabel=Address is empty +noAuthorizationURLLabel=Can not retrieve authorization URL from Google, please \ +make sure the Consumer Secret you typed in and then try again. +duplicatedPermalinkLabel=Duplicated permalink! +invalidPermalinkFormatLabel=Invalid permalink format! +duplicatedEmailLabel=Duplicated email! +refreshAndRetryLabel=Please refresh and try again! +editorLeaveLabel=Content is not null, Do you leave\uFF1F +editorPostLabel=Content is not null, Do you clear\uFF1F +#### +confirmRemoveLabel=Are You Sure? +confirmInitLabel=Are You Sure? diff --git a/classic/lang/lang_zh_CN.properties b/skins/classic/lang/lang_zh_CN.properties similarity index 97% rename from classic/lang/lang_zh_CN.properties rename to skins/classic/lang/lang_zh_CN.properties index e728699..d58087f 100644 --- a/classic/lang/lang_zh_CN.properties +++ b/skins/classic/lang/lang_zh_CN.properties @@ -1,266 +1,266 @@ -# -# Copyright (c) 2010-2017, b3log.org & hacpai.com -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# -# Description: Solo default language configurations(zh_CN). -# Version: 1.1.6.5, Mar 14, 2017 -# Author: Liang Ding -# Author: Liyuan Li -# - -siteViewLabel=\u7AD9\u70B9\u6982\u89C8 -tocLabel=\u6587\u7AE0\u76EE\u5F55 -adminConsoleLabel=\u540E\u53F0\u7BA1\u7406 -adminIndexLabel=\u540E\u53F0\u9996\u9875 -postArticleLabel=\u53D1\u5E03\u6587\u7AE0 -articleListLabel=\u6587\u7AE0\u7BA1\u7406 -commentListLabel=\u8BC4\u8BBA\u7BA1\u7406 -draftListLabel=\u8349\u7A3F\u5939 -userManageLabel=\u7528\u6237\u7BA1\u7406 -commonUserLabel=\u4E00\u822C\u7528\u6237 -addUserLabel=\u6DFB\u52A0\u7528\u6237 -updateUserLabel=\u66F4\u65B0\u7528\u6237 -linkManagementLabel=\u94FE\u63A5\u7BA1\u7406 -pluginMgmtLabel=\u63D2\u4EF6\u7BA1\u7406 -pluginNameLabel=\u63D2\u4EF6\u540D -versionLabel=\u7248\u672C -statusLabel=\u72B6\u6001 -enabledLabel=\u5DF2\u542F\u7528 -disabledLabel=\u5DF2\u7981\u7528 -enableLabel=\u542F\u7528 -disableLabel=\u7981\u7528 -preferenceLabel=\u504F\u597D\u8BBE\u5B9A -localeString1Label=\u8BED\u8A00\uFF1A -timeZoneId1Label=\u65F6\u533A\uFF1A -adminLabel=\u7BA1\u7406 -administratorLabel=\u7BA1\u7406\u5458 -loginLabel=\u767B\u5F55 -logoutLabel=\u767B\u51FA -initLabel=\u521D\u59CB\u5316 -popTagsLabel=\u5206\u7C7B\u6807\u7B7E -tag1Label=\u6807\u7B7E\uFF1A -tags1Label=\u6807\u7B7E\uFF1A -recentArticlesLabel=\u6700\u65B0\u6587\u7AE0 -recentCommentsLabel=\u6700\u65B0\u8BC4\u8BBA -postCommentsLabel=\u53D1\u8868\u8BC4\u8BBA -mostCommentArticlesLabel=\u8BC4\u8BBA\u6700\u591A\u7684\u6587\u7AE0 -mostViewCountArticlesLabel=\u8BBF\u95EE\u6700\u591A\u7684\u6587\u7AE0 -linkLabel=\u53CB\u60C5\u94FE\u63A5 -sumLabel=\u5171 -pageLabel=\u9875 -commentLabel=\u8BC4\u8BBA -linkTitleLabel=\u94FE\u63A5\u6807\u9898 -linkTitle1Label=\u6807\u9898\uFF1A -updateLabel=\u66F4\u65B0 -removeLabel=\u5220\u9664 -putTopLabel=\u7F6E\u9876 -cancelPutTopLabel=\u53D6\u6D88\u7F6E\u9876 -downloadCountLabel=\u4E0B\u8F7D\u6B21\u6570 -sizeLabel=\u5927\u5C0F -uploadDateLabel=\u4E0A\u4F20\u65E5\u671F -downloadURLLabel=\u4E0B\u8F7D\u5730\u5740 -downloadLabel=\u4E0B\u8F7D -createDateLabel=\u521B\u5EFA\u65E5\u671F -updateDateLabel=\u66F4\u65B0\u65E5\u671F -titleLabel=\u6807\u9898 -title1Label=\u6807\u9898\uFF1A -content1Label=\u6B63\u6587\uFF1A -abstract1Label=\u6458\u8981\uFF1A -publishLabel=\u53D1\u5E03 -unPublishLabel=\u53D6\u6D88\u53D1\u5E03 -urlLabel=URL -url1Label=URL (\u8BF7\u4EE5\u534F\u8BAE\u5F00\u5934\uFF0C\u5982: http://)\uFF1A -addLinkLabel=\u6DFB\u52A0\u94FE\u63A5 -updateLinkLabel=\u66F4\u65B0\u94FE\u63A5 -archiveLabel=\u5B58\u6863 -archive1Label=\u5B58\u6863\uFF1A -yearLabel=\u5E74 -monthLabel=\u6708 -blogSyncLabel=\u535A\u5BA2\u540C\u6B65 -pageLabel=\u9875\u9762 -pageMgmtLabel=\u9875\u9762\u7BA1\u7406 -othersLabel=\u5176\u4ED6 -fileListLabel=\u6587\u4EF6\u7BA1\u7406 -submitUploadLabel=\u4E0A\u4F20 -fileNameLabel=\u6587\u4EF6\u540D -paramSettingsLabel=\u53C2\u6570\u8BBE\u7F6E -skinLabel=\u76AE\u80A4 -signLabel=\u7B7E\u540D\u6863 -sign1Label=\u7B7E\u540D\u6863\uFF1A -noSignLabel=\u4E0D\u4F7F\u7528\u7B7E\u540D\u6863 -signIsNullLabel=\u8BE5\u7B7E\u540D\u6863\u4E3A\u7A7A -statisticLabel=\u535A\u5BA2\u7EDF\u8BA1 -viewLabel=\u6D4F\u89C8 -countLabel=\u7BC7 -viewCount1Label=\u6D4F\u89C8\u6B21\u6570\uFF1A -articleCount1Label=\u6587\u7AE0\u603B\u6570\uFF1A -commentCountLabel=\u8BC4\u8BBA\u6570 -commentCount1Label=\u8BC4\u8BBA\u603B\u6570\uFF1A -commentEmotions1Label=\u8868\u60C5\uFF1A -commentEmotionsLabel=\u8868\u60C5 -commentName1Label=\u59D3\u540D\uFF1A -commentNameLabel=\u59D3\u540D -commentEmail1Label=\u90AE\u7BB1\uFF1A -commentEmailLabel=\u90AE\u7BB1 -commentURL1Label=URL\uFF1A -commentURLLabel=URL -commentContent1Label=\u8BC4\u8BBA\u5185\u5BB9\uFF1A -commentContentLabel=\u8BC4\u8BBA\u5185\u5BB9 -getDateLabel=\u83B7\u53D6\u65E5\u671F -getArticleLabel=\u83B7\u53D6\u6587\u7AE0 -selectDateLabel=\u9009\u62E9\u65E5\u671F -selectDate1Label=\u9009\u62E9\u65E5\u671F\uFF1A -importLabel=\u5BFC\u5165 -chooseBlog1Label=\u8BF7\u9009\u62E9\u9700\u8981\u7BA1\u7406\u7684\u535A\u5BA2\uFF1A -blogArticleImportLabel=\u6587\u7AE0\u5BFC\u5165 -blogSyncMgmtLabel=\u535A\u5BA2\u540C\u6B65\u7BA1\u7406 -syncMgmtLabel=\u540C\u6B65\u7BA1\u7406\u535A\u5BA2 -userName1Label=\u7528\u6237\u540D\uFF1A -userPassword1Label=\u5BC6\u7801\uFF1A -syncPostLabel=\u540C\u6B65\u53D1\u5E03 -syncUpdateLabel=\u540C\u6B65\u66F4\u65B0 -syncRemoveLabel=\u540C\u6B65\u5220\u9664 -categoryLabel=\u5206\u7C7B -noticeBoard1Label=\u516C\u544A\uFF1A -noticeBoardLabel=\u516C\u544A -htmlhead1Label=HTML head\uFF1A -indexTagDisplayCnt1Label= \u9996\u9875\u6807\u7B7E\u663E\u793A\u6570\uFF1A -indexRecentArticleDisplayCnt1Label=\u6700\u65B0\u6587\u7AE0\u663E\u793A\u6570\u76EE\uFF1A -indexRecentCommentDisplayCnt1Label=\u6700\u65B0\u8BC4\u8BBA\u663E\u793A\u6570\u76EE\uFF1A -indexMostCommentArticleDisplayCnt1Label=\u8BC4\u8BBA\u6700\u591A\u6587\u7AE0\u663E\u793A\u6570\u76EE\uFF1A -indexMostViewArticleDisplayCnt1Label=\u8BBF\u95EE\u6700\u591A\u6700\u591A\u6587\u7AE0\u663E\u793A\u6570\u76EE\uFF1A -relevantArticlesDisplayCnt1Label=\u76F8\u5173\u9605\u8BFB\u663E\u793A\u6570\u76EE\uFF1A -randomArticlesDisplayCnt1Label=\u968F\u673A\u9605\u8BFB\u663E\u793A\u6570\u76EE\uFF1A -externalRelevantArticlesDisplayCnt1Label=\u7AD9\u5916\u76F8\u5173\u9605\u8BFB\u663E\u793A\u6570\u76EE\uFF1A -windowSize1Label=\u5206\u9875\u9875\u7801\u6700\u5927\u5BBD\u5EA6\uFF1A -pageSize1Label=\u5206\u9875\u6BCF\u9875\u663E\u793A\u6587\u7AE0\u6570\uFF1A -blogTitle1Label=\u535A\u5BA2\u6807\u9898\uFF1A -blogSubtitle1Label=\u535A\u5BA2\u5B50\u6807\u9898\uFF1A -blogHost1Label=\u535A\u5BA2\u5730\u5740\uFF1A -submmitCommentLabel=\u63D0\u4EA4\u8BC4\u8BBA -saveLabel=\u4FDD\u5B58 -tagLabel=\u6807\u7B7E -tagsLabel=\u6807\u7B7E -importedLabel=\u5DF2\u5BFC\u5165 -captcha1Label=\u9A8C\u8BC1\u7801\uFF1A -captchaLabel=\u9A8C\u8BC1\u7801 -indexLabel=\u9996\u9875 -nextArticle1Label=\u65B0\u4E00\u7BC7\uFF1A -previousArticle1Label=\u65E7\u4E00\u7BC7\uFF1A -updatedLabel=\u6709\u66F4\u65B0\uFF01 -topArticleLabel=\u7F6E\u9876\uFF01 -CSDNBlogLabel=CSDN \u535A\u5BA2 -BlogJavaLabel=BlogJava -CnBlogsLabel=\u535A\u5BA2\u56ED -previousPageLabel=\u4E0A\u4E00\u9875 -nextPagePabel=\u4E0B\u4E00\u9875 -firstPageLabel=\u7B2C\u4E00\u9875 -lastPageLabel=\u6700\u540E\u4E00\u9875 -returnTo1Label=\u8FD4\u56DE\uFF1A -tencentLabel=\u817E\u8BAF -appKey1Label=App Key: -appSecret1Label=App Secret: -postToTencentMicroblogWhilePublishArticleLabel=\u53D1\u6587\u7AE0\u65F6\u540C\u6B65\u5230\u817E\u8BAF\u5FAE\u535A\uFF1A -postToCommunityLabel=\u53D1\u5E03\u5230\u793E\u533A\uFF1A -authorizeTencentMicroblog1Label=\u70B9\u51FB\u56FE\u6807\u8FDB\u884C\u6388\u6743: -googleLabel=Google -OAuthConsumerSecret1Label=OAuth Consumer Secret\uFF1A -atomLabel=Atom -relevantArticles1Label=\u76F8\u5173\u9605\u8BFB\uFF1A -randomArticles1Label=\u968F\u673A\u9605\u8BFB\uFF1A -externalRelevantArticles1Label=\u7AD9\u5916\u76F8\u5173\u9605\u8BFB\uFF1A -metaKeywords1Label=Meta Keywords: -metaDescription1Label=Meta Description: -removeUnusedTagsLabel=\u79FB\u9664\u672A\u4F7F\u7528\u6807\u7B7E -goTopLabel=\u9876\u90E8 -permalink1Label=\u94FE\u63A5\uFF1A -permalinkLabel=\u94FE\u63A5 -b3logLabel=B3LOG -killBrowserLabel=

\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

\u60A8\u53EF\u4EE5\u4E0B\u8F7D -readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB -readmore2Label=\u9605\u8BFB\u66F4\u591A -replyLabel=\u56DE\u590D\u00BB -homeLabel=\u9996\u9875 -enableArticleUpdateHint1Label=\u542F\u7528\u6587\u7AE0\u66F4\u65B0\u63D0\u793A\uFF1A -allowVisitDraftViaPermalink1Label=\u5141\u8BB8\u901A\u8FC7\u94FE\u63A5\u8BBF\u95EE\u8349\u7A3F\uFF1A -author1Label=\u4F5C\u8005\uFF1A -authorLabel=\u4F5C\u8005 -keyOfSolo1Label=Solo Key\uFF1A -articleLabel=\u6587\u7AE0 -tagArticlesLabel=\u6807\u7B7E\u6587\u7AE0\u5217\u8868 -dateArticlesLabel=\u5B58\u6863\u6587\u7AE0\u5217\u8868 -authorArticlesLabel=\u4F5C\u8005\u6587\u7AE0\u5217\u8868 -indexArticleLabel=\u9996\u9875\u6587\u7AE0\u5217\u8868 -allTagsLabel=\u6807\u7B7E\u5899 -customizedPageLabel=\u81EA\u5B9A\u4E49\u9875\u9762 -killBrowserPageLabel=Kill Browser Page -pageNumLabel=\u9875\u53F7 -#### -forbiddenLabel=\u64CD\u4F5C\u88AB\u7981\u6B62\uFF01 -sorryLabel=\u5BF9\u4E0D\u8D77\uFF01 -notFoundLabel=\u627E\u4E0D\u5230\uFF01 -unPulbishSuccLabel=\u53D6\u6D88\u53D1\u5E03\u6210\u529F -unPulbishFailLabel=\u53D6\u6D88\u53D1\u5E03\u5931\u8D25 -removeSuccLabel=\u5220\u9664\u6210\u529F -removeFailLabel=\u5220\u9664\u5931\u8D25 -removeUserFailSkinNeedMulUsersLabel=\u5220\u9664\u5931\u8D25\uFF0C\u5F53\u524D\u4F7F\u7528\u7684\u76AE\u80A4\u9700\u8981\u591A\u7528\u6237\u652F\u6301 -putTopSuccLabel=\u7F6E\u9876\u6210\u529F -putTopFailLabel=\u7F6E\u9876\u5931\u8D25 -cancelTopSuccLabel=\u53D6\u6D88\u7F6E\u9876\u6210\u529F -cancelTopFailLabel=\u53D6\u6D88\u7F6E\u9876\u5931\u8D25 -addSuccLabel=\u6DFB\u52A0\u6210\u529F -addFailLabel=\u6DFB\u52A0\u5931\u8D25 -updateSuccLabel=\u66F4\u65B0\u6210\u529F -updateFailLabel=\u66F4\u65B0\u5931\u8D25 -updatePreferenceFailNeedMulUsersLabel=\u66F4\u65B0\u5931\u8D25\uFF0C\u9700\u8981\u591A\u7528\u6237\u624D\u80FD\u4F7F\u7528\u9009\u62E9\u7684\u76AE\u80A4 -setFailLabel=\u8BBE\u7F6E\u5931\u8D25 -setSuccLabel=\u8BBE\u7F6E\u6210\u529F -getFailLabel=\u83B7\u53D6\u5931\u8D25 -noSettingLabel=\u8BE5\u535A\u5BA2\u65E0\u8D26\u53F7\uFF0C\u8BF7\u6DFB\u52A0 -getSuccLabel=\u83B7\u53D6\u6210\u529F -importSuccLabel=\u5BFC\u5165\u6210\u529F :-) -importFailLabel=\u90E8\u5206\u5BFC\u5165\u5931\u8D25 %>_<% -noCommentLabel=\u6682\u65E0\u8BC4\u8BBA -captchaErrorLabel=\u9A8C\u8BC1\u7801\u9519\u8BEF -inputErrorLabel=\u8F93\u5165\u9519\u8BEF\uFF01 -gotoLabel=\u8DF3\u8F6C -nameEmptyLabel=\u59D3\u540D\u4E0D\u80FD\u4E3A\u7A7A\uFF01 -passwordEmptyLabel=\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01 -blogEmptyLabel=\u8BF7\u9009\u62E9\u535A\u5BA2\u670D\u52A1\uFF01 -blogArticleEmptyLabel=\u8BF7\u9009\u62E9\u9700\u8981\u5BFC\u5165\u7684\u6587\u7AE0 -nameTooLongLabel=\u59D3\u540D\u53EA\u80FD\u4E3A 2 \u5230 20 \u4E2A\u5B57\u7B26\uFF01 -mailCannotEmptyLabel=\u90AE\u7BB1\u4E0D\u80FD\u4E3A\u7A7A\uFF01 -mailInvalidLabel=\u90AE\u7BB1\u683C\u5F0F\u4E0D\u6B63\u786E\uFF01 -commentContentCannotEmptyLabel=\u8BC4\u8BBA\u5185\u5BB9\u53EA\u80FD\u4E3A 2 \u5230 500 \u4E2A\u5B57\u7B26\uFF01 -captchaCannotEmptyLabel=\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01 -loadingLabel=\u8F7D\u5165\u4E2D.... -titleEmptyLabel=\u6807\u9898\u4E0D\u80FD\u4E3A\u7A7A\uFF01 -contentEmptyLabel=\u5185\u5BB9\u4E0D\u80FD\u4E3A\u7A7A\uFF01 -orderEmptyLabel=\u5E8F\u53F7\u4E0D\u80FD\u4E3A\u7A7A\uFF01 -abstractEmptyLabel=\u6458\u8981\u4E0D\u80FD\u4E3A\u7A7A\uFF01 -tagsEmptyLabel=\u6807\u7B7E\u4E0D\u80FD\u4E3A\u7A7A\uFF01 -addressEmptyLabel=\u5730\u5740\u4E0D\u80FD\u4E3A\u7A7A\uFF01 -noAuthorizationURLLabel=\u4ECE Google \u83B7\u53D6\u6388\u6743\u5730\u5740\u5931\u8D25\uFF0C\u8BF7\u786E\u8BA4\u60A8\u8F93\u5165\u7684 \ -Consumer Secret \u662F\u6B63\u786E\u7684\uFF0C\u7136\u540E\u8FDB\u884C\u91CD\u8BD5\u3002 -duplicatedPermalinkLabel=\u94FE\u63A5\u91CD\u590D\uFF01 -invalidPermalinkFormatLabel=\u975E\u6CD5\u7684\u94FE\u63A5\u683C\u5F0F\uFF01 -duplicatedEmailLabel=\u90AE\u4EF6\u5730\u5740\u91CD\u590D\uFF01 -refreshAndRetryLabel=\u8BF7\u5237\u65B0\u91CD\u8BD5\uFF01 -editorLeaveLabel=\u7F16\u8F91\u5668\u4E2D\u8FD8\u6709\u5185\u5BB9\uFF0C\u662F\u5426\u79BB\u5F00\uFF1F -editorPostLabel=\u7F16\u8F91\u5668\u4E2D\u8FD8\u6709\u5185\u5BB9\uFF0C\u662F\u5426\u6E05\u7A7A\uFF1F -#### -confirmRemoveLabel=\u786E\u5B9A\u5220\u9664\uFF1F -confirmInitLabel=\u786E\u5B9A\u8FDB\u884C\u521D\u59CB\u5316\u5417\uFF1F +# +# Copyright (c) 2010-2017, b3log.org & hacpai.com +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# +# Description: Solo default language configurations(zh_CN). +# Version: 1.1.6.5, Mar 14, 2017 +# Author: Liang Ding +# Author: Liyuan Li +# + +siteViewLabel=\u7AD9\u70B9\u6982\u89C8 +tocLabel=\u6587\u7AE0\u76EE\u5F55 +adminConsoleLabel=\u540E\u53F0\u7BA1\u7406 +adminIndexLabel=\u540E\u53F0\u9996\u9875 +postArticleLabel=\u53D1\u5E03\u6587\u7AE0 +articleListLabel=\u6587\u7AE0\u7BA1\u7406 +commentListLabel=\u8BC4\u8BBA\u7BA1\u7406 +draftListLabel=\u8349\u7A3F\u5939 +userManageLabel=\u7528\u6237\u7BA1\u7406 +commonUserLabel=\u4E00\u822C\u7528\u6237 +addUserLabel=\u6DFB\u52A0\u7528\u6237 +updateUserLabel=\u66F4\u65B0\u7528\u6237 +linkManagementLabel=\u94FE\u63A5\u7BA1\u7406 +pluginMgmtLabel=\u63D2\u4EF6\u7BA1\u7406 +pluginNameLabel=\u63D2\u4EF6\u540D +versionLabel=\u7248\u672C +statusLabel=\u72B6\u6001 +enabledLabel=\u5DF2\u542F\u7528 +disabledLabel=\u5DF2\u7981\u7528 +enableLabel=\u542F\u7528 +disableLabel=\u7981\u7528 +preferenceLabel=\u504F\u597D\u8BBE\u5B9A +localeString1Label=\u8BED\u8A00\uFF1A +timeZoneId1Label=\u65F6\u533A\uFF1A +adminLabel=\u7BA1\u7406 +administratorLabel=\u7BA1\u7406\u5458 +loginLabel=\u767B\u5F55 +logoutLabel=\u767B\u51FA +initLabel=\u521D\u59CB\u5316 +popTagsLabel=\u5206\u7C7B\u6807\u7B7E +tag1Label=\u6807\u7B7E\uFF1A +tags1Label=\u6807\u7B7E\uFF1A +recentArticlesLabel=\u6700\u65B0\u6587\u7AE0 +recentCommentsLabel=\u6700\u65B0\u8BC4\u8BBA +postCommentsLabel=\u53D1\u8868\u8BC4\u8BBA +mostCommentArticlesLabel=\u8BC4\u8BBA\u6700\u591A\u7684\u6587\u7AE0 +mostViewCountArticlesLabel=\u8BBF\u95EE\u6700\u591A\u7684\u6587\u7AE0 +linkLabel=\u53CB\u60C5\u94FE\u63A5 +sumLabel=\u5171 +pageLabel=\u9875 +commentLabel=\u8BC4\u8BBA +linkTitleLabel=\u94FE\u63A5\u6807\u9898 +linkTitle1Label=\u6807\u9898\uFF1A +updateLabel=\u66F4\u65B0 +removeLabel=\u5220\u9664 +putTopLabel=\u7F6E\u9876 +cancelPutTopLabel=\u53D6\u6D88\u7F6E\u9876 +downloadCountLabel=\u4E0B\u8F7D\u6B21\u6570 +sizeLabel=\u5927\u5C0F +uploadDateLabel=\u4E0A\u4F20\u65E5\u671F +downloadURLLabel=\u4E0B\u8F7D\u5730\u5740 +downloadLabel=\u4E0B\u8F7D +createDateLabel=\u521B\u5EFA\u65E5\u671F +updateDateLabel=\u66F4\u65B0\u65E5\u671F +titleLabel=\u6807\u9898 +title1Label=\u6807\u9898\uFF1A +content1Label=\u6B63\u6587\uFF1A +abstract1Label=\u6458\u8981\uFF1A +publishLabel=\u53D1\u5E03 +unPublishLabel=\u53D6\u6D88\u53D1\u5E03 +urlLabel=URL +url1Label=URL (\u8BF7\u4EE5\u534F\u8BAE\u5F00\u5934\uFF0C\u5982: http://)\uFF1A +addLinkLabel=\u6DFB\u52A0\u94FE\u63A5 +updateLinkLabel=\u66F4\u65B0\u94FE\u63A5 +archiveLabel=\u5B58\u6863 +archive1Label=\u5B58\u6863\uFF1A +yearLabel=\u5E74 +monthLabel=\u6708 +blogSyncLabel=\u535A\u5BA2\u540C\u6B65 +pageLabel=\u9875\u9762 +pageMgmtLabel=\u9875\u9762\u7BA1\u7406 +othersLabel=\u5176\u4ED6 +fileListLabel=\u6587\u4EF6\u7BA1\u7406 +submitUploadLabel=\u4E0A\u4F20 +fileNameLabel=\u6587\u4EF6\u540D +paramSettingsLabel=\u53C2\u6570\u8BBE\u7F6E +skinLabel=\u76AE\u80A4 +signLabel=\u7B7E\u540D\u6863 +sign1Label=\u7B7E\u540D\u6863\uFF1A +noSignLabel=\u4E0D\u4F7F\u7528\u7B7E\u540D\u6863 +signIsNullLabel=\u8BE5\u7B7E\u540D\u6863\u4E3A\u7A7A +statisticLabel=\u535A\u5BA2\u7EDF\u8BA1 +viewLabel=\u6D4F\u89C8 +countLabel=\u7BC7 +viewCount1Label=\u6D4F\u89C8\u6B21\u6570\uFF1A +articleCount1Label=\u6587\u7AE0\u603B\u6570\uFF1A +commentCountLabel=\u8BC4\u8BBA\u6570 +commentCount1Label=\u8BC4\u8BBA\u603B\u6570\uFF1A +commentEmotions1Label=\u8868\u60C5\uFF1A +commentEmotionsLabel=\u8868\u60C5 +commentName1Label=\u59D3\u540D\uFF1A +commentNameLabel=\u59D3\u540D +commentEmail1Label=\u90AE\u7BB1\uFF1A +commentEmailLabel=\u90AE\u7BB1 +commentURL1Label=URL\uFF1A +commentURLLabel=URL +commentContent1Label=\u8BC4\u8BBA\u5185\u5BB9\uFF1A +commentContentLabel=\u8BC4\u8BBA\u5185\u5BB9 +getDateLabel=\u83B7\u53D6\u65E5\u671F +getArticleLabel=\u83B7\u53D6\u6587\u7AE0 +selectDateLabel=\u9009\u62E9\u65E5\u671F +selectDate1Label=\u9009\u62E9\u65E5\u671F\uFF1A +importLabel=\u5BFC\u5165 +chooseBlog1Label=\u8BF7\u9009\u62E9\u9700\u8981\u7BA1\u7406\u7684\u535A\u5BA2\uFF1A +blogArticleImportLabel=\u6587\u7AE0\u5BFC\u5165 +blogSyncMgmtLabel=\u535A\u5BA2\u540C\u6B65\u7BA1\u7406 +syncMgmtLabel=\u540C\u6B65\u7BA1\u7406\u535A\u5BA2 +userName1Label=\u7528\u6237\u540D\uFF1A +userPassword1Label=\u5BC6\u7801\uFF1A +syncPostLabel=\u540C\u6B65\u53D1\u5E03 +syncUpdateLabel=\u540C\u6B65\u66F4\u65B0 +syncRemoveLabel=\u540C\u6B65\u5220\u9664 +categoryLabel=\u5206\u7C7B +noticeBoard1Label=\u516C\u544A\uFF1A +noticeBoardLabel=\u516C\u544A +htmlhead1Label=HTML head\uFF1A +indexTagDisplayCnt1Label= \u9996\u9875\u6807\u7B7E\u663E\u793A\u6570\uFF1A +indexRecentArticleDisplayCnt1Label=\u6700\u65B0\u6587\u7AE0\u663E\u793A\u6570\u76EE\uFF1A +indexRecentCommentDisplayCnt1Label=\u6700\u65B0\u8BC4\u8BBA\u663E\u793A\u6570\u76EE\uFF1A +indexMostCommentArticleDisplayCnt1Label=\u8BC4\u8BBA\u6700\u591A\u6587\u7AE0\u663E\u793A\u6570\u76EE\uFF1A +indexMostViewArticleDisplayCnt1Label=\u8BBF\u95EE\u6700\u591A\u6700\u591A\u6587\u7AE0\u663E\u793A\u6570\u76EE\uFF1A +relevantArticlesDisplayCnt1Label=\u76F8\u5173\u9605\u8BFB\u663E\u793A\u6570\u76EE\uFF1A +randomArticlesDisplayCnt1Label=\u968F\u673A\u9605\u8BFB\u663E\u793A\u6570\u76EE\uFF1A +externalRelevantArticlesDisplayCnt1Label=\u7AD9\u5916\u76F8\u5173\u9605\u8BFB\u663E\u793A\u6570\u76EE\uFF1A +windowSize1Label=\u5206\u9875\u9875\u7801\u6700\u5927\u5BBD\u5EA6\uFF1A +pageSize1Label=\u5206\u9875\u6BCF\u9875\u663E\u793A\u6587\u7AE0\u6570\uFF1A +blogTitle1Label=\u535A\u5BA2\u6807\u9898\uFF1A +blogSubtitle1Label=\u535A\u5BA2\u5B50\u6807\u9898\uFF1A +blogHost1Label=\u535A\u5BA2\u5730\u5740\uFF1A +submmitCommentLabel=\u63D0\u4EA4\u8BC4\u8BBA +saveLabel=\u4FDD\u5B58 +tagLabel=\u6807\u7B7E +tagsLabel=\u6807\u7B7E +importedLabel=\u5DF2\u5BFC\u5165 +captcha1Label=\u9A8C\u8BC1\u7801\uFF1A +captchaLabel=\u9A8C\u8BC1\u7801 +indexLabel=\u9996\u9875 +nextArticle1Label=\u65B0\u4E00\u7BC7\uFF1A +previousArticle1Label=\u65E7\u4E00\u7BC7\uFF1A +updatedLabel=\u6709\u66F4\u65B0\uFF01 +topArticleLabel=\u7F6E\u9876\uFF01 +CSDNBlogLabel=CSDN \u535A\u5BA2 +BlogJavaLabel=BlogJava +CnBlogsLabel=\u535A\u5BA2\u56ED +previousPageLabel=\u4E0A\u4E00\u9875 +nextPagePabel=\u4E0B\u4E00\u9875 +firstPageLabel=\u7B2C\u4E00\u9875 +lastPageLabel=\u6700\u540E\u4E00\u9875 +returnTo1Label=\u8FD4\u56DE\uFF1A +tencentLabel=\u817E\u8BAF +appKey1Label=App Key: +appSecret1Label=App Secret: +postToTencentMicroblogWhilePublishArticleLabel=\u53D1\u6587\u7AE0\u65F6\u540C\u6B65\u5230\u817E\u8BAF\u5FAE\u535A\uFF1A +postToCommunityLabel=\u53D1\u5E03\u5230\u793E\u533A\uFF1A +authorizeTencentMicroblog1Label=\u70B9\u51FB\u56FE\u6807\u8FDB\u884C\u6388\u6743: +googleLabel=Google +OAuthConsumerSecret1Label=OAuth Consumer Secret\uFF1A +atomLabel=Atom +relevantArticles1Label=\u76F8\u5173\u9605\u8BFB\uFF1A +randomArticles1Label=\u968F\u673A\u9605\u8BFB\uFF1A +externalRelevantArticles1Label=\u7AD9\u5916\u76F8\u5173\u9605\u8BFB\uFF1A +metaKeywords1Label=Meta Keywords: +metaDescription1Label=Meta Description: +removeUnusedTagsLabel=\u79FB\u9664\u672A\u4F7F\u7528\u6807\u7B7E +goTopLabel=\u9876\u90E8 +permalink1Label=\u94FE\u63A5\uFF1A +permalinkLabel=\u94FE\u63A5 +b3logLabel=B3LOG +killBrowserLabel=

\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

\u60A8\u53EF\u4EE5\u4E0B\u8F7D +readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB +readmore2Label=\u9605\u8BFB\u66F4\u591A +replyLabel=\u56DE\u590D\u00BB +homeLabel=\u9996\u9875 +enableArticleUpdateHint1Label=\u542F\u7528\u6587\u7AE0\u66F4\u65B0\u63D0\u793A\uFF1A +allowVisitDraftViaPermalink1Label=\u5141\u8BB8\u901A\u8FC7\u94FE\u63A5\u8BBF\u95EE\u8349\u7A3F\uFF1A +author1Label=\u4F5C\u8005\uFF1A +authorLabel=\u4F5C\u8005 +keyOfSolo1Label=Solo Key\uFF1A +articleLabel=\u6587\u7AE0 +tagArticlesLabel=\u6807\u7B7E\u6587\u7AE0\u5217\u8868 +dateArticlesLabel=\u5B58\u6863\u6587\u7AE0\u5217\u8868 +authorArticlesLabel=\u4F5C\u8005\u6587\u7AE0\u5217\u8868 +indexArticleLabel=\u9996\u9875\u6587\u7AE0\u5217\u8868 +allTagsLabel=\u6807\u7B7E\u5899 +customizedPageLabel=\u81EA\u5B9A\u4E49\u9875\u9762 +killBrowserPageLabel=Kill Browser Page +pageNumLabel=\u9875\u53F7 +#### +forbiddenLabel=\u64CD\u4F5C\u88AB\u7981\u6B62\uFF01 +sorryLabel=\u5BF9\u4E0D\u8D77\uFF01 +notFoundLabel=\u627E\u4E0D\u5230\uFF01 +unPulbishSuccLabel=\u53D6\u6D88\u53D1\u5E03\u6210\u529F +unPulbishFailLabel=\u53D6\u6D88\u53D1\u5E03\u5931\u8D25 +removeSuccLabel=\u5220\u9664\u6210\u529F +removeFailLabel=\u5220\u9664\u5931\u8D25 +removeUserFailSkinNeedMulUsersLabel=\u5220\u9664\u5931\u8D25\uFF0C\u5F53\u524D\u4F7F\u7528\u7684\u76AE\u80A4\u9700\u8981\u591A\u7528\u6237\u652F\u6301 +putTopSuccLabel=\u7F6E\u9876\u6210\u529F +putTopFailLabel=\u7F6E\u9876\u5931\u8D25 +cancelTopSuccLabel=\u53D6\u6D88\u7F6E\u9876\u6210\u529F +cancelTopFailLabel=\u53D6\u6D88\u7F6E\u9876\u5931\u8D25 +addSuccLabel=\u6DFB\u52A0\u6210\u529F +addFailLabel=\u6DFB\u52A0\u5931\u8D25 +updateSuccLabel=\u66F4\u65B0\u6210\u529F +updateFailLabel=\u66F4\u65B0\u5931\u8D25 +updatePreferenceFailNeedMulUsersLabel=\u66F4\u65B0\u5931\u8D25\uFF0C\u9700\u8981\u591A\u7528\u6237\u624D\u80FD\u4F7F\u7528\u9009\u62E9\u7684\u76AE\u80A4 +setFailLabel=\u8BBE\u7F6E\u5931\u8D25 +setSuccLabel=\u8BBE\u7F6E\u6210\u529F +getFailLabel=\u83B7\u53D6\u5931\u8D25 +noSettingLabel=\u8BE5\u535A\u5BA2\u65E0\u8D26\u53F7\uFF0C\u8BF7\u6DFB\u52A0 +getSuccLabel=\u83B7\u53D6\u6210\u529F +importSuccLabel=\u5BFC\u5165\u6210\u529F :-) +importFailLabel=\u90E8\u5206\u5BFC\u5165\u5931\u8D25 %>_<% +noCommentLabel=\u6682\u65E0\u8BC4\u8BBA +captchaErrorLabel=\u9A8C\u8BC1\u7801\u9519\u8BEF +inputErrorLabel=\u8F93\u5165\u9519\u8BEF\uFF01 +gotoLabel=\u8DF3\u8F6C +nameEmptyLabel=\u59D3\u540D\u4E0D\u80FD\u4E3A\u7A7A\uFF01 +passwordEmptyLabel=\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01 +blogEmptyLabel=\u8BF7\u9009\u62E9\u535A\u5BA2\u670D\u52A1\uFF01 +blogArticleEmptyLabel=\u8BF7\u9009\u62E9\u9700\u8981\u5BFC\u5165\u7684\u6587\u7AE0 +nameTooLongLabel=\u59D3\u540D\u53EA\u80FD\u4E3A 2 \u5230 20 \u4E2A\u5B57\u7B26\uFF01 +mailCannotEmptyLabel=\u90AE\u7BB1\u4E0D\u80FD\u4E3A\u7A7A\uFF01 +mailInvalidLabel=\u90AE\u7BB1\u683C\u5F0F\u4E0D\u6B63\u786E\uFF01 +commentContentCannotEmptyLabel=\u8BC4\u8BBA\u5185\u5BB9\u53EA\u80FD\u4E3A 2 \u5230 500 \u4E2A\u5B57\u7B26\uFF01 +captchaCannotEmptyLabel=\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01 +loadingLabel=\u8F7D\u5165\u4E2D.... +titleEmptyLabel=\u6807\u9898\u4E0D\u80FD\u4E3A\u7A7A\uFF01 +contentEmptyLabel=\u5185\u5BB9\u4E0D\u80FD\u4E3A\u7A7A\uFF01 +orderEmptyLabel=\u5E8F\u53F7\u4E0D\u80FD\u4E3A\u7A7A\uFF01 +abstractEmptyLabel=\u6458\u8981\u4E0D\u80FD\u4E3A\u7A7A\uFF01 +tagsEmptyLabel=\u6807\u7B7E\u4E0D\u80FD\u4E3A\u7A7A\uFF01 +addressEmptyLabel=\u5730\u5740\u4E0D\u80FD\u4E3A\u7A7A\uFF01 +noAuthorizationURLLabel=\u4ECE Google \u83B7\u53D6\u6388\u6743\u5730\u5740\u5931\u8D25\uFF0C\u8BF7\u786E\u8BA4\u60A8\u8F93\u5165\u7684 \ +Consumer Secret \u662F\u6B63\u786E\u7684\uFF0C\u7136\u540E\u8FDB\u884C\u91CD\u8BD5\u3002 +duplicatedPermalinkLabel=\u94FE\u63A5\u91CD\u590D\uFF01 +invalidPermalinkFormatLabel=\u975E\u6CD5\u7684\u94FE\u63A5\u683C\u5F0F\uFF01 +duplicatedEmailLabel=\u90AE\u4EF6\u5730\u5740\u91CD\u590D\uFF01 +refreshAndRetryLabel=\u8BF7\u5237\u65B0\u91CD\u8BD5\uFF01 +editorLeaveLabel=\u7F16\u8F91\u5668\u4E2D\u8FD8\u6709\u5185\u5BB9\uFF0C\u662F\u5426\u79BB\u5F00\uFF1F +editorPostLabel=\u7F16\u8F91\u5668\u4E2D\u8FD8\u6709\u5185\u5BB9\uFF0C\u662F\u5426\u6E05\u7A7A\uFF1F +#### +confirmRemoveLabel=\u786E\u5B9A\u5220\u9664\uFF1F +confirmInitLabel=\u786E\u5B9A\u8FDB\u884C\u521D\u59CB\u5316\u5417\uFF1F diff --git a/classic/macro-comments.ftl b/skins/classic/macro-comments.ftl similarity index 97% rename from classic/macro-comments.ftl rename to skins/classic/macro-comments.ftl index e5ffb5c..65c4b99 100644 --- a/classic/macro-comments.ftl +++ b/skins/classic/macro-comments.ftl @@ -1,126 +1,126 @@ -<#macro comments commentList article> -

${commentLabel}

-
- <#if 0 == commentList?size> - ${noCommentLabel} - - <#list commentList as comment> - <#include "common-comment.ftl"/> - -
-<#if article.commentable> -
- ${postCommentsLabel} -
-
- - - <#if !isLoggedIn> - - - - - - - - - - - - - - - - - - - - - - <#if !isLoggedIn> - - - - - - - - - -
- ${commentName1Label} - - -
- ${commentEmail1Label} - - -
- ${commentURL1Label} - - -
- ${commentEmotions1Label} - - - - - - - - - - - - - - - - -
- ${commentContent1Label} - - -
- ${captcha1Label} - - - validate -
- - -
-
- - - -<#macro comment_script oId> - - +<#macro comments commentList article> +

${commentLabel}

+
+ <#if 0 == commentList?size> + ${noCommentLabel} + + <#list commentList as comment> + <#include "common-comment.ftl"/> + +
+<#if article.commentable> +
+ ${postCommentsLabel} +
+
+ + + <#if !isLoggedIn> + + + + + + + + + + + + + + + + + + + + + + <#if !isLoggedIn> + + + + + + + + + +
+ ${commentName1Label} + + +
+ ${commentEmail1Label} + + +
+ ${commentURL1Label} + + +
+ ${commentEmotions1Label} + + + + + + + + + + + + + + + + +
+ ${commentContent1Label} + + +
+ ${captcha1Label} + + + validate +
+ + +
+
+ + + +<#macro comment_script oId> + + \ No newline at end of file diff --git a/classic/macro-head.ftl b/skins/classic/macro-head.ftl similarity index 100% rename from classic/macro-head.ftl rename to skins/classic/macro-head.ftl diff --git a/classic/page.ftl b/skins/classic/page.ftl similarity index 97% rename from classic/page.ftl rename to skins/classic/page.ftl index 8740f15..0992f9a 100644 --- a/classic/page.ftl +++ b/skins/classic/page.ftl @@ -1,39 +1,39 @@ -<#include "macro-head.ftl"> -<#include "macro-comments.ftl"> - - - - <@head title="${page.pageTitle} - ${blogTitle}"> - - - - - - ${topBarReplacement} -
-
- <#include "header.ftl"> -
-
-
-
-
-
- ${page.pageContent} -
-
- <@comments commentList=pageComments article=page> -
-
-
- <#include "side.ftl"> -
-
-
- -
- <@comment_script oId=page.oId> - - +<#include "macro-head.ftl"> +<#include "macro-comments.ftl"> + + + + <@head title="${page.pageTitle} - ${blogTitle}"> + + + + + + ${topBarReplacement} +
+
+ <#include "header.ftl"> +
+
+
+
+
+
+ ${page.pageContent} +
+
+ <@comments commentList=pageComments article=page> +
+
+
+ <#include "side.ftl"> +
+
+
+ +
+ <@comment_script oId=page.oId> + + diff --git a/classic/preview.png b/skins/classic/preview.png similarity index 100% rename from classic/preview.png rename to skins/classic/preview.png diff --git a/classic/side.ftl b/skins/classic/side.ftl similarity index 97% rename from classic/side.ftl rename to skins/classic/side.ftl index 6cd65f0..4ac4b49 100644 --- a/classic/side.ftl +++ b/skins/classic/side.ftl @@ -1,157 +1,157 @@ -
- <#if "" != noticeBoard> -
    -
  • -

    ${noticeBoardLabel}

    -
  • -
  • ${noticeBoard}
  • -
-
- - <#if 0 != recentComments?size> - -
- - <#if 0 != mostCommentArticles?size> -
    -
  • -

    ${mostCommentArticlesLabel}

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

    ${mostViewCountArticlesLabel}

    -
  • -
  • - -
  • -
-
- - - <#if 0 != mostUsedCategories?size> -
    -
  • -

    ${categoryLabel}

    -
  • -
  • - -
  • -
-
- - - - <#if 0 != mostUsedTags?size> -
    -
  • -

    ${tagsLabel}

    -
  • -
  • - -
  • -
-
- - <#if 0 != links?size> -
    -
  • -

    ${linkLabel}

    -
  • -
  • - -
  • -
-
- - <#if 0 != archiveDates?size> - - -
+
+ <#if "" != noticeBoard> +
    +
  • +

    ${noticeBoardLabel}

    +
  • +
  • ${noticeBoard}
  • +
+
+ + <#if 0 != recentComments?size> + +
+ + <#if 0 != mostCommentArticles?size> +
    +
  • +

    ${mostCommentArticlesLabel}

    +
  • +
  • + +
  • +
+
+ + <#if 0 != mostViewCountArticles?size> +
    +
  • +

    ${mostViewCountArticlesLabel}

    +
  • +
  • + +
  • +
+
+ + + <#if 0 != mostUsedCategories?size> +
    +
  • +

    ${categoryLabel}

    +
  • +
  • + +
  • +
+
+ + + + <#if 0 != mostUsedTags?size> +
    +
  • +

    ${tagsLabel}

    +
  • +
  • + +
  • +
+
+ + <#if 0 != links?size> +
    +
  • +

    ${linkLabel}

    +
  • +
  • + +
  • +
+
+ + <#if 0 != archiveDates?size> + + +
diff --git a/classic/skin.properties b/skins/classic/skin.properties similarity index 100% rename from classic/skin.properties rename to skins/classic/skin.properties diff --git a/classic/tag-articles.ftl b/skins/classic/tag-articles.ftl similarity index 97% rename from classic/tag-articles.ftl rename to skins/classic/tag-articles.ftl index 19cedae..1a8aa53 100644 --- a/classic/tag-articles.ftl +++ b/skins/classic/tag-articles.ftl @@ -1,37 +1,37 @@ -<#include "macro-head.ftl"> - - - - <@head title="${tag.tagTitle} - ${blogTitle}"> - - - - - - ${topBarReplacement} -
-
- <#include "header.ftl"> -
-
-
- - <#include "article-list.ftl"> -
-
- <#include "side.ftl"> -
-
-
- -
- - +<#include "macro-head.ftl"> + + + + <@head title="${tag.tagTitle} - ${blogTitle}"> + + + + + + ${topBarReplacement} +
+
+ <#include "header.ftl"> +
+
+
+ + <#include "article-list.ftl"> +
+
+ <#include "side.ftl"> +
+
+
+ +
+ + diff --git a/classic/tags.ftl b/skins/classic/tags.ftl similarity index 97% rename from classic/tags.ftl rename to skins/classic/tags.ftl index 662cde2..417d570 100644 --- a/classic/tags.ftl +++ b/skins/classic/tags.ftl @@ -1,45 +1,45 @@ -<#include "macro-head.ftl"> - - - - <@head title="${allTagsLabel} - ${blogTitle}"> - - - - - - ${topBarReplacement} -
-
- <#include "header.ftl"> -
-
-
-
- -
-
-
- <#include "side.ftl"> -
-
-
- -
- - - +<#include "macro-head.ftl"> + + + + <@head title="${allTagsLabel} - ${blogTitle}"> + + + + + + ${topBarReplacement} +
+
+ <#include "header.ftl"> +
+
+
+
+ +
+
+
+ <#include "side.ftl"> +
+
+
+ +
+ + + diff --git a/ease/archive-articles.ftl b/skins/ease/archive-articles.ftl similarity index 97% rename from ease/archive-articles.ftl rename to skins/ease/archive-articles.ftl index 88af8e8..069c136 100644 --- a/ease/archive-articles.ftl +++ b/skins/ease/archive-articles.ftl @@ -1,27 +1,27 @@ -<#include "macro-head.ftl"> - - - - <@head title="${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - ${blogTitle}"> - - - - - - ${topBarReplacement} - <#include "header.ftl"> -
-
-

${archive1Label} - <#if "en" == localeString?substring(0, 2)> - ${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - <#else> - ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} (${archiveDate.archiveDatePublishedArticleCount}) - -

- <#include "article-list.ftl"> -
-
- <#include "footer.ftl"> - - +<#include "macro-head.ftl"> + + + + <@head title="${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - ${blogTitle}"> + + + + + + ${topBarReplacement} + <#include "header.ftl"> +
+
+

${archive1Label} + <#if "en" == localeString?substring(0, 2)> + ${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) + <#else> + ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} (${archiveDate.archiveDatePublishedArticleCount}) + +

+ <#include "article-list.ftl"> +
+
+ <#include "footer.ftl"> + + diff --git a/ease/archives.ftl b/skins/ease/archives.ftl similarity index 98% rename from ease/archives.ftl rename to skins/ease/archives.ftl index cd66da9..26405b2 100644 --- a/ease/archives.ftl +++ b/skins/ease/archives.ftl @@ -1,36 +1,36 @@ -<#include "macro-head.ftl"> - - - - <@head title="${blogTitle}"> - - - - - - ${topBarReplacement} - <#include "header.ftl"> - - <#include "footer.ftl"> - - +<#include "macro-head.ftl"> + + + + <@head title="${blogTitle}"> + + + + + + ${topBarReplacement} + <#include "header.ftl"> + + <#include "footer.ftl"> + + diff --git a/ease/article-list.ftl b/skins/ease/article-list.ftl similarity index 97% rename from ease/article-list.ftl rename to skins/ease/article-list.ftl index 4d9d632..6bca0f2 100644 --- a/ease/article-list.ftl +++ b/skins/ease/article-list.ftl @@ -1,57 +1,57 @@ - -<#if paginationCurrentPageNum != paginationPageCount && 0 != paginationPageCount> -
${moreLabel}
+ +<#if paginationCurrentPageNum != paginationPageCount && 0 != paginationPageCount> +
${moreLabel}
\ No newline at end of file diff --git a/ease/article.ftl b/skins/ease/article.ftl similarity index 97% rename from ease/article.ftl rename to skins/ease/article.ftl index 39244b6..7ae6bda 100644 --- a/ease/article.ftl +++ b/skins/ease/article.ftl @@ -1,112 +1,112 @@ -<#include "macro-head.ftl"> -<#include "macro-comments.ftl"> - - - - <@head title="${article.articleTitle} - ${blogTitle}"> - - - - <#if previousArticlePermalink??> - - - <#if nextArticlePermalink??> - - - - - ${topBarReplacement} - <#include "header.ftl"> -
-
-
-
-

- - ${article.articleTitle} - - <#if article.hasUpdated> - - ${updatedLabel} - - - <#if article.articlePutTop> - - ${topArticleLabel} - - -

- -
-
-
- ${article.articleContent} - <#if "" != article.articleSign.signHTML?trim> -

- ${article.articleSign.signHTML} -

- -
-
- <#if article.hasUpdated> - ${article.articleUpdateDate?string("yy-MM-dd HH:mm")} - <#else> - ${article.articleCreateDate?string("yy-MM-dd HH:mm")} - - ${article.authorName} -
-
- ${tag1Label} - <#list article.articleTags?split(",") as articleTag> - <#if articleTag_has_next>, - -
-
-
- <#if 0 != relevantArticlesDisplayCount> -
- - <#if 0 != randomArticlesDisplayCount> -
- -
-
- <#if nextArticlePermalink??> - - - <#if previousArticlePermalink??> - - -
-
- <@comments commentList=articleComments article=article> -
-
- <#include "footer.ftl"> - <@comment_script oId=article.oId> - page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}"; - <#if 0 != randomArticlesDisplayCount> - page.loadRandomArticles('

${randomArticlesLabel}

'); - - <#if 0 != relevantArticlesDisplayCount> - page.loadRelevantArticles('${article.oId}', '

${relevantArticlesLabel}

'); - - <#if 0 != externalRelevantArticlesDisplayCount> - page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,"); - - - - +<#include "macro-head.ftl"> +<#include "macro-comments.ftl"> + + + + <@head title="${article.articleTitle} - ${blogTitle}"> + + + + <#if previousArticlePermalink??> + + + <#if nextArticlePermalink??> + + + + + ${topBarReplacement} + <#include "header.ftl"> +
+
+
+
+

+ + ${article.articleTitle} + + <#if article.hasUpdated> + + ${updatedLabel} + + + <#if article.articlePutTop> + + ${topArticleLabel} + + +

+ +
+
+
+ ${article.articleContent} + <#if "" != article.articleSign.signHTML?trim> +

+ ${article.articleSign.signHTML} +

+ +
+
+ <#if article.hasUpdated> + ${article.articleUpdateDate?string("yy-MM-dd HH:mm")} + <#else> + ${article.articleCreateDate?string("yy-MM-dd HH:mm")} + + ${article.authorName} +
+
+ ${tag1Label} + <#list article.articleTags?split(",") as articleTag> + <#if articleTag_has_next>, + +
+
+
+ <#if 0 != relevantArticlesDisplayCount> +
+ + <#if 0 != randomArticlesDisplayCount> +
+ +
+
+ <#if nextArticlePermalink??> + + + <#if previousArticlePermalink??> + + +
+
+ <@comments commentList=articleComments article=article> +
+
+ <#include "footer.ftl"> + <@comment_script oId=article.oId> + page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}"; + <#if 0 != randomArticlesDisplayCount> + page.loadRandomArticles('

${randomArticlesLabel}

'); + + <#if 0 != relevantArticlesDisplayCount> + page.loadRelevantArticles('${article.oId}', '

${relevantArticlesLabel}

'); + + <#if 0 != externalRelevantArticlesDisplayCount> + page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,"); + + + + diff --git a/ease/author-articles.ftl b/skins/ease/author-articles.ftl similarity index 97% rename from ease/author-articles.ftl rename to skins/ease/author-articles.ftl index beeca41..55937b1 100644 --- a/ease/author-articles.ftl +++ b/skins/ease/author-articles.ftl @@ -1,21 +1,21 @@ -<#include "macro-head.ftl"> - - - - <@head title="${authorName} - ${blogTitle}"> - - - - - - ${topBarReplacement} - <#include "header.ftl"> -
-
-

${author1Label}${authorName}

- <#include "article-list.ftl"> -
-
- <#include "footer.ftl"> - - +<#include "macro-head.ftl"> + + + + <@head title="${authorName} - ${blogTitle}"> + + + + + + ${topBarReplacement} + <#include "header.ftl"> +
+
+

${author1Label}${authorName}

+ <#include "article-list.ftl"> +
+
+ <#include "footer.ftl"> + + diff --git a/ease/category-articles.ftl b/skins/ease/category-articles.ftl similarity index 100% rename from ease/category-articles.ftl rename to skins/ease/category-articles.ftl diff --git a/ease/common-comment.ftl b/skins/ease/common-comment.ftl similarity index 100% rename from ease/common-comment.ftl rename to skins/ease/common-comment.ftl diff --git a/ease/css/ease.css b/skins/ease/css/ease.css similarity index 94% rename from ease/css/ease.css rename to skins/ease/css/ease.css index 5f500d0..d0d9f56 100644 --- a/ease/css/ease.css +++ b/skins/ease/css/ease.css @@ -1,752 +1,752 @@ -/** - * Copyright (c) 2010-2017, b3log.org & hacpai.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* -* Skin ease style. -* -* @author Liyuan Li -* @version 1.1.0.0, Sep 21, 2017 -*/ -/* start base */ -html, body, div, ul, li { - margin: 0; - padding: 0; -} - -body { - font-family: Verdana,arial,'\5fae\8f6f\96c5\9ed1'; - font-size: 12px; - background-color: #FCFCFC; -} - -::selection { - background-color: #D5D5D5; - color: #FCFCFC; -} - -::-moz-selection { - background-color: #D5D5D5; - color: #FCFCFC; -} - -a { - outline: none; - color: #009EB8; - text-decoration: none; -} - -a:visited { - color: #00b4d2; -} - -a:hover { - text-decoration: underline; -} - -a:active { - color: #00889f; -} - -img { - vertical-align: middle; - border: 0; -} - -textarea, input { - outline: none; -} - -sup { - font-size: 10px; - font-weight: normal; - -webkit-text-size-adjust: none; -} - -.left { - float: left; -} - -.right { - float: right; -} - -.clear { - background-color: transparent; - border: 0; - clear: both; - display: block; - font-size: 0; - height: 0; - line-height: 0; - overflow: hidden; -} - -.none { - display: none; -} - -.ft-gray { - color: #808080; -} - -.ft-gray:visited { - color: #9a9a9a -} - -.ft-gray:hover { - color: #676767; - text-decoration: none; -} - -.fn-mgtb10 { - margin: 10px 0; -} - -.logo { - padding: 0 5px; - text-shadow: 0 0 1px #D5D5D5; -} - -.em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09, -.em10, .em11, .em12, .em13, .em14 { - cursor: pointer; - background-image: url("../../../images/emotions/emotions.png"); - background-size: 120px; - float: left; - height: 24px; - margin-right: 5px; - width: 24px; - transition: all .2s ease-out; - -webkit-transition: all .2s ease-out; - -moz-transition: all .2s ease-out; -} - -#emotions span:hover { - transform: scale(1.2) rotate(360deg); - -webkit-transform: scale(1.2) rotate(360deg); - -moz-transform: scale(1.2) rotate(360deg); -} - -.em01 { - background-position: -24px 0; -} -.em02 { - background-position: -48px 0; -} -.em03 { - background-position: -72px 0; -} -.em04 { - background-position: -96px 1px; -} -.em05 { - background-position: 0 -24px; -} -.em06 { - background-position: -24px -24px; -} -.em07 { - background-position: -48px -24px; -} -.em08 { - background-position: -72px -24px; -} -.em09 { - background-position: -96px -24px; -} -.em10 { - background-position: 0 -48px; -} -.em11 { - background-position: -24px -48px ; -} -.em12 { - background-position: -48px -48px; -} -.em13 { - background-position: -72px -48px; -} -.em14 { - background-position: -96px -48px; -} -/* end base */ - -/* start ico */ -#search, -.translate-ico { - background-image: url("/skins/ease/images/icons.png"); -} - -.translate-ico { - background-position: 1px -125px; - background-repeat: no-repeat; - border: 1px solid #D5D5D5; - border-radius: 3px; - cursor: pointer; - float: right; - height: 16px; - margin: -3px 0 0 15px; - padding: 1px; - width: 16px; -} - -.translate-ico:hover { - border-color: #9a9a9a; - box-shadow: 0 0 1px #808080; - background-color: #FCFCFC; -} -/* end ico */ - -/* start frame */ -.wrapper { - margin: 0 auto; - width: 990px; -} - -.main { - background-color: #FFF; - padding-bottom: 50px; -} -/* end frame */ - -/* start header */ -.header { - width: 100%; - z-index: 1; -} - -.header .title { - border-bottom: 1px solid #808080; - font-size: 26px; - font-weight: normal; -} - -.header .sub-title { - font-size: 11px; -} - -#search { - background-position: 7px -99px; - background-repeat: no-repeat; - background-color: #FFF; - border: 1px solid #D5D5D5; - border-radius: 2px 2px 2px 2px; - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1) inset; - color: #808080; - float: right; - font-size: 14px; - height: 19px; - line-height: 145%; - padding: 4px 10px 4px 28px; - width: 24px; - -moz-transition: width 0.4s ease, background 0.4s ease; - -webkit-transition: width 0.4s ease, background 0.4s ease; - transition: width 0.4s ease, background 0.4s ease; -} - -#search:focus { - width: 150px; -} - -.banner { - margin-bottom: 20px; -} - -.banner .notice { - float: left; - margin: 20px 0 0 50px; -} - -.nav { - background-color: #2C2C2C; - box-shadow: 0 2px 2px #D5D5D5, 0 3px 3px -3px #D5D5D5 inset; - border-top: 1px solid #e2e2e2; - border-bottom: 1px solid #e2e2e2; - height: 29px; - top: 0; - width: 100%; - z-index: 1; -} - -.nav ul { - list-style: none; - float: left; -} - -.nav li { - float: left; -} - -.nav a { - color: #C9C9C9; - display: block; - float: left; - font-size: 14px; - font-weight: 700; - line-height: 29px; - margin-right: 20px; - padding: 0 10px; - text-decoration: none; - transition: color .4s ease, background-color .8s ease; - -webkit-transition: color .4s ease, background-color .8s ease; - -moz-transition: color .4s ease, background-color .8s ease; -} -.nav a:hover { - color: #FFF; - background-color: #535353; -} - -.nav a.current { - background-color: #FFF; - box-shadow: 0 -1px 1px rgba(0, 0, 0, 0.1) inset, 0 1px 1px rgba(0, 0, 0, 0.1) inset; - color: #808080; -} - -.nav img { - margin-left: 3px; -} - -.nav .page-icon { - float: left; - height: 14px; - width: 14px; - margin: 8px 5px 0 0; -} -/* end header */ - -/* start footer */ -.footer { - border-top: 1px solid #D5D5D5; - box-shadow: 0 -1px 1px #D5D5D5; - font-size: 11px; - padding: 12px 0; - -webkit-text-size-adjust: none; -} - -#goTop { - background: url("/skins/ease/images/icons.png") no-repeat scroll 5px -51px #D5D5D5; - border-radius: 2px 2px 0 0; - box-shadow: 0 0 3px #D5D5D5; - cursor: pointer; - font-size: 11px; - height: 21px; - line-height: 21px; - padding: 0 10px 0 23px; - position: absolute; - right: 50px; - display: none; -} - -#goTop:hover { - background-color: #c8c8c8; - box-shadow: 0 0 3px #c8c8c8; -} -/* end footer*/ - -/* start article list */ -.wrapper > ul { - list-style: none; -} - -.main > .wrapper > h2 { - margin: 0; - padding: 14px 0; -} - -.article { - border-bottom: 1px solid #f6f6f6; - padding: 30px 50px; -} - -.article:hover { - border-bottom-color: #ddd; - box-shadow: 0 0 1px #f6f6f6 inset; - background-color: #FCFCFC; -} - -.article-body { - line-height: 145%; - overflow: hidden; - word-wrap: break-word; - margin-bottom: 10px; - font-size: 14px; -} - -.article-body ol, .article-body ul { - margin-left: 40px; - padding-left: 0; -} - -.article-body a { - color: #808080; - text-decoration: underline; -} - -.article-body a:vidited { - color: #9a9a9a -} - -.article-body a:hover { - color: #676767; -} - -.article-body>div { - min-height: 32px; -} - -.article-title h2 { - display: inline; -} - -.article-title span { - cursor: pointer; -} - -.article-last:hover { - border-bottom: 1px solid #f6f6f6; -} - -.article-next { - border: 1px solid #eee; - background-color: #F9F9F9; - cursor: pointer; - font-size: 14px; - line-height: 36px; - text-align: center; -} - -.article-next:hover { - background-color: #FCFCFC; -} -/* end article list */ - -/* start article */ -.article-relative { - background-color: #FCFCFC; - box-shadow: 0 0 2px #D5D5D5; - float: left; - margin: 10px 0; - padding: 0 20px 10px; - width: 382px; -} - -.article-relative:hover { - background-color: #fff; - box-shadow: 0 0 4px #D5D5D5; -} - -.article-relative ul { - list-style: none; -} - -#relevantArticles { - margin-right: 40px; -} - -#externalRelevantArticles { - width: 357px; - margin-top: 13px; -} -/* end article*/ - -/* start comment */ -#comments { - padding: 20px 50px; - position: relative; -} - -.comment-header { - float: left; - background-color: #FFF; - border: 1px solid #DEDEDE; - padding: 2px; - height: 60px; - width: 60px; -} - -.comment-panel { - float: left; - line-height: 16px; - margin: 0 0 20px 10px; - min-height: 64px; - overflow: hidden; - width: 814px; -} - -.comment-body-ref { - background-color: #FCFCFC; - box-shadow: 0 0 2px #D5D5D5; - display: block; - left: 127px; - padding: 10px; - opacity: 0.9; - filter: alpha(opacity=90); - position: absolute; - border: 1px solid #e2e2e2; -} - -.comment-body-ref > .comment-header { - border: 0 none; - float: right; - height: 48px; - width: 48px; - padding: 0; -} - -.comment-body-ref > .comment-panel { - margin: 0 20px 0 0; - min-height: 48px; - width: 725px; -} - -.comment-body-ref > .comment-panel > .right { - display: none; -} - -#replyForm { - margin-left: 25px; -} - -.form { - padding: 0 50px 20px; -} - -.wrapper > .form { - float: left; -} - -.form th { - text-align: right; - white-space: nowrap; -} - -.form input[type="text"], -.form input[type="password"], -.form textarea { - background-color: #FCFCFC; - border-width: 0; - box-shadow: 0 0 2px #BCBCBC; - font-family: Verdana,arial,\5fae\8f6f\96c5\9ed1; - font-size: 12px; - margin: 0 5px 10px 0; - outline: medium none; - padding: 0 3px; - height: 28px; - line-height: 28px; - width: 260px; -} - -.form input:focus, -.form textarea:focus { - box-shadow: 0 0 4px #D5D5D5; -} - -.form textarea { - height: 120px; - overflow: auto; - width: 426px; - line-height: 16px; -} - -.form button { - background-color: #F6F6F6; - border: 0 none; - box-shadow: 0 0 2px #D5D5D5; - height: 28px; - line-height: 28px; - padding: 0 12px; - color: #808080; -} - -.form button:hover { - box-shadow: 0 0 4px #D5D5D5; - text-shadow: 0 0 2px; -} - -.form img { - background-color: #FCFCFC; - box-shadow: 0 0 2px #D5D5D5; - cursor: pointer; - height: 24px; - padding: 1px; -} -/* end comment */ - -/* start tags */ -#tags.other-main { - margin: 47px 44px 0; - width: 902px; -} - -#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; -} - -.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 */ - -/* start archives */ -.archives { - position: relative; -} - -.archives > div { - background-color: #FCFCFC; - box-shadow: 0 0 2px #D5D5D5; - padding-bottom: 20px; - line-height: 20px; - margin: 20px; - width: 270px; - position: absolute; - top: 0; -} - -.archives h3 { - text-align: center; -} - -.archives > div:hover { - box-shadow: 0 0 4px #D5D5D5; -} - -.archives a { - display: block; - margin-left: 77px; -} -/* end archives */ - -/* start dynamic */ -.dynamic ul { - list-style: none; -} - -.dynamic h3 { - text-align: center; -} - -.dynamic .module { - background-color: #FCFCFC; - box-shadow: 0 0 2px #D5D5D5; - float: left; - line-height: 20px; - margin: 20px; - padding: 10px 20px 20px; - width: 385px; -} - -.dynamic .module:hover { - box-shadow: 0 0 4px #D5D5D5; -} - -.dynamic .side-comments { - width: 600px; -} - -.dynamic .side-comments .comment-panel { - width: 510px; -} - -.dynamic .side-tags { - width: 170px; -} - -.dynamic .side-tags li { - float: left; - margin: 0 5px; -} - -.dynamic .side-most-comment, -.dynamic .side-most-view { - margin-bottom: 0; -} -/* end dynamic */ - -/* start links */ -.other-main.links { - margin-top: 45px; -} - -.links li { - float: left; - line-height: 22px; - margin: 0 20px; - width: 270px; -} -/* end links */ - -/* start not list */ -.other-main { - display: inline-block; - margin: 30px 30px 0; - width: 930px; -} - -#tags a, -.archives > div, -.dynamic .module, -.form input[type="text"], -.form input[type="password"], -.form textarea, -.article-relative { - border: 1px solid #f2f2f2; -} - -#tags a:hover, -.archives>div:hover, -.dynamic .module:hover, -.form input:focus, -.form textarea:focus, -.article-relative:hover { - border: 1px solid #e2e2e2; -} +/** + * Copyright (c) 2010-2017, b3log.org & hacpai.com + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/* +* Skin ease style. +* +* @author Liyuan Li +* @version 1.1.0.0, Sep 21, 2017 +*/ +/* start base */ +html, body, div, ul, li { + margin: 0; + padding: 0; +} + +body { + font-family: Verdana,arial,'\5fae\8f6f\96c5\9ed1'; + font-size: 12px; + background-color: #FCFCFC; +} + +::selection { + background-color: #D5D5D5; + color: #FCFCFC; +} + +::-moz-selection { + background-color: #D5D5D5; + color: #FCFCFC; +} + +a { + outline: none; + color: #009EB8; + text-decoration: none; +} + +a:visited { + color: #00b4d2; +} + +a:hover { + text-decoration: underline; +} + +a:active { + color: #00889f; +} + +img { + vertical-align: middle; + border: 0; +} + +textarea, input { + outline: none; +} + +sup { + font-size: 10px; + font-weight: normal; + -webkit-text-size-adjust: none; +} + +.left { + float: left; +} + +.right { + float: right; +} + +.clear { + background-color: transparent; + border: 0; + clear: both; + display: block; + font-size: 0; + height: 0; + line-height: 0; + overflow: hidden; +} + +.none { + display: none; +} + +.ft-gray { + color: #808080; +} + +.ft-gray:visited { + color: #9a9a9a +} + +.ft-gray:hover { + color: #676767; + text-decoration: none; +} + +.fn-mgtb10 { + margin: 10px 0; +} + +.logo { + padding: 0 5px; + text-shadow: 0 0 1px #D5D5D5; +} + +.em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09, +.em10, .em11, .em12, .em13, .em14 { + cursor: pointer; + background-image: url("../../../images/emotions/emotions.png"); + background-size: 120px; + float: left; + height: 24px; + margin-right: 5px; + width: 24px; + transition: all .2s ease-out; + -webkit-transition: all .2s ease-out; + -moz-transition: all .2s ease-out; +} + +#emotions span:hover { + transform: scale(1.2) rotate(360deg); + -webkit-transform: scale(1.2) rotate(360deg); + -moz-transform: scale(1.2) rotate(360deg); +} + +.em01 { + background-position: -24px 0; +} +.em02 { + background-position: -48px 0; +} +.em03 { + background-position: -72px 0; +} +.em04 { + background-position: -96px 1px; +} +.em05 { + background-position: 0 -24px; +} +.em06 { + background-position: -24px -24px; +} +.em07 { + background-position: -48px -24px; +} +.em08 { + background-position: -72px -24px; +} +.em09 { + background-position: -96px -24px; +} +.em10 { + background-position: 0 -48px; +} +.em11 { + background-position: -24px -48px ; +} +.em12 { + background-position: -48px -48px; +} +.em13 { + background-position: -72px -48px; +} +.em14 { + background-position: -96px -48px; +} +/* end base */ + +/* start ico */ +#search, +.translate-ico { + background-image: url("/skins/ease/images/icons.png"); +} + +.translate-ico { + background-position: 1px -125px; + background-repeat: no-repeat; + border: 1px solid #D5D5D5; + border-radius: 3px; + cursor: pointer; + float: right; + height: 16px; + margin: -3px 0 0 15px; + padding: 1px; + width: 16px; +} + +.translate-ico:hover { + border-color: #9a9a9a; + box-shadow: 0 0 1px #808080; + background-color: #FCFCFC; +} +/* end ico */ + +/* start frame */ +.wrapper { + margin: 0 auto; + width: 990px; +} + +.main { + background-color: #FFF; + padding-bottom: 50px; +} +/* end frame */ + +/* start header */ +.header { + width: 100%; + z-index: 1; +} + +.header .title { + border-bottom: 1px solid #808080; + font-size: 26px; + font-weight: normal; +} + +.header .sub-title { + font-size: 11px; +} + +#search { + background-position: 7px -99px; + background-repeat: no-repeat; + background-color: #FFF; + border: 1px solid #D5D5D5; + border-radius: 2px 2px 2px 2px; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1) inset; + color: #808080; + float: right; + font-size: 14px; + height: 19px; + line-height: 145%; + padding: 4px 10px 4px 28px; + width: 24px; + -moz-transition: width 0.4s ease, background 0.4s ease; + -webkit-transition: width 0.4s ease, background 0.4s ease; + transition: width 0.4s ease, background 0.4s ease; +} + +#search:focus { + width: 150px; +} + +.banner { + margin-bottom: 20px; +} + +.banner .notice { + float: left; + margin: 20px 0 0 50px; +} + +.nav { + background-color: #2C2C2C; + box-shadow: 0 2px 2px #D5D5D5, 0 3px 3px -3px #D5D5D5 inset; + border-top: 1px solid #e2e2e2; + border-bottom: 1px solid #e2e2e2; + height: 29px; + top: 0; + width: 100%; + z-index: 1; +} + +.nav ul { + list-style: none; + float: left; +} + +.nav li { + float: left; +} + +.nav a { + color: #C9C9C9; + display: block; + float: left; + font-size: 14px; + font-weight: 700; + line-height: 29px; + margin-right: 20px; + padding: 0 10px; + text-decoration: none; + transition: color .4s ease, background-color .8s ease; + -webkit-transition: color .4s ease, background-color .8s ease; + -moz-transition: color .4s ease, background-color .8s ease; +} +.nav a:hover { + color: #FFF; + background-color: #535353; +} + +.nav a.current { + background-color: #FFF; + box-shadow: 0 -1px 1px rgba(0, 0, 0, 0.1) inset, 0 1px 1px rgba(0, 0, 0, 0.1) inset; + color: #808080; +} + +.nav img { + margin-left: 3px; +} + +.nav .page-icon { + float: left; + height: 14px; + width: 14px; + margin: 8px 5px 0 0; +} +/* end header */ + +/* start footer */ +.footer { + border-top: 1px solid #D5D5D5; + box-shadow: 0 -1px 1px #D5D5D5; + font-size: 11px; + padding: 12px 0; + -webkit-text-size-adjust: none; +} + +#goTop { + background: url("/skins/ease/images/icons.png") no-repeat scroll 5px -51px #D5D5D5; + border-radius: 2px 2px 0 0; + box-shadow: 0 0 3px #D5D5D5; + cursor: pointer; + font-size: 11px; + height: 21px; + line-height: 21px; + padding: 0 10px 0 23px; + position: absolute; + right: 50px; + display: none; +} + +#goTop:hover { + background-color: #c8c8c8; + box-shadow: 0 0 3px #c8c8c8; +} +/* end footer*/ + +/* start article list */ +.wrapper > ul { + list-style: none; +} + +.main > .wrapper > h2 { + margin: 0; + padding: 14px 0; +} + +.article { + border-bottom: 1px solid #f6f6f6; + padding: 30px 50px; +} + +.article:hover { + border-bottom-color: #ddd; + box-shadow: 0 0 1px #f6f6f6 inset; + background-color: #FCFCFC; +} + +.article-body { + line-height: 145%; + overflow: hidden; + word-wrap: break-word; + margin-bottom: 10px; + font-size: 14px; +} + +.article-body ol, .article-body ul { + margin-left: 40px; + padding-left: 0; +} + +.article-body a { + color: #808080; + text-decoration: underline; +} + +.article-body a:vidited { + color: #9a9a9a +} + +.article-body a:hover { + color: #676767; +} + +.article-body>div { + min-height: 32px; +} + +.article-title h2 { + display: inline; +} + +.article-title span { + cursor: pointer; +} + +.article-last:hover { + border-bottom: 1px solid #f6f6f6; +} + +.article-next { + border: 1px solid #eee; + background-color: #F9F9F9; + cursor: pointer; + font-size: 14px; + line-height: 36px; + text-align: center; +} + +.article-next:hover { + background-color: #FCFCFC; +} +/* end article list */ + +/* start article */ +.article-relative { + background-color: #FCFCFC; + box-shadow: 0 0 2px #D5D5D5; + float: left; + margin: 10px 0; + padding: 0 20px 10px; + width: 382px; +} + +.article-relative:hover { + background-color: #fff; + box-shadow: 0 0 4px #D5D5D5; +} + +.article-relative ul { + list-style: none; +} + +#relevantArticles { + margin-right: 40px; +} + +#externalRelevantArticles { + width: 357px; + margin-top: 13px; +} +/* end article*/ + +/* start comment */ +#comments { + padding: 20px 50px; + position: relative; +} + +.comment-header { + float: left; + background-color: #FFF; + border: 1px solid #DEDEDE; + padding: 2px; + height: 60px; + width: 60px; +} + +.comment-panel { + float: left; + line-height: 16px; + margin: 0 0 20px 10px; + min-height: 64px; + overflow: hidden; + width: 814px; +} + +.comment-body-ref { + background-color: #FCFCFC; + box-shadow: 0 0 2px #D5D5D5; + display: block; + left: 127px; + padding: 10px; + opacity: 0.9; + filter: alpha(opacity=90); + position: absolute; + border: 1px solid #e2e2e2; +} + +.comment-body-ref > .comment-header { + border: 0 none; + float: right; + height: 48px; + width: 48px; + padding: 0; +} + +.comment-body-ref > .comment-panel { + margin: 0 20px 0 0; + min-height: 48px; + width: 725px; +} + +.comment-body-ref > .comment-panel > .right { + display: none; +} + +#replyForm { + margin-left: 25px; +} + +.form { + padding: 0 50px 20px; +} + +.wrapper > .form { + float: left; +} + +.form th { + text-align: right; + white-space: nowrap; +} + +.form input[type="text"], +.form input[type="password"], +.form textarea { + background-color: #FCFCFC; + border-width: 0; + box-shadow: 0 0 2px #BCBCBC; + font-family: Verdana,arial,\5fae\8f6f\96c5\9ed1; + font-size: 12px; + margin: 0 5px 10px 0; + outline: medium none; + padding: 0 3px; + height: 28px; + line-height: 28px; + width: 260px; +} + +.form input:focus, +.form textarea:focus { + box-shadow: 0 0 4px #D5D5D5; +} + +.form textarea { + height: 120px; + overflow: auto; + width: 426px; + line-height: 16px; +} + +.form button { + background-color: #F6F6F6; + border: 0 none; + box-shadow: 0 0 2px #D5D5D5; + height: 28px; + line-height: 28px; + padding: 0 12px; + color: #808080; +} + +.form button:hover { + box-shadow: 0 0 4px #D5D5D5; + text-shadow: 0 0 2px; +} + +.form img { + background-color: #FCFCFC; + box-shadow: 0 0 2px #D5D5D5; + cursor: pointer; + height: 24px; + padding: 1px; +} +/* end comment */ + +/* start tags */ +#tags.other-main { + margin: 47px 44px 0; + width: 902px; +} + +#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; +} + +.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 */ + +/* start archives */ +.archives { + position: relative; +} + +.archives > div { + background-color: #FCFCFC; + box-shadow: 0 0 2px #D5D5D5; + padding-bottom: 20px; + line-height: 20px; + margin: 20px; + width: 270px; + position: absolute; + top: 0; +} + +.archives h3 { + text-align: center; +} + +.archives > div:hover { + box-shadow: 0 0 4px #D5D5D5; +} + +.archives a { + display: block; + margin-left: 77px; +} +/* end archives */ + +/* start dynamic */ +.dynamic ul { + list-style: none; +} + +.dynamic h3 { + text-align: center; +} + +.dynamic .module { + background-color: #FCFCFC; + box-shadow: 0 0 2px #D5D5D5; + float: left; + line-height: 20px; + margin: 20px; + padding: 10px 20px 20px; + width: 385px; +} + +.dynamic .module:hover { + box-shadow: 0 0 4px #D5D5D5; +} + +.dynamic .side-comments { + width: 600px; +} + +.dynamic .side-comments .comment-panel { + width: 510px; +} + +.dynamic .side-tags { + width: 170px; +} + +.dynamic .side-tags li { + float: left; + margin: 0 5px; +} + +.dynamic .side-most-comment, +.dynamic .side-most-view { + margin-bottom: 0; +} +/* end dynamic */ + +/* start links */ +.other-main.links { + margin-top: 45px; +} + +.links li { + float: left; + line-height: 22px; + margin: 0 20px; + width: 270px; +} +/* end links */ + +/* start not list */ +.other-main { + display: inline-block; + margin: 30px 30px 0; + width: 930px; +} + +#tags a, +.archives > div, +.dynamic .module, +.form input[type="text"], +.form input[type="password"], +.form textarea, +.article-relative { + border: 1px solid #f2f2f2; +} + +#tags a:hover, +.archives>div:hover, +.dynamic .module:hover, +.form input:focus, +.form textarea:focus, +.article-relative:hover { + border: 1px solid #e2e2e2; +} /* end not list */ \ No newline at end of file diff --git a/ease/css/ease.min.css b/skins/ease/css/ease.min.css similarity index 100% rename from ease/css/ease.min.css rename to skins/ease/css/ease.min.css diff --git a/ease/dynamic.ftl b/skins/ease/dynamic.ftl similarity index 98% rename from ease/dynamic.ftl rename to skins/ease/dynamic.ftl index d41287e..6c8def5 100644 --- a/ease/dynamic.ftl +++ b/skins/ease/dynamic.ftl @@ -1,125 +1,125 @@ -<#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> -
-

${tagsLabel}

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

${categoryLabel}

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

${mostCommentArticlesLabel}

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

${mostViewCountArticlesLabel}

- -
- -
-
-
-
- <#include "footer.ftl"> - - +<#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> +
+

${tagsLabel}

+ +
+
+ + + <#if 0 != mostUsedCategories?size> +
+

${categoryLabel}

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

${mostCommentArticlesLabel}

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

${mostViewCountArticlesLabel}

+ +
+ +
+
+
+
+ <#include "footer.ftl"> + + diff --git a/ease/footer.ftl b/skins/ease/footer.ftl similarity index 97% rename from ease/footer.ftl rename to skins/ease/footer.ftl index 018e0aa..c8e84e6 100644 --- a/ease/footer.ftl +++ b/skins/ease/footer.ftl @@ -1,70 +1,70 @@ - -
TOP
- - - - -${plugins} + +
TOP
+ + + + +${plugins} diff --git a/ease/header.ftl b/skins/ease/header.ftl similarity index 97% rename from ease/header.ftl rename to skins/ease/header.ftl index e0736aa..9b50cf6 100644 --- a/ease/header.ftl +++ b/skins/ease/header.ftl @@ -1,52 +1,52 @@ -
- - +
+ +
\ No newline at end of file diff --git a/ease/images/ajax-loader.gif b/skins/ease/images/ajax-loader.gif similarity index 100% rename from ease/images/ajax-loader.gif rename to skins/ease/images/ajax-loader.gif diff --git a/ease/images/icons.png b/skins/ease/images/icons.png similarity index 100% rename from ease/images/icons.png rename to skins/ease/images/icons.png diff --git a/ease/index.ftl b/skins/ease/index.ftl similarity index 96% rename from ease/index.ftl rename to skins/ease/index.ftl index 064ae81..6b33302 100644 --- a/ease/index.ftl +++ b/skins/ease/index.ftl @@ -1,24 +1,24 @@ -<#include "macro-head.ftl"> - - - - <@head title="${blogTitle}"> - <#if metaKeywords??> - - - <#if metaDescription??> - - - - - - ${topBarReplacement} - <#include "header.ftl"> -
-
- <#include "article-list.ftl"> -
-
- <#include "footer.ftl"> - - +<#include "macro-head.ftl"> + + + + <@head title="${blogTitle}"> + <#if metaKeywords??> + + + <#if metaDescription??> + + + + + + ${topBarReplacement} + <#include "header.ftl"> +
+
+ <#include "article-list.ftl"> +
+
+ <#include "footer.ftl"> + + diff --git a/ease/js/ease.js b/skins/ease/js/ease.js similarity index 97% rename from ease/js/ease.js rename to skins/ease/js/ease.js index 64308f5..feea75f 100644 --- a/ease/js/ease.js +++ b/skins/ease/js/ease.js @@ -1,294 +1,294 @@ -/* - * Copyright (c) 2010-2017, b3log.org & hacpai.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * @fileoverview ease js. - * - * @author Liyuan Li - * @version 1.0.1.6, Nov 28, 2013 - */ -var goTranslate = function () { - window.open("http://translate.google.com/translate?sl=auto&tl=auto&u=" + location.href); -}; - -var getNextPage = function () { - var $more = $(".article-next"); - currentPage += 1; - var path = "/articles/"; - if($("#tag").length === 1) { - var pathnames = location.pathname.split("/"); - path = "/articles/tags/" + pathnames[pathnames.length - 1] + "/"; - } else if ($("#archive").length === 1) { - var pathnames = location.pathname.split("/"); - path = "/articles/archives/" + pathnames[pathnames.length - 2] + "/" + pathnames[pathnames.length - 1] + "/"; - } else if ($("#author").length === 1) { - var pathnames = location.pathname.split("/"); - path = "/articles/authors/" + pathnames[pathnames.length - 1] + "/"; - } - - $.ajax({ - url: latkeConfig.servePath + path + currentPage, - type: "GET", - beforeSend: function () { - $more.css("background", - "url(" + latkeConfig.staticServePath + "/skins/ease/images/ajax-loader.gif) no-repeat scroll center center #fefefe"); - }, - success: function(result, textStatus){ - if (!result.sc) { - return; - } - - var articlesHTML = "", - pagination = result.rslts.pagination; - - // append articles - for (var i = 0; i < result.rslts.articles.length; i++) { - var article = result.rslts.articles[i], - lastClass = ""; - if (result.rslts.articles.length - 1 === i) { - lastClass = " article-last"; - } - - articlesHTML += '
  • ' + - '
    ' + - '

    ' + - '' + - article.articleTitle + - ''; - if (article.hasUpdated) { - articlesHTML += '' + Label.updatedLabel + ''; - } - - if (article.articlePutTop) { - articlesHTML += '' + Label.topArticleLabel + ''; - } - - articlesHTML += '

    ' + - '' + - '
    ' + - '
    ' + - '
    ' + - '
    ' + - article.articleAbstract + - '
    ' + - '
    ' + - '
    ' + - '
    '; - if (article.hasUpdated) { - articlesHTML += Util.toDate(article.articleUpdateTime, 'yy-MM-dd HH:mm'); - } else { - articlesHTML += Util.toDate(article.articleCreateTime, 'yy-MM-dd HH:mm'); - } - - articlesHTML += ' ' + article.authorName + '' + - '
    ' + - '
    ' + - Label.tag1Label + " "; - - var articleTags = article.articleTags.split(","); - for (var j = 0; j < articleTags.length; j++) { - articlesHTML += ''; - - if (j < articleTags.length - 1) { - articlesHTML += ", "; - } - } - - articlesHTML += '
    ' + - '
    ' + - '
  • '; - } - - $(".article-last").removeClass("article-last"); - $(".main>.wrapper>ul").append(articlesHTML); - - // 最后一页处理 - if (pagination.paginationPageCount === currentPage) { - $more.remove(); - } else { - $more.css("background", "none"); - } - } - }); -}; - -var ease = { - $header: $(".header"), - headerH: 103, - $body: $(".main > .wrapper"), - $nav: $(".nav"), - getCurrentPage: function () { - var $next = $(".article-next"); - if ($next.length > 0) { - window.currentPage = $next.data("page"); - } - }, - - setNavCurrent: function () { - $(".nav ul a").each(function () { - var $this = $(this); - if ($this.attr("href") === location.href) { - $this.addClass("current"); - } else if (/\/[0-9]+$/.test(location.pathname)) { - $(".nav ul li")[0].className = "current"; - } - }); - }, - - initCommon: function () { - Util.init(); - Util.replaceSideEm($(".recent-comments-content")); - Util.buildTags("tagsSide"); - }, - - initArchives: function () { - var $archives = $(".archives"); - if ($archives.length < 1) { - return; - } - - $(".footer").css("marginTop", "30px"); - var years = [], - $archiveList = $archives.find("span").each(function () { - var year = $(this).data("year"), - tag = true; - for (var i = 0; i < years.length; i++) { - if (year === years[i]) { - tag = false; - break; - } - } - if (tag) { - years.push(year); - } - }); - - var yearsHTML = ""; - for (var j = 0; j < years.length; j++) { - var monthsHTML = ""; - for (var l = 0; l < $archiveList.length; l++) { - var $month = $($archiveList[l]); - if ($month.data("year") === years[j]) { - monthsHTML += $month.html(); - } - } - - yearsHTML += "

    " + years[j] + "

    " + monthsHTML + "
    "; - } - - $archives.html(yearsHTML); - - // position - var $items = $(".archives>div"), - line = 0, - top = 0, - heights = []; - - for (var m = 0; m < $items.length; m++) { - for (var n = 0; n < 3; n++) { - if (m >= $items.length) { - break; - } - - $items[m].style.left = (n * 310) + "px"; - - if (line > 0) { - if ($items[m - 3].style.top !== "") { - top = parseInt($items[m - 3].style.top); - } - $items[m].style.top = $($items[m - 3]).height() + 60 + top + "px"; - - heights[n] = parseInt($items[m].style.top) + $($items[m]).height() + 60; - } else { - heights[n] = $($items[m]).height() + 60; - } - - if (n < 2) { - m += 1; - } - } - line += 1; - } - - // archive height - $archives.height(heights.sort()[heights.length - 1]); - }, - - scrollEvent: function () { - var _it = this; - $(window).scroll(function () { - var y = $(window).scrollTop(); - - // go top icon show or hide - if (y > _it.headerH) { - var bodyH = $(window).height(); - var top = y + bodyH - 21; - if ($("body").height() - 58 <= y + bodyH) { - top = $(".footer").offset().top - 21; - } - $("#goTop").fadeIn("slow").css("top", top); - } else { - $("#goTop").hide(); - } - }); - }, - - setDynamic: function () { - var $dynamic = $(".dynamic"); - if ($(".dynamic").length < 1) { - return; - } - - var $comments = $dynamic.find(".side-comments"), - $tags = $dynamic.find(".side-tags"), - $mostComment = $dynamic.find(".side-most-comment"), - $mostView = $dynamic.find(".side-most-view"); - - if ($comments.height() > $tags.height()) { - $tags.height($comments.height()); - } else { - $comments.height($tags.height()); - } - - if ($mostComment.height() > $mostView.height()) { - $mostView.height($mostComment.height()); - } else { - $mostComment.height($mostView.height()); - } - - // emotions - $(".article-body").each(function () { - this.innerHTML = Util.replaceEmString($(this).html()); - }); - } -}; - -(function () { - ease.getCurrentPage(); - ease.initCommon(); - ease.scrollEvent(); - ease.setNavCurrent(); - - ease.initArchives(); - ease.setDynamic(); +/* + * Copyright (c) 2010-2017, b3log.org & hacpai.com + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * @fileoverview ease js. + * + * @author Liyuan Li + * @version 1.0.1.6, Nov 28, 2013 + */ +var goTranslate = function () { + window.open("http://translate.google.com/translate?sl=auto&tl=auto&u=" + location.href); +}; + +var getNextPage = function () { + var $more = $(".article-next"); + currentPage += 1; + var path = "/articles/"; + if($("#tag").length === 1) { + var pathnames = location.pathname.split("/"); + path = "/articles/tags/" + pathnames[pathnames.length - 1] + "/"; + } else if ($("#archive").length === 1) { + var pathnames = location.pathname.split("/"); + path = "/articles/archives/" + pathnames[pathnames.length - 2] + "/" + pathnames[pathnames.length - 1] + "/"; + } else if ($("#author").length === 1) { + var pathnames = location.pathname.split("/"); + path = "/articles/authors/" + pathnames[pathnames.length - 1] + "/"; + } + + $.ajax({ + url: latkeConfig.servePath + path + currentPage, + type: "GET", + beforeSend: function () { + $more.css("background", + "url(" + latkeConfig.staticServePath + "/skins/ease/images/ajax-loader.gif) no-repeat scroll center center #fefefe"); + }, + success: function(result, textStatus){ + if (!result.sc) { + return; + } + + var articlesHTML = "", + pagination = result.rslts.pagination; + + // append articles + for (var i = 0; i < result.rslts.articles.length; i++) { + var article = result.rslts.articles[i], + lastClass = ""; + if (result.rslts.articles.length - 1 === i) { + lastClass = " article-last"; + } + + articlesHTML += '
  • ' + + '
    ' + + '

    ' + + '' + + article.articleTitle + + ''; + if (article.hasUpdated) { + articlesHTML += '' + Label.updatedLabel + ''; + } + + if (article.articlePutTop) { + articlesHTML += '' + Label.topArticleLabel + ''; + } + + articlesHTML += '

    ' + + '' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + article.articleAbstract + + '
    ' + + '
    ' + + '
    ' + + '
    '; + if (article.hasUpdated) { + articlesHTML += Util.toDate(article.articleUpdateTime, 'yy-MM-dd HH:mm'); + } else { + articlesHTML += Util.toDate(article.articleCreateTime, 'yy-MM-dd HH:mm'); + } + + articlesHTML += ' ' + article.authorName + '' + + '
    ' + + '
    ' + + Label.tag1Label + " "; + + var articleTags = article.articleTags.split(","); + for (var j = 0; j < articleTags.length; j++) { + articlesHTML += ''; + + if (j < articleTags.length - 1) { + articlesHTML += ", "; + } + } + + articlesHTML += '
    ' + + '
    ' + + '
  • '; + } + + $(".article-last").removeClass("article-last"); + $(".main>.wrapper>ul").append(articlesHTML); + + // 最后一页处理 + if (pagination.paginationPageCount === currentPage) { + $more.remove(); + } else { + $more.css("background", "none"); + } + } + }); +}; + +var ease = { + $header: $(".header"), + headerH: 103, + $body: $(".main > .wrapper"), + $nav: $(".nav"), + getCurrentPage: function () { + var $next = $(".article-next"); + if ($next.length > 0) { + window.currentPage = $next.data("page"); + } + }, + + setNavCurrent: function () { + $(".nav ul a").each(function () { + var $this = $(this); + if ($this.attr("href") === location.href) { + $this.addClass("current"); + } else if (/\/[0-9]+$/.test(location.pathname)) { + $(".nav ul li")[0].className = "current"; + } + }); + }, + + initCommon: function () { + Util.init(); + Util.replaceSideEm($(".recent-comments-content")); + Util.buildTags("tagsSide"); + }, + + initArchives: function () { + var $archives = $(".archives"); + if ($archives.length < 1) { + return; + } + + $(".footer").css("marginTop", "30px"); + var years = [], + $archiveList = $archives.find("span").each(function () { + var year = $(this).data("year"), + tag = true; + for (var i = 0; i < years.length; i++) { + if (year === years[i]) { + tag = false; + break; + } + } + if (tag) { + years.push(year); + } + }); + + var yearsHTML = ""; + for (var j = 0; j < years.length; j++) { + var monthsHTML = ""; + for (var l = 0; l < $archiveList.length; l++) { + var $month = $($archiveList[l]); + if ($month.data("year") === years[j]) { + monthsHTML += $month.html(); + } + } + + yearsHTML += "

    " + years[j] + "

    " + monthsHTML + "
    "; + } + + $archives.html(yearsHTML); + + // position + var $items = $(".archives>div"), + line = 0, + top = 0, + heights = []; + + for (var m = 0; m < $items.length; m++) { + for (var n = 0; n < 3; n++) { + if (m >= $items.length) { + break; + } + + $items[m].style.left = (n * 310) + "px"; + + if (line > 0) { + if ($items[m - 3].style.top !== "") { + top = parseInt($items[m - 3].style.top); + } + $items[m].style.top = $($items[m - 3]).height() + 60 + top + "px"; + + heights[n] = parseInt($items[m].style.top) + $($items[m]).height() + 60; + } else { + heights[n] = $($items[m]).height() + 60; + } + + if (n < 2) { + m += 1; + } + } + line += 1; + } + + // archive height + $archives.height(heights.sort()[heights.length - 1]); + }, + + scrollEvent: function () { + var _it = this; + $(window).scroll(function () { + var y = $(window).scrollTop(); + + // go top icon show or hide + if (y > _it.headerH) { + var bodyH = $(window).height(); + var top = y + bodyH - 21; + if ($("body").height() - 58 <= y + bodyH) { + top = $(".footer").offset().top - 21; + } + $("#goTop").fadeIn("slow").css("top", top); + } else { + $("#goTop").hide(); + } + }); + }, + + setDynamic: function () { + var $dynamic = $(".dynamic"); + if ($(".dynamic").length < 1) { + return; + } + + var $comments = $dynamic.find(".side-comments"), + $tags = $dynamic.find(".side-tags"), + $mostComment = $dynamic.find(".side-most-comment"), + $mostView = $dynamic.find(".side-most-view"); + + if ($comments.height() > $tags.height()) { + $tags.height($comments.height()); + } else { + $comments.height($tags.height()); + } + + if ($mostComment.height() > $mostView.height()) { + $mostView.height($mostComment.height()); + } else { + $mostComment.height($mostView.height()); + } + + // emotions + $(".article-body").each(function () { + this.innerHTML = Util.replaceEmString($(this).html()); + }); + } +}; + +(function () { + ease.getCurrentPage(); + ease.initCommon(); + ease.scrollEvent(); + ease.setNavCurrent(); + + ease.initArchives(); + ease.setDynamic(); })(); \ No newline at end of file diff --git a/ease/js/ease.min.js b/skins/ease/js/ease.min.js similarity index 100% rename from ease/js/ease.min.js rename to skins/ease/js/ease.min.js diff --git a/ease/lang/lang_en_US.properties b/skins/ease/lang/lang_en_US.properties similarity index 96% rename from ease/lang/lang_en_US.properties rename to skins/ease/lang/lang_en_US.properties index e1ee025..5461d1e 100644 --- a/ease/lang/lang_en_US.properties +++ b/skins/ease/lang/lang_en_US.properties @@ -1,76 +1,76 @@ -# -# Copyright (c) 2010-2017, b3log.org & hacpai.com -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# -# Description: Language configurations(en_US) for skin "ease". -# Version: 1.0.0.5, May 22, 2012 -# Author: Liyuan Li -# -dynamicLabel=Dynamic -moreLabel=More -contentLabel=More... -abstractLabel=Abstract -viewCount1Label=View Count: -articleCount1Label=Article Count: -commentCount1Label=Comment Count: -allTagsLabel=Tags -archiveLabel=Archive -yearLabel= -monthLabel= -recentArticlesLabel=Recent Articles -recentCommentsLabel=Recent Comments -mostCommentArticlesLabel=Most Comment Articles -mostViewCountArticlesLabel=Most View Articles -popTagsLabel=Popular Tags -linkLabel=Friend Links -indexLabel=Home -sumLabel= -pageLabel=Page -adminLabel=Admin -logoutLabel=Logout -loginLabel=Login -commentLabel=Comment -viewLabel=View -authorLabel=Author -previousPageLabel=Previous Page -nextPagePabel=Next Page -firstPageLabel=First Page -lastPageLabel=Last Page -archive1Label=Archive: -author1Label=Author: -tag1Label=Tags: -sorryLabel=Sorry! -notFoundLabel=Not Found! -returnTo1Label=Return: -updatedLabel=Updated! -topArticleLabel=Top! -replyLabel=Reply -commentNameLabel=Name -commentEmailLabel=Email -commentURLLabel=URL -submmitCommentLabel=Commit Comment -nameTooLongLabel=Sorry, your username must be between 2 and 20 characters long! -mailCannotEmptyLabel=Mail is empty! -mailInvalidLabel=Mail is invalid! -commentContentCannotEmptyLabel=Sorry, your content must be between 2 and 500 characters long! -captchaCannotEmptyLabel=Captcha is empty! -loadingLabel=loading.... -relevantArticlesLabel=Relevant Articles -randomArticlesLabel=Random Articles -externalRelevantArticlesLabel=External Relevant Articles: -captchaErrorLabel=Captcha Error -b3logLabel=B3LOG +# +# Copyright (c) 2010-2017, b3log.org & hacpai.com +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# +# Description: Language configurations(en_US) for skin "ease". +# Version: 1.0.0.5, May 22, 2012 +# Author: Liyuan Li +# +dynamicLabel=Dynamic +moreLabel=More +contentLabel=More... +abstractLabel=Abstract +viewCount1Label=View Count: +articleCount1Label=Article Count: +commentCount1Label=Comment Count: +allTagsLabel=Tags +archiveLabel=Archive +yearLabel= +monthLabel= +recentArticlesLabel=Recent Articles +recentCommentsLabel=Recent Comments +mostCommentArticlesLabel=Most Comment Articles +mostViewCountArticlesLabel=Most View Articles +popTagsLabel=Popular Tags +linkLabel=Friend Links +indexLabel=Home +sumLabel= +pageLabel=Page +adminLabel=Admin +logoutLabel=Logout +loginLabel=Login +commentLabel=Comment +viewLabel=View +authorLabel=Author +previousPageLabel=Previous Page +nextPagePabel=Next Page +firstPageLabel=First Page +lastPageLabel=Last Page +archive1Label=Archive: +author1Label=Author: +tag1Label=Tags: +sorryLabel=Sorry! +notFoundLabel=Not Found! +returnTo1Label=Return: +updatedLabel=Updated! +topArticleLabel=Top! +replyLabel=Reply +commentNameLabel=Name +commentEmailLabel=Email +commentURLLabel=URL +submmitCommentLabel=Commit Comment +nameTooLongLabel=Sorry, your username must be between 2 and 20 characters long! +mailCannotEmptyLabel=Mail is empty! +mailInvalidLabel=Mail is invalid! +commentContentCannotEmptyLabel=Sorry, your content must be between 2 and 500 characters long! +captchaCannotEmptyLabel=Captcha is empty! +loadingLabel=loading.... +relevantArticlesLabel=Relevant Articles +randomArticlesLabel=Random Articles +externalRelevantArticlesLabel=External Relevant Articles: +captchaErrorLabel=Captcha Error +b3logLabel=B3LOG killBrowserLabel=

    Let's kill outdated and insecure browser!

    Let's kill outdated and insecure browser for browser evolution, human progress and better experience.

    You can download

    \ No newline at end of file diff --git a/ease/lang/lang_zh_CN.properties b/skins/ease/lang/lang_zh_CN.properties similarity index 98% rename from ease/lang/lang_zh_CN.properties rename to skins/ease/lang/lang_zh_CN.properties index 7084762..255108d 100644 --- a/ease/lang/lang_zh_CN.properties +++ b/skins/ease/lang/lang_zh_CN.properties @@ -1,76 +1,76 @@ -# -# Copyright (c) 2010-2017, b3log.org & hacpai.com -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# -# Description: Language configurations(zh_CN) for skin "ease". -# Version: 1.0.0.5, May 22, 2012 -# Author: Liyuan Li -# -dynamicLabel=\u52A8\u6001 -moreLabel=\u66F4\u591A -contentLabel=\u5168\u6587 -abstractLabel=\u6458\u8981 -viewCount1Label=\u6D4F\u89C8\u6B21\u6570\uFF1A -articleCount1Label=\u6587\u7AE0\u603B\u6570\uFF1A -commentCount1Label=\u8BC4\u8BBA\u603B\u6570\uFF1A -allTagsLabel=\u6807\u7B7E\u5899 -updatedLabel=\u6709\u66F4\u65B0\uFF01 -topArticleLabel=\u7F6E\u9876\uFF01 -archiveLabel=\u5B58\u6863 -yearLabel=\u5E74 -monthLabel=\u6708 -recentArticlesLabel=\u6700\u65B0\u6587\u7AE0 -recentCommentsLabel=\u6700\u65B0\u8BC4\u8BBA -mostCommentArticlesLabel=\u8BC4\u8BBA\u6700\u591A\u7684\u6587\u7AE0 -mostViewCountArticlesLabel=\u8BBF\u95EE\u6700\u591A\u7684\u6587\u7AE0 -popTagsLabel=\u5206\u7C7B\u6807\u7B7E -linkLabel=\u53CB\u60C5\u94FE\u63A5 -indexLabel=\u9996\u9875 -sumLabel=\u5171 -pageLabel=\u9875 -adminLabel=\u7BA1\u7406 -logoutLabel=\u767B\u51FA -loginLabel=\u767B\u5F55 -commentLabel=\u8BC4\u8BBA -viewLabel=\u6D4F\u89C8 -authorLabel=\u4F5C\u8005 -previousPageLabel=\u4E0A\u4E00\u9875 -nextPagePabel=\u4E0B\u4E00\u9875 -firstPageLabel=\u7B2C\u4E00\u9875 -lastPageLabel=\u6700\u540E\u4E00\u9875 -archive1Label=\u5B58\u6863\uFF1A -author1Label=\u4F5C\u8005\uFF1A -tag1Label=\u6807\u7B7E\uFF1A -sorryLabel=\u5BF9\u4E0D\u8D77\uFF01 -notFoundLabel=\u627E\u4E0D\u5230\uFF01 -returnTo1Label=\u8FD4\u56DE\uFF1A -replyLabel=\u56DE\u590D -commentNameLabel=\u59D3\u540D -commentEmailLabel=\u90AE\u7BB1 -commentURLLabel=URL -submmitCommentLabel=\u63D0\u4EA4\u8BC4\u8BBA -nameTooLongLabel=\u59D3\u540D\u53EA\u80FD\u4E3A 2 \u5230 20 \u4E2A\u5B57\u7B26\uFF01 -mailCannotEmptyLabel=\u90AE\u7BB1\u4E0D\u80FD\u4E3A\u7A7A\uFF01 -mailInvalidLabel=\u90AE\u7BB1\u683C\u5F0F\u4E0D\u6B63\u786E\uFF01 -commentContentCannotEmptyLabel=\u8BC4\u8BBA\u5185\u5BB9\u53EA\u80FD\u4E3A 2 \u5230 500 \u4E2A\u5B57\u7B26\uFF01 -captchaCannotEmptyLabel=\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01 -loadingLabel=\u8F7D\u5165\u4E2D.... -relevantArticlesLabel=\u76F8\u5173\u9605\u8BFB -randomArticlesLabel=\u968F\u673A\u9605\u8BFB -externalRelevantArticlesLabel=\u7AD9\u5916\u76F8\u5173\u9605\u8BFB -captchaErrorLabel=\u9A8C\u8BC1\u7801\u9519\u8BEF -b3logLabel=B3LOG -killBrowserLabel=

    \u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

    \u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

    \u60A8\u53EF\u4EE5\u4E0B\u8F7D +# +# Copyright (c) 2010-2017, b3log.org & hacpai.com +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# +# Description: Language configurations(zh_CN) for skin "ease". +# Version: 1.0.0.5, May 22, 2012 +# Author: Liyuan Li +# +dynamicLabel=\u52A8\u6001 +moreLabel=\u66F4\u591A +contentLabel=\u5168\u6587 +abstractLabel=\u6458\u8981 +viewCount1Label=\u6D4F\u89C8\u6B21\u6570\uFF1A +articleCount1Label=\u6587\u7AE0\u603B\u6570\uFF1A +commentCount1Label=\u8BC4\u8BBA\u603B\u6570\uFF1A +allTagsLabel=\u6807\u7B7E\u5899 +updatedLabel=\u6709\u66F4\u65B0\uFF01 +topArticleLabel=\u7F6E\u9876\uFF01 +archiveLabel=\u5B58\u6863 +yearLabel=\u5E74 +monthLabel=\u6708 +recentArticlesLabel=\u6700\u65B0\u6587\u7AE0 +recentCommentsLabel=\u6700\u65B0\u8BC4\u8BBA +mostCommentArticlesLabel=\u8BC4\u8BBA\u6700\u591A\u7684\u6587\u7AE0 +mostViewCountArticlesLabel=\u8BBF\u95EE\u6700\u591A\u7684\u6587\u7AE0 +popTagsLabel=\u5206\u7C7B\u6807\u7B7E +linkLabel=\u53CB\u60C5\u94FE\u63A5 +indexLabel=\u9996\u9875 +sumLabel=\u5171 +pageLabel=\u9875 +adminLabel=\u7BA1\u7406 +logoutLabel=\u767B\u51FA +loginLabel=\u767B\u5F55 +commentLabel=\u8BC4\u8BBA +viewLabel=\u6D4F\u89C8 +authorLabel=\u4F5C\u8005 +previousPageLabel=\u4E0A\u4E00\u9875 +nextPagePabel=\u4E0B\u4E00\u9875 +firstPageLabel=\u7B2C\u4E00\u9875 +lastPageLabel=\u6700\u540E\u4E00\u9875 +archive1Label=\u5B58\u6863\uFF1A +author1Label=\u4F5C\u8005\uFF1A +tag1Label=\u6807\u7B7E\uFF1A +sorryLabel=\u5BF9\u4E0D\u8D77\uFF01 +notFoundLabel=\u627E\u4E0D\u5230\uFF01 +returnTo1Label=\u8FD4\u56DE\uFF1A +replyLabel=\u56DE\u590D +commentNameLabel=\u59D3\u540D +commentEmailLabel=\u90AE\u7BB1 +commentURLLabel=URL +submmitCommentLabel=\u63D0\u4EA4\u8BC4\u8BBA +nameTooLongLabel=\u59D3\u540D\u53EA\u80FD\u4E3A 2 \u5230 20 \u4E2A\u5B57\u7B26\uFF01 +mailCannotEmptyLabel=\u90AE\u7BB1\u4E0D\u80FD\u4E3A\u7A7A\uFF01 +mailInvalidLabel=\u90AE\u7BB1\u683C\u5F0F\u4E0D\u6B63\u786E\uFF01 +commentContentCannotEmptyLabel=\u8BC4\u8BBA\u5185\u5BB9\u53EA\u80FD\u4E3A 2 \u5230 500 \u4E2A\u5B57\u7B26\uFF01 +captchaCannotEmptyLabel=\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01 +loadingLabel=\u8F7D\u5165\u4E2D.... +relevantArticlesLabel=\u76F8\u5173\u9605\u8BFB +randomArticlesLabel=\u968F\u673A\u9605\u8BFB +externalRelevantArticlesLabel=\u7AD9\u5916\u76F8\u5173\u9605\u8BFB +captchaErrorLabel=\u9A8C\u8BC1\u7801\u9519\u8BEF +b3logLabel=B3LOG +killBrowserLabel=

    \u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

    \u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

    \u60A8\u53EF\u4EE5\u4E0B\u8F7D diff --git a/ease/links.ftl b/skins/ease/links.ftl similarity index 97% rename from ease/links.ftl rename to skins/ease/links.ftl index 9157edc..acebae8 100644 --- a/ease/links.ftl +++ b/skins/ease/links.ftl @@ -1,32 +1,32 @@ -<#include "macro-head.ftl"> - - - - <@head title="${blogTitle}"> - - - - - - ${topBarReplacement} - <#include "header.ftl"> -
    -
    - <#if 0 != links?size> - - -
    -
    - <#include "footer.ftl"> - - +<#include "macro-head.ftl"> + + + + <@head title="${blogTitle}"> + + + + + + ${topBarReplacement} + <#include "header.ftl"> +
    +
    + <#if 0 != links?size> + + +
    +
    + <#include "footer.ftl"> + + diff --git a/ease/macro-comments.ftl b/skins/ease/macro-comments.ftl similarity index 97% rename from ease/macro-comments.ftl rename to skins/ease/macro-comments.ftl index a249c56..c20d796 100644 --- a/ease/macro-comments.ftl +++ b/skins/ease/macro-comments.ftl @@ -1,115 +1,115 @@ -<#macro comments commentList article> -
    - <#list commentList as comment> - <#include "common-comment.ftl"/> - -
    -<#if article.commentable> -
    - - - <#if !isLoggedIn> - - - - - - - - - - - - - - - - - <#if !isLoggedIn> - - - - - - - - - -
    - - -
    - - -
    - - -
    - - - - - - - - - - - - - - - -
    - -
    - - validate -
    - - - -
    -
    -<#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount> -
    - - - - - -<#macro comment_script oId> - - +<#macro comments commentList article> +
    + <#list commentList as comment> + <#include "common-comment.ftl"/> + +
    +<#if article.commentable> +
    + + + <#if !isLoggedIn> + + + + + + + + + + + + + + + + + <#if !isLoggedIn> + + + + + + + + + +
    + + +
    + + +
    + + +
    + + + + + + + + + + + + + + + +
    + +
    + + validate +
    + + + +
    +
    +<#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount> +
    + + + + + +<#macro comment_script oId> + + \ No newline at end of file diff --git a/ease/macro-head.ftl b/skins/ease/macro-head.ftl similarity index 100% rename from ease/macro-head.ftl rename to skins/ease/macro-head.ftl diff --git a/ease/page.ftl b/skins/ease/page.ftl similarity index 96% rename from ease/page.ftl rename to skins/ease/page.ftl index 4643957..6907acd 100644 --- a/ease/page.ftl +++ b/skins/ease/page.ftl @@ -1,25 +1,25 @@ -<#include "macro-head.ftl"> -<#include "macro-comments.ftl"> - - - - <@head title="${page.pageTitle} - ${blogTitle}"> - - - - - - ${topBarReplacement} - <#include "header.ftl"> -
    -
    -
    - ${page.pageContent} -
    - <@comments commentList=pageComments article=page> -
    -
    - <#include "footer.ftl"> - <@comment_script oId=page.oId> - - +<#include "macro-head.ftl"> +<#include "macro-comments.ftl"> + + + + <@head title="${page.pageTitle} - ${blogTitle}"> + + + + + + ${topBarReplacement} + <#include "header.ftl"> +
    +
    +
    + ${page.pageContent} +
    + <@comments commentList=pageComments article=page> +
    +
    + <#include "footer.ftl"> + <@comment_script oId=page.oId> + + diff --git a/ease/preview.png b/skins/ease/preview.png similarity index 100% rename from ease/preview.png rename to skins/ease/preview.png diff --git a/ease/skin.properties b/skins/ease/skin.properties similarity index 100% rename from ease/skin.properties rename to skins/ease/skin.properties diff --git a/ease/tag-articles.ftl b/skins/ease/tag-articles.ftl similarity index 97% rename from ease/tag-articles.ftl rename to skins/ease/tag-articles.ftl index 5f8dd55..65752b3 100644 --- a/ease/tag-articles.ftl +++ b/skins/ease/tag-articles.ftl @@ -1,27 +1,27 @@ -<#include "macro-head.ftl"> - - - - <@head title="${tag.tagTitle} - ${blogTitle}"> - - - - - - ${topBarReplacement} - <#include "header.ftl"> - - <#include "footer.ftl"> - - +<#include "macro-head.ftl"> + + + + <@head title="${tag.tagTitle} - ${blogTitle}"> + + + + + + ${topBarReplacement} + <#include "header.ftl"> + + <#include "footer.ftl"> + + diff --git a/ease/tags.ftl b/skins/ease/tags.ftl similarity index 97% rename from ease/tags.ftl rename to skins/ease/tags.ftl index 725bbe5..95f0b71 100644 --- a/ease/tags.ftl +++ b/skins/ease/tags.ftl @@ -1,34 +1,34 @@ -<#include "macro-head.ftl"> - - - - <@head title="${allTagsLabel} - ${blogTitle}"> - - - - - - ${topBarReplacement} - <#include "header.ftl"> -
    -
    - -
    -
    -
    - <#include "footer.ftl"> - - - +<#include "macro-head.ftl"> + + + + <@head title="${allTagsLabel} - ${blogTitle}"> + + + + + + ${topBarReplacement} + <#include "header.ftl"> +
    +
    + +
    +
    +
    + <#include "footer.ftl"> + + + diff --git a/favourite/archive-articles.ftl b/skins/favourite/archive-articles.ftl similarity index 100% rename from favourite/archive-articles.ftl rename to skins/favourite/archive-articles.ftl diff --git a/favourite/article-list.ftl b/skins/favourite/article-list.ftl similarity index 100% rename from favourite/article-list.ftl rename to skins/favourite/article-list.ftl diff --git a/favourite/article.ftl b/skins/favourite/article.ftl similarity index 100% rename from favourite/article.ftl rename to skins/favourite/article.ftl diff --git a/favourite/author-articles.ftl b/skins/favourite/author-articles.ftl similarity index 100% rename from favourite/author-articles.ftl rename to skins/favourite/author-articles.ftl diff --git a/favourite/category-articles.ftl b/skins/favourite/category-articles.ftl similarity index 100% rename from favourite/category-articles.ftl rename to skins/favourite/category-articles.ftl diff --git a/favourite/common-comment.ftl b/skins/favourite/common-comment.ftl similarity index 100% rename from favourite/common-comment.ftl rename to skins/favourite/common-comment.ftl diff --git a/favourite/css/favourite.css b/skins/favourite/css/favourite.css similarity index 95% rename from favourite/css/favourite.css rename to skins/favourite/css/favourite.css index 58087d4..194aeb6 100644 --- a/favourite/css/favourite.css +++ b/skins/favourite/css/favourite.css @@ -1,660 +1,660 @@ -/** - * Copyright (c) 2010-2017, b3log.org & hacpai.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -@charset "utf-8"; -/* - * skin favoutite style - * - * @author Liyuan Li - * @version 1.1.0.8, Apr 9, 2017 -*/ -body { - background: url("../images/bg.jpg") repeat scroll left top transparent; -} -a, a:link, a:active, a:visited { - color: #2970A6; - text-decoration: none; -} -a:hover { - color: black; -} -h1 { - font-size: 300%; -} -h4 { - font-size: 160%; - padding: 18px 0 0 80px; -} -h5 { - font-size: 12px; -} -.margin5R { - margin-right: 5px; -} -.margin5 { - margin: 5px; -} -.margin25 { - margin: 25px 25px 0; -} -.content { - margin: 0 auto; - width: 960px; -} -.header { - height: 65px; - padding: 15px 0 0 30px; -} -.body { - background: url("../images/cont-bg.png") repeat-y scroll right center #FFFFFF; - min-height: 400px; -} -.side-navi { - background: url("../images/cont-bg.png") repeat-y scroll left top #00798A; - color: white; - font-size: 95%; - line-height: 145%; - padding-top: 8px; - position: relative; - width: 300px; -} -.side-navi ul { - list-style: none; -} -.side-navi a { - color: #FFFFFF; -} -.comm div { - display: none; -} -.main { - padding: 0 0 15px 35px; - width: 600px; -} -.footer { - color: white; - line-height: 145%; -} -#logoTitle { - color: white; - display: block; - font-family: "Microsoft YaHei"; - height: 50px; - outline: none; - text-decoration: none; -} -.sub-title { - border-top: 1px solid #FFFFFF; - color: #FFFFFF; - font-size: 18px; - padding: 0 15px; -} -#header-navi { - background: none repeat scroll 0 0 #FFFFFF; - border-bottom: 1px solid #A6A6A6; -} -#header-navi li { - float: left; - list-style: none; - margin-left: 0px; -} -#header-navi li a { - background: url("../images/menu.gif") no-repeat scroll 0 0 transparent; - color: #382E1F; - display: block; - font-size: 11px; - height: 31px; - line-height: 31px; - margin-left: -10px; - outline: none; - padding: 0 20px; - text-decoration: none; -} -#header-navi li a:hover { - background-position: 0 -31px; -} -#header-navi li a.home { - background-position: 0 -93px; - margin-left: 0; - padding: 0; - text-indent: -999em; - width: 45px; -} -#header-navi li a.home:hover { - background-position: 0 -124px; -} -#header-navi li a.lastNavi:hover { - background-position: 0 0; -} -#header-navi li.selected a { - background-position: 0 -62px; -} -#header-navi li.selected a.home { - background-position: 0 -155px; -} -#statistic { - left: 250px; - position: relative; - text-align: left; - top: 110px; - width: 600px; -} -.footer .copyright { - padding-top: 60px; - text-align: center; -} -.footer .goTop { - background: url("../images/icons.gif") no-repeat scroll 0 -304px transparent; - cursor: pointer; - font-size: 12px; - padding-left: 16px; - position: absolute; - right: 17px; - top: 0; - width: 25px; -} -.article { - border-top: 1px dotted #0184AF; - padding-bottom: 15px; -} -.article-title { - font-size: 22px; - margin-top: 10px; - padding: 0 5px 3px; - position: relative; - top: 20px; -} -.article-title sup { - font-size: 12px; -} -.article-title a { - color: #4C4C4C; - text-decoration: none; -} -.article-title a:hover { - color: #2970A6; -} -.article-abstract { - line-height: 145%; - margin: 5px 0 5px 5px; - word-wrap: break-word; -} -.tagsIcon, .articles-commentIcon, .dateIcon, .article-browserIcon { - background: url("../images/icons.gif") no-repeat scroll 0 -400px transparent; - float: left; - height: 30px; - margin-right: 6px; - width: 30px; -} -.tagsIcon { - background: url("../images/tagsIcon.png"); -} -.dateIcon { - background-position: 0 -48px; -} -.articles-commentIcon { - background: url("../images/comment.jpg"); -} -.article-browserIcon { - background: url("../images/category.jpg"); -} -.article-body { - line-height: 145%; - padding: 5px 0 0 5px; -} -.article-footer { - margin: 0 5px 10px 5px; -} -.article-relative { - line-height: 22px; - margin-top: 20px; -} -.article-relative h4 { - font-size: 12px; - padding: 0; -} -.comments { - background: none repeat scroll 0 0 #FCFCFC; - border-bottom: 1px solid #CCCCCC; - border-top: 1px solid #CCCCCC; - margin: 15px -15px; - padding: 0 15px 15px; - position: relative; -} -.comment-title { - background-color: #E3E9FF; - border-top: 1px solid #3366CC; - padding: 3px 12px 3px 12px; - position: relative; -} -.comment-body-ref { - background-color: #FFFFFF; - filter: alpha(opacity=90); - left: 217px; - opacity: 0.9; - padding: 6px; - position: absolute; - width: 605px; - z-index: 10; -} -.comment-body { - margin-top: 15px; -} -.comment-author { - float: left; - text-align: center; - width: 81px; -} -.comment-author div { - background: url("../images/commentpoint.png") no-repeat scroll 100% 33% transparent; - margin-top: 10px; - padding-right: 14px; -} -.comment-author img { - border: 1px solid #999999; - height: 32px; - padding: 1px; - width: 32px; -} -.comment-author a { - font-weight: bold; - white-space: nowrap; - margin-right: 14px; -} -.comment-info { - background: url("../images/comment.gif") no-repeat scroll 0 0 #EDEFF0; - font-size: 12px; - margin: -62px 0 0 80px; - padding: 10px 15px 0; - width: 494px; -} -.comment-content { - background: url("../images/comment.gif") no-repeat scroll 100% 100% transparent; - font-size: 12px; - line-height: 145%; - margin: 0 -15px; - overflow: hidden; - padding: 9px 15px 10px; - word-wrap: break-word; -} -.comment-form img { - cursor: pointer; -} -.comment-form input, .comment-form textarea { - background: url("../images/textfield.gif") repeat-x scroll 50% 0 #FFFFFF; - border: 1px solid #A6A6A6; - color: #555555; - font-family: Helvetica,Arial,sans-serif; - height: 16px; - outline: none; - padding: 2px 1px; - width: 200px; -} -.comment-form textarea { - font-size: 12px; - height: auto; - width: 600px; -} -.comment-form button { - background: none repeat scroll 0 0 #B4D666; - border-color: #B4D666 #81B840 #81B840 #B4D666; - border-radius: 0px; - border-style: solid; - border-width: 1px; - color: #2970A6; - font-size: 12px; - height: 22px; - line-height: 22px; - padding: 0px 6px; -} -.comment-form button:hover { - background: none repeat scroll 0 0 #98C64C; - border-color: #76B33A #98C64C #98C64C #76B33A; - color: #074A7E; -} -.em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09, .em10, .em11, .em12, .em13, .em14 { - background-image: url("../../../images/emotions/emotions.png"); - background-size: 120px; -} -.error-msg { - color: #3366CC; -} -.side-navi .item { - padding: 12px 15px; -} -.side-navi .navi-comments img { - border: 1px solid #999999; - height: 32px; - margin-right: 7px; - padding: 1px; - width: 32px; -} -.side-navi .navi-comments a { - color: white; - font-weight: bold; -} -.side-navi .navi-comments .side-comment { - color: white; - font-weight: normal; - height: 18px; - width: 210px; -} -.side-navi .navi-comments .side-comment img { - border: 0px; - height: 16px; - margin-right: 0px; - padding: 0px; - width: 16px; -} -.side-navi .navi-comments li { - padding: 2px 0; -} -.side-navi .navi-comments li div { - width: 215px; - overflow: hidden; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; -} -.side-navi a.selected { - color: #555555; - text-decoration: none; -} -.side-navi ul.navi-tags li, .side-navi .navi-comments li { - background-image: none; - padding-left: 0px; -} -.side-navi ul.navi-tags li img { - height: 16px; - padding-right: 6px; - width: 16px; -} -.side-navi li { - background: url("../images/pl.png") no-repeat scroll 0 0 transparent; - margin: 5px 0 0 0; - overflow: hidden; - padding-left: 22px; - white-space: nowrap; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; -} -.side-navi li.aboutMe { - white-space: normal; -} -.side-navi .line { - border-color: #67C3CF; - border-style: dotted; - border-width: 1px 0; -} -.pagination { - margin: 16px; - text-align: center; -} -.pagination a, .pagination a:visited { - color: #4272DB; - padding: 0 3px; -} -.pagination a.selected { - color: #000000; - font-weight: bold; -} -#tagsPanel .tagPanel { - border: 2px solid; - border-radius: 6px; - cursor: pointer; - float: left; - margin: 3px; -} -#tagsPanel .tagPanel:hover { - background-color: #EEEEEE; - border: 2px dashed; -} -#tagsPanel .tagPanel { - text-decoration: none; -} -.error-body { - background: url("../images/cont-bg_2.png") repeat-y scroll left; - height: 400px; - padding: 12px; -} -.error-title { - line-height: 72px; -} -.error-panel { - margin: 0 auto; - width: 201px; -} -.error-panel a { - background: none repeat scroll 0 0 #9CD941; - border-color: #D0F29D #398A38 #398A38 #D0F29D; - border-style: solid; - border-width: 1px; - color: #000000; - font-size: 14px; - font-weight: bold; - margin-right: 3px; - padding: 10px 15px; - text-decoration: none; -} -.error-panel a:hover { - background-color: #ADEb51; -} -.kind-panel { - background: url("../images/box.gif") no-repeat scroll 100% 100% #F4F5F7; - margin-bottom: 10px; - padding: 8px 12px; -} -.kind-title { - background: url("../images/box.gif") no-repeat scroll 0 0 #E3E4E6; - border-bottom: 1px solid #CCCCCC; - font-weight: bold; - padding: 6px 12px; -} -.top { - background: url("../images/top-bg.jpg") repeat-x scroll left top transparent; - border: none; - color: white; - height: 87px; -} -.footer-icon { - background: url("../images/footer-ico.png") no-repeat scroll center center transparent; - height: 133px; -} -.info { - background: url("../images/info.png") repeat-x scroll left top transparent; - height: 110px; - position: relative; -} -.logoutIcon { - background-position: -96px -16px; -} -#qq2 { - float: right; - padding: 68px 120px 0 0; -} -.thinks { - background: url("../images/thinks.png") no-repeat scroll left top transparent; - height: 420px; - position: absolute; - right: 12px; - top: 36px; - width: 388px; - z-index: 1; -} -.lamb { - background: url("../images/lamb.png") no-repeat scroll left top transparent; - height: 80px; - left: 460px; - position: absolute; - top: 100px; - width: 320px; -} -.lamb a { - display: block; - height: 80px; - outline: none; - width: 320px; -} -.null { - height: 160px; -} -#navigation { - height: 87px; - margin: 0 auto; - width: 960px; -} -#navigation a.classifiche { - background: url("../images/classifiche.png") no-repeat scroll left top transparent; -} -#navigation a.about { - background: url("../images/about.png") no-repeat scroll left top transparent; -} -#navigation a.home { - background: url("../images/home.png") no-repeat scroll left top transparent; -} -#navigation a.Guestbook { - background: url("../images/Guestbook.png") no-repeat scroll left top transparent; -} -#navigation a { - background: url("../images/default.png") no-repeat scroll left top transparent; - color: #FFFFFF; - cursor: pointer !important; - float: left; - height: 70px; - margin-left: 10px; - outline: none; - padding-top: 2px; - text-align: center; - text-decoration: none; - width: 73px; -} -.admins { - position: relative; - top: -85px; -} -#mostCommentArticles li a,#mostViewCountArticles li a,.navi-tags li a,#sideLink li a,#save li a,#sideAuthor li a { - color: white; -} -.roundtop { - background: url("../images/roundtop.png") no-repeat scroll left top transparent; - height: 75px; -} -.roundbottom { - background: url("../images/roundbottom.png") no-repeat scroll left top transparent; - height: 35px; -} -.paint { - background: url("../images/paint.png") no-repeat scroll left top transparent; - height: 183px; - left: 34px; - position: absolute; - top: 450px; - width: 87px; -} -.rings { - background: url("../images/anelli.png") no-repeat scroll left top transparent; - height: 121px; - left: -28px; - position: absolute; - width: 56px; - z-index: 80; -} -.antefatto { - background: url("../images/twitter.png") no-repeat scroll left top transparent; - height: 64px; -} -.ads { - background: url("../images/ads.png") no-repeat scroll left top transparent; - height: 64px; -} -.categorie { - background: url("../images/categorie.png") no-repeat scroll left top transparent; - height: 64px; -} -#sideNavi .tags { - background: url(../images/tagsIcon.png) no-repeat scroll left top transparent; - height: 52px; - background-size: contain; -} -.archivio { - background: url("../images/archivio.png") no-repeat scroll left top transparent; - height: 64px; -} -.side-author { - background: url("../images/antefatto.png") no-repeat scroll left top transparent; - height: 64px; -} -.blog { - background: url("../images/blog.png") no-repeat scroll left top transparent; - height: 64px; -} -.cuore { - background: url("../images/cuore.png") no-repeat scroll left top transparent; - height: 64px; -} -.esclamativo { - background: url("../images/esclamativo.png") no-repeat scroll left top transparent; - height: 64px; -} -.posttime-blue { - background-color: #0184AF; -} -.posttime-blue, .posttime-pink { - border: 1px solid #999999; - clear: right; - color: #FFFFFF; - float: right; - font-family: Tohama,Arial,Helvetica,sans-serif; - height: 60px; - position: relative; - right: 30px; - top: -25px; - width: 60px; -} -.posttime-MY { - border-bottom: 1px solid #FFFFFF; - font-size: 9px; - height: 15px; - padding-top: 5px; - text-align: center; -} -.posttime-D { - font-size: 28px; - font-weight: bold; - text-align: center; -} -.note { - background: none repeat scroll 0 0 #E7F5F7; - margin: 40px 0 0 -49px; - padding: 10px 10px 10px 85px; - position: relative; - width: 574px; - z-index: 50; -} -.corner { - background: url("../images/corner.png") no-repeat scroll left top transparent; - height: 9px; - left: 0; - position: absolute; - top: -9px; - width: 9px; -} -.count { - position: relative; - top: 8px; -} -.substance { - overflow: hidden; - width: 500px; +/** + * Copyright (c) 2010-2017, b3log.org & hacpai.com + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +@charset "utf-8"; +/* + * skin favoutite style + * + * @author Liyuan Li + * @version 1.1.0.8, Apr 9, 2017 +*/ +body { + background: url("../images/bg.jpg") repeat scroll left top transparent; +} +a, a:link, a:active, a:visited { + color: #2970A6; + text-decoration: none; +} +a:hover { + color: black; +} +h1 { + font-size: 300%; +} +h4 { + font-size: 160%; + padding: 18px 0 0 80px; +} +h5 { + font-size: 12px; +} +.margin5R { + margin-right: 5px; +} +.margin5 { + margin: 5px; +} +.margin25 { + margin: 25px 25px 0; +} +.content { + margin: 0 auto; + width: 960px; +} +.header { + height: 65px; + padding: 15px 0 0 30px; +} +.body { + background: url("../images/cont-bg.png") repeat-y scroll right center #FFFFFF; + min-height: 400px; +} +.side-navi { + background: url("../images/cont-bg.png") repeat-y scroll left top #00798A; + color: white; + font-size: 95%; + line-height: 145%; + padding-top: 8px; + position: relative; + width: 300px; +} +.side-navi ul { + list-style: none; +} +.side-navi a { + color: #FFFFFF; +} +.comm div { + display: none; +} +.main { + padding: 0 0 15px 35px; + width: 600px; +} +.footer { + color: white; + line-height: 145%; +} +#logoTitle { + color: white; + display: block; + font-family: "Microsoft YaHei"; + height: 50px; + outline: none; + text-decoration: none; +} +.sub-title { + border-top: 1px solid #FFFFFF; + color: #FFFFFF; + font-size: 18px; + padding: 0 15px; +} +#header-navi { + background: none repeat scroll 0 0 #FFFFFF; + border-bottom: 1px solid #A6A6A6; +} +#header-navi li { + float: left; + list-style: none; + margin-left: 0px; +} +#header-navi li a { + background: url("../images/menu.gif") no-repeat scroll 0 0 transparent; + color: #382E1F; + display: block; + font-size: 11px; + height: 31px; + line-height: 31px; + margin-left: -10px; + outline: none; + padding: 0 20px; + text-decoration: none; +} +#header-navi li a:hover { + background-position: 0 -31px; +} +#header-navi li a.home { + background-position: 0 -93px; + margin-left: 0; + padding: 0; + text-indent: -999em; + width: 45px; +} +#header-navi li a.home:hover { + background-position: 0 -124px; +} +#header-navi li a.lastNavi:hover { + background-position: 0 0; +} +#header-navi li.selected a { + background-position: 0 -62px; +} +#header-navi li.selected a.home { + background-position: 0 -155px; +} +#statistic { + left: 250px; + position: relative; + text-align: left; + top: 110px; + width: 600px; +} +.footer .copyright { + padding-top: 60px; + text-align: center; +} +.footer .goTop { + background: url("../images/icons.gif") no-repeat scroll 0 -304px transparent; + cursor: pointer; + font-size: 12px; + padding-left: 16px; + position: absolute; + right: 17px; + top: 0; + width: 25px; +} +.article { + border-top: 1px dotted #0184AF; + padding-bottom: 15px; +} +.article-title { + font-size: 22px; + margin-top: 10px; + padding: 0 5px 3px; + position: relative; + top: 20px; +} +.article-title sup { + font-size: 12px; +} +.article-title a { + color: #4C4C4C; + text-decoration: none; +} +.article-title a:hover { + color: #2970A6; +} +.article-abstract { + line-height: 145%; + margin: 5px 0 5px 5px; + word-wrap: break-word; +} +.tagsIcon, .articles-commentIcon, .dateIcon, .article-browserIcon { + background: url("../images/icons.gif") no-repeat scroll 0 -400px transparent; + float: left; + height: 30px; + margin-right: 6px; + width: 30px; +} +.tagsIcon { + background: url("../images/tagsIcon.png"); +} +.dateIcon { + background-position: 0 -48px; +} +.articles-commentIcon { + background: url("../images/comment.jpg"); +} +.article-browserIcon { + background: url("../images/category.jpg"); +} +.article-body { + line-height: 145%; + padding: 5px 0 0 5px; +} +.article-footer { + margin: 0 5px 10px 5px; +} +.article-relative { + line-height: 22px; + margin-top: 20px; +} +.article-relative h4 { + font-size: 12px; + padding: 0; +} +.comments { + background: none repeat scroll 0 0 #FCFCFC; + border-bottom: 1px solid #CCCCCC; + border-top: 1px solid #CCCCCC; + margin: 15px -15px; + padding: 0 15px 15px; + position: relative; +} +.comment-title { + background-color: #E3E9FF; + border-top: 1px solid #3366CC; + padding: 3px 12px 3px 12px; + position: relative; +} +.comment-body-ref { + background-color: #FFFFFF; + filter: alpha(opacity=90); + left: 217px; + opacity: 0.9; + padding: 6px; + position: absolute; + width: 605px; + z-index: 10; +} +.comment-body { + margin-top: 15px; +} +.comment-author { + float: left; + text-align: center; + width: 81px; +} +.comment-author div { + background: url("../images/commentpoint.png") no-repeat scroll 100% 33% transparent; + margin-top: 10px; + padding-right: 14px; +} +.comment-author img { + border: 1px solid #999999; + height: 32px; + padding: 1px; + width: 32px; +} +.comment-author a { + font-weight: bold; + white-space: nowrap; + margin-right: 14px; +} +.comment-info { + background: url("../images/comment.gif") no-repeat scroll 0 0 #EDEFF0; + font-size: 12px; + margin: -62px 0 0 80px; + padding: 10px 15px 0; + width: 494px; +} +.comment-content { + background: url("../images/comment.gif") no-repeat scroll 100% 100% transparent; + font-size: 12px; + line-height: 145%; + margin: 0 -15px; + overflow: hidden; + padding: 9px 15px 10px; + word-wrap: break-word; +} +.comment-form img { + cursor: pointer; +} +.comment-form input, .comment-form textarea { + background: url("../images/textfield.gif") repeat-x scroll 50% 0 #FFFFFF; + border: 1px solid #A6A6A6; + color: #555555; + font-family: Helvetica,Arial,sans-serif; + height: 16px; + outline: none; + padding: 2px 1px; + width: 200px; +} +.comment-form textarea { + font-size: 12px; + height: auto; + width: 600px; +} +.comment-form button { + background: none repeat scroll 0 0 #B4D666; + border-color: #B4D666 #81B840 #81B840 #B4D666; + border-radius: 0px; + border-style: solid; + border-width: 1px; + color: #2970A6; + font-size: 12px; + height: 22px; + line-height: 22px; + padding: 0px 6px; +} +.comment-form button:hover { + background: none repeat scroll 0 0 #98C64C; + border-color: #76B33A #98C64C #98C64C #76B33A; + color: #074A7E; +} +.em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09, .em10, .em11, .em12, .em13, .em14 { + background-image: url("../../../images/emotions/emotions.png"); + background-size: 120px; +} +.error-msg { + color: #3366CC; +} +.side-navi .item { + padding: 12px 15px; +} +.side-navi .navi-comments img { + border: 1px solid #999999; + height: 32px; + margin-right: 7px; + padding: 1px; + width: 32px; +} +.side-navi .navi-comments a { + color: white; + font-weight: bold; +} +.side-navi .navi-comments .side-comment { + color: white; + font-weight: normal; + height: 18px; + width: 210px; +} +.side-navi .navi-comments .side-comment img { + border: 0px; + height: 16px; + margin-right: 0px; + padding: 0px; + width: 16px; +} +.side-navi .navi-comments li { + padding: 2px 0; +} +.side-navi .navi-comments li div { + width: 215px; + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; +} +.side-navi a.selected { + color: #555555; + text-decoration: none; +} +.side-navi ul.navi-tags li, .side-navi .navi-comments li { + background-image: none; + padding-left: 0px; +} +.side-navi ul.navi-tags li img { + height: 16px; + padding-right: 6px; + width: 16px; +} +.side-navi li { + background: url("../images/pl.png") no-repeat scroll 0 0 transparent; + margin: 5px 0 0 0; + overflow: hidden; + padding-left: 22px; + white-space: nowrap; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; +} +.side-navi li.aboutMe { + white-space: normal; +} +.side-navi .line { + border-color: #67C3CF; + border-style: dotted; + border-width: 1px 0; +} +.pagination { + margin: 16px; + text-align: center; +} +.pagination a, .pagination a:visited { + color: #4272DB; + padding: 0 3px; +} +.pagination a.selected { + color: #000000; + font-weight: bold; +} +#tagsPanel .tagPanel { + border: 2px solid; + border-radius: 6px; + cursor: pointer; + float: left; + margin: 3px; +} +#tagsPanel .tagPanel:hover { + background-color: #EEEEEE; + border: 2px dashed; +} +#tagsPanel .tagPanel { + text-decoration: none; +} +.error-body { + background: url("../images/cont-bg_2.png") repeat-y scroll left; + height: 400px; + padding: 12px; +} +.error-title { + line-height: 72px; +} +.error-panel { + margin: 0 auto; + width: 201px; +} +.error-panel a { + background: none repeat scroll 0 0 #9CD941; + border-color: #D0F29D #398A38 #398A38 #D0F29D; + border-style: solid; + border-width: 1px; + color: #000000; + font-size: 14px; + font-weight: bold; + margin-right: 3px; + padding: 10px 15px; + text-decoration: none; +} +.error-panel a:hover { + background-color: #ADEb51; +} +.kind-panel { + background: url("../images/box.gif") no-repeat scroll 100% 100% #F4F5F7; + margin-bottom: 10px; + padding: 8px 12px; +} +.kind-title { + background: url("../images/box.gif") no-repeat scroll 0 0 #E3E4E6; + border-bottom: 1px solid #CCCCCC; + font-weight: bold; + padding: 6px 12px; +} +.top { + background: url("../images/top-bg.jpg") repeat-x scroll left top transparent; + border: none; + color: white; + height: 87px; +} +.footer-icon { + background: url("../images/footer-ico.png") no-repeat scroll center center transparent; + height: 133px; +} +.info { + background: url("../images/info.png") repeat-x scroll left top transparent; + height: 110px; + position: relative; +} +.logoutIcon { + background-position: -96px -16px; +} +#qq2 { + float: right; + padding: 68px 120px 0 0; +} +.thinks { + background: url("../images/thinks.png") no-repeat scroll left top transparent; + height: 420px; + position: absolute; + right: 12px; + top: 36px; + width: 388px; + z-index: 1; +} +.lamb { + background: url("../images/lamb.png") no-repeat scroll left top transparent; + height: 80px; + left: 460px; + position: absolute; + top: 100px; + width: 320px; +} +.lamb a { + display: block; + height: 80px; + outline: none; + width: 320px; +} +.null { + height: 160px; +} +#navigation { + height: 87px; + margin: 0 auto; + width: 960px; +} +#navigation a.classifiche { + background: url("../images/classifiche.png") no-repeat scroll left top transparent; +} +#navigation a.about { + background: url("../images/about.png") no-repeat scroll left top transparent; +} +#navigation a.home { + background: url("../images/home.png") no-repeat scroll left top transparent; +} +#navigation a.Guestbook { + background: url("../images/Guestbook.png") no-repeat scroll left top transparent; +} +#navigation a { + background: url("../images/default.png") no-repeat scroll left top transparent; + color: #FFFFFF; + cursor: pointer !important; + float: left; + height: 70px; + margin-left: 10px; + outline: none; + padding-top: 2px; + text-align: center; + text-decoration: none; + width: 73px; +} +.admins { + position: relative; + top: -85px; +} +#mostCommentArticles li a,#mostViewCountArticles li a,.navi-tags li a,#sideLink li a,#save li a,#sideAuthor li a { + color: white; +} +.roundtop { + background: url("../images/roundtop.png") no-repeat scroll left top transparent; + height: 75px; +} +.roundbottom { + background: url("../images/roundbottom.png") no-repeat scroll left top transparent; + height: 35px; +} +.paint { + background: url("../images/paint.png") no-repeat scroll left top transparent; + height: 183px; + left: 34px; + position: absolute; + top: 450px; + width: 87px; +} +.rings { + background: url("../images/anelli.png") no-repeat scroll left top transparent; + height: 121px; + left: -28px; + position: absolute; + width: 56px; + z-index: 80; +} +.antefatto { + background: url("../images/twitter.png") no-repeat scroll left top transparent; + height: 64px; +} +.ads { + background: url("../images/ads.png") no-repeat scroll left top transparent; + height: 64px; +} +.categorie { + background: url("../images/categorie.png") no-repeat scroll left top transparent; + height: 64px; +} +#sideNavi .tags { + background: url(../images/tagsIcon.png) no-repeat scroll left top transparent; + height: 52px; + background-size: contain; +} +.archivio { + background: url("../images/archivio.png") no-repeat scroll left top transparent; + height: 64px; +} +.side-author { + background: url("../images/antefatto.png") no-repeat scroll left top transparent; + height: 64px; +} +.blog { + background: url("../images/blog.png") no-repeat scroll left top transparent; + height: 64px; +} +.cuore { + background: url("../images/cuore.png") no-repeat scroll left top transparent; + height: 64px; +} +.esclamativo { + background: url("../images/esclamativo.png") no-repeat scroll left top transparent; + height: 64px; +} +.posttime-blue { + background-color: #0184AF; +} +.posttime-blue, .posttime-pink { + border: 1px solid #999999; + clear: right; + color: #FFFFFF; + float: right; + font-family: Tohama,Arial,Helvetica,sans-serif; + height: 60px; + position: relative; + right: 30px; + top: -25px; + width: 60px; +} +.posttime-MY { + border-bottom: 1px solid #FFFFFF; + font-size: 9px; + height: 15px; + padding-top: 5px; + text-align: center; +} +.posttime-D { + font-size: 28px; + font-weight: bold; + text-align: center; +} +.note { + background: none repeat scroll 0 0 #E7F5F7; + margin: 40px 0 0 -49px; + padding: 10px 10px 10px 85px; + position: relative; + width: 574px; + z-index: 50; +} +.corner { + background: url("../images/corner.png") no-repeat scroll left top transparent; + height: 9px; + left: 0; + position: absolute; + top: -9px; + width: 9px; +} +.count { + position: relative; + top: 8px; +} +.substance { + overflow: hidden; + width: 500px; } \ No newline at end of file diff --git a/favourite/css/favourite.min.css b/skins/favourite/css/favourite.min.css similarity index 100% rename from favourite/css/favourite.min.css rename to skins/favourite/css/favourite.min.css diff --git a/favourite/footer.ftl b/skins/favourite/footer.ftl similarity index 97% rename from favourite/footer.ftl rename to skins/favourite/footer.ftl index 6cbc288..f6e9a5d 100644 --- a/favourite/footer.ftl +++ b/skins/favourite/footer.ftl @@ -1,46 +1,46 @@ -
    - -
    - ${goTopLabel} -
    -
    - - - +
    + +
    + ${goTopLabel} +
    +
    + + + ${plugins} \ No newline at end of file diff --git a/favourite/header.ftl b/skins/favourite/header.ftl similarity index 100% rename from favourite/header.ftl rename to skins/favourite/header.ftl diff --git a/favourite/images/Guestbook.png b/skins/favourite/images/Guestbook.png similarity index 100% rename from favourite/images/Guestbook.png rename to skins/favourite/images/Guestbook.png diff --git a/favourite/images/about.png b/skins/favourite/images/about.png similarity index 100% rename from favourite/images/about.png rename to skins/favourite/images/about.png diff --git a/favourite/images/ads.png b/skins/favourite/images/ads.png similarity index 100% rename from favourite/images/ads.png rename to skins/favourite/images/ads.png diff --git a/favourite/images/anelli.png b/skins/favourite/images/anelli.png similarity index 100% rename from favourite/images/anelli.png rename to skins/favourite/images/anelli.png diff --git a/favourite/images/antefatto.png b/skins/favourite/images/antefatto.png similarity index 100% rename from favourite/images/antefatto.png rename to skins/favourite/images/antefatto.png diff --git a/favourite/images/archivio.png b/skins/favourite/images/archivio.png similarity index 100% rename from favourite/images/archivio.png rename to skins/favourite/images/archivio.png diff --git a/favourite/images/bg.jpg b/skins/favourite/images/bg.jpg similarity index 100% rename from favourite/images/bg.jpg rename to skins/favourite/images/bg.jpg diff --git a/favourite/images/blog.png b/skins/favourite/images/blog.png similarity index 100% rename from favourite/images/blog.png rename to skins/favourite/images/blog.png diff --git a/favourite/images/box.gif b/skins/favourite/images/box.gif similarity index 100% rename from favourite/images/box.gif rename to skins/favourite/images/box.gif diff --git a/favourite/images/categorie.png b/skins/favourite/images/categorie.png similarity index 100% rename from favourite/images/categorie.png rename to skins/favourite/images/categorie.png diff --git a/favourite/images/category.jpg b/skins/favourite/images/category.jpg similarity index 100% rename from favourite/images/category.jpg rename to skins/favourite/images/category.jpg diff --git a/favourite/images/classifiche.png b/skins/favourite/images/classifiche.png similarity index 100% rename from favourite/images/classifiche.png rename to skins/favourite/images/classifiche.png diff --git a/favourite/images/comment.gif b/skins/favourite/images/comment.gif similarity index 100% rename from favourite/images/comment.gif rename to skins/favourite/images/comment.gif diff --git a/favourite/images/comment.jpg b/skins/favourite/images/comment.jpg similarity index 100% rename from favourite/images/comment.jpg rename to skins/favourite/images/comment.jpg diff --git a/favourite/images/commentpoint.png b/skins/favourite/images/commentpoint.png similarity index 100% rename from favourite/images/commentpoint.png rename to skins/favourite/images/commentpoint.png diff --git a/favourite/images/cont-bg.png b/skins/favourite/images/cont-bg.png similarity index 100% rename from favourite/images/cont-bg.png rename to skins/favourite/images/cont-bg.png diff --git a/favourite/images/cont-bg_2.png b/skins/favourite/images/cont-bg_2.png similarity index 100% rename from favourite/images/cont-bg_2.png rename to skins/favourite/images/cont-bg_2.png diff --git a/favourite/images/corner.png b/skins/favourite/images/corner.png similarity index 100% rename from favourite/images/corner.png rename to skins/favourite/images/corner.png diff --git a/favourite/images/cuore.png b/skins/favourite/images/cuore.png similarity index 100% rename from favourite/images/cuore.png rename to skins/favourite/images/cuore.png diff --git a/favourite/images/default.png b/skins/favourite/images/default.png similarity index 100% rename from favourite/images/default.png rename to skins/favourite/images/default.png diff --git a/favourite/images/esclamativo.png b/skins/favourite/images/esclamativo.png similarity index 100% rename from favourite/images/esclamativo.png rename to skins/favourite/images/esclamativo.png diff --git a/favourite/images/footer-ico.png b/skins/favourite/images/footer-ico.png similarity index 100% rename from favourite/images/footer-ico.png rename to skins/favourite/images/footer-ico.png diff --git a/favourite/images/header.jpg b/skins/favourite/images/header.jpg similarity index 100% rename from favourite/images/header.jpg rename to skins/favourite/images/header.jpg diff --git a/favourite/images/home.png b/skins/favourite/images/home.png similarity index 100% rename from favourite/images/home.png rename to skins/favourite/images/home.png diff --git a/favourite/images/icons.gif b/skins/favourite/images/icons.gif similarity index 100% rename from favourite/images/icons.gif rename to skins/favourite/images/icons.gif diff --git a/favourite/images/info.png b/skins/favourite/images/info.png similarity index 100% rename from favourite/images/info.png rename to skins/favourite/images/info.png diff --git a/favourite/images/pl.png b/skins/favourite/images/pl.png similarity index 100% rename from favourite/images/pl.png rename to skins/favourite/images/pl.png diff --git a/favourite/images/roundbottom.png b/skins/favourite/images/roundbottom.png similarity index 100% rename from favourite/images/roundbottom.png rename to skins/favourite/images/roundbottom.png diff --git a/favourite/images/roundtop.png b/skins/favourite/images/roundtop.png similarity index 100% rename from favourite/images/roundtop.png rename to skins/favourite/images/roundtop.png diff --git a/favourite/images/tagsIcon.png b/skins/favourite/images/tagsIcon.png similarity index 100% rename from favourite/images/tagsIcon.png rename to skins/favourite/images/tagsIcon.png diff --git a/favourite/images/textfield.gif b/skins/favourite/images/textfield.gif similarity index 100% rename from favourite/images/textfield.gif rename to skins/favourite/images/textfield.gif diff --git a/favourite/images/thinks.png b/skins/favourite/images/thinks.png similarity index 100% rename from favourite/images/thinks.png rename to skins/favourite/images/thinks.png diff --git a/favourite/images/top-bg.jpg b/skins/favourite/images/top-bg.jpg similarity index 100% rename from favourite/images/top-bg.jpg rename to skins/favourite/images/top-bg.jpg diff --git a/favourite/images/twitter.png b/skins/favourite/images/twitter.png similarity index 100% rename from favourite/images/twitter.png rename to skins/favourite/images/twitter.png diff --git a/favourite/index.ftl b/skins/favourite/index.ftl similarity index 100% rename from favourite/index.ftl rename to skins/favourite/index.ftl diff --git a/favourite/lang/lang_en_US.properties b/skins/favourite/lang/lang_en_US.properties similarity index 100% rename from favourite/lang/lang_en_US.properties rename to skins/favourite/lang/lang_en_US.properties diff --git a/favourite/lang/lang_zh_CN.properties b/skins/favourite/lang/lang_zh_CN.properties similarity index 100% rename from favourite/lang/lang_zh_CN.properties rename to skins/favourite/lang/lang_zh_CN.properties diff --git a/favourite/macro-comments.ftl b/skins/favourite/macro-comments.ftl similarity index 97% rename from favourite/macro-comments.ftl rename to skins/favourite/macro-comments.ftl index 60ab4f0..62282fd 100644 --- a/favourite/macro-comments.ftl +++ b/skins/favourite/macro-comments.ftl @@ -1,113 +1,113 @@ -<#macro comments commentList article> -
    - <#list commentList as comment> - <#include "common-comment.ftl"/> - -
    -<#if article.commentable> - - - <#if !isLoggedIn> - - - - - - - - - - - - - - - - - - - - <#if !isLoggedIn> - - - - - - - - - -
    - - - ${commentNameLabel} -
    - - - ${commentEmailLabel} -
    - - - ${commentURLLabel} -
    - - - - - - - - - - - - - - - -
    - -
    - - - validate -
    - - -
    - - - -<#macro comment_script oId> - - +<#macro comments commentList article> +
    + <#list commentList as comment> + <#include "common-comment.ftl"/> + +
    +<#if article.commentable> + + + <#if !isLoggedIn> + + + + + + + + + + + + + + + + + + + + <#if !isLoggedIn> + + + + + + + + + +
    + + + ${commentNameLabel} +
    + + + ${commentEmailLabel} +
    + + + ${commentURLLabel} +
    + + + + + + + + + + + + + + + +
    + +
    + + + validate +
    + + +
    + + + +<#macro comment_script oId> + + \ No newline at end of file diff --git a/favourite/macro-head.ftl b/skins/favourite/macro-head.ftl similarity index 100% rename from favourite/macro-head.ftl rename to skins/favourite/macro-head.ftl diff --git a/favourite/nav.ftl b/skins/favourite/nav.ftl similarity index 100% rename from favourite/nav.ftl rename to skins/favourite/nav.ftl diff --git a/favourite/page.ftl b/skins/favourite/page.ftl similarity index 100% rename from favourite/page.ftl rename to skins/favourite/page.ftl diff --git a/favourite/preview.png b/skins/favourite/preview.png similarity index 100% rename from favourite/preview.png rename to skins/favourite/preview.png diff --git a/favourite/side.ftl b/skins/favourite/side.ftl similarity index 100% rename from favourite/side.ftl rename to skins/favourite/side.ftl diff --git a/favourite/skin.properties b/skins/favourite/skin.properties similarity index 100% rename from favourite/skin.properties rename to skins/favourite/skin.properties diff --git a/favourite/statistic.ftl b/skins/favourite/statistic.ftl similarity index 100% rename from favourite/statistic.ftl rename to skins/favourite/statistic.ftl diff --git a/favourite/tag-articles.ftl b/skins/favourite/tag-articles.ftl similarity index 100% rename from favourite/tag-articles.ftl rename to skins/favourite/tag-articles.ftl diff --git a/favourite/tags.ftl b/skins/favourite/tags.ftl similarity index 100% rename from favourite/tags.ftl rename to skins/favourite/tags.ftl diff --git a/i-nove/archive-articles.ftl b/skins/i-nove/archive-articles.ftl similarity index 100% rename from i-nove/archive-articles.ftl rename to skins/i-nove/archive-articles.ftl diff --git a/i-nove/article-list.ftl b/skins/i-nove/article-list.ftl similarity index 100% rename from i-nove/article-list.ftl rename to skins/i-nove/article-list.ftl diff --git a/i-nove/article.ftl b/skins/i-nove/article.ftl similarity index 100% rename from i-nove/article.ftl rename to skins/i-nove/article.ftl diff --git a/i-nove/author-articles.ftl b/skins/i-nove/author-articles.ftl similarity index 100% rename from i-nove/author-articles.ftl rename to skins/i-nove/author-articles.ftl diff --git a/i-nove/category-articles.ftl b/skins/i-nove/category-articles.ftl similarity index 100% rename from i-nove/category-articles.ftl rename to skins/i-nove/category-articles.ftl diff --git a/i-nove/common-comment.ftl b/skins/i-nove/common-comment.ftl similarity index 100% rename from i-nove/common-comment.ftl rename to skins/i-nove/common-comment.ftl diff --git a/i-nove/css/i-nove.css b/skins/i-nove/css/i-nove.css similarity index 100% rename from i-nove/css/i-nove.css rename to skins/i-nove/css/i-nove.css diff --git a/i-nove/css/i-nove.min.css b/skins/i-nove/css/i-nove.min.css similarity index 100% rename from i-nove/css/i-nove.min.css rename to skins/i-nove/css/i-nove.min.css diff --git a/i-nove/footer.ftl b/skins/i-nove/footer.ftl similarity index 97% rename from i-nove/footer.ftl rename to skins/i-nove/footer.ftl index b2034fe..7896bd9 100644 --- a/i-nove/footer.ftl +++ b/skins/i-nove/footer.ftl @@ -1,59 +1,59 @@ - -
    - ${goTopLabel} -
    - - - + +
    + ${goTopLabel} +
    + + + ${plugins} \ No newline at end of file diff --git a/i-nove/header.ftl b/skins/i-nove/header.ftl similarity index 100% rename from i-nove/header.ftl rename to skins/i-nove/header.ftl diff --git a/i-nove/images/bg.jpg b/skins/i-nove/images/bg.jpg similarity index 100% rename from i-nove/images/bg.jpg rename to skins/i-nove/images/bg.jpg diff --git a/i-nove/images/box.gif b/skins/i-nove/images/box.gif similarity index 100% rename from i-nove/images/box.gif rename to skins/i-nove/images/box.gif diff --git a/i-nove/images/comment.gif b/skins/i-nove/images/comment.gif similarity index 100% rename from i-nove/images/comment.gif rename to skins/i-nove/images/comment.gif diff --git a/i-nove/images/commentpoint.png b/skins/i-nove/images/commentpoint.png similarity index 100% rename from i-nove/images/commentpoint.png rename to skins/i-nove/images/commentpoint.png diff --git a/i-nove/images/footer.jpg b/skins/i-nove/images/footer.jpg similarity index 100% rename from i-nove/images/footer.jpg rename to skins/i-nove/images/footer.jpg diff --git a/i-nove/images/header.jpg b/skins/i-nove/images/header.jpg similarity index 100% rename from i-nove/images/header.jpg rename to skins/i-nove/images/header.jpg diff --git a/i-nove/images/icons.gif b/skins/i-nove/images/icons.gif similarity index 100% rename from i-nove/images/icons.gif rename to skins/i-nove/images/icons.gif diff --git a/i-nove/images/light.gif b/skins/i-nove/images/light.gif similarity index 100% rename from i-nove/images/light.gif rename to skins/i-nove/images/light.gif diff --git a/i-nove/images/main_shadow.gif b/skins/i-nove/images/main_shadow.gif similarity index 100% rename from i-nove/images/main_shadow.gif rename to skins/i-nove/images/main_shadow.gif diff --git a/i-nove/images/menu.gif b/skins/i-nove/images/menu.gif similarity index 100% rename from i-nove/images/menu.gif rename to skins/i-nove/images/menu.gif diff --git a/i-nove/images/sidebar_shadow.gif b/skins/i-nove/images/sidebar_shadow.gif similarity index 100% rename from i-nove/images/sidebar_shadow.gif rename to skins/i-nove/images/sidebar_shadow.gif diff --git a/i-nove/images/sidesep.gif b/skins/i-nove/images/sidesep.gif similarity index 100% rename from i-nove/images/sidesep.gif rename to skins/i-nove/images/sidesep.gif diff --git a/i-nove/images/textfield.gif b/skins/i-nove/images/textfield.gif similarity index 100% rename from i-nove/images/textfield.gif rename to skins/i-nove/images/textfield.gif diff --git a/i-nove/images/widgetsep.png b/skins/i-nove/images/widgetsep.png similarity index 100% rename from i-nove/images/widgetsep.png rename to skins/i-nove/images/widgetsep.png diff --git a/i-nove/index.ftl b/skins/i-nove/index.ftl similarity index 100% rename from i-nove/index.ftl rename to skins/i-nove/index.ftl diff --git a/i-nove/lang/lang_en_US.properties b/skins/i-nove/lang/lang_en_US.properties similarity index 100% rename from i-nove/lang/lang_en_US.properties rename to skins/i-nove/lang/lang_en_US.properties diff --git a/i-nove/lang/lang_zh_CN.properties b/skins/i-nove/lang/lang_zh_CN.properties similarity index 100% rename from i-nove/lang/lang_zh_CN.properties rename to skins/i-nove/lang/lang_zh_CN.properties diff --git a/i-nove/macro-comments.ftl b/skins/i-nove/macro-comments.ftl similarity index 97% rename from i-nove/macro-comments.ftl rename to skins/i-nove/macro-comments.ftl index c66862a..158fcf9 100644 --- a/i-nove/macro-comments.ftl +++ b/skins/i-nove/macro-comments.ftl @@ -1,115 +1,115 @@ -<#macro comments commentList article> -
    - <#list commentList as comment> - <#include "common-comment.ftl"/> - -
    -<#if article.commentable> - - - <#if !isLoggedIn> - - - - - - - - - - - - - - - - - - - - <#if !isLoggedIn> - - - - - - - - - -
    - - - ${commentNameLabel} -
    - - - ${commentEmailLabel} -
    - - - ${commentURLLabel} -
    - - - - - - - - - - - - - - - -
    - -
    - - - validate -
    - - -
    - - - -<#macro comment_script oId> - - +<#macro comments commentList article> +
    + <#list commentList as comment> + <#include "common-comment.ftl"/> + +
    +<#if article.commentable> + + + <#if !isLoggedIn> + + + + + + + + + + + + + + + + + + + + <#if !isLoggedIn> + + + + + + + + + +
    + + + ${commentNameLabel} +
    + + + ${commentEmailLabel} +
    + + + ${commentURLLabel} +
    + + + + + + + + + + + + + + + +
    + +
    + + + validate +
    + + +
    + + + +<#macro comment_script oId> + + \ No newline at end of file diff --git a/i-nove/macro-head.ftl b/skins/i-nove/macro-head.ftl similarity index 100% rename from i-nove/macro-head.ftl rename to skins/i-nove/macro-head.ftl diff --git a/i-nove/page.ftl b/skins/i-nove/page.ftl similarity index 100% rename from i-nove/page.ftl rename to skins/i-nove/page.ftl diff --git a/i-nove/preview.png b/skins/i-nove/preview.png similarity index 100% rename from i-nove/preview.png rename to skins/i-nove/preview.png diff --git a/i-nove/side.ftl b/skins/i-nove/side.ftl similarity index 100% rename from i-nove/side.ftl rename to skins/i-nove/side.ftl diff --git a/i-nove/skin.properties b/skins/i-nove/skin.properties similarity index 100% rename from i-nove/skin.properties rename to skins/i-nove/skin.properties diff --git a/i-nove/tag-articles.ftl b/skins/i-nove/tag-articles.ftl similarity index 100% rename from i-nove/tag-articles.ftl rename to skins/i-nove/tag-articles.ftl diff --git a/i-nove/tags.ftl b/skins/i-nove/tags.ftl similarity index 100% rename from i-nove/tags.ftl rename to skins/i-nove/tags.ftl diff --git a/metro-hot/archive-articles.ftl b/skins/metro-hot/archive-articles.ftl similarity index 100% rename from metro-hot/archive-articles.ftl rename to skins/metro-hot/archive-articles.ftl diff --git a/metro-hot/archives.ftl b/skins/metro-hot/archives.ftl similarity index 100% rename from metro-hot/archives.ftl rename to skins/metro-hot/archives.ftl diff --git a/metro-hot/article-list.ftl b/skins/metro-hot/article-list.ftl similarity index 100% rename from metro-hot/article-list.ftl rename to skins/metro-hot/article-list.ftl diff --git a/metro-hot/article.ftl b/skins/metro-hot/article.ftl similarity index 100% rename from metro-hot/article.ftl rename to skins/metro-hot/article.ftl diff --git a/metro-hot/author-articles.ftl b/skins/metro-hot/author-articles.ftl similarity index 100% rename from metro-hot/author-articles.ftl rename to skins/metro-hot/author-articles.ftl diff --git a/metro-hot/category-articles.ftl b/skins/metro-hot/category-articles.ftl similarity index 100% rename from metro-hot/category-articles.ftl rename to skins/metro-hot/category-articles.ftl diff --git a/metro-hot/category.ftl b/skins/metro-hot/category.ftl similarity index 100% rename from metro-hot/category.ftl rename to skins/metro-hot/category.ftl diff --git a/metro-hot/common-comment.ftl b/skins/metro-hot/common-comment.ftl similarity index 100% rename from metro-hot/common-comment.ftl rename to skins/metro-hot/common-comment.ftl diff --git a/metro-hot/copyright.ftl b/skins/metro-hot/copyright.ftl similarity index 100% rename from metro-hot/copyright.ftl rename to skins/metro-hot/copyright.ftl diff --git a/metro-hot/css/font/IcoMoon.eot b/skins/metro-hot/css/font/IcoMoon.eot similarity index 100% rename from metro-hot/css/font/IcoMoon.eot rename to skins/metro-hot/css/font/IcoMoon.eot diff --git a/metro-hot/css/font/IcoMoon.svg b/skins/metro-hot/css/font/IcoMoon.svg similarity index 100% rename from metro-hot/css/font/IcoMoon.svg rename to skins/metro-hot/css/font/IcoMoon.svg diff --git a/metro-hot/css/font/IcoMoon.ttf b/skins/metro-hot/css/font/IcoMoon.ttf similarity index 100% rename from metro-hot/css/font/IcoMoon.ttf rename to skins/metro-hot/css/font/IcoMoon.ttf diff --git a/metro-hot/css/font/IcoMoon.woff b/skins/metro-hot/css/font/IcoMoon.woff similarity index 100% rename from metro-hot/css/font/IcoMoon.woff rename to skins/metro-hot/css/font/IcoMoon.woff diff --git a/metro-hot/css/metro-hot-responsive.css b/skins/metro-hot/css/metro-hot-responsive.css similarity index 100% rename from metro-hot/css/metro-hot-responsive.css rename to skins/metro-hot/css/metro-hot-responsive.css diff --git a/metro-hot/css/metro-hot-responsive.min.css b/skins/metro-hot/css/metro-hot-responsive.min.css similarity index 100% rename from metro-hot/css/metro-hot-responsive.min.css rename to skins/metro-hot/css/metro-hot-responsive.min.css diff --git a/metro-hot/css/metro-hot.css b/skins/metro-hot/css/metro-hot.css similarity index 100% rename from metro-hot/css/metro-hot.css rename to skins/metro-hot/css/metro-hot.css diff --git a/metro-hot/css/metro-hot.min.css b/skins/metro-hot/css/metro-hot.min.css similarity index 100% rename from metro-hot/css/metro-hot.min.css rename to skins/metro-hot/css/metro-hot.min.css diff --git a/metro-hot/dynamic.ftl b/skins/metro-hot/dynamic.ftl similarity index 100% rename from metro-hot/dynamic.ftl rename to skins/metro-hot/dynamic.ftl diff --git a/metro-hot/footer.ftl b/skins/metro-hot/footer.ftl similarity index 100% rename from metro-hot/footer.ftl rename to skins/metro-hot/footer.ftl diff --git a/metro-hot/header.ftl b/skins/metro-hot/header.ftl similarity index 100% rename from metro-hot/header.ftl rename to skins/metro-hot/header.ftl diff --git a/metro-hot/images/ajax-loader.gif b/skins/metro-hot/images/ajax-loader.gif similarity index 100% rename from metro-hot/images/ajax-loader.gif rename to skins/metro-hot/images/ajax-loader.gif diff --git a/metro-hot/images/icons.png b/skins/metro-hot/images/icons.png similarity index 100% rename from metro-hot/images/icons.png rename to skins/metro-hot/images/icons.png diff --git a/metro-hot/index.ftl b/skins/metro-hot/index.ftl similarity index 100% rename from metro-hot/index.ftl rename to skins/metro-hot/index.ftl diff --git a/metro-hot/js/metro-hot.js b/skins/metro-hot/js/metro-hot.js similarity index 100% rename from metro-hot/js/metro-hot.js rename to skins/metro-hot/js/metro-hot.js diff --git a/metro-hot/js/metro-hot.min.js b/skins/metro-hot/js/metro-hot.min.js similarity index 100% rename from metro-hot/js/metro-hot.min.js rename to skins/metro-hot/js/metro-hot.min.js diff --git a/metro-hot/lang/lang_en_US.properties b/skins/metro-hot/lang/lang_en_US.properties similarity index 100% rename from metro-hot/lang/lang_en_US.properties rename to skins/metro-hot/lang/lang_en_US.properties diff --git a/metro-hot/lang/lang_zh_CN.properties b/skins/metro-hot/lang/lang_zh_CN.properties similarity index 100% rename from metro-hot/lang/lang_zh_CN.properties rename to skins/metro-hot/lang/lang_zh_CN.properties diff --git a/metro-hot/links.ftl b/skins/metro-hot/links.ftl similarity index 100% rename from metro-hot/links.ftl rename to skins/metro-hot/links.ftl diff --git a/metro-hot/macro-comments.ftl b/skins/metro-hot/macro-comments.ftl similarity index 100% rename from metro-hot/macro-comments.ftl rename to skins/metro-hot/macro-comments.ftl diff --git a/metro-hot/macro-head.ftl b/skins/metro-hot/macro-head.ftl similarity index 100% rename from metro-hot/macro-head.ftl rename to skins/metro-hot/macro-head.ftl diff --git a/metro-hot/macro-side.ftl b/skins/metro-hot/macro-side.ftl similarity index 100% rename from metro-hot/macro-side.ftl rename to skins/metro-hot/macro-side.ftl diff --git a/metro-hot/page.ftl b/skins/metro-hot/page.ftl similarity index 100% rename from metro-hot/page.ftl rename to skins/metro-hot/page.ftl diff --git a/metro-hot/preview.png b/skins/metro-hot/preview.png similarity index 100% rename from metro-hot/preview.png rename to skins/metro-hot/preview.png diff --git a/metro-hot/skin.properties b/skins/metro-hot/skin.properties similarity index 100% rename from metro-hot/skin.properties rename to skins/metro-hot/skin.properties diff --git a/metro-hot/tag-articles.ftl b/skins/metro-hot/tag-articles.ftl similarity index 100% rename from metro-hot/tag-articles.ftl rename to skins/metro-hot/tag-articles.ftl diff --git a/metro-hot/tags.ftl b/skins/metro-hot/tags.ftl similarity index 100% rename from metro-hot/tags.ftl rename to skins/metro-hot/tags.ftl diff --git a/mobile/archive-articles.ftl b/skins/mobile/archive-articles.ftl similarity index 100% rename from mobile/archive-articles.ftl rename to skins/mobile/archive-articles.ftl diff --git a/mobile/article-list.ftl b/skins/mobile/article-list.ftl similarity index 100% rename from mobile/article-list.ftl rename to skins/mobile/article-list.ftl diff --git a/mobile/article.ftl b/skins/mobile/article.ftl similarity index 100% rename from mobile/article.ftl rename to skins/mobile/article.ftl diff --git a/mobile/author-articles.ftl b/skins/mobile/author-articles.ftl similarity index 100% rename from mobile/author-articles.ftl rename to skins/mobile/author-articles.ftl diff --git a/mobile/category-articles.ftl b/skins/mobile/category-articles.ftl similarity index 100% rename from mobile/category-articles.ftl rename to skins/mobile/category-articles.ftl diff --git a/mobile/common-comment.ftl b/skins/mobile/common-comment.ftl similarity index 100% rename from mobile/common-comment.ftl rename to skins/mobile/common-comment.ftl diff --git a/mobile/footer.ftl b/skins/mobile/footer.ftl similarity index 100% rename from mobile/footer.ftl rename to skins/mobile/footer.ftl diff --git a/mobile/header.ftl b/skins/mobile/header.ftl similarity index 100% rename from mobile/header.ftl rename to skins/mobile/header.ftl diff --git a/mobile/images/good.png b/skins/mobile/images/good.png similarity index 100% rename from mobile/images/good.png rename to skins/mobile/images/good.png diff --git a/mobile/images/icon-pool/Apps.png b/skins/mobile/images/icon-pool/Apps.png similarity index 100% rename from mobile/images/icon-pool/Apps.png rename to skins/mobile/images/icon-pool/Apps.png diff --git a/mobile/images/icon-pool/Archives.png b/skins/mobile/images/icon-pool/Archives.png similarity index 100% rename from mobile/images/icon-pool/Archives.png rename to skins/mobile/images/icon-pool/Archives.png diff --git a/mobile/images/icon-pool/Home.png b/skins/mobile/images/icon-pool/Home.png similarity index 100% rename from mobile/images/icon-pool/Home.png rename to skins/mobile/images/icon-pool/Home.png diff --git a/mobile/images/icon-pool/Mail.png b/skins/mobile/images/icon-pool/Mail.png similarity index 100% rename from mobile/images/icon-pool/Mail.png rename to skins/mobile/images/icon-pool/Mail.png diff --git a/mobile/images/icon-pool/Pages.png b/skins/mobile/images/icon-pool/Pages.png similarity index 100% rename from mobile/images/icon-pool/Pages.png rename to skins/mobile/images/icon-pool/Pages.png diff --git a/mobile/images/icon-pool/RSS.png b/skins/mobile/images/icon-pool/RSS.png similarity index 100% rename from mobile/images/icon-pool/RSS.png rename to skins/mobile/images/icon-pool/RSS.png diff --git a/mobile/images/icon-pool/Tags.png b/skins/mobile/images/icon-pool/Tags.png similarity index 100% rename from mobile/images/icon-pool/Tags.png rename to skins/mobile/images/icon-pool/Tags.png diff --git a/mobile/images/icon-pool/category.png b/skins/mobile/images/icon-pool/category.png similarity index 100% rename from mobile/images/icon-pool/category.png rename to skins/mobile/images/icon-pool/category.png diff --git a/mobile/index.ftl b/skins/mobile/index.ftl similarity index 100% rename from mobile/index.ftl rename to skins/mobile/index.ftl diff --git a/mobile/js/l10n.js b/skins/mobile/js/l10n.js similarity index 100% rename from mobile/js/l10n.js rename to skins/mobile/js/l10n.js diff --git a/mobile/js/l10n.min.js b/skins/mobile/js/l10n.min.js similarity index 100% rename from mobile/js/l10n.min.js rename to skins/mobile/js/l10n.min.js diff --git a/mobile/lang/lang_en_US.properties b/skins/mobile/lang/lang_en_US.properties similarity index 100% rename from mobile/lang/lang_en_US.properties rename to skins/mobile/lang/lang_en_US.properties diff --git a/mobile/lang/lang_zh_CN.properties b/skins/mobile/lang/lang_zh_CN.properties similarity index 100% rename from mobile/lang/lang_zh_CN.properties rename to skins/mobile/lang/lang_zh_CN.properties diff --git a/mobile/macro-comments.ftl b/skins/mobile/macro-comments.ftl similarity index 100% rename from mobile/macro-comments.ftl rename to skins/mobile/macro-comments.ftl diff --git a/mobile/macro-head.ftl b/skins/mobile/macro-head.ftl similarity index 100% rename from mobile/macro-head.ftl rename to skins/mobile/macro-head.ftl diff --git a/mobile/page.ftl b/skins/mobile/page.ftl similarity index 100% rename from mobile/page.ftl rename to skins/mobile/page.ftl diff --git a/mobile/preview.png b/skins/mobile/preview.png similarity index 100% rename from mobile/preview.png rename to skins/mobile/preview.png diff --git a/mobile/side.ftl b/skins/mobile/side.ftl similarity index 100% rename from mobile/side.ftl rename to skins/mobile/side.ftl diff --git a/mobile/skin.properties b/skins/mobile/skin.properties similarity index 100% rename from mobile/skin.properties rename to skins/mobile/skin.properties diff --git a/mobile/tag-articles.ftl b/skins/mobile/tag-articles.ftl similarity index 100% rename from mobile/tag-articles.ftl rename to skins/mobile/tag-articles.ftl diff --git a/mobile/tags.ftl b/skins/mobile/tags.ftl similarity index 100% rename from mobile/tags.ftl rename to skins/mobile/tags.ftl diff --git a/mobile/themes/core/core-images/arrow.png b/skins/mobile/themes/core/core-images/arrow.png similarity index 100% rename from mobile/themes/core/core-images/arrow.png rename to skins/mobile/themes/core/core-images/arrow.png diff --git a/mobile/themes/core/core-images/bookmarks/delicious.jpg b/skins/mobile/themes/core/core-images/bookmarks/delicious.jpg similarity index 100% rename from mobile/themes/core/core-images/bookmarks/delicious.jpg rename to skins/mobile/themes/core/core-images/bookmarks/delicious.jpg diff --git a/mobile/themes/core/core-images/bookmarks/digg.jpg b/skins/mobile/themes/core/core-images/bookmarks/digg.jpg similarity index 100% rename from mobile/themes/core/core-images/bookmarks/digg.jpg rename to skins/mobile/themes/core/core-images/bookmarks/digg.jpg diff --git a/mobile/themes/core/core-images/bookmarks/magnolia.jpg b/skins/mobile/themes/core/core-images/bookmarks/magnolia.jpg similarity index 100% rename from mobile/themes/core/core-images/bookmarks/magnolia.jpg rename to skins/mobile/themes/core/core-images/bookmarks/magnolia.jpg diff --git a/mobile/themes/core/core-images/bookmarks/newsvine.jpg b/skins/mobile/themes/core/core-images/bookmarks/newsvine.jpg similarity index 100% rename from mobile/themes/core/core-images/bookmarks/newsvine.jpg rename to skins/mobile/themes/core/core-images/bookmarks/newsvine.jpg diff --git a/mobile/themes/core/core-images/bookmarks/reddit.jpg b/skins/mobile/themes/core/core-images/bookmarks/reddit.jpg similarity index 100% rename from mobile/themes/core/core-images/bookmarks/reddit.jpg rename to skins/mobile/themes/core/core-images/bookmarks/reddit.jpg diff --git a/mobile/themes/core/core-images/bookmarks/technorati.jpg b/skins/mobile/themes/core/core-images/bookmarks/technorati.jpg similarity index 100% rename from mobile/themes/core/core-images/bookmarks/technorati.jpg rename to skins/mobile/themes/core/core-images/bookmarks/technorati.jpg diff --git a/mobile/themes/core/core-images/com_arrow.png b/skins/mobile/themes/core/core-images/com_arrow.png similarity index 100% rename from mobile/themes/core/core-images/com_arrow.png rename to skins/mobile/themes/core/core-images/com_arrow.png diff --git a/mobile/themes/core/core-images/comment-ajax-loader.gif b/skins/mobile/themes/core/core-images/comment-ajax-loader.gif similarity index 100% rename from mobile/themes/core/core-images/comment-ajax-loader.gif rename to skins/mobile/themes/core/core-images/comment-ajax-loader.gif diff --git a/mobile/themes/core/core-images/head-close.png b/skins/mobile/themes/core/core-images/head-close.png similarity index 100% rename from mobile/themes/core/core-images/head-close.png rename to skins/mobile/themes/core/core-images/head-close.png diff --git a/mobile/themes/core/core-images/head-fade-bk.png b/skins/mobile/themes/core/core-images/head-fade-bk.png similarity index 100% rename from mobile/themes/core/core-images/head-fade-bk.png rename to skins/mobile/themes/core/core-images/head-fade-bk.png diff --git a/mobile/themes/core/core-images/menu-sprite.png b/skins/mobile/themes/core/core-images/menu-sprite.png similarity index 100% rename from mobile/themes/core/core-images/menu-sprite.png rename to skins/mobile/themes/core/core-images/menu-sprite.png diff --git a/mobile/themes/core/core-images/onoff.jpg b/skins/mobile/themes/core/core-images/onoff.jpg similarity index 100% rename from mobile/themes/core/core-images/onoff.jpg rename to skins/mobile/themes/core/core-images/onoff.jpg diff --git a/mobile/themes/core/core-images/pinstripes-classic.gif b/skins/mobile/themes/core/core-images/pinstripes-classic.gif similarity index 100% rename from mobile/themes/core/core-images/pinstripes-classic.gif rename to skins/mobile/themes/core/core-images/pinstripes-classic.gif diff --git a/mobile/themes/core/core-images/post-arrow.png b/skins/mobile/themes/core/core-images/post-arrow.png similarity index 100% rename from mobile/themes/core/core-images/post-arrow.png rename to skins/mobile/themes/core/core-images/post-arrow.png diff --git a/mobile/themes/core/core-images/post-options.png b/skins/mobile/themes/core/core-images/post-options.png similarity index 100% rename from mobile/themes/core/core-images/post-options.png rename to skins/mobile/themes/core/core-images/post-options.png diff --git a/mobile/themes/core/core-images/push-icon.png b/skins/mobile/themes/core/core-images/push-icon.png similarity index 100% rename from mobile/themes/core/core-images/push-icon.png rename to skins/mobile/themes/core/core-images/push-icon.png diff --git a/mobile/themes/core/core-images/wptouch-menu-dropper.png b/skins/mobile/themes/core/core-images/wptouch-menu-dropper.png similarity index 100% rename from mobile/themes/core/core-images/wptouch-menu-dropper.png rename to skins/mobile/themes/core/core-images/wptouch-menu-dropper.png diff --git a/mobile/themes/core/core.js b/skins/mobile/themes/core/core.js similarity index 100% rename from mobile/themes/core/core.js rename to skins/mobile/themes/core/core.js diff --git a/mobile/themes/default/style.css b/skins/mobile/themes/default/style.css similarity index 100% rename from mobile/themes/default/style.css rename to skins/mobile/themes/default/style.css diff --git a/next/archive-articles.ftl b/skins/next/archive-articles.ftl similarity index 100% rename from next/archive-articles.ftl rename to skins/next/archive-articles.ftl diff --git a/next/archives.ftl b/skins/next/archives.ftl similarity index 100% rename from next/archives.ftl rename to skins/next/archives.ftl diff --git a/next/article-list.ftl b/skins/next/article-list.ftl similarity index 100% rename from next/article-list.ftl rename to skins/next/article-list.ftl diff --git a/next/article.ftl b/skins/next/article.ftl similarity index 100% rename from next/article.ftl rename to skins/next/article.ftl diff --git a/next/category-articles.ftl b/skins/next/category-articles.ftl similarity index 100% rename from next/category-articles.ftl rename to skins/next/category-articles.ftl diff --git a/next/common-comment.ftl b/skins/next/common-comment.ftl similarity index 100% rename from next/common-comment.ftl rename to skins/next/common-comment.ftl diff --git a/next/css/fonts/icomoon.eot b/skins/next/css/fonts/icomoon.eot similarity index 100% rename from next/css/fonts/icomoon.eot rename to skins/next/css/fonts/icomoon.eot diff --git a/next/css/fonts/icomoon.svg b/skins/next/css/fonts/icomoon.svg similarity index 100% rename from next/css/fonts/icomoon.svg rename to skins/next/css/fonts/icomoon.svg diff --git a/next/css/fonts/icomoon.ttf b/skins/next/css/fonts/icomoon.ttf similarity index 100% rename from next/css/fonts/icomoon.ttf rename to skins/next/css/fonts/icomoon.ttf diff --git a/next/css/fonts/icomoon.woff b/skins/next/css/fonts/icomoon.woff similarity index 100% rename from next/css/fonts/icomoon.woff rename to skins/next/css/fonts/icomoon.woff diff --git a/next/css/fonts/selection.json b/skins/next/css/fonts/selection.json similarity index 100% rename from next/css/fonts/selection.json rename to skins/next/css/fonts/selection.json diff --git a/next/css/next.css b/skins/next/css/next.css similarity index 100% rename from next/css/next.css rename to skins/next/css/next.css diff --git a/next/css/next.min.css b/skins/next/css/next.min.css similarity index 100% rename from next/css/next.min.css rename to skins/next/css/next.min.css diff --git a/next/dynamic.ftl b/skins/next/dynamic.ftl similarity index 100% rename from next/dynamic.ftl rename to skins/next/dynamic.ftl diff --git a/next/footer.ftl b/skins/next/footer.ftl similarity index 100% rename from next/footer.ftl rename to skins/next/footer.ftl diff --git a/next/header.ftl b/skins/next/header.ftl similarity index 100% rename from next/header.ftl rename to skins/next/header.ftl diff --git a/next/images/code-bg.png b/skins/next/images/code-bg.png similarity index 100% rename from next/images/code-bg.png rename to skins/next/images/code-bg.png diff --git a/next/index.ftl b/skins/next/index.ftl similarity index 100% rename from next/index.ftl rename to skins/next/index.ftl diff --git a/next/js/next.js b/skins/next/js/next.js similarity index 100% rename from next/js/next.js rename to skins/next/js/next.js diff --git a/next/js/next.min.js b/skins/next/js/next.min.js similarity index 100% rename from next/js/next.min.js rename to skins/next/js/next.min.js diff --git a/next/lang/lang_en_US.properties b/skins/next/lang/lang_en_US.properties similarity index 100% rename from next/lang/lang_en_US.properties rename to skins/next/lang/lang_en_US.properties diff --git a/next/lang/lang_zh_CN.properties b/skins/next/lang/lang_zh_CN.properties similarity index 100% rename from next/lang/lang_zh_CN.properties rename to skins/next/lang/lang_zh_CN.properties diff --git a/next/macro-comments.ftl b/skins/next/macro-comments.ftl similarity index 100% rename from next/macro-comments.ftl rename to skins/next/macro-comments.ftl diff --git a/next/macro-head.ftl b/skins/next/macro-head.ftl similarity index 100% rename from next/macro-head.ftl rename to skins/next/macro-head.ftl diff --git a/next/page.ftl b/skins/next/page.ftl similarity index 100% rename from next/page.ftl rename to skins/next/page.ftl diff --git a/next/preview.png b/skins/next/preview.png similarity index 100% rename from next/preview.png rename to skins/next/preview.png diff --git a/next/side.ftl b/skins/next/side.ftl similarity index 100% rename from next/side.ftl rename to skins/next/side.ftl diff --git a/next/skin.properties b/skins/next/skin.properties similarity index 100% rename from next/skin.properties rename to skins/next/skin.properties diff --git a/next/tag-articles.ftl b/skins/next/tag-articles.ftl similarity index 100% rename from next/tag-articles.ftl rename to skins/next/tag-articles.ftl diff --git a/next/tags.ftl b/skins/next/tags.ftl similarity index 100% rename from next/tags.ftl rename to skins/next/tags.ftl diff --git a/owmx-3.0/archive-articles.ftl b/skins/owmx-3.0/archive-articles.ftl similarity index 100% rename from owmx-3.0/archive-articles.ftl rename to skins/owmx-3.0/archive-articles.ftl diff --git a/owmx-3.0/article-list.ftl b/skins/owmx-3.0/article-list.ftl similarity index 100% rename from owmx-3.0/article-list.ftl rename to skins/owmx-3.0/article-list.ftl diff --git a/owmx-3.0/article.ftl b/skins/owmx-3.0/article.ftl similarity index 100% rename from owmx-3.0/article.ftl rename to skins/owmx-3.0/article.ftl diff --git a/owmx-3.0/author-articles.ftl b/skins/owmx-3.0/author-articles.ftl similarity index 100% rename from owmx-3.0/author-articles.ftl rename to skins/owmx-3.0/author-articles.ftl diff --git a/owmx-3.0/category-articles.ftl b/skins/owmx-3.0/category-articles.ftl similarity index 100% rename from owmx-3.0/category-articles.ftl rename to skins/owmx-3.0/category-articles.ftl diff --git a/owmx-3.0/common-comment.ftl b/skins/owmx-3.0/common-comment.ftl similarity index 100% rename from owmx-3.0/common-comment.ftl rename to skins/owmx-3.0/common-comment.ftl diff --git a/owmx-3.0/css/owmx-3.0.css b/skins/owmx-3.0/css/owmx-3.0.css similarity index 95% rename from owmx-3.0/css/owmx-3.0.css rename to skins/owmx-3.0/css/owmx-3.0.css index 5a42928..04b49c9 100644 --- a/owmx-3.0/css/owmx-3.0.css +++ b/skins/owmx-3.0/css/owmx-3.0.css @@ -1,571 +1,571 @@ -/** - * Copyright (c) 2010-2017, b3log.org & hacpai.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -@charset "utf-8"; -/*================================================== -Template: OWMX-3 -Resource: http://www.owmx.com/ -Version: 1.0 -Date: 2010-09-13 -Editor: Jonas Jacek -License: CC Attribution-Share Alike 3.0 Unported -Update: Dongxu Wang 2011-02-24 - @ http://dx.b3log.org/ -==================================================*/ -/* - * skin owmx-3.0 style - * @author Liyuan Li - * @version 1.1.0.0, Sep 21 2017 -*/ -/* Reset */ -header, footer, article, nav, section, aside, time, hgroup { - display : block; -} -html, body, header, footer, article, nav, section, aside, time, h1, h2, h3, p, a, ul, li, dl, dd, dt, table, thead, tfoot, tbody, th, tr, td { - border : 0; - font : 12px/22px 'Verdana', 'sans-serif'; - margin : 0; - outline : 0; - padding : 0; -} - -/* BASICS */ -BODY { - background : #DDD; - margin : 0px 0 0 0; - color : #444; -} - -img { - max-width: 100%; - vertical-align: middle; - border: 0; - height: auto; - overflow: hidden; - font-size: 12px; -} - -A, A:LINK, A:ACTIVE, A:VISITED{ - color : #016f93; - text-decoration : none; -} -A:HOVER { - color : #DB0202; -} -a.selected { - font-weight: bold; - color: #000000; -} - -H1, H3, H4, H5, H6 { - background : url(../images/ai4.png) no-repeat 0 7px; - border-bottom : 1px solid #CCC; - color : #666; - font-weight : bold; - margin : 0 0 10px; - padding : 0 0 0 25px; -} -H1 { - background : url(../images/ai4.png) no-repeat 0 6px; - font-size : 15px; -} -H1 a{ - font-weight : bold; - font-size : 15px; -} -H2 { - font-size : 14px; - margin : 0 0 20px 0; -} -H3 { - background : url(../images/ai5.png) no-repeat 0 7px; -} -H3, H4, H5, H6 { - font-size : 13px; -} - -h4 { - background-position: 0 5px; -} - -sup { - color: #444; - top : -4px; -} - -/* Header */ -header { - border-radius : 4px; - background : #0098CC url(../images/hd.jpg) no-repeat top left; - height : 200px; - margin : 0 0 10px 0; - padding : 10px 10px; - position : relative; -} -header a:link, header a:active, header a:visited{ - font-weight : bold; - color : #FFF; - font-size : 16px; -} -header a:hover { - color : #FFF; -} -header p { - border-radius : 4px; - background : #FFF; - bottom : 20px; - color : #000; - font-weight : bold; - opacity : 0.5; - padding : 10px; - position : absolute; - right : 20px; - width : 400px; -} - -/* Article */ -article { - border-radius : 4px; - background : #FFF; - border: 1px solid #CCC; - float : right; - height : auto; - padding : 20px; - width : 550px; -} -article h1{ - color : #666; - font-weight : bold; - font-size : 15px; -} -/* Highlighted Paragraphs */ -.highlight-1, .highlight-2, .highlight-3 { - -moz-border-radius : 4px; - -webkit-border-radius : 4px; - padding : 5px 10px; -} -.highlight-1 { - background : #FFCCCC; - border : 1px dotted #FF9966; -} -.highlight-2 { - background : #FFFF99; - border : 1px dotted #FFCC33; -} -.highlight-3 { - background : #CCFF99; - border : 1px dotted #CCCC33; -} - -/* Citations & Quotes */ -cite { - border-left: 2px solid #0098CC; - color : #666; - font-size : 12px; - font-style : normal; - font-weight : bold; - margin : 0; - padding : 5px 10px; -} - -blockquote { - border-left: 2px solid #0098CC; - color : #666; - margin : 0 0 20px 0; - padding : 5px 10px; -} - -/* Pre & Code */ -pre { - color : #333; - font-size : 10px; - line-height : 15px; /*--Height of each line of code--*/ - overflow : hidden; /*--If the Code exceeds the width, put "auto" and scrolling is available--*/ - overflow-y : hidden; /*--Hides vertical scroll created by IE--*/ -} -pre code { - background : #EEE; - border-left : 2px solid #0098CC; - margin : 0 0 10px 0; - padding : 5px; - display : block; -} - -/* Calendar */ -dl.vevent { - margin : -20px 0 20px 0; - padding : 0; -} -.vevent dt { - font-size : 10px; - position : relative; - left : 0; - top : 22px; - font-weight : bold; -} -.vevent dd -{ - border-left : 2px solid #0098CC; - font-size : 11px; - margin : 0 0 0 80px; - padding : 0 0 0 10px; -} -dd.summary { - font-weight : bold; -} -.vevent a { - font-size : 11px; -} - -/* Forms */ -article form { - border-radius: 4px; - background : #DDD; - margin : 0 0 20px; - padding : 10px; -} -article label { - color : #666; - display : block; - font-size : 10px; - font-weight : bold; - margin : 0 0 0 2px; -} -article input, article textarea { - border-radius : 4px; - border : 1px solid #CCC; - font-size : 11px; - padding : 4px 5px; - width : 458px; -} - -/* Lists */ -article ul, aside ul { - list-style : none; - margin : 0 0 20px 0; -} -article ul { - margin : 0 0 20px 23px; -} -article ul li { - background : url(../images/ai2.png) no-repeat 0 8px; - padding : 0 0 0 17px; -} - -/* Sidebar */ -aside { - background : #EEE; - float : left; - margin : 0 0 20px 0; - width : 200px; - white-space:normal; -} -aside ul.aside-comments img{ - border-radius : 4px; - width:32px;height:32px; - border:1px solid #999999; - padding:1px; - margin-top:5px; - margin-right:5px; -} -aside ul.aside-comments a{ - font-weight:bold; -} -aside ul.aside-comments .side-comment{ - color: #555555; - font-weight: normal; - overflow: hidden; - white-space: nowrap; - width: 158px; - height: 18px; -} -aside ul.aside-comments div.left>div>div { - display: none; -} -aside ul.aside-comments .side-comment img{ - border:0px;height:16px;width:16px;padding:0px;margin-right: 0px; - margin-top: 0; -} -aside ul.aside-comments li { - padding:2px 0; -} -aside ul.aside-comments li div{ - width:158px; -} -aside ul.aside-comments li div.left div { - height: 18px; - line-height: 18px; - overflow: hidden; - -o-text-overflow: ellipsis; - text-overflow: ellipsis; -} -aside ul.navi-tags li{padding-left:0px;background-image:none;} -aside ul.navi-tags li img{ margin-bottom:3px;padding-right:6px;height:16px;width:16px;} - -#mostViewCountArticles li, #mostCommentArticles li { - overflow: hidden; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; -} - -#mostViewCountArticles a, #mostCommentArticles a { - white-space: nowrap; -} -/* Search Box */ -.s { - border-radius : 4px; - margin : 0 0 20px 0; - padding : 10px; - width : 179px; -} -.s input { - border-radius: 4px; - border : 1px solid #AAA; - color : #999; - font-size : 11px; - padding : 4px 5px; - width : 168px; -} - -/* Navigation & Menu */ -nav ul { - list-style : none; -} -nav li { - background : url(../images/ai1.png) no-repeat 0 8px; - padding : 0 0 0 15px; -} -nav li ul, aside li ul li ul { - margin : 0; -} -nav li li a { - font-size : 11px; -} -nav li li li a { - font-size : 10px; -} -nav li li li, aside li.active li li { - background : url(../images/ai8.png) no-repeat 0 10px; -} -nav li.active, aside li.active li { - background : url(../images/ai2.png) no-repeat 0 8px; -} - -nav .page-icon { - float: left; - height: 14px; - width: 14px; - margin: 4px 4px 0 0; -} -/* Gallery */ -.gallery { - list-style : none; - margin : 0 0 10px; -} -.gallery li { - display: inline; - margin : 0 15px 0 0; -} -.gallery a img { - border : 1px solid #999; - height : 50px; - opacity: 0.8; - padding : 1px; - width : 50px; -} -.gallery li:last-child { - margin : 0 0 10px 0; -} -.gallery a img:hover{ - opacity: 1; -} - -/* Ad Space */ -.adspace { - border-radius : 4px; - box-shadow : 0 2px 2px rgba(0,0,0,0.3); - background : #EEE; - height : 100%; - margin : 0 0 20px 0; - padding : 5px 10px; - text-align : center; - width : 178px; -} -.adspace a img { - border : none; -} - -/* Tag Cloud */ -#tagcloud { - overflow : hidden; - width : 200px; -} -#tagcloud li { - display : inline; - margin : 0 10px 0 0; -} -.tagcloudsize-1 a { - font-size : 14px; -} -.tagcloudsize-2 a { - font-size : 16px; -} -.tagcloudsize-3 a { - font-size : 18px; -} - -/* Footer */ -footer { - border-top : 1px dotted #B5B3A9; - clear : both; - margin : 20px 0; -} -footer a, footer p { - color : #666; - display : inline; - font-size : 12px; -} -footer div{ - background:url("../images/icons.gif") no-repeat scroll 0 -304px transparent; - color:#2A2A2A; - cursor:pointer; - line-height:18px; - margin:5px 17px 0 0; - padding-left:16px; - width:22px; - float : right; - white-space :nowrap; -} -footer span{ - margin:0px; -} -footer img{ - height : 28px; -} - - -/* Comments */ -.comments{position:relative;background:none repeat scroll 0 0 #FCFCFC;border-bottom:1px solid #CCCCCC;border-top:1px solid #CCCCCC;margin:15px -15px;padding:0 15px 15px;} -.comment-title{background-color:#E3E9FF;border-top:1px solid #3366CC;padding:3px 12px 3px 12px;position:relative;} -.comment-body-ref { - border-radius: 6px; - background-color: #FFFFFF; - border: 1px solid #CCCCCC; - opacity: 0.9; - padding: 6px; - position: absolute; - width: 387px; - left: 174px; -} - -.comment-body-ref .comment-author { - width: 67px; -} - -.comment-body-ref .comment-info { - width: 300px; - border-width: 0px; -} -.comment-body{margin-top:15px;} -.comment-author{float:left;text-align:center;width:81px;} -.comment-author div{margin-top:10px;padding-right:14px;background:url("../images/commentpoint.png") no-repeat scroll 100% 33% transparent;} -.comment-author img{border-radius : 4px;border:1px solid #999999;padding:1px;width:32px;height:32px;} -.comment-author a{white-space: nowrap;margin-right:14px;font-weight:bold;} -.comment-info{border-radius : 6px;width : 440px;padding : 5px 10px;background : #EDEFF0;border : 1px dotted #EDEFF0;} -.comment-content{word-wrap:break-word;overflow: hidden;background:url("../images/comment.gif") no-repeat scroll 100% 100% transparent;line-height:145%;margin:0 -15px;padding:9px 15px 10px;font-size:12px;} -.comment-form img{cursor:pointer;} -.comment-form input, .comment-form textarea{height: 16px;outline:none;font-family:Helvetica,Arial,sans-serif;color:#555555;background:url("../images/textfield.gif") repeat-x scroll 50% 0 #FFFFFF;border:1px solid #A6A6A6;padding:2px 1px;width:200px;} -.comment-form textarea{width:541px;font-size: 12px;height: auto;} -.comment-form button{background:none repeat scroll 0 0 #B4D666;border-color:#B4D666 #81B840 #81B840 #B4D666;border-style:solid;border-width:1px;color:#2970A6;font-size:12px;padding:0px 6px;height:22px;line-height:22px;border-radius:0px;} -.comment-form button:hover{background:none repeat scroll 0 0 #98C64C;border-color:#76B33A #98C64C #98C64C #76B33A;color:#074A7E;} -.error-msg{color:#3366CC;} -/* Wrappers */ -#a, #b { - margin : 0 auto; - position : relative; -} -#a { - border-radius : 4px; - box-shadow : 0 2px 2px rgba(0,0,0,0.3); - background : #EEE; - margin : 15px auto; - padding : 10px 10px 0 10px; - width : 800px; -} -#b { - overflow : hidden; -} - -/* Shadow-Boxes*/ -#c, .meta, .s, nav ul { - border-radius : 4px; - box-shadow : 0 2px 2px rgba(0,0,0,0.4); - background : #CCC; -} -#c { - margin : 0 0 20px 0; - padding : 5px 10px; - width : 178px; -} -#c p, #c a { - font-size : 11px; - line-height : 15px; -} -#c p { - margin : 0 0 10px 0; -} -#c img { - border-radius : 4px; - float : left; - margin : 4px 10px 2px 0; -} -.meta { - margin: 10px 0 30px; - padding: 2px 5px; -} -.meta p, .meta a { - font-size : 10px; - margin : 0; -} -nav ul { - padding : 10px; -} -nav ul ul { - border-radius : none; - box-shadow : none; -} - -.single_page { - border-radius : 4px; - box-shadow : 0 2px 2px rgba(0,0,0,0.2); - background : #F2F7F8; - padding : 10px; - margin-bottom : 25px; - width : 531px; -} - -/* Scrollbar */ -::-webkit-scrollbar { - width: 6px; -} -::-webkit-scrollbar-track { - background-color: #bbb; -} -::-webkit-scrollbar-thumb { - background-color: #eee; -} -::-webkit-scrollbar-thumb:hover { - background-color: #888; -} +/** + * Copyright (c) 2010-2017, b3log.org & hacpai.com + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +@charset "utf-8"; +/*================================================== +Template: OWMX-3 +Resource: http://www.owmx.com/ +Version: 1.0 +Date: 2010-09-13 +Editor: Jonas Jacek +License: CC Attribution-Share Alike 3.0 Unported +Update: Dongxu Wang 2011-02-24 + @ http://dx.b3log.org/ +==================================================*/ +/* + * skin owmx-3.0 style + * @author Liyuan Li + * @version 1.1.0.0, Sep 21 2017 +*/ +/* Reset */ +header, footer, article, nav, section, aside, time, hgroup { + display : block; +} +html, body, header, footer, article, nav, section, aside, time, h1, h2, h3, p, a, ul, li, dl, dd, dt, table, thead, tfoot, tbody, th, tr, td { + border : 0; + font : 12px/22px 'Verdana', 'sans-serif'; + margin : 0; + outline : 0; + padding : 0; +} + +/* BASICS */ +BODY { + background : #DDD; + margin : 0px 0 0 0; + color : #444; +} + +img { + max-width: 100%; + vertical-align: middle; + border: 0; + height: auto; + overflow: hidden; + font-size: 12px; +} + +A, A:LINK, A:ACTIVE, A:VISITED{ + color : #016f93; + text-decoration : none; +} +A:HOVER { + color : #DB0202; +} +a.selected { + font-weight: bold; + color: #000000; +} + +H1, H3, H4, H5, H6 { + background : url(../images/ai4.png) no-repeat 0 7px; + border-bottom : 1px solid #CCC; + color : #666; + font-weight : bold; + margin : 0 0 10px; + padding : 0 0 0 25px; +} +H1 { + background : url(../images/ai4.png) no-repeat 0 6px; + font-size : 15px; +} +H1 a{ + font-weight : bold; + font-size : 15px; +} +H2 { + font-size : 14px; + margin : 0 0 20px 0; +} +H3 { + background : url(../images/ai5.png) no-repeat 0 7px; +} +H3, H4, H5, H6 { + font-size : 13px; +} + +h4 { + background-position: 0 5px; +} + +sup { + color: #444; + top : -4px; +} + +/* Header */ +header { + border-radius : 4px; + background : #0098CC url(../images/hd.jpg) no-repeat top left; + height : 200px; + margin : 0 0 10px 0; + padding : 10px 10px; + position : relative; +} +header a:link, header a:active, header a:visited{ + font-weight : bold; + color : #FFF; + font-size : 16px; +} +header a:hover { + color : #FFF; +} +header p { + border-radius : 4px; + background : #FFF; + bottom : 20px; + color : #000; + font-weight : bold; + opacity : 0.5; + padding : 10px; + position : absolute; + right : 20px; + width : 400px; +} + +/* Article */ +article { + border-radius : 4px; + background : #FFF; + border: 1px solid #CCC; + float : right; + height : auto; + padding : 20px; + width : 550px; +} +article h1{ + color : #666; + font-weight : bold; + font-size : 15px; +} +/* Highlighted Paragraphs */ +.highlight-1, .highlight-2, .highlight-3 { + -moz-border-radius : 4px; + -webkit-border-radius : 4px; + padding : 5px 10px; +} +.highlight-1 { + background : #FFCCCC; + border : 1px dotted #FF9966; +} +.highlight-2 { + background : #FFFF99; + border : 1px dotted #FFCC33; +} +.highlight-3 { + background : #CCFF99; + border : 1px dotted #CCCC33; +} + +/* Citations & Quotes */ +cite { + border-left: 2px solid #0098CC; + color : #666; + font-size : 12px; + font-style : normal; + font-weight : bold; + margin : 0; + padding : 5px 10px; +} + +blockquote { + border-left: 2px solid #0098CC; + color : #666; + margin : 0 0 20px 0; + padding : 5px 10px; +} + +/* Pre & Code */ +pre { + color : #333; + font-size : 10px; + line-height : 15px; /*--Height of each line of code--*/ + overflow : hidden; /*--If the Code exceeds the width, put "auto" and scrolling is available--*/ + overflow-y : hidden; /*--Hides vertical scroll created by IE--*/ +} +pre code { + background : #EEE; + border-left : 2px solid #0098CC; + margin : 0 0 10px 0; + padding : 5px; + display : block; +} + +/* Calendar */ +dl.vevent { + margin : -20px 0 20px 0; + padding : 0; +} +.vevent dt { + font-size : 10px; + position : relative; + left : 0; + top : 22px; + font-weight : bold; +} +.vevent dd +{ + border-left : 2px solid #0098CC; + font-size : 11px; + margin : 0 0 0 80px; + padding : 0 0 0 10px; +} +dd.summary { + font-weight : bold; +} +.vevent a { + font-size : 11px; +} + +/* Forms */ +article form { + border-radius: 4px; + background : #DDD; + margin : 0 0 20px; + padding : 10px; +} +article label { + color : #666; + display : block; + font-size : 10px; + font-weight : bold; + margin : 0 0 0 2px; +} +article input, article textarea { + border-radius : 4px; + border : 1px solid #CCC; + font-size : 11px; + padding : 4px 5px; + width : 458px; +} + +/* Lists */ +article ul, aside ul { + list-style : none; + margin : 0 0 20px 0; +} +article ul { + margin : 0 0 20px 23px; +} +article ul li { + background : url(../images/ai2.png) no-repeat 0 8px; + padding : 0 0 0 17px; +} + +/* Sidebar */ +aside { + background : #EEE; + float : left; + margin : 0 0 20px 0; + width : 200px; + white-space:normal; +} +aside ul.aside-comments img{ + border-radius : 4px; + width:32px;height:32px; + border:1px solid #999999; + padding:1px; + margin-top:5px; + margin-right:5px; +} +aside ul.aside-comments a{ + font-weight:bold; +} +aside ul.aside-comments .side-comment{ + color: #555555; + font-weight: normal; + overflow: hidden; + white-space: nowrap; + width: 158px; + height: 18px; +} +aside ul.aside-comments div.left>div>div { + display: none; +} +aside ul.aside-comments .side-comment img{ + border:0px;height:16px;width:16px;padding:0px;margin-right: 0px; + margin-top: 0; +} +aside ul.aside-comments li { + padding:2px 0; +} +aside ul.aside-comments li div{ + width:158px; +} +aside ul.aside-comments li div.left div { + height: 18px; + line-height: 18px; + overflow: hidden; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; +} +aside ul.navi-tags li{padding-left:0px;background-image:none;} +aside ul.navi-tags li img{ margin-bottom:3px;padding-right:6px;height:16px;width:16px;} + +#mostViewCountArticles li, #mostCommentArticles li { + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; +} + +#mostViewCountArticles a, #mostCommentArticles a { + white-space: nowrap; +} +/* Search Box */ +.s { + border-radius : 4px; + margin : 0 0 20px 0; + padding : 10px; + width : 179px; +} +.s input { + border-radius: 4px; + border : 1px solid #AAA; + color : #999; + font-size : 11px; + padding : 4px 5px; + width : 168px; +} + +/* Navigation & Menu */ +nav ul { + list-style : none; +} +nav li { + background : url(../images/ai1.png) no-repeat 0 8px; + padding : 0 0 0 15px; +} +nav li ul, aside li ul li ul { + margin : 0; +} +nav li li a { + font-size : 11px; +} +nav li li li a { + font-size : 10px; +} +nav li li li, aside li.active li li { + background : url(../images/ai8.png) no-repeat 0 10px; +} +nav li.active, aside li.active li { + background : url(../images/ai2.png) no-repeat 0 8px; +} + +nav .page-icon { + float: left; + height: 14px; + width: 14px; + margin: 4px 4px 0 0; +} +/* Gallery */ +.gallery { + list-style : none; + margin : 0 0 10px; +} +.gallery li { + display: inline; + margin : 0 15px 0 0; +} +.gallery a img { + border : 1px solid #999; + height : 50px; + opacity: 0.8; + padding : 1px; + width : 50px; +} +.gallery li:last-child { + margin : 0 0 10px 0; +} +.gallery a img:hover{ + opacity: 1; +} + +/* Ad Space */ +.adspace { + border-radius : 4px; + box-shadow : 0 2px 2px rgba(0,0,0,0.3); + background : #EEE; + height : 100%; + margin : 0 0 20px 0; + padding : 5px 10px; + text-align : center; + width : 178px; +} +.adspace a img { + border : none; +} + +/* Tag Cloud */ +#tagcloud { + overflow : hidden; + width : 200px; +} +#tagcloud li { + display : inline; + margin : 0 10px 0 0; +} +.tagcloudsize-1 a { + font-size : 14px; +} +.tagcloudsize-2 a { + font-size : 16px; +} +.tagcloudsize-3 a { + font-size : 18px; +} + +/* Footer */ +footer { + border-top : 1px dotted #B5B3A9; + clear : both; + margin : 20px 0; +} +footer a, footer p { + color : #666; + display : inline; + font-size : 12px; +} +footer div{ + background:url("../images/icons.gif") no-repeat scroll 0 -304px transparent; + color:#2A2A2A; + cursor:pointer; + line-height:18px; + margin:5px 17px 0 0; + padding-left:16px; + width:22px; + float : right; + white-space :nowrap; +} +footer span{ + margin:0px; +} +footer img{ + height : 28px; +} + + +/* Comments */ +.comments{position:relative;background:none repeat scroll 0 0 #FCFCFC;border-bottom:1px solid #CCCCCC;border-top:1px solid #CCCCCC;margin:15px -15px;padding:0 15px 15px;} +.comment-title{background-color:#E3E9FF;border-top:1px solid #3366CC;padding:3px 12px 3px 12px;position:relative;} +.comment-body-ref { + border-radius: 6px; + background-color: #FFFFFF; + border: 1px solid #CCCCCC; + opacity: 0.9; + padding: 6px; + position: absolute; + width: 387px; + left: 174px; +} + +.comment-body-ref .comment-author { + width: 67px; +} + +.comment-body-ref .comment-info { + width: 300px; + border-width: 0px; +} +.comment-body{margin-top:15px;} +.comment-author{float:left;text-align:center;width:81px;} +.comment-author div{margin-top:10px;padding-right:14px;background:url("../images/commentpoint.png") no-repeat scroll 100% 33% transparent;} +.comment-author img{border-radius : 4px;border:1px solid #999999;padding:1px;width:32px;height:32px;} +.comment-author a{white-space: nowrap;margin-right:14px;font-weight:bold;} +.comment-info{border-radius : 6px;width : 440px;padding : 5px 10px;background : #EDEFF0;border : 1px dotted #EDEFF0;} +.comment-content{word-wrap:break-word;overflow: hidden;background:url("../images/comment.gif") no-repeat scroll 100% 100% transparent;line-height:145%;margin:0 -15px;padding:9px 15px 10px;font-size:12px;} +.comment-form img{cursor:pointer;} +.comment-form input, .comment-form textarea{height: 16px;outline:none;font-family:Helvetica,Arial,sans-serif;color:#555555;background:url("../images/textfield.gif") repeat-x scroll 50% 0 #FFFFFF;border:1px solid #A6A6A6;padding:2px 1px;width:200px;} +.comment-form textarea{width:541px;font-size: 12px;height: auto;} +.comment-form button{background:none repeat scroll 0 0 #B4D666;border-color:#B4D666 #81B840 #81B840 #B4D666;border-style:solid;border-width:1px;color:#2970A6;font-size:12px;padding:0px 6px;height:22px;line-height:22px;border-radius:0px;} +.comment-form button:hover{background:none repeat scroll 0 0 #98C64C;border-color:#76B33A #98C64C #98C64C #76B33A;color:#074A7E;} +.error-msg{color:#3366CC;} +/* Wrappers */ +#a, #b { + margin : 0 auto; + position : relative; +} +#a { + border-radius : 4px; + box-shadow : 0 2px 2px rgba(0,0,0,0.3); + background : #EEE; + margin : 15px auto; + padding : 10px 10px 0 10px; + width : 800px; +} +#b { + overflow : hidden; +} + +/* Shadow-Boxes*/ +#c, .meta, .s, nav ul { + border-radius : 4px; + box-shadow : 0 2px 2px rgba(0,0,0,0.4); + background : #CCC; +} +#c { + margin : 0 0 20px 0; + padding : 5px 10px; + width : 178px; +} +#c p, #c a { + font-size : 11px; + line-height : 15px; +} +#c p { + margin : 0 0 10px 0; +} +#c img { + border-radius : 4px; + float : left; + margin : 4px 10px 2px 0; +} +.meta { + margin: 10px 0 30px; + padding: 2px 5px; +} +.meta p, .meta a { + font-size : 10px; + margin : 0; +} +nav ul { + padding : 10px; +} +nav ul ul { + border-radius : none; + box-shadow : none; +} + +.single_page { + border-radius : 4px; + box-shadow : 0 2px 2px rgba(0,0,0,0.2); + background : #F2F7F8; + padding : 10px; + margin-bottom : 25px; + width : 531px; +} + +/* Scrollbar */ +::-webkit-scrollbar { + width: 6px; +} +::-webkit-scrollbar-track { + background-color: #bbb; +} +::-webkit-scrollbar-thumb { + background-color: #eee; +} +::-webkit-scrollbar-thumb:hover { + background-color: #888; +} diff --git a/owmx-3.0/css/owmx-3.0.min.css b/skins/owmx-3.0/css/owmx-3.0.min.css similarity index 100% rename from owmx-3.0/css/owmx-3.0.min.css rename to skins/owmx-3.0/css/owmx-3.0.min.css diff --git a/owmx-3.0/footer.ftl b/skins/owmx-3.0/footer.ftl similarity index 97% rename from owmx-3.0/footer.ftl rename to skins/owmx-3.0/footer.ftl index 99c854a..4381f4e 100644 --- a/owmx-3.0/footer.ftl +++ b/skins/owmx-3.0/footer.ftl @@ -1,41 +1,41 @@ - - - - -${plugins} + + + + +${plugins} diff --git a/owmx-3.0/header.ftl b/skins/owmx-3.0/header.ftl similarity index 100% rename from owmx-3.0/header.ftl rename to skins/owmx-3.0/header.ftl diff --git a/owmx-3.0/images/ai1.png b/skins/owmx-3.0/images/ai1.png similarity index 100% rename from owmx-3.0/images/ai1.png rename to skins/owmx-3.0/images/ai1.png diff --git a/owmx-3.0/images/ai2.png b/skins/owmx-3.0/images/ai2.png similarity index 100% rename from owmx-3.0/images/ai2.png rename to skins/owmx-3.0/images/ai2.png diff --git a/owmx-3.0/images/ai3.png b/skins/owmx-3.0/images/ai3.png similarity index 100% rename from owmx-3.0/images/ai3.png rename to skins/owmx-3.0/images/ai3.png diff --git a/owmx-3.0/images/ai4.png b/skins/owmx-3.0/images/ai4.png similarity index 100% rename from owmx-3.0/images/ai4.png rename to skins/owmx-3.0/images/ai4.png diff --git a/owmx-3.0/images/ai5.png b/skins/owmx-3.0/images/ai5.png similarity index 100% rename from owmx-3.0/images/ai5.png rename to skins/owmx-3.0/images/ai5.png diff --git a/owmx-3.0/images/ai6.png b/skins/owmx-3.0/images/ai6.png similarity index 100% rename from owmx-3.0/images/ai6.png rename to skins/owmx-3.0/images/ai6.png diff --git a/owmx-3.0/images/ai7.png b/skins/owmx-3.0/images/ai7.png similarity index 100% rename from owmx-3.0/images/ai7.png rename to skins/owmx-3.0/images/ai7.png diff --git a/owmx-3.0/images/ai8.png b/skins/owmx-3.0/images/ai8.png similarity index 100% rename from owmx-3.0/images/ai8.png rename to skins/owmx-3.0/images/ai8.png diff --git a/owmx-3.0/images/comment.gif b/skins/owmx-3.0/images/comment.gif similarity index 100% rename from owmx-3.0/images/comment.gif rename to skins/owmx-3.0/images/comment.gif diff --git a/owmx-3.0/images/commentpoint.png b/skins/owmx-3.0/images/commentpoint.png similarity index 100% rename from owmx-3.0/images/commentpoint.png rename to skins/owmx-3.0/images/commentpoint.png diff --git a/owmx-3.0/images/hd.jpg b/skins/owmx-3.0/images/hd.jpg similarity index 100% rename from owmx-3.0/images/hd.jpg rename to skins/owmx-3.0/images/hd.jpg diff --git a/owmx-3.0/images/icons.gif b/skins/owmx-3.0/images/icons.gif similarity index 100% rename from owmx-3.0/images/icons.gif rename to skins/owmx-3.0/images/icons.gif diff --git a/owmx-3.0/images/textfield.gif b/skins/owmx-3.0/images/textfield.gif similarity index 100% rename from owmx-3.0/images/textfield.gif rename to skins/owmx-3.0/images/textfield.gif diff --git a/owmx-3.0/index.ftl b/skins/owmx-3.0/index.ftl similarity index 100% rename from owmx-3.0/index.ftl rename to skins/owmx-3.0/index.ftl diff --git a/owmx-3.0/lang/lang_en_US.properties b/skins/owmx-3.0/lang/lang_en_US.properties similarity index 100% rename from owmx-3.0/lang/lang_en_US.properties rename to skins/owmx-3.0/lang/lang_en_US.properties diff --git a/owmx-3.0/lang/lang_zh_CN.properties b/skins/owmx-3.0/lang/lang_zh_CN.properties similarity index 100% rename from owmx-3.0/lang/lang_zh_CN.properties rename to skins/owmx-3.0/lang/lang_zh_CN.properties diff --git a/owmx-3.0/macro-comments.ftl b/skins/owmx-3.0/macro-comments.ftl similarity index 97% rename from owmx-3.0/macro-comments.ftl rename to skins/owmx-3.0/macro-comments.ftl index 1d874e9..75aaa44 100644 --- a/owmx-3.0/macro-comments.ftl +++ b/skins/owmx-3.0/macro-comments.ftl @@ -1,114 +1,114 @@ -<#macro comments commentList article> -
    - <#list commentList as comment> - <#include "common-comment.ftl"/> - -
    -<#if article.commentable> - - - <#if !isLoggedIn> - - - - - - - - - - - - - - - - - - - - <#if !isLoggedIn> - - - - - - - - - -
    - - - ${commentNameLabel} -
    - - - ${commentEmailLabel} -
    - - - ${commentURLLabel} -
    - - - - - - - - - - - - - - - -
    - -
    - - - validate -
    - - -
    - - - -<#macro comment_script oId> - - +<#macro comments commentList article> +
    + <#list commentList as comment> + <#include "common-comment.ftl"/> + +
    +<#if article.commentable> + + + <#if !isLoggedIn> + + + + + + + + + + + + + + + + + + + + <#if !isLoggedIn> + + + + + + + + + +
    + + + ${commentNameLabel} +
    + + + ${commentEmailLabel} +
    + + + ${commentURLLabel} +
    + + + + + + + + + + + + + + + +
    + +
    + + + validate +
    + + +
    + + + +<#macro comment_script oId> + + \ No newline at end of file diff --git a/owmx-3.0/macro-head.ftl b/skins/owmx-3.0/macro-head.ftl similarity index 100% rename from owmx-3.0/macro-head.ftl rename to skins/owmx-3.0/macro-head.ftl diff --git a/owmx-3.0/page.ftl b/skins/owmx-3.0/page.ftl similarity index 100% rename from owmx-3.0/page.ftl rename to skins/owmx-3.0/page.ftl diff --git a/owmx-3.0/preview.png b/skins/owmx-3.0/preview.png similarity index 100% rename from owmx-3.0/preview.png rename to skins/owmx-3.0/preview.png diff --git a/owmx-3.0/side.ftl b/skins/owmx-3.0/side.ftl similarity index 100% rename from owmx-3.0/side.ftl rename to skins/owmx-3.0/side.ftl diff --git a/owmx-3.0/skin.properties b/skins/owmx-3.0/skin.properties similarity index 100% rename from owmx-3.0/skin.properties rename to skins/owmx-3.0/skin.properties diff --git a/owmx-3.0/tag-articles.ftl b/skins/owmx-3.0/tag-articles.ftl similarity index 100% rename from owmx-3.0/tag-articles.ftl rename to skins/owmx-3.0/tag-articles.ftl diff --git a/owmx-3.0/tags.ftl b/skins/owmx-3.0/tags.ftl similarity index 100% rename from owmx-3.0/tags.ftl rename to skins/owmx-3.0/tags.ftl diff --git a/timeline/article-list.ftl b/skins/timeline/article-list.ftl similarity index 97% rename from timeline/article-list.ftl rename to skins/timeline/article-list.ftl index 6a92778..58ece0e 100644 --- a/timeline/article-list.ftl +++ b/skins/timeline/article-list.ftl @@ -1,59 +1,59 @@ -
    -
    -
    - <#list articles as article> -
    -
    -
    -
    - -

    - - ${article.articleTitle} - - <#if article.hasUpdated> - - ${updatedLabel} - - - <#if article.articlePutTop> - - ${topArticleLabel} - - -

    -
    - ${article.articleAbstract} -
    - - <#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>, - - - - - - - <#if article.articleCommentCount == 0> - ${noCommentLabel} - <#else> - ${article.articleCommentCount} - - - - - - ${article.articleViewCount} - - -
    -
    - - <#if paginationCurrentPageNum != paginationPageCount && 0 != paginationPageCount> -
    ${moreLabel}
    - -
    +
    +
    +
    + <#list articles as article> +
    +
    +
    +
    + +

    + + ${article.articleTitle} + + <#if article.hasUpdated> + + ${updatedLabel} + + + <#if article.articlePutTop> + + ${topArticleLabel} + + +

    +
    + ${article.articleAbstract} +
    + + <#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>, + + + + + + + <#if article.articleCommentCount == 0> + ${noCommentLabel} + <#else> + ${article.articleCommentCount} + + + + + + ${article.articleViewCount} + + +
    +
    + + <#if paginationCurrentPageNum != paginationPageCount && 0 != paginationPageCount> +
    ${moreLabel}
    + +
    \ No newline at end of file diff --git a/timeline/article.ftl b/skins/timeline/article.ftl similarity index 100% rename from timeline/article.ftl rename to skins/timeline/article.ftl diff --git a/timeline/author-articles.ftl b/skins/timeline/author-articles.ftl similarity index 97% rename from timeline/author-articles.ftl rename to skins/timeline/author-articles.ftl index b7c48de..11c6fe2 100644 --- a/timeline/author-articles.ftl +++ b/skins/timeline/author-articles.ftl @@ -1,21 +1,21 @@ -<#include "macro-head.ftl"> - - - - <@head title="${authorName} - ${blogTitle}"> - - - - - - ${topBarReplacement} - <#include "header.ftl"> - - <#include "article-list.ftl"> - <#include "footer.ftl"> - - +<#include "macro-head.ftl"> + + + + <@head title="${authorName} - ${blogTitle}"> + + + + + + ${topBarReplacement} + <#include "header.ftl"> + + <#include "article-list.ftl"> + <#include "footer.ftl"> + + diff --git a/timeline/category-articles.ftl b/skins/timeline/category-articles.ftl similarity index 100% rename from timeline/category-articles.ftl rename to skins/timeline/category-articles.ftl diff --git a/timeline/common-comment.ftl b/skins/timeline/common-comment.ftl similarity index 100% rename from timeline/common-comment.ftl rename to skins/timeline/common-comment.ftl diff --git a/timeline/css/timeline.css b/skins/timeline/css/timeline.css similarity index 100% rename from timeline/css/timeline.css rename to skins/timeline/css/timeline.css diff --git a/timeline/css/timeline.min.css b/skins/timeline/css/timeline.min.css similarity index 100% rename from timeline/css/timeline.min.css rename to skins/timeline/css/timeline.min.css diff --git a/timeline/dynamic.ftl b/skins/timeline/dynamic.ftl similarity index 98% rename from timeline/dynamic.ftl rename to skins/timeline/dynamic.ftl index 29d0c8a..d316106 100644 --- a/timeline/dynamic.ftl +++ b/skins/timeline/dynamic.ftl @@ -1,137 +1,137 @@ -<#include "macro-head.ftl"> - - - - <@head title="${blogTitle}"> - - - - - - ${topBarReplacement} - <#include "header.ftl"> -
    -
    -
    -
    - <#if "" != noticeBoard> -
    - ${noticeBoard} -
    - - <#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")} - - - ${viewLabel} - - -
      - ${comment.commentContent} -
      -
      -
    • - -
    -
    - -
    -
    - <#if 0 != mostCommentArticles?size> - - - <#if 0 != mostViewCountArticles?size> -
    -

    ${mostViewCountArticlesLabel}

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

    ${popTagsLabel}

    - <#list mostUsedTags as tag> -     - - -
    - -
    -
    - <#if 0 != links?size> - - -
    -
    - <#include "footer.ftl"> - - - +<#include "macro-head.ftl"> + + + + <@head title="${blogTitle}"> + + + + + + ${topBarReplacement} + <#include "header.ftl"> +
    +
    +
    +
    + <#if "" != noticeBoard> +
    + ${noticeBoard} +
    + + <#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")} + + + ${viewLabel} + + +
      + ${comment.commentContent} +
      +
      +
    • + +
    +
    + +
    +
    + <#if 0 != mostCommentArticles?size> + + + <#if 0 != mostViewCountArticles?size> +
    +

    ${mostViewCountArticlesLabel}

    + +
    + + <#if 0 != mostUsedTags?size> +
    +

    ${popTagsLabel}

    + <#list mostUsedTags as tag> +     + + +
    + +
    +
    + <#if 0 != links?size> + + +
    +
    + <#include "footer.ftl"> + + + diff --git a/timeline/footer.ftl b/skins/timeline/footer.ftl similarity index 100% rename from timeline/footer.ftl rename to skins/timeline/footer.ftl diff --git a/timeline/header.ftl b/skins/timeline/header.ftl similarity index 100% rename from timeline/header.ftl rename to skins/timeline/header.ftl diff --git a/timeline/images/ajax-loader.gif b/skins/timeline/images/ajax-loader.gif similarity index 100% rename from timeline/images/ajax-loader.gif rename to skins/timeline/images/ajax-loader.gif diff --git a/timeline/images/bg.png b/skins/timeline/images/bg.png similarity index 100% rename from timeline/images/bg.png rename to skins/timeline/images/bg.png diff --git a/timeline/images/icons.png b/skins/timeline/images/icons.png similarity index 100% rename from timeline/images/icons.png rename to skins/timeline/images/icons.png diff --git a/timeline/images/nav-bg.png b/skins/timeline/images/nav-bg.png similarity index 100% rename from timeline/images/nav-bg.png rename to skins/timeline/images/nav-bg.png diff --git a/timeline/index.ftl b/skins/timeline/index.ftl similarity index 97% rename from timeline/index.ftl rename to skins/timeline/index.ftl index 48be7fe..dc1517d 100644 --- a/timeline/index.ftl +++ b/skins/timeline/index.ftl @@ -1,105 +1,105 @@ -<#include "macro-head.ftl"> - - - - <@head title="${blogTitle}"> - <#if metaKeywords??> - - - <#if metaDescription??> - - - - - - ${topBarReplacement} - <#include "header.ftl"> - -
    -
    -
    - <#list archiveDates as archiveDate> -
    -

    - - <#if "en" == localeString?substring(0, 2)> - ${archiveDate.monthName} ${archiveDate.archiveDateYear} - <#else> - ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} - - -

    - <#list articles1 as article> - <#if article.articleCreateDate?string("yyyy/MM") == "${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"> -
    -
    -
    -
    - -

    - - ${article.articleTitle} - - <#if article.hasUpdated> - - ${updatedLabel} - - - <#if article.articlePutTop> - - ${topArticleLabel} - - -

    -
    - ${article.articleAbstract} -
    - - <#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>, - - - - - - - <#if article.articleCommentCount == 0> - ${noCommentLabel} - <#else> - ${article.articleCommentCount} - - - - - - ${article.articleViewCount} - - -
    -
    - <#if paginationCurrentPageNum != paginationPageCount && 0 != paginationPageCount && !article_has_next> -
    ${moreLabel}
    - - - -
    - -
    -
    - <#include "footer.ftl"> - - +<#include "macro-head.ftl"> + + + + <@head title="${blogTitle}"> + <#if metaKeywords??> + + + <#if metaDescription??> + + + + + + ${topBarReplacement} + <#include "header.ftl"> + +
    +
    +
    + <#list archiveDates as archiveDate> +
    +

    + + <#if "en" == localeString?substring(0, 2)> + ${archiveDate.monthName} ${archiveDate.archiveDateYear} + <#else> + ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} + + +

    + <#list articles1 as article> + <#if article.articleCreateDate?string("yyyy/MM") == "${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"> +
    +
    +
    +
    + +

    + + ${article.articleTitle} + + <#if article.hasUpdated> + + ${updatedLabel} + + + <#if article.articlePutTop> + + ${topArticleLabel} + + +

    +
    + ${article.articleAbstract} +
    + + <#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>, + + + + + + + <#if article.articleCommentCount == 0> + ${noCommentLabel} + <#else> + ${article.articleCommentCount} + + + + + + ${article.articleViewCount} + + +
    +
    + <#if paginationCurrentPageNum != paginationPageCount && 0 != paginationPageCount && !article_has_next> +
    ${moreLabel}
    + + + +
    + +
    +
    + <#include "footer.ftl"> + + diff --git a/timeline/js/timeline.js b/skins/timeline/js/timeline.js similarity index 97% rename from timeline/js/timeline.js rename to skins/timeline/js/timeline.js index 5c77f8b..222a22e 100644 --- a/timeline/js/timeline.js +++ b/skins/timeline/js/timeline.js @@ -1,454 +1,454 @@ -/* - * Copyright (c) 2010-2017, b3log.org & hacpai.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * @fileoverview timeline js. - * - * @author Liyuan Li - * @version 1.0.1.2, Jun 6, 2013 - */ -var timeline = { - _COLHA: 0, - _COLHB: 20, - _initArticleList: function() { - var $articles = $(".articles"); - if ($articles.length === 0 || $(".articles > .fn-clear").length > 0) { - return; - } - - $(window).resize(function() { - if ($("#hideTop").css("top") === "auto") { - var colH = [timeline._COLHA, timeline._COLHB]; - $articles.find("article").each(function() { - var $it = $(this), - isLeft = colH[1] > colH[0], - top = isLeft ? colH[0] : colH[1]; - if (parseInt($it.css("top")) !== top || top === 0) { - $it.css({ - "top": top + "px", - "position": "absolute" - }); - - if (isLeft) { - this.className = "l"; - } else { - this.className = "r"; - } - } - colH[(isLeft ? '0' : '1')] += parseInt($it.outerHeight(true)); - }); - - $articles.height(colH[0] > colH[1] ? colH[0] : colH[1]); - } else { - $articles.find("article").each(function() { - $(this).css({ - "position": "inherit", - "top": "auto" - }).removeClass("r l"); - }); - $articles.css("height", "auto"); - } - }); - - $(window).resize(); - $(".module img").imagesLoaded(function() { - $(window).resize(); - }); - }, - _initIndexList: function() { - var $archives = $(".articles > .fn-clear"); - if ($archives.length === 0) { - return; - } - - // 如果为 index 页面,重构 archives 结构,使其可收缩 - var year = 0; - $(".nav-abs li").each(function(i) { - var $this = $(this); - $this.hide(); - if (year !== $this.data("year")) { - year = $this.data("year"); - $this.before("
  • " + year + "
  • "); - } - }); - - // 首次加载时,当没有下一页时,使用 js 隐藏"更多"按钮 - if ($(".article-more").parent().data("count") <= $(".article-more").parent().find("article").length) { - $(".article-more").remove(); - } - - $(window).resize(function() { - $archives.each(function() { - if ($("#hideTop").css("top") === "auto") { - var colH = [timeline._COLHA + 60, timeline._COLHB * 4]; - - var $articles = $(this).find("article"); - if ($articles.length === 0) { - $(this).find("h2").remove(); - $(this).css("margin-bottom", 0); - } else { - $articles.each(function() { - var $it = $(this), - isLeft = colH[1] > colH[0], - top = isLeft ? colH[0] : colH[1]; - - if (parseInt($it.css("top")) !== top || top === 0) { - $it.css({ - "top": top + "px", - "position": "absolute" - }); - - if (isLeft) { - this.className = "l"; - } else { - this.className = "r"; - } - } - colH[(isLeft ? '0' : '1')] += parseInt($it.outerHeight(true)); - }); - $(this).height(colH[0] > colH[1] ? colH[0] : colH[1]); - } - } else { - var $articles = $(this).find("article"); - if ($articles.length === 0) { - $(this).find("h2").remove(); - $(this).css("margin-bottom", 0); - } else { - $articles.each(function() { - $(this).css({ - "position": "inherit", - "top": "auto" - }).removeClass("r l"); - }); - $(this).css("height", "auto"); - } - } - }); - }); - - $(window).resize(); - $(".module img").imagesLoaded(function() { - $(window).resize(); - }); - }, - _setNavCurrent: function() { - $(".header li a").each(function() { - if ($(this).prop("href") === location.href.split("#")[0]) { - this.className = "current"; - } else { - this.className = ""; - } - }) - }, - init: function() { - $(window).scroll(function() { - if ($(window).scrollTop() > 60) { - $(".ico-top").show(); - } else { - $(".ico-top").hide(); - } - }); - timeline._initIndexList(); - timeline._initArticleList(); - timeline._setNavCurrent(); - - // init header list - $(".ico-list").click(function() { - if ($(".header > .container > form").css("height") === "0px") { - $(".header > .container > ul, .header > .container > form").css({ - "height": "auto" - }); - } else { - $(".header > .container > ul, .header > .container > form").animate({ - "height": "0px" - }); - } - }); - }, - translate: function() { - window.open("http://translate.google.com/translate?sl=auto&tl=auto&u=" + location.href); - }, - getArchive: function(year, month, monthName) { - var archiveDate = year + month, - archive = year + "/" + month; - window.location.hash = "#" + archiveDate; - if ($("#" + archiveDate + " > article").length === 0) { - var archiveDataTitle = year + " " + Label.yearLabel + " " + month + " " + Label.monthLabel; - if (Label.localeString.substring(0, 2) === "en") { - archiveDataTitle = monthName + " " + year; - } - var archiveHTML = '

    ' + archiveDataTitle + '

    ' - + '
    ' + Label.moreLabel + '
    '; - - $("#" + archiveDate).html(archiveHTML).css("margin-bottom", "50px"); - timeline.getNextPage($("#" + archiveDate).find(".article-more")[0], archive); - } - }, - getNextPage: function(it, archive) { - var $more = $(it), - currentPage = $more.data("page") + 1, - path = "/articles/"; - if ($("#tag").length === 1) { - var pathnames = location.pathname.split("/"); - path = "/articles/tags/" + pathnames[pathnames.length - 1] + "/"; - } else if ($("#author").length === 1) { - var pathnames = location.pathname.split("/"); - path = "/articles/authors/" + pathnames[pathnames.length - 1] + "/"; - } else if (archive) { - path = "/articles/archives/" + archive + "/"; - } - $.ajax({ - url: latkeConfig.servePath + path + currentPage, - type: "GET", - beforeSend: function() { - $more.css("background", - "url(" + latkeConfig.staticServePath - + "/skins/timeline/images/ajax-loader.gif) no-repeat scroll center center #60829F").text(""); - }, - success: function(result, textStatus) { - if (!result.sc) { - $more.css("background", "none #60829F").text("Error"); - return; - } - - if (result.rslts.articles.length === 0) { - $more.remove(); - return; - } - - var articlesHTML = "", - pagination = result.rslts.pagination; - - // append articles - for (var i = 0; i < result.rslts.articles.length; i++) { - var article = result.rslts.articles[i]; - - articlesHTML += '
    ' - + '

    ' - + article.articleTitle + ''; - - if (article.hasUpdated) { - articlesHTML += '' + Label.updatedLabel + ''; - } - - if (article.articlePutTop) { - articlesHTML += '' + Label.topArticleLabel + ''; - } - - articlesHTML += '

    ' + article.articleAbstract + '

    ' - + ''; - - var articleTags = article.articleTags.split(","); - for (var j = 0; j < articleTags.length; j++) { - articlesHTML += '' + articleTags[j] + ''; - - if (j < articleTags.length - 1) { - articlesHTML += ","; - } - } - - articlesHTML += ' ' - + ' ' + (article.articleCommentCount === 0 ? Label.noCommentLabel : article.articleCommentCount) - + ' ' - + '' + article.articleViewCount - + '
    '; - } - - $more.before(articlesHTML).data("page", currentPage); - // 最后一页处理 - if (pagination.paginationPageCount <= currentPage) { - $more.remove(); - } else { - $more.css("background", "none #60829F").text(Label.moreLabel); - } - - $(window).resize(); - $(".module img").imagesLoaded(function() { - $(window).resize(); - }); - } - }); - }, - toggleArchives: function(it, year) { - $(".nav-abs li").each(function(i) { - var $it = $(this); - if (!$it.hasClass("year")) { - $it.hide(); - if (year === $it.data("year") && $(it).hasClass("close")) { - $it.show(); - } - } - }); - - $(".nav-abs li.year").each(function() { - if (parseInt($(this).text()) === year) { - if ($(it).hasClass("close")) { - it.className = "year open"; - } else { - it.className = "year close"; - } - } else { - this.className = "year close"; - } - }); - } -}; - -/*! - * jQuery imagesLoaded plugin v2.1.1 - * http://github.com/desandro/imagesloaded - * - * MIT License. by Paul Irish et al. - */ - -/*jshint curly: true, eqeqeq: true, noempty: true, strict: true, undef: true, browser: true */ -/*global jQuery: false */ - -; -(function($, undefined) { - 'use strict'; - - // blank image data-uri bypasses webkit log warning (thx doug jones) - var BLANK = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw=='; - - $.fn.imagesLoaded = function(callback) { - var $this = this, - deferred = $.isFunction($.Deferred) ? $.Deferred() : 0, - hasNotify = $.isFunction(deferred.notify), - $images = $this.find('img').add($this.filter('img')), - loaded = [], - proper = [], - broken = []; - - // Register deferred callbacks - if ($.isPlainObject(callback)) { - $.each(callback, function(key, value) { - if (key === 'callback') { - callback = value; - } else if (deferred) { - deferred[key](value); - } - }); - } - - function doneLoading() { - var $proper = $(proper), - $broken = $(broken); - - if (deferred) { - if (broken.length) { - deferred.reject($images, $proper, $broken); - } else { - deferred.resolve($images); - } - } - - if ($.isFunction(callback)) { - callback.call($this, $images, $proper, $broken); - } - } - - function imgLoadedHandler(event) { - imgLoaded(event.target, event.type === 'error'); - } - - function imgLoaded(img, isBroken) { - // don't proceed if BLANK image, or image is already loaded - if (img.src === BLANK || $.inArray(img, loaded) !== -1) { - return; - } - - // store element in loaded images array - loaded.push(img); - - // keep track of broken and properly loaded images - if (isBroken) { - broken.push(img); - } else { - proper.push(img); - } - - // cache image and its state for future calls - $.data(img, 'imagesLoaded', { - isBroken: isBroken, - src: img.src - }); - - // trigger deferred progress method if present - if (hasNotify) { - deferred.notifyWith($(img), [isBroken, $images, $(proper), $(broken)]); - } - - // call doneLoading and clean listeners if all images are loaded - if ($images.length === loaded.length) { - setTimeout(doneLoading); - $images.unbind('.imagesLoaded', imgLoadedHandler); - } - } - - // if no images, trigger immediately - if (!$images.length) { - doneLoading(); - } else { - $images.bind('load.imagesLoaded error.imagesLoaded', imgLoadedHandler) - .each(function(i, el) { - var src = el.src; - - // find out if this image has been already checked for status - // if it was, and src has not changed, call imgLoaded on it - var cached = $.data(el, 'imagesLoaded'); - if (cached && cached.src === src) { - imgLoaded(el, cached.isBroken); - return; - } - - // if complete is true and browser supports natural sizes, try - // to check for image status manually - if (el.complete && el.naturalWidth !== undefined) { - imgLoaded(el, el.naturalWidth === 0 || el.naturalHeight === 0); - return; - } - - // cached images don't fire load sometimes, so we reset src, but only when - // dealing with IE, or image is complete (loaded) and failed manual check - // webkit hack from http://groups.google.com/group/jquery-dev/browse_thread/thread/eee6ab7b2da50e1f - if (el.readyState || el.complete) { - el.src = BLANK; - el.src = src; - } - }); - } - - return deferred ? deferred.promise($this) : $this; - }; - -})(jQuery); - -(function() { - Util.init(); - Util.replaceSideEm($(".comments .article-body")); - Util.buildTags("tagsSide"); - - timeline.init(); +/* + * Copyright (c) 2010-2017, b3log.org & hacpai.com + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * @fileoverview timeline js. + * + * @author Liyuan Li + * @version 1.0.1.2, Jun 6, 2013 + */ +var timeline = { + _COLHA: 0, + _COLHB: 20, + _initArticleList: function() { + var $articles = $(".articles"); + if ($articles.length === 0 || $(".articles > .fn-clear").length > 0) { + return; + } + + $(window).resize(function() { + if ($("#hideTop").css("top") === "auto") { + var colH = [timeline._COLHA, timeline._COLHB]; + $articles.find("article").each(function() { + var $it = $(this), + isLeft = colH[1] > colH[0], + top = isLeft ? colH[0] : colH[1]; + if (parseInt($it.css("top")) !== top || top === 0) { + $it.css({ + "top": top + "px", + "position": "absolute" + }); + + if (isLeft) { + this.className = "l"; + } else { + this.className = "r"; + } + } + colH[(isLeft ? '0' : '1')] += parseInt($it.outerHeight(true)); + }); + + $articles.height(colH[0] > colH[1] ? colH[0] : colH[1]); + } else { + $articles.find("article").each(function() { + $(this).css({ + "position": "inherit", + "top": "auto" + }).removeClass("r l"); + }); + $articles.css("height", "auto"); + } + }); + + $(window).resize(); + $(".module img").imagesLoaded(function() { + $(window).resize(); + }); + }, + _initIndexList: function() { + var $archives = $(".articles > .fn-clear"); + if ($archives.length === 0) { + return; + } + + // 如果为 index 页面,重构 archives 结构,使其可收缩 + var year = 0; + $(".nav-abs li").each(function(i) { + var $this = $(this); + $this.hide(); + if (year !== $this.data("year")) { + year = $this.data("year"); + $this.before("
  • " + year + "
  • "); + } + }); + + // 首次加载时,当没有下一页时,使用 js 隐藏"更多"按钮 + if ($(".article-more").parent().data("count") <= $(".article-more").parent().find("article").length) { + $(".article-more").remove(); + } + + $(window).resize(function() { + $archives.each(function() { + if ($("#hideTop").css("top") === "auto") { + var colH = [timeline._COLHA + 60, timeline._COLHB * 4]; + + var $articles = $(this).find("article"); + if ($articles.length === 0) { + $(this).find("h2").remove(); + $(this).css("margin-bottom", 0); + } else { + $articles.each(function() { + var $it = $(this), + isLeft = colH[1] > colH[0], + top = isLeft ? colH[0] : colH[1]; + + if (parseInt($it.css("top")) !== top || top === 0) { + $it.css({ + "top": top + "px", + "position": "absolute" + }); + + if (isLeft) { + this.className = "l"; + } else { + this.className = "r"; + } + } + colH[(isLeft ? '0' : '1')] += parseInt($it.outerHeight(true)); + }); + $(this).height(colH[0] > colH[1] ? colH[0] : colH[1]); + } + } else { + var $articles = $(this).find("article"); + if ($articles.length === 0) { + $(this).find("h2").remove(); + $(this).css("margin-bottom", 0); + } else { + $articles.each(function() { + $(this).css({ + "position": "inherit", + "top": "auto" + }).removeClass("r l"); + }); + $(this).css("height", "auto"); + } + } + }); + }); + + $(window).resize(); + $(".module img").imagesLoaded(function() { + $(window).resize(); + }); + }, + _setNavCurrent: function() { + $(".header li a").each(function() { + if ($(this).prop("href") === location.href.split("#")[0]) { + this.className = "current"; + } else { + this.className = ""; + } + }) + }, + init: function() { + $(window).scroll(function() { + if ($(window).scrollTop() > 60) { + $(".ico-top").show(); + } else { + $(".ico-top").hide(); + } + }); + timeline._initIndexList(); + timeline._initArticleList(); + timeline._setNavCurrent(); + + // init header list + $(".ico-list").click(function() { + if ($(".header > .container > form").css("height") === "0px") { + $(".header > .container > ul, .header > .container > form").css({ + "height": "auto" + }); + } else { + $(".header > .container > ul, .header > .container > form").animate({ + "height": "0px" + }); + } + }); + }, + translate: function() { + window.open("http://translate.google.com/translate?sl=auto&tl=auto&u=" + location.href); + }, + getArchive: function(year, month, monthName) { + var archiveDate = year + month, + archive = year + "/" + month; + window.location.hash = "#" + archiveDate; + if ($("#" + archiveDate + " > article").length === 0) { + var archiveDataTitle = year + " " + Label.yearLabel + " " + month + " " + Label.monthLabel; + if (Label.localeString.substring(0, 2) === "en") { + archiveDataTitle = monthName + " " + year; + } + var archiveHTML = '

    ' + archiveDataTitle + '

    ' + + '
    ' + Label.moreLabel + '
    '; + + $("#" + archiveDate).html(archiveHTML).css("margin-bottom", "50px"); + timeline.getNextPage($("#" + archiveDate).find(".article-more")[0], archive); + } + }, + getNextPage: function(it, archive) { + var $more = $(it), + currentPage = $more.data("page") + 1, + path = "/articles/"; + if ($("#tag").length === 1) { + var pathnames = location.pathname.split("/"); + path = "/articles/tags/" + pathnames[pathnames.length - 1] + "/"; + } else if ($("#author").length === 1) { + var pathnames = location.pathname.split("/"); + path = "/articles/authors/" + pathnames[pathnames.length - 1] + "/"; + } else if (archive) { + path = "/articles/archives/" + archive + "/"; + } + $.ajax({ + url: latkeConfig.servePath + path + currentPage, + type: "GET", + beforeSend: function() { + $more.css("background", + "url(" + latkeConfig.staticServePath + + "/skins/timeline/images/ajax-loader.gif) no-repeat scroll center center #60829F").text(""); + }, + success: function(result, textStatus) { + if (!result.sc) { + $more.css("background", "none #60829F").text("Error"); + return; + } + + if (result.rslts.articles.length === 0) { + $more.remove(); + return; + } + + var articlesHTML = "", + pagination = result.rslts.pagination; + + // append articles + for (var i = 0; i < result.rslts.articles.length; i++) { + var article = result.rslts.articles[i]; + + articlesHTML += '
    ' + + '

    ' + + article.articleTitle + ''; + + if (article.hasUpdated) { + articlesHTML += '' + Label.updatedLabel + ''; + } + + if (article.articlePutTop) { + articlesHTML += '' + Label.topArticleLabel + ''; + } + + articlesHTML += '

    ' + article.articleAbstract + '

    ' + + ''; + + var articleTags = article.articleTags.split(","); + for (var j = 0; j < articleTags.length; j++) { + articlesHTML += '' + articleTags[j] + ''; + + if (j < articleTags.length - 1) { + articlesHTML += ","; + } + } + + articlesHTML += ' ' + + ' ' + (article.articleCommentCount === 0 ? Label.noCommentLabel : article.articleCommentCount) + + ' ' + + '' + article.articleViewCount + + '
    '; + } + + $more.before(articlesHTML).data("page", currentPage); + // 最后一页处理 + if (pagination.paginationPageCount <= currentPage) { + $more.remove(); + } else { + $more.css("background", "none #60829F").text(Label.moreLabel); + } + + $(window).resize(); + $(".module img").imagesLoaded(function() { + $(window).resize(); + }); + } + }); + }, + toggleArchives: function(it, year) { + $(".nav-abs li").each(function(i) { + var $it = $(this); + if (!$it.hasClass("year")) { + $it.hide(); + if (year === $it.data("year") && $(it).hasClass("close")) { + $it.show(); + } + } + }); + + $(".nav-abs li.year").each(function() { + if (parseInt($(this).text()) === year) { + if ($(it).hasClass("close")) { + it.className = "year open"; + } else { + it.className = "year close"; + } + } else { + this.className = "year close"; + } + }); + } +}; + +/*! + * jQuery imagesLoaded plugin v2.1.1 + * http://github.com/desandro/imagesloaded + * + * MIT License. by Paul Irish et al. + */ + +/*jshint curly: true, eqeqeq: true, noempty: true, strict: true, undef: true, browser: true */ +/*global jQuery: false */ + +; +(function($, undefined) { + 'use strict'; + + // blank image data-uri bypasses webkit log warning (thx doug jones) + var BLANK = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw=='; + + $.fn.imagesLoaded = function(callback) { + var $this = this, + deferred = $.isFunction($.Deferred) ? $.Deferred() : 0, + hasNotify = $.isFunction(deferred.notify), + $images = $this.find('img').add($this.filter('img')), + loaded = [], + proper = [], + broken = []; + + // Register deferred callbacks + if ($.isPlainObject(callback)) { + $.each(callback, function(key, value) { + if (key === 'callback') { + callback = value; + } else if (deferred) { + deferred[key](value); + } + }); + } + + function doneLoading() { + var $proper = $(proper), + $broken = $(broken); + + if (deferred) { + if (broken.length) { + deferred.reject($images, $proper, $broken); + } else { + deferred.resolve($images); + } + } + + if ($.isFunction(callback)) { + callback.call($this, $images, $proper, $broken); + } + } + + function imgLoadedHandler(event) { + imgLoaded(event.target, event.type === 'error'); + } + + function imgLoaded(img, isBroken) { + // don't proceed if BLANK image, or image is already loaded + if (img.src === BLANK || $.inArray(img, loaded) !== -1) { + return; + } + + // store element in loaded images array + loaded.push(img); + + // keep track of broken and properly loaded images + if (isBroken) { + broken.push(img); + } else { + proper.push(img); + } + + // cache image and its state for future calls + $.data(img, 'imagesLoaded', { + isBroken: isBroken, + src: img.src + }); + + // trigger deferred progress method if present + if (hasNotify) { + deferred.notifyWith($(img), [isBroken, $images, $(proper), $(broken)]); + } + + // call doneLoading and clean listeners if all images are loaded + if ($images.length === loaded.length) { + setTimeout(doneLoading); + $images.unbind('.imagesLoaded', imgLoadedHandler); + } + } + + // if no images, trigger immediately + if (!$images.length) { + doneLoading(); + } else { + $images.bind('load.imagesLoaded error.imagesLoaded', imgLoadedHandler) + .each(function(i, el) { + var src = el.src; + + // find out if this image has been already checked for status + // if it was, and src has not changed, call imgLoaded on it + var cached = $.data(el, 'imagesLoaded'); + if (cached && cached.src === src) { + imgLoaded(el, cached.isBroken); + return; + } + + // if complete is true and browser supports natural sizes, try + // to check for image status manually + if (el.complete && el.naturalWidth !== undefined) { + imgLoaded(el, el.naturalWidth === 0 || el.naturalHeight === 0); + return; + } + + // cached images don't fire load sometimes, so we reset src, but only when + // dealing with IE, or image is complete (loaded) and failed manual check + // webkit hack from http://groups.google.com/group/jquery-dev/browse_thread/thread/eee6ab7b2da50e1f + if (el.readyState || el.complete) { + el.src = BLANK; + el.src = src; + } + }); + } + + return deferred ? deferred.promise($this) : $this; + }; + +})(jQuery); + +(function() { + Util.init(); + Util.replaceSideEm($(".comments .article-body")); + Util.buildTags("tagsSide"); + + timeline.init(); })(); \ No newline at end of file diff --git a/timeline/js/timeline.min.js b/skins/timeline/js/timeline.min.js similarity index 100% rename from timeline/js/timeline.min.js rename to skins/timeline/js/timeline.min.js diff --git a/timeline/lang/lang_en_US.properties b/skins/timeline/lang/lang_en_US.properties similarity index 96% rename from timeline/lang/lang_en_US.properties rename to skins/timeline/lang/lang_en_US.properties index 1b0774e..a50aa4f 100644 --- a/timeline/lang/lang_en_US.properties +++ b/skins/timeline/lang/lang_en_US.properties @@ -1,78 +1,78 @@ -# -# Copyright (c) 2010-2017, b3log.org & hacpai.com -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# -# Description: Language configurations(en_US) for skin "timeline". -# Version: 1.0.0.6, Jul 31, 2016 -# Author: Liyuan Li -# -searchLabel=Search -dynamicLabel=Dynamic -moreLabel=More -contentLabel=More... -abstractLabel=Abstract -viewCount1Label=View Count: -articleCount1Label=Article Count: -commentCount1Label=Comment Count: -allTagsLabel=Tags -archiveLabel=Archive -yearLabel= -monthLabel= -recentArticlesLabel=Recent Articles -recentCommentsLabel=Recent Comments -mostCommentArticlesLabel=Most Comment Articles -mostViewCountArticlesLabel=Most View Articles -popTagsLabel=Popular Tags -linkLabel=Friend Links -indexLabel=Home -sumLabel= -pageLabel=Page -adminLabel=Admin -logoutLabel=Logout -loginLabel=Login -commentLabel=Comment -noCommentLabel=No Comment -viewLabel=View -authorLabel=Author -previousPageLabel=Previous Page -nextPagePabel=Next Page -firstPageLabel=First Page -lastPageLabel=Last Page -archive1Label=Archive: -author1Label=Author: -tagLabel=Tags -sorryLabel=Sorry! -notFoundLabel=Not Found! -returnTo1Label=Return: -updatedLabel=Updated! -topArticleLabel=Top! -replyLabel=Reply -commentNameLabel=Name -commentEmailLabel=Email -commentURLLabel=URL -submmitCommentLabel=Commit Comment -nameTooLongLabel=Sorry, your username must be between 2 and 20 characters long! -mailCannotEmptyLabel=Mail is empty! -mailInvalidLabel=Mail is invalid! -commentContentCannotEmptyLabel=Sorry, your content must be between 2 and 500 characters long! -captchaCannotEmptyLabel=Captcha is empty! -loadingLabel=loading.... -relevantArticlesLabel=Relevant Articles -randomArticlesLabel=Random Articles -externalRelevantArticlesLabel=External Relevant Articles: -captchaErrorLabel=Captcha Error -b3logLabel=B3LOG +# +# Copyright (c) 2010-2017, b3log.org & hacpai.com +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# +# Description: Language configurations(en_US) for skin "timeline". +# Version: 1.0.0.6, Jul 31, 2016 +# Author: Liyuan Li +# +searchLabel=Search +dynamicLabel=Dynamic +moreLabel=More +contentLabel=More... +abstractLabel=Abstract +viewCount1Label=View Count: +articleCount1Label=Article Count: +commentCount1Label=Comment Count: +allTagsLabel=Tags +archiveLabel=Archive +yearLabel= +monthLabel= +recentArticlesLabel=Recent Articles +recentCommentsLabel=Recent Comments +mostCommentArticlesLabel=Most Comment Articles +mostViewCountArticlesLabel=Most View Articles +popTagsLabel=Popular Tags +linkLabel=Friend Links +indexLabel=Home +sumLabel= +pageLabel=Page +adminLabel=Admin +logoutLabel=Logout +loginLabel=Login +commentLabel=Comment +noCommentLabel=No Comment +viewLabel=View +authorLabel=Author +previousPageLabel=Previous Page +nextPagePabel=Next Page +firstPageLabel=First Page +lastPageLabel=Last Page +archive1Label=Archive: +author1Label=Author: +tagLabel=Tags +sorryLabel=Sorry! +notFoundLabel=Not Found! +returnTo1Label=Return: +updatedLabel=Updated! +topArticleLabel=Top! +replyLabel=Reply +commentNameLabel=Name +commentEmailLabel=Email +commentURLLabel=URL +submmitCommentLabel=Commit Comment +nameTooLongLabel=Sorry, your username must be between 2 and 20 characters long! +mailCannotEmptyLabel=Mail is empty! +mailInvalidLabel=Mail is invalid! +commentContentCannotEmptyLabel=Sorry, your content must be between 2 and 500 characters long! +captchaCannotEmptyLabel=Captcha is empty! +loadingLabel=loading.... +relevantArticlesLabel=Relevant Articles +randomArticlesLabel=Random Articles +externalRelevantArticlesLabel=External Relevant Articles: +captchaErrorLabel=Captcha Error +b3logLabel=B3LOG killBrowserLabel=

    Let's kill outdated and insecure browser!

    Let's kill outdated and insecure browser for browser evolution, human progress and better experience.

    You can download

    \ No newline at end of file diff --git a/timeline/lang/lang_zh_CN.properties b/skins/timeline/lang/lang_zh_CN.properties similarity index 98% rename from timeline/lang/lang_zh_CN.properties rename to skins/timeline/lang/lang_zh_CN.properties index d2303b1..5afb7c9 100644 --- a/timeline/lang/lang_zh_CN.properties +++ b/skins/timeline/lang/lang_zh_CN.properties @@ -1,78 +1,78 @@ -# -# Copyright (c) 2010-2017, b3log.org & hacpai.com -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# -# Description: Language configurations(zh_CN) for skin "timeline". -# Version: 1.0.0.6, Jul 31, 2016 -# Author: Liyuan Li -# -searchLabel=\u641C\u7D22 -dynamicLabel=\u52A8\u6001 -moreLabel=\u66F4\u591A -contentLabel=\u5168\u6587 -abstractLabel=\u6458\u8981 -viewCount1Label=\u6D4F\u89C8\u6B21\u6570\uFF1A -articleCount1Label=\u6587\u7AE0\u603B\u6570\uFF1A -commentCount1Label=\u8BC4\u8BBA\u603B\u6570\uFF1A -allTagsLabel=\u6807\u7B7E\u5899 -updatedLabel=\u6709\u66F4\u65B0\uFF01 -topArticleLabel=\u7F6E\u9876\uFF01 -archiveLabel=\u5B58\u6863 -yearLabel=\u5E74 -monthLabel=\u6708 -recentArticlesLabel=\u6700\u65B0\u6587\u7AE0 -recentCommentsLabel=\u6700\u65B0\u8BC4\u8BBA -mostCommentArticlesLabel=\u8BC4\u8BBA\u6700\u591A\u7684\u6587\u7AE0 -mostViewCountArticlesLabel=\u8BBF\u95EE\u6700\u591A\u7684\u6587\u7AE0 -popTagsLabel=\u5206\u7C7B\u6807\u7B7E -linkLabel=\u53CB\u60C5\u94FE\u63A5 -indexLabel=\u9996\u9875 -sumLabel=\u5171 -pageLabel=\u9875 -adminLabel=\u7BA1\u7406 -logoutLabel=\u767B\u51FA -loginLabel=\u767B\u5F55 -commentLabel=\u8BC4\u8BBA -noCommentLabel=\u65E0\u8BC4\u8BBA -viewLabel=\u6D4F\u89C8 -authorLabel=\u4F5C\u8005 -previousPageLabel=\u4E0A\u4E00\u9875 -nextPagePabel=\u4E0B\u4E00\u9875 -firstPageLabel=\u7B2C\u4E00\u9875 -lastPageLabel=\u6700\u540E\u4E00\u9875 -archive1Label=\u5B58\u6863\uFF1A -author1Label=\u4F5C\u8005\uFF1A -tagLabel=\u6807\u7B7E -sorryLabel=\u5BF9\u4E0D\u8D77\uFF01 -notFoundLabel=\u627E\u4E0D\u5230\uFF01 -returnTo1Label=\u8FD4\u56DE\uFF1A -replyLabel=\u56DE\u590D -commentNameLabel=\u59D3\u540D -commentEmailLabel=\u90AE\u7BB1 -commentURLLabel=URL -submmitCommentLabel=\u63D0\u4EA4\u8BC4\u8BBA -nameTooLongLabel=\u59D3\u540D\u53EA\u80FD\u4E3A 2 \u5230 20 \u4E2A\u5B57\u7B26\uFF01 -mailCannotEmptyLabel=\u90AE\u7BB1\u4E0D\u80FD\u4E3A\u7A7A\uFF01 -mailInvalidLabel=\u90AE\u7BB1\u683C\u5F0F\u4E0D\u6B63\u786E\uFF01 -commentContentCannotEmptyLabel=\u8BC4\u8BBA\u5185\u5BB9\u53EA\u80FD\u4E3A 2 \u5230 500 \u4E2A\u5B57\u7B26\uFF01 -captchaCannotEmptyLabel=\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01 -loadingLabel=\u8F7D\u5165\u4E2D.... -relevantArticlesLabel=\u76F8\u5173\u9605\u8BFB -randomArticlesLabel=\u968F\u673A\u9605\u8BFB -externalRelevantArticlesLabel=\u7AD9\u5916\u76F8\u5173\u9605\u8BFB -captchaErrorLabel=\u9A8C\u8BC1\u7801\u9519\u8BEF -b3logLabel=B3LOG -killBrowserLabel=

    \u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

    \u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

    \u60A8\u53EF\u4EE5\u4E0B\u8F7D +# +# Copyright (c) 2010-2017, b3log.org & hacpai.com +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# +# Description: Language configurations(zh_CN) for skin "timeline". +# Version: 1.0.0.6, Jul 31, 2016 +# Author: Liyuan Li +# +searchLabel=\u641C\u7D22 +dynamicLabel=\u52A8\u6001 +moreLabel=\u66F4\u591A +contentLabel=\u5168\u6587 +abstractLabel=\u6458\u8981 +viewCount1Label=\u6D4F\u89C8\u6B21\u6570\uFF1A +articleCount1Label=\u6587\u7AE0\u603B\u6570\uFF1A +commentCount1Label=\u8BC4\u8BBA\u603B\u6570\uFF1A +allTagsLabel=\u6807\u7B7E\u5899 +updatedLabel=\u6709\u66F4\u65B0\uFF01 +topArticleLabel=\u7F6E\u9876\uFF01 +archiveLabel=\u5B58\u6863 +yearLabel=\u5E74 +monthLabel=\u6708 +recentArticlesLabel=\u6700\u65B0\u6587\u7AE0 +recentCommentsLabel=\u6700\u65B0\u8BC4\u8BBA +mostCommentArticlesLabel=\u8BC4\u8BBA\u6700\u591A\u7684\u6587\u7AE0 +mostViewCountArticlesLabel=\u8BBF\u95EE\u6700\u591A\u7684\u6587\u7AE0 +popTagsLabel=\u5206\u7C7B\u6807\u7B7E +linkLabel=\u53CB\u60C5\u94FE\u63A5 +indexLabel=\u9996\u9875 +sumLabel=\u5171 +pageLabel=\u9875 +adminLabel=\u7BA1\u7406 +logoutLabel=\u767B\u51FA +loginLabel=\u767B\u5F55 +commentLabel=\u8BC4\u8BBA +noCommentLabel=\u65E0\u8BC4\u8BBA +viewLabel=\u6D4F\u89C8 +authorLabel=\u4F5C\u8005 +previousPageLabel=\u4E0A\u4E00\u9875 +nextPagePabel=\u4E0B\u4E00\u9875 +firstPageLabel=\u7B2C\u4E00\u9875 +lastPageLabel=\u6700\u540E\u4E00\u9875 +archive1Label=\u5B58\u6863\uFF1A +author1Label=\u4F5C\u8005\uFF1A +tagLabel=\u6807\u7B7E +sorryLabel=\u5BF9\u4E0D\u8D77\uFF01 +notFoundLabel=\u627E\u4E0D\u5230\uFF01 +returnTo1Label=\u8FD4\u56DE\uFF1A +replyLabel=\u56DE\u590D +commentNameLabel=\u59D3\u540D +commentEmailLabel=\u90AE\u7BB1 +commentURLLabel=URL +submmitCommentLabel=\u63D0\u4EA4\u8BC4\u8BBA +nameTooLongLabel=\u59D3\u540D\u53EA\u80FD\u4E3A 2 \u5230 20 \u4E2A\u5B57\u7B26\uFF01 +mailCannotEmptyLabel=\u90AE\u7BB1\u4E0D\u80FD\u4E3A\u7A7A\uFF01 +mailInvalidLabel=\u90AE\u7BB1\u683C\u5F0F\u4E0D\u6B63\u786E\uFF01 +commentContentCannotEmptyLabel=\u8BC4\u8BBA\u5185\u5BB9\u53EA\u80FD\u4E3A 2 \u5230 500 \u4E2A\u5B57\u7B26\uFF01 +captchaCannotEmptyLabel=\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01 +loadingLabel=\u8F7D\u5165\u4E2D.... +relevantArticlesLabel=\u76F8\u5173\u9605\u8BFB +randomArticlesLabel=\u968F\u673A\u9605\u8BFB +externalRelevantArticlesLabel=\u7AD9\u5916\u76F8\u5173\u9605\u8BFB +captchaErrorLabel=\u9A8C\u8BC1\u7801\u9519\u8BEF +b3logLabel=B3LOG +killBrowserLabel=

    \u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

    \u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

    \u60A8\u53EF\u4EE5\u4E0B\u8F7D diff --git a/timeline/macro-comments.ftl b/skins/timeline/macro-comments.ftl similarity index 97% rename from timeline/macro-comments.ftl rename to skins/timeline/macro-comments.ftl index eb25346..b9e48b0 100644 --- a/timeline/macro-comments.ftl +++ b/skins/timeline/macro-comments.ftl @@ -1,111 +1,111 @@ -<#macro comments commentList article> -
      - <#list commentList as comment> - <#include "common-comment.ftl"/> - -
    -<#if article.commentable> -

    ${commentLabel}

    - - - <#if !isLoggedIn> - - - - - - - - - - - - - - - - - <#if !isLoggedIn> - - - - - - - - -
    - - -
    - - -
    - - -
    - - - - - - - - - - - - - - - -
    - -
    - - validate -
    - - -
    -<#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount> -
    - - - - -<#macro comment_script oId> - - +<#macro comments commentList article> +
      + <#list commentList as comment> + <#include "common-comment.ftl"/> + +
    +<#if article.commentable> +

    ${commentLabel}

    + + + <#if !isLoggedIn> + + + + + + + + + + + + + + + + + <#if !isLoggedIn> + + + + + + + + +
    + + +
    + + +
    + + +
    + + + + + + + + + + + + + + + +
    + +
    + + validate +
    + + +
    +<#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount> +
    + + + + +<#macro comment_script oId> + + \ No newline at end of file diff --git a/timeline/macro-head.ftl b/skins/timeline/macro-head.ftl similarity index 100% rename from timeline/macro-head.ftl rename to skins/timeline/macro-head.ftl diff --git a/timeline/page.ftl b/skins/timeline/page.ftl similarity index 96% rename from timeline/page.ftl rename to skins/timeline/page.ftl index 307e65a..215d13b 100644 --- a/timeline/page.ftl +++ b/skins/timeline/page.ftl @@ -1,27 +1,27 @@ -<#include "macro-head.ftl"> -<#include "macro-comments.ftl"> - - - - <@head title="${page.pageTitle} - ${blogTitle}"> - - - - - - ${topBarReplacement} - <#include "header.ftl"> -
    -
    -
    -
    - ${page.pageContent} -
    - <@comments commentList=pageComments article=page> -
    -
    -
    - <#include "footer.ftl"> - <@comment_script oId=page.oId> - - +<#include "macro-head.ftl"> +<#include "macro-comments.ftl"> + + + + <@head title="${page.pageTitle} - ${blogTitle}"> + + + + + + ${topBarReplacement} + <#include "header.ftl"> +
    +
    +
    +
    + ${page.pageContent} +
    + <@comments commentList=pageComments article=page> +
    +
    +
    + <#include "footer.ftl"> + <@comment_script oId=page.oId> + + diff --git a/timeline/preview.png b/skins/timeline/preview.png similarity index 100% rename from timeline/preview.png rename to skins/timeline/preview.png diff --git a/timeline/skin.properties b/skins/timeline/skin.properties similarity index 100% rename from timeline/skin.properties rename to skins/timeline/skin.properties diff --git a/timeline/tag-articles.ftl b/skins/timeline/tag-articles.ftl similarity index 97% rename from timeline/tag-articles.ftl rename to skins/timeline/tag-articles.ftl index eebfdb8..2e43db0 100644 --- a/timeline/tag-articles.ftl +++ b/skins/timeline/tag-articles.ftl @@ -1,22 +1,22 @@ -<#include "macro-head.ftl"> - - - - <@head title="${tag.tagTitle} - ${blogTitle}"> - - - - - - ${topBarReplacement} - <#include "header.ftl"> - - <#include "article-list.ftl"> - <#include "footer.ftl"> - - +<#include "macro-head.ftl"> + + + + <@head title="${tag.tagTitle} - ${blogTitle}"> + + + + + + ${topBarReplacement} + <#include "header.ftl"> + + <#include "article-list.ftl"> + <#include "footer.ftl"> + + diff --git a/timeline/tags.ftl b/skins/timeline/tags.ftl similarity index 97% rename from timeline/tags.ftl rename to skins/timeline/tags.ftl index 4cb0884..e2e6ca2 100644 --- a/timeline/tags.ftl +++ b/skins/timeline/tags.ftl @@ -1,48 +1,48 @@ -<#include "macro-head.ftl"> - - - - <@head title="${allTagsLabel} - ${blogTitle}"> - - - - - - ${topBarReplacement} - <#include "header.ftl"> -
    -
    - <#if 0 != mostUsedCategories?size> -

    ${categoryLabel}

    - - - -

    ${tagsLabel}

    - -
    -
    - <#include "footer.ftl"> - - - +<#include "macro-head.ftl"> + + + + <@head title="${allTagsLabel} - ${blogTitle}"> + + + + + + ${topBarReplacement} + <#include "header.ftl"> +
    +
    + <#if 0 != mostUsedCategories?size> +

    ${categoryLabel}

    + + + +

    ${tagsLabel}

    + +
    +
    + <#include "footer.ftl"> + + + diff --git a/tree-house/archive-articles.ftl b/skins/tree-house/archive-articles.ftl similarity index 100% rename from tree-house/archive-articles.ftl rename to skins/tree-house/archive-articles.ftl diff --git a/tree-house/article-list.ftl b/skins/tree-house/article-list.ftl similarity index 100% rename from tree-house/article-list.ftl rename to skins/tree-house/article-list.ftl diff --git a/tree-house/article.ftl b/skins/tree-house/article.ftl similarity index 100% rename from tree-house/article.ftl rename to skins/tree-house/article.ftl diff --git a/tree-house/author-articles.ftl b/skins/tree-house/author-articles.ftl similarity index 100% rename from tree-house/author-articles.ftl rename to skins/tree-house/author-articles.ftl diff --git a/tree-house/category-articles.ftl b/skins/tree-house/category-articles.ftl similarity index 100% rename from tree-house/category-articles.ftl rename to skins/tree-house/category-articles.ftl diff --git a/tree-house/common-comment.ftl b/skins/tree-house/common-comment.ftl similarity index 100% rename from tree-house/common-comment.ftl rename to skins/tree-house/common-comment.ftl diff --git a/tree-house/css/tree-house.css b/skins/tree-house/css/tree-house.css similarity index 100% rename from tree-house/css/tree-house.css rename to skins/tree-house/css/tree-house.css diff --git a/tree-house/css/tree-house.min.css b/skins/tree-house/css/tree-house.min.css similarity index 100% rename from tree-house/css/tree-house.min.css rename to skins/tree-house/css/tree-house.min.css diff --git a/tree-house/footer.ftl b/skins/tree-house/footer.ftl similarity index 97% rename from tree-house/footer.ftl rename to skins/tree-house/footer.ftl index f26b331..8f373ae 100644 --- a/tree-house/footer.ftl +++ b/skins/tree-house/footer.ftl @@ -1,41 +1,41 @@ -© ${year} - ${blogTitle}${footerContent}
    -Powered by B3log 开源Solo ${version}   -Theme by Pixel & Vanessa. -
    -
    - - - +© ${year} - ${blogTitle}${footerContent}
    +Powered by B3log 开源Solo ${version}   +Theme by Pixel & Vanessa. +
    +
    + + + ${plugins} \ No newline at end of file diff --git a/tree-house/header.ftl b/skins/tree-house/header.ftl similarity index 100% rename from tree-house/header.ftl rename to skins/tree-house/header.ftl diff --git a/tree-house/images/balloons.png b/skins/tree-house/images/balloons.png similarity index 100% rename from tree-house/images/balloons.png rename to skins/tree-house/images/balloons.png diff --git a/tree-house/images/bg-branch-small.png b/skins/tree-house/images/bg-branch-small.png similarity index 100% rename from tree-house/images/bg-branch-small.png rename to skins/tree-house/images/bg-branch-small.png diff --git a/tree-house/images/bg-branch.png b/skins/tree-house/images/bg-branch.png similarity index 100% rename from tree-house/images/bg-branch.png rename to skins/tree-house/images/bg-branch.png diff --git a/tree-house/images/bg-comments-body.png b/skins/tree-house/images/bg-comments-body.png similarity index 100% rename from tree-house/images/bg-comments-body.png rename to skins/tree-house/images/bg-comments-body.png diff --git a/tree-house/images/bg-comments-bottom.png b/skins/tree-house/images/bg-comments-bottom.png similarity index 100% rename from tree-house/images/bg-comments-bottom.png rename to skins/tree-house/images/bg-comments-bottom.png diff --git a/tree-house/images/bg-comments-top.png b/skins/tree-house/images/bg-comments-top.png similarity index 100% rename from tree-house/images/bg-comments-top.png rename to skins/tree-house/images/bg-comments-top.png diff --git a/tree-house/images/bg-comments.png b/skins/tree-house/images/bg-comments.png similarity index 100% rename from tree-house/images/bg-comments.png rename to skins/tree-house/images/bg-comments.png diff --git a/tree-house/images/bg-footer2.jpg b/skins/tree-house/images/bg-footer2.jpg similarity index 100% rename from tree-house/images/bg-footer2.jpg rename to skins/tree-house/images/bg-footer2.jpg diff --git a/tree-house/images/bg-header.jpg b/skins/tree-house/images/bg-header.jpg similarity index 100% rename from tree-house/images/bg-header.jpg rename to skins/tree-house/images/bg-header.jpg diff --git a/tree-house/images/bg-heading-about-us.png b/skins/tree-house/images/bg-heading-about-us.png similarity index 100% rename from tree-house/images/bg-heading-about-us.png rename to skins/tree-house/images/bg-heading-about-us.png diff --git a/tree-house/images/bg-heading-categories.png b/skins/tree-house/images/bg-heading-categories.png similarity index 100% rename from tree-house/images/bg-heading-categories.png rename to skins/tree-house/images/bg-heading-categories.png diff --git a/tree-house/images/bg-heading-portfolio.png b/skins/tree-house/images/bg-heading-portfolio.png similarity index 100% rename from tree-house/images/bg-heading-portfolio.png rename to skins/tree-house/images/bg-heading-portfolio.png diff --git a/tree-house/images/bg-heading-resources.png b/skins/tree-house/images/bg-heading-resources.png similarity index 100% rename from tree-house/images/bg-heading-resources.png rename to skins/tree-house/images/bg-heading-resources.png diff --git a/tree-house/images/bg-heading.png b/skins/tree-house/images/bg-heading.png similarity index 100% rename from tree-house/images/bg-heading.png rename to skins/tree-house/images/bg-heading.png diff --git a/tree-house/images/bg-menu-active-tags.png b/skins/tree-house/images/bg-menu-active-tags.png similarity index 100% rename from tree-house/images/bg-menu-active-tags.png rename to skins/tree-house/images/bg-menu-active-tags.png diff --git a/tree-house/images/bg-menu-active.png b/skins/tree-house/images/bg-menu-active.png similarity index 100% rename from tree-house/images/bg-menu-active.png rename to skins/tree-house/images/bg-menu-active.png diff --git a/tree-house/images/bg-tree.jpg b/skins/tree-house/images/bg-tree.jpg similarity index 100% rename from tree-house/images/bg-tree.jpg rename to skins/tree-house/images/bg-tree.jpg diff --git a/tree-house/index.ftl b/skins/tree-house/index.ftl similarity index 100% rename from tree-house/index.ftl rename to skins/tree-house/index.ftl diff --git a/tree-house/lang/lang_en_US.properties b/skins/tree-house/lang/lang_en_US.properties similarity index 100% rename from tree-house/lang/lang_en_US.properties rename to skins/tree-house/lang/lang_en_US.properties diff --git a/tree-house/lang/lang_zh_CN.properties b/skins/tree-house/lang/lang_zh_CN.properties similarity index 100% rename from tree-house/lang/lang_zh_CN.properties rename to skins/tree-house/lang/lang_zh_CN.properties diff --git a/tree-house/macro-comments.ftl b/skins/tree-house/macro-comments.ftl similarity index 97% rename from tree-house/macro-comments.ftl rename to skins/tree-house/macro-comments.ftl index 3147975..9ea49de 100644 --- a/tree-house/macro-comments.ftl +++ b/skins/tree-house/macro-comments.ftl @@ -1,127 +1,127 @@ -<#macro comments commentList article> -
    -
    - <#list commentList as comment> - <#include "common-comment.ftl"/> - -
    -<#if article.commentable> -
    -
    -
    - - - - <#if !isLoggedIn> - - - - - - - - - - - - - - - - - - - - - <#if !isLoggedIn> - - - - - - - - - -
    - ${commentName1Label} - - -
    - ${commentEmail1Label} - - -
    - ${commentURL1Label} - - -
    - - - - - - - - - - - - - - - -
    - ${commentContent1Label} - - -
    - ${captcha1Label} - - - validate -
    - - -
    -
    -
    -
    - - - -<#macro comment_script oId> - - +<#macro comments commentList article> +
    +
    + <#list commentList as comment> + <#include "common-comment.ftl"/> + +
    +<#if article.commentable> +
    +
    +
    + + + + <#if !isLoggedIn> + + + + + + + + + + + + + + + + + + + + + <#if !isLoggedIn> + + + + + + + + + +
    + ${commentName1Label} + + +
    + ${commentEmail1Label} + + +
    + ${commentURL1Label} + + +
    + + + + + + + + + + + + + + + +
    + ${commentContent1Label} + + +
    + ${captcha1Label} + + + validate +
    + + +
    +
    +
    +
    + + + +<#macro comment_script oId> + + \ No newline at end of file diff --git a/tree-house/macro-head.ftl b/skins/tree-house/macro-head.ftl similarity index 100% rename from tree-house/macro-head.ftl rename to skins/tree-house/macro-head.ftl diff --git a/tree-house/page.ftl b/skins/tree-house/page.ftl similarity index 100% rename from tree-house/page.ftl rename to skins/tree-house/page.ftl diff --git a/tree-house/preview.png b/skins/tree-house/preview.png similarity index 100% rename from tree-house/preview.png rename to skins/tree-house/preview.png diff --git a/tree-house/side.ftl b/skins/tree-house/side.ftl similarity index 100% rename from tree-house/side.ftl rename to skins/tree-house/side.ftl diff --git a/tree-house/skin.properties b/skins/tree-house/skin.properties similarity index 100% rename from tree-house/skin.properties rename to skins/tree-house/skin.properties diff --git a/tree-house/tag-articles.ftl b/skins/tree-house/tag-articles.ftl similarity index 100% rename from tree-house/tag-articles.ftl rename to skins/tree-house/tag-articles.ftl diff --git a/tree-house/tags.ftl b/skins/tree-house/tags.ftl similarity index 100% rename from tree-house/tags.ftl rename to skins/tree-house/tags.ftl diff --git a/yilia/archive-articles.ftl b/skins/yilia/archive-articles.ftl similarity index 100% rename from yilia/archive-articles.ftl rename to skins/yilia/archive-articles.ftl diff --git a/yilia/archives.ftl b/skins/yilia/archives.ftl similarity index 100% rename from yilia/archives.ftl rename to skins/yilia/archives.ftl diff --git a/yilia/article-list.ftl b/skins/yilia/article-list.ftl similarity index 100% rename from yilia/article-list.ftl rename to skins/yilia/article-list.ftl diff --git a/yilia/article.ftl b/skins/yilia/article.ftl similarity index 100% rename from yilia/article.ftl rename to skins/yilia/article.ftl diff --git a/yilia/author-articles.ftl b/skins/yilia/author-articles.ftl similarity index 100% rename from yilia/author-articles.ftl rename to skins/yilia/author-articles.ftl diff --git a/yilia/category-articles.ftl b/skins/yilia/category-articles.ftl similarity index 100% rename from yilia/category-articles.ftl rename to skins/yilia/category-articles.ftl diff --git a/yilia/common-comment.ftl b/skins/yilia/common-comment.ftl similarity index 100% rename from yilia/common-comment.ftl rename to skins/yilia/common-comment.ftl diff --git a/yilia/css/fonts/icomoon.eot b/skins/yilia/css/fonts/icomoon.eot similarity index 100% rename from yilia/css/fonts/icomoon.eot rename to skins/yilia/css/fonts/icomoon.eot diff --git a/yilia/css/fonts/icomoon.svg b/skins/yilia/css/fonts/icomoon.svg similarity index 100% rename from yilia/css/fonts/icomoon.svg rename to skins/yilia/css/fonts/icomoon.svg diff --git a/yilia/css/fonts/icomoon.ttf b/skins/yilia/css/fonts/icomoon.ttf similarity index 100% rename from yilia/css/fonts/icomoon.ttf rename to skins/yilia/css/fonts/icomoon.ttf diff --git a/yilia/css/fonts/icomoon.woff b/skins/yilia/css/fonts/icomoon.woff similarity index 100% rename from yilia/css/fonts/icomoon.woff rename to skins/yilia/css/fonts/icomoon.woff diff --git a/yilia/css/fonts/selection.json b/skins/yilia/css/fonts/selection.json similarity index 100% rename from yilia/css/fonts/selection.json rename to skins/yilia/css/fonts/selection.json diff --git a/yilia/css/yilia.css b/skins/yilia/css/yilia.css similarity index 100% rename from yilia/css/yilia.css rename to skins/yilia/css/yilia.css diff --git a/yilia/css/yilia.min.css b/skins/yilia/css/yilia.min.css similarity index 100% rename from yilia/css/yilia.min.css rename to skins/yilia/css/yilia.min.css diff --git a/yilia/dynamic.ftl b/skins/yilia/dynamic.ftl similarity index 100% rename from yilia/dynamic.ftl rename to skins/yilia/dynamic.ftl diff --git a/yilia/footer.ftl b/skins/yilia/footer.ftl similarity index 100% rename from yilia/footer.ftl rename to skins/yilia/footer.ftl diff --git a/yilia/index.ftl b/skins/yilia/index.ftl similarity index 100% rename from yilia/index.ftl rename to skins/yilia/index.ftl diff --git a/yilia/js/yilia.js b/skins/yilia/js/yilia.js similarity index 100% rename from yilia/js/yilia.js rename to skins/yilia/js/yilia.js diff --git a/yilia/js/yilia.min.js b/skins/yilia/js/yilia.min.js similarity index 100% rename from yilia/js/yilia.min.js rename to skins/yilia/js/yilia.min.js diff --git a/yilia/lang/lang_en_US.properties b/skins/yilia/lang/lang_en_US.properties similarity index 100% rename from yilia/lang/lang_en_US.properties rename to skins/yilia/lang/lang_en_US.properties diff --git a/yilia/lang/lang_zh_CN.properties b/skins/yilia/lang/lang_zh_CN.properties similarity index 100% rename from yilia/lang/lang_zh_CN.properties rename to skins/yilia/lang/lang_zh_CN.properties diff --git a/yilia/links.ftl b/skins/yilia/links.ftl similarity index 100% rename from yilia/links.ftl rename to skins/yilia/links.ftl diff --git a/yilia/macro-comments.ftl b/skins/yilia/macro-comments.ftl similarity index 100% rename from yilia/macro-comments.ftl rename to skins/yilia/macro-comments.ftl diff --git a/yilia/macro-head.ftl b/skins/yilia/macro-head.ftl similarity index 100% rename from yilia/macro-head.ftl rename to skins/yilia/macro-head.ftl diff --git a/yilia/page.ftl b/skins/yilia/page.ftl similarity index 100% rename from yilia/page.ftl rename to skins/yilia/page.ftl diff --git a/yilia/preview.png b/skins/yilia/preview.png similarity index 100% rename from yilia/preview.png rename to skins/yilia/preview.png diff --git a/yilia/side.ftl b/skins/yilia/side.ftl similarity index 100% rename from yilia/side.ftl rename to skins/yilia/side.ftl diff --git a/yilia/skin.properties b/skins/yilia/skin.properties similarity index 100% rename from yilia/skin.properties rename to skins/yilia/skin.properties diff --git a/yilia/tag-articles.ftl b/skins/yilia/tag-articles.ftl similarity index 100% rename from yilia/tag-articles.ftl rename to skins/yilia/tag-articles.ftl diff --git a/yilia/tags.ftl b/skins/yilia/tags.ftl similarity index 100% rename from yilia/tags.ftl rename to skins/yilia/tags.ftl