diff --git a/.bowerrc b/.bowerrc index 8013f263d..b3cfe47b3 100644 --- a/.bowerrc +++ b/.bowerrc @@ -1,3 +1,3 @@ { - "directory": "source/lib" -} + "directory": "source/vendors" +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 616a00747..ceb255b00 100644 --- a/.gitignore +++ b/.gitignore @@ -5,11 +5,11 @@ node_modules/ # Ignore unused verdors' files -source/lib/fancybox/* -!source/lib/fancybox/source/ +source/vendors/fancybox/* +!source/vendors/fancybox/source/ -source/lib/font-awesome/less/ -source/lib/font-awesome/scss/ +source/vendors/font-awesome/less/ +source/vendors/font-awesome/scss/ -source/lib/ua-parser-js/* -!source/lib/ua-parser-js/dist/ +source/vendors/ua-parser-js/* +!source/vendors/ua-parser-js/dist/ diff --git a/.javascript_ignore b/.javascript_ignore index 14501d2bb..3bfd8f0ec 100644 --- a/.javascript_ignore +++ b/.javascript_ignore @@ -1,4 +1,3 @@ source/vendors/* -source/lib/* source/js/src/affix.js source/js/src/scrollspy.js diff --git a/README.md b/README.md index a2b004fbb..3f5f23dce 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,45 @@ +# NexTD from [NexT](https://github.com/iissnan/hexo-theme-next/) + +花了一两天时间改造了大大的 Hexo 主题，添加了页面封面与博文封面的设置，更大气一些哈 +由于第一次使用 Swig 与 Stylus，一边改造一边学习，可惜改动蛮多的，已与原版不兼容_(:зゝ∠)_ +做了响应式处理，基本没什么大问题嘞~ + +**页面封面设置**（效果预览 > [熊D博客](https://blog.beard.ink/)）： +``` +# /themes/nextd/_config.yml +# Page covers for follow pages, whom height is greater than 400px. +# Home cover is required, which is default cover for other pages. +cover: + home: /images/home_bg.jpg + tag: /images/tag_bg.jpg + archive: /images/archive_bg.jpg + category: /images/category_bg.jpg + # post: + # about: + # pages: +``` +效果： +![页面封面效果](https://github.com/HiDino9/hexo-theme-nextd/blob/master/test/nextd_home_preview.jpg?raw=true) + +**博文封面设置**（效果预览 > [从零开始：现在开始用ES6写代码 | 熊D博客](https://blog.beard.ink/JavaScript/从零开始：现在开始用ES6写代码/)）： +``` +--- +title: 从零开始：现在开始用ES6写代码 +date: 2016-09-30 18:46:45 +categories: JavaScript +tags: [JS,JavaScript,ES6,ECMAScript6,ES2015,Babel,Gulp,NodeJs] +cover: banner-write-in-es6.jpg +--- +``` +> 博文封面效果借鉴了[ Hux ](https://github.com/huxpro)大大博客的效果，谢谢~ + +效果： +![博文封面效果](https://github.com/HiDino9/hexo-theme-nextd/blob/master/test/nextd_post_preview.jpg?raw=true) + +**如果文章无法查到封面路径，请尝试安装 `hexo-asset-image` 插件** + +*** + # NexT > 精于心，简于形 diff --git a/_config.yml b/_config.yml index dd125120f..edd66b5c7 100755 --- a/_config.yml +++ b/_config.yml @@ -5,30 +5,36 @@ # Put your favicon.ico into `hexo-site/source/` directory. favicon: /favicon.ico +# Page covers for follow pages, whom height is greater than 400px. +# Home cover is required, which is default cover for other pages. +cover: + home: /images/home_bg.jpg + tag: /images/tag_bg.jpg + archive: /images/archive_bg.jpg + category: /images/category_bg.jpg + # post: + # about: + # pages: + +# Post footer will be added to the end of each post body. +post_footer: "所有文章非特别说明皆为原创。技术更迭迅猛，部分内容可能会作修改，为保证信息与源同步，转载时请务必注明文章出处！谢谢合作 :-)" + # Set default keywords (Use a comma to separate) -keywords: "Hexo, NexT" +keywords: "Hexo, NexTD" # Set rss to false to disable feed link. # Leave rss as empty to use site's feed link. # Set rss to specific value if you have burned your feed already. -rss: +rss: /rss2.xml # Specify the date when the site was setup -#since: 2015 - -# icon between year and author @Footer -authoricon: heart - -# Footer `powered-by` and `theme-info` copyright -copyright: true +since: 2015 # Canonical, set a canonical link tag in your hexo, you could use it for your SEO of blog. # See: https://support.google.com/webmasters/answer/139066 # Tips: Before you open this tag, remeber set up your URL in hexo _config.yml ( ex. url: http://yourdomain.com ) canonical: true -# Change headers hierarchy on site-subtitle (will be main site description) and on all post/pages titles for better SEO-optimization. -seo: false # --------------------------------------------------------------- # Menu Settings @@ -36,12 +42,11 @@ seo: false # When running the site in a subdirectory (e.g. domain.tld/blog), remove the leading slash (/archives -> archives) menu: - home: / - #categories: /categories - #about: /about + # home: / + categories: /categories archives: /archives tags: /tags - #sitemap: /sitemap.xml + about: /about #commonweal: /404.html @@ -56,10 +61,8 @@ menu_icons: home: home about: user categories: th - schedule: calendar tags: tags archives: archive - sitemap: sitemap commonweal: heartbeat @@ -69,10 +72,8 @@ menu_icons: # Scheme Settings # --------------------------------------------------------------- -# Schemes -scheme: Muse -#scheme: Mist -#scheme: Pisces +# NexTD is based on NexT.Pisces +scheme: Pisces # --------------------------------------------------------------- @@ -84,10 +85,10 @@ scheme: Muse # - Introduce in 5.0.1 # --------------------------------------------------------------- font: - enable: true + enable: false # Uri of fonts host. E.g. //fonts.googleapis.com (Default) - host: + host: //fonts.useso.com # Global font settings used on element. global: @@ -119,7 +120,6 @@ font: codes: external: true family: - size: @@ -132,9 +132,11 @@ font: # Social Links # Key is the link label showing to end users. # Value is the target link (E.g. GitHub: https://github.com/iissnan) -#social: - #LinkLabel: Link - +social: + GitHub: https://github.com/BearD01001 + Instagram: http://www.instagram.com/BearD01001 + 微博: http://weibo.com/lookime + 知乎: http://www.zhihu.com/people/HiDino9 # Social Links Icons # Icon Mapping: @@ -146,14 +148,16 @@ social_icons: # Icon Mappings. # KeyMapsToSocalItemKey: NameOfTheIconFromFontAwesome GitHub: github + Instagram: instagram Twitter: twitter - Weibo: weibo + 微博: weibo + 知乎: globe # Sidebar Avatar # in theme directory(source/images): /images/avatar.jpg # in site directory(source/uploads): /uploads/avatar.jpg -#avatar: +avatar: /images/avatar.png # Table Of Contents in the Sidebar @@ -167,14 +171,13 @@ toc: # Creative Commons 4.0 International License. # http://creativecommons.org/ # Available: by | by-nc | by-nc-nd | by-nc-sa | by-nd | by-sa | zero -#creative_commons: by-nc-sa -#creative_commons: +creative_commons: by-nc-sa sidebar: # Sidebar Position, available value: left | right - position: left - #position: right + # position: left + position: right # Sidebar Display, available value: # - post expand on posts automatically. Default. @@ -196,14 +199,29 @@ sidebar: # --------------------------------------------------------------- -# Post Settings +# Misc Theme Settings # --------------------------------------------------------------- +# Custom Logo. +# !!Only available for Default Scheme currently. +# Options: +# enabled: [true/false] - Replace with specific image +# image: url-of-image - Images's url +custom_logo: + enabled: false + image: + + +# Code Highlight theme +# Available value: +# normal | night | night eighties | night blue | night bright +# https://github.com/chriskempson/tomorrow-theme +highlight_theme: night bright + + # Automatically scroll page to section which is under mark. -scroll_to_more: true +scroll_to_more: false -# Automatically excerpt description in homepage as preamble text. -excerpt_description: true # Automatically Excerpt. Not recommand. # Please use in the post to control excerpt accurately. @@ -211,13 +229,6 @@ auto_excerpt: enable: false length: 150 -# Post meta display settings -post_meta: - item_text: true - created_at: true - updated_at: false - categories: true - # Wechat Subscriber #wechat_subscriber: @@ -227,26 +238,6 @@ post_meta: -# --------------------------------------------------------------- -# Misc Theme Settings -# --------------------------------------------------------------- - -# Custom Logo. -# !!Only available for Default Scheme currently. -# Options: -# enabled: [true/false] - Replace with specific image -# image: url-of-image - Images's url -custom_logo: - enabled: false - image: - - -# Code Highlight theme -# Available value: -# normal | night | night eighties | night blue | night bright -# https://github.com/chriskempson/tomorrow-theme -highlight_theme: normal - # --------------------------------------------------------------- # Third Party Services Settings @@ -255,7 +246,6 @@ highlight_theme: normal # MathJax Support mathjax: enable: false - per_page: false cdn: //cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML @@ -277,20 +267,21 @@ mathjax: # Gentie productKey #gentie_productKey: -# Support for youyan comments system. -# You can get your uid from http://www.uyan.cc -#youyan_uid: your uid +# gitment comments system. https://github.com/imsun/gitment +gitment: + owner: BearD01001 + repo: beard01001.github.io + client_id: 7e6796bf4bd74a25333f + client_secret: d190223868b2175fbce4094e6485195cef7d3e8a # Baidu Share # Available value: # button | slide -# Warning: Baidu Share does not support https. #baidushare: ## type: button # Share -#jiathis: -# Warning: JiaThis does not support https. +jiathis: true #add_this_id: # Share @@ -305,20 +296,17 @@ mathjax: #google_analytics: # CNZZ count -#cnzz_siteid: +cnzz_siteid: 1261020784 -# Application Insights -# See https://azure.microsoft.com/en-us/services/application-insights/ -# application_insights: # Make duoshuo show UA # user_id must NOT be null when admin_enable is true! # you can visit http://dev.duoshuo.com get duoshuo user id. -duoshuo_info: - ua_enable: true - admin_enable: false - user_id: 0 - #admin_nickname: Author +# duoshuo_info: +# ua_enable: true +# admin_enable: true +# user_id: 7566230 +# admin_nickname: Author # Facebook SDK Support. @@ -335,9 +323,7 @@ facebook_sdk: # If facebook_sdk.enable is false, Facebook comments plugin is unavailable. facebook_comments_plugin: enable: false - num_of_posts: 10 # min posts num is 1 - width: 100% # default width is 550px - scheme: light # default scheme is light (light or dark) + num_of_posts: 10 # Show number of visitors to each article. @@ -365,40 +351,11 @@ busuanzi_count: page_pv_header: page_pv_footer: - # Tencent analytics ID # tencent_analytics: - # Enable baidu push so that the blog will push the url to baidu automatically which is very helpful for SEO -baidu_push: false - -# Google Calendar -# Share your recent schedule to others via calendar page -# -# API Documentation: -# https://developers.google.com/google-apps/calendar/v3/reference/events/list -calendar: - enable: false - calendar_id: - api_key: - orderBy: startTime - offsetMax: 24 - offsetMin: 4 - timeZone: - showDeleted: false - singleEvents: true - maxResults: 250 - -# Algolia Search -algolia_search: - enable: false - hits: - per_page: 10 - labels: - input_placeholder: Search for Posts - hits_empty: "We didn't find any results for the search: ${query}" - hits_stats: "${hits} results found in ${time} ms" +baidu_push: true @@ -421,7 +378,6 @@ canvas_nest: false # For example # jquery: https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js # Be aware that you should use the same version as internal ones to avoid potential problems. -# Please use the https protocol of CDN files when you enable https on your site. vendors: # Internal path prefix. Please do not edit it. _internal: lib @@ -430,32 +386,32 @@ vendors: jquery: # Internal version: 2.1.5 - # See: http://fancyapps.com/fancybox/ + # http://fancyapps.com/fancybox/ fancybox: fancybox_css: # Internal version: 1.0.6 - # See: https://github.com/ftlabs/fastclick + # https://github.com/ftlabs/fastclick fastclick: # Internal version: 1.9.7 - # See: https://github.com/tuupola/jquery_lazyload + # https://github.com/tuupola/jquery_lazyload lazyload: # Internal version: 1.2.1 - # See: http://VelocityJS.org + # http://VelocityJS.org velocity: # Internal version: 1.2.1 - # See: http://VelocityJS.org + # http://VelocityJS.org velocity_ui: # Internal version: 0.7.9 - # See: https://faisalman.github.io/ua-parser-js/ + # https://faisalman.github.io/ua-parser-js/ ua_parser: - # Internal version: 4.6.2 - # See: http://fontawesome.io/ + # Internal version: 4.4.0 + # http://fontawesome.io/ fontawesome: # Internal version: 1 @@ -467,12 +423,10 @@ vendors: # https://github.com/hustcc/canvas-nest.js canvas_nest: - - # Assets css: css js: js images: images # Theme version -version: 5.1.0 +version: 5.0.1 diff --git a/bower.json b/bower.json index 98b1427a3..beb4ceab9 100644 --- a/bower.json +++ b/bower.json @@ -1,11 +1,11 @@ { "name": "isn-next", - "version": "5.1.0", + "version": "5.0.0", "homepage": "https://github.com/iissnan/hexo-theme-next", "authors": [ "iissnan " ], - "description": "Elegant theme for Hexo", + "description": "High quality and elegant theme for Hexo", "repository": "https://github.com/iissnan/hexo-theme-next", "keywords": [ "hexo", @@ -19,7 +19,7 @@ "**/.*", "node_modules", "bower_components", - "source/lib", + "source/vendors", "test", "tests", "screenshots" @@ -29,7 +29,7 @@ "velocity": "~1.2.1", "jquery": "http://code.jquery.com/jquery-2.1.3.min.js", "fastclick": "~1.0.6", - "font-awesome": "fontawesome#*", + "font-awesome": "fontawesome#~4.4.0", "jquery_lazyload": "jquery.lazyload#~1.9.7", "ua-parser-js": "~0.7.9" } diff --git a/gulpfile.coffee b/gulpfile.coffee index ec7a1ac95..7e22b2091 100644 --- a/gulpfile.coffee +++ b/gulpfile.coffee @@ -6,8 +6,7 @@ gulp.task 'lint', -> return gulp.src([ './source/js/src/utils.js', './source/js/src/motion.js', - './source/js/src/hook-duoshuo.js', - './source/js/src/algolia-search.js', + './source/js/src/hook-duoshuo.js' './source/js/src/bootstrap.js', './source/js/src/post-details.js', './source/js/src/schemes/pisces.js' diff --git a/languages/de.yml b/languages/de.yml index 87d615405..938fa3d9f 100644 --- a/languages/de.yml +++ b/languages/de.yml @@ -20,7 +20,6 @@ sidebar: post: posted: Veröffentlicht am - modified: Updated at in: in read_more: Weiterlesen untitled: Unbenannt diff --git a/languages/default.yml b/languages/default.yml index 2f7050fea..109b72cc7 100644 --- a/languages/default.yml +++ b/languages/default.yml @@ -12,22 +12,18 @@ menu: tags: Tags about: About search: Search - sitemap: Sitemap sidebar: overview: Overview toc: Table of Contents post: - created: Post created - modified: Post modified sticky: Sticky posted: Posted on in: In read_more: Read more untitled: Untitled toc_empty: This post does not have a Table of Contents - visitors: Visitors page: totally: Totally diff --git a/languages/en.yml b/languages/en.yml index deb0bf731..18854ea32 100644 --- a/languages/en.yml +++ b/languages/en.yml @@ -1,7 +1,6 @@ title: archive: Archive category: Category - schedule: Schedule tag: Tag author: Author @@ -10,26 +9,22 @@ menu: home: Home archives: Archives categories: Categories - schedule: Schedule tags: Tags about: About search: Search - sitemap: Sitemap sidebar: overview: Overview toc: Table of Contents post: - created: Post created - modified: Post modified sticky: Sticky posted: Posted on in: In read_more: Read more untitled: Untitled toc_empty: This post does not have a Table of Contents - visitors: Visitors + visitors: visitors page: totally: Totally diff --git a/languages/fr-FR.yml b/languages/fr-FR.yml index 83deae540..df029d1c0 100644 --- a/languages/fr-FR.yml +++ b/languages/fr-FR.yml @@ -20,7 +20,6 @@ sidebar: post: sticky: Sticky posted: Posté le - modified: Updated at in: In read_more: Lire la suite untitled: Non titré diff --git a/languages/id.yml b/languages/id.yml index 81b265cb8..6aac05c01 100644 --- a/languages/id.yml +++ b/languages/id.yml @@ -20,7 +20,6 @@ sidebar: post: sticky: Sticky posted: Diposting di - modified: Updated at in: Di read_more: Baca lebih untitled: Tidak ada title diff --git a/languages/ja.yml b/languages/ja.yml index 68a657b4b..a66bd6191 100644 --- a/languages/ja.yml +++ b/languages/ja.yml @@ -20,7 +20,6 @@ sidebar: post: sticky: 固定 posted: 投稿日 - modified: Updated at in: In read_more: 続きを読む untitled: 無題 diff --git a/languages/pt-BR.yml b/languages/pt-BR.yml index c0fc0c1d9..b131d6ef3 100644 --- a/languages/pt-BR.yml +++ b/languages/pt-BR.yml @@ -20,7 +20,6 @@ sidebar: post: sticky: Sticky posted: Postado em - modified: Updated at in: Em read_more: Leia mais untitled: Sem título diff --git a/languages/pt.yml b/languages/pt.yml index d48c2ba6a..b0d911688 100644 --- a/languages/pt.yml +++ b/languages/pt.yml @@ -20,7 +20,6 @@ sidebar: post: sticky: Sticky posted: Postado em - modified: Updated at in: Em read_more: Ler mais untitled: Sem título diff --git a/languages/ru.yml b/languages/ru.yml index ba9226f44..089e857fc 100644 --- a/languages/ru.yml +++ b/languages/ru.yml @@ -6,28 +6,24 @@ title: author: Author menu: - home: Главная + home: Домой archives: Архив categories: Категории tags: Тэги about: О сайте - search: Поиск - sitemap: Карта сайта + search: поиск sidebar: overview: Обзор toc: Содержание post: - created: Дата создания записи - modified: Дата обновления записи - sticky: Ссылка - posted: Размещено - in: в категории - read_more: Читать полностью + sticky: Sticky + posted: отправлено + in: в + read_more: Читать дальше untitled: Без имени - toc_empty: Эта запись без оглавления - visitors: Просмотров + toc_empty: Этот пост не имеет оглавления page: totally: Всего @@ -39,20 +35,20 @@ footer: counter: tag_cloud: - zero: Нет тэгов. - one: 1 тэг. - two: "%d тэга всего." - three: "%d тэга всего." - four: "%d тэга всего." - other: "%d тэгов всего." + zero: Нет тэгов + one: 1 тэг + two: "%d тэга всего" + three: "%d тэга всего" + four: "%d тэга всего" + other: "%d тэгов всего" categories: - zero: Нет категорий. - one: 1 категория. - two: "%d категории всего." - three: "%d категории всего." - four: "%d категории всего." - other: "%d категорий всего." + zero: Нет категорий + one: 1 категория + two: "%d категории всего" + three: "%d категории всего" + four: "%d категории всего" + other: "%d категорий всего" archive_posts: zero: Нет записей. @@ -63,10 +59,10 @@ counter: other: "%d записей всего." state: - posts: Архив - pages: Страницы - tags: Тэги - categories: Категории + posts: записи + pages: страницы + tags: тэги + categories: категории cheers: um: Эм.. diff --git a/languages/zh-Hans.yml b/languages/zh-Hans.yml index f900734a8..772827ed0 100644 --- a/languages/zh-Hans.yml +++ b/languages/zh-Hans.yml @@ -1,17 +1,15 @@ title: - archive: 归档 + archive: 博文归档 category: 分类 - schedule: 日程 - tag: 标签 + tag: 标签云 author: 博主 menu: home: 首页 - archives: 归档 + archives: 博文归档 categories: 分类 - schedule: 日程 - tags: 标签 + tags: 标签云 about: 关于 search: 搜索 commonweal: 公益404 @@ -24,7 +22,6 @@ sidebar: post: sticky: 置顶 posted: 发表于 - modified: 更新于 in: 分类于 visitors: 阅读次数 read_more: 阅读全文 @@ -33,7 +30,7 @@ post: page: totally: 共有 - tags: 标签 + tags: 标签云 footer: powered: "由 %s 强力驱动" @@ -42,9 +39,9 @@ footer: counter: tag_cloud: - zero: 暂无标签 - one: 目前共计 1 个标签 - other: "目前共计 %d 个标签" + zero: 暂无标签云 + one: 目前共计 1 个标签云 + other: "目前共计 %d 个标签云" categories: zero: 暂无分类 @@ -59,7 +56,7 @@ counter: state: posts: 日志 pages: 页面 - tags: 标签 + tags: 标签云 categories: 分类 cheers: diff --git a/languages/zh-hk.yml b/languages/zh-hk.yml index 5f79feda1..2133108c9 100644 --- a/languages/zh-hk.yml +++ b/languages/zh-hk.yml @@ -21,7 +21,6 @@ sidebar: post: sticky: 置頂 posted: 發表於 - modified: 更新於 in: 分類於 visitors: 閱讀次數 read_more: 閱讀全文 diff --git a/languages/zh-tw.yml b/languages/zh-tw.yml index 5fda08430..0cd53d36a 100644 --- a/languages/zh-tw.yml +++ b/languages/zh-tw.yml @@ -21,7 +21,6 @@ sidebar: post: sticky: 置頂 posted: 發表於 - modified: 更新於 in: 分類於 visitors: 閱讀次數 read_more: 閱讀全文 diff --git a/layout/_layout.swig b/layout/_layout.swig index f3bfc3bfb..c908e2639 100644 --- a/layout/_layout.swig +++ b/layout/_layout.swig @@ -5,13 +5,13 @@ {% set html_class = html_class + ' use-motion' %} {% endif %} - + {% include '_partials/head.swig' %} {% block title %}{% endblock %} - + {% include '_scripts/third-party/analytics.swig' %} @@ -22,10 +22,7 @@
- - + {% block header %}{% endblock %}
@@ -71,7 +68,6 @@ {% include '_scripts/third-party/mathjax.swig' %} {% include '_scripts/third-party/lean-analytics.swig' %} {% include '_scripts/baidu-push.swig' %} - {% include '_components/algolia-search/assets.swig' %} diff --git a/layout/_macro/post-collapse.swig b/layout/_macro/post-collapse.swig index f6d2c3ce9..2bdb60336 100644 --- a/layout/_macro/post-collapse.swig +++ b/layout/_macro/post-collapse.swig @@ -3,7 +3,7 @@
- <{% if theme.seo %}h2{% else %}h1{% endif %} class="post-title"> +

{% if post.link %}{# Link posts #} {% endif %} - +

+{% endmacro %} diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig index e37c89ee6..eb406d302 100644 --- a/layout/_macro/post.swig +++ b/layout/_macro/post.swig @@ -1,6 +1,7 @@ {% macro render(post, is_index, post_extra_class) %} {% set headlessPost = Array.prototype.indexOf.call(['quote', 'picture'], post.type) > -1 %} + {% set navlessPost = headlessPost %} {% set post_class = 'post post-type-' + post.type | default('normal') %} {% set post_class = post_class + ' ' + post_extra_class | default('') %} @@ -9,27 +10,13 @@ {% endif %}
- - - - - - - - {{ config.title }} - - {% if not headlessPost %}
{# Not to show title for quote posts that do not have a title #} {% if not (is_index and post.type === 'quote' and not post.title) %} - <{% if theme.seo %}h2{% else %}h1{% endif %} class="post-title" itemprop="name headline"> +

{# Link posts #} {% if post.link %} {% if post.sticky > 0 %} @@ -56,53 +43,29 @@ {{ post.title }} {% endif %} {% endif %} - +

{% endif %}
- {% if theme.post_meta.created_at %} - - - - {% if theme.post_meta.item_text %} - {{ __('post.posted') }} - {% endif %} - - {% endif %} - - {% if theme.post_meta.created_at and theme.post_meta.updated_at %} - | - {% endif %} - - {% if theme.post_meta.updated_at %} - - - - {% if theme.post_meta.item_text %} - {{ __('post.modified') }} - {% endif %} - - {% endif %} + + + + {{ __('post.posted') }} + - {% if post.categories and post.categories.length and theme.post_meta.categories %} + {% if post.categories and post.categories.length %} - {% if theme.post_meta.created_at or theme.post_meta.updated_at %} - | - {% endif %} +   |   - {% if theme.post_meta.item_text %} - {{ __('post.in') }} - {% endif %} + {{ __('post.in') }} {% for cat in post.categories %} - + @@ -112,98 +75,52 @@ {% if cat_length > 1 and loop.index !== cat_length %} {{ __('symbol.comma') }} {% endif %} + {% endfor %} {% endif %} - {% if post.comments %} + - - | - - - - - - - - - {% elseif is_post() and theme.gentie_productKey %} - - | - - - - - + {% endif %} - {% endif %} + {% endif %} --> {% if not is_index and theme.facebook_sdk.enable and theme.facebook_sdk.like_button %} - | +   |  
{% endif %} {# LeanCould PageView #} {% if theme.leancloud_visitors.enable %} - | +   |   - {% if theme.post_meta.item_text %} - {{__('post.visitors')}} - {% endif %} - - + {{__('post.visitors')}} + + {% endif %} {% if not is_index and theme.busuanzi_count.enable and theme.busuanzi_count.page_pv %} - | - {{ theme.busuanzi_count.page_pv_header }} - {{ theme.busuanzi_count.page_pv_footer }} - - {% endif %} - - {% if post.description and (not theme.excerpt_description or not is_index) %} -
- {{ post.description }} -
+   |   + {{ theme.busuanzi_count.page_pv_header }} + {{ theme.busuanzi_count.page_pv_footer }} + {% endif %} -
{% endif %} @@ -231,35 +148,37 @@ {% endif %} {% if is_index %} - {% if post.description and theme.excerpt_description %} + {% if post.cover %} + + {{ post.excerpt }} +
+ + {{ __('post.read_more') }} » + +
+ {% elif post.description %} {{ post.description }} - -
+
{{ __('post.read_more') }} »
- - {% elif post.excerpt %} + {% elif post.excerpt %} {{ post.excerpt }} - -
+
{{ __('post.read_more') }} »
- {% elif theme.auto_excerpt.enable %} {% set content = post.content | striptags %} {{ content.substring(0, theme.auto_excerpt.length) }} {% if content.length > theme.auto_excerpt.length %}...{% endif %} - -
+
{{ __('post.read_more') }} »
- {% else %} {% if post.type === 'picture' %} {{ post.content }} @@ -269,6 +188,7 @@ {% endif %} {% else %} {{ post.content }} + {{ theme.post_footer }} {% endif %}
@@ -284,17 +204,16 @@ {% endif %}
-