Skip to content

Commit

Permalink
修复了某些机器上运行不识别模版字符串及运行后乱码的bug
Browse files Browse the repository at this point in the history
  • Loading branch information
fan-lv committed Mar 17, 2019
1 parent a9fb9f3 commit 8e7c4d7
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 22 deletions.
6 changes: 3 additions & 3 deletions layout/archive.pug
@@ -1,4 +1,4 @@
extends includes/layout
extends includes/layout.pug

block content
div#tag
Expand All @@ -18,7 +18,7 @@ block content
time.article-time(datetime=date_xml(article.date))= date(article.date)
a.article-link(href=url_for(article.path))= article.title || 'No Title'
- })
include includes/pagination
include includes/pagination.pug
// - var categoriesList = list_categories({ show_count: false })
// - var tagsList = list_tags({ show_count: false })
// - var archivesList = list_archives({ show_count: false })
Expand Down Expand Up @@ -70,6 +70,6 @@ block content
// a(href=url_for(article.path))= article.title || 'No Title'
// time(datetime=date_xml(article.date))= date(article.date)
// - })
// include includes/pagination
// include includes/pagination.pug
//div!= paginator()
4 changes: 2 additions & 2 deletions layout/category.pug
@@ -1,4 +1,4 @@
extends includes/layout
extends includes/layout.pug

block content

Expand Down Expand Up @@ -30,6 +30,6 @@ block content
// a(href=url_for(article.path))= article.title || 'No Title'
// time(datetime=date_xml(article.date))= date(article.date)
// - })
include includes/pagination
include includes/pagination.pug
//div!= paginator()
8 changes: 5 additions & 3 deletions layout/includes/footer.pug
Expand Up @@ -3,10 +3,12 @@
i.fas.fa-arrow-right
.right-content
if theme.busuanzi.enable
include ./count/busuanzi
include ./count/busuanzi.pug
- var now = new Date()
- var nowYear = now.getFullYear()
if theme.since && theme.since != nowYear
.copyright!= `©${theme.since}${nowYear} By ${config.author}`
- let copyrightSince = `©${theme.since}${nowYear} By ${config.author}`
.copyright!= copyrightSince
else
.copyright!= `©${nowYear} By ${config.author}`
- let copyright = `©${nowYear} By ${config.author}`
.copyright!= copyright
8 changes: 4 additions & 4 deletions layout/includes/layout.pug
Expand Up @@ -34,10 +34,10 @@ html(lang=config.language)
body
canvas(id="universe")
//#body
include sidebar
include sidebar.pug
#main-container
header
include header
include header.pug
#content-outer
#content-inner
if body
Expand All @@ -47,12 +47,12 @@ html(lang=config.language)
#return-top.button-hover
i.fas.fa-arrow-up(aria-hidden="true")
footer
include footer
include footer.pug
if theme.scripts !== undefined && theme.scripts.length > 0
//- scripts list from config.yml
each url in theme.scripts
//js(src=url_for(url) + '?version=' + version())
script(src=url_for(url))
//script(src=url)
include ./search/index.pug
include ./additional-js.pug
include ./additional-js.pug
6 changes: 3 additions & 3 deletions layout/index.pug
@@ -1,8 +1,8 @@
extends includes/layout
extends includes/layout.pug

block content
include includes/recent-posts
include includes/pagination
include includes/recent-posts.pug
include includes/pagination.pug



4 changes: 2 additions & 2 deletions layout/page.pug
@@ -1,4 +1,4 @@
extends includes/layout
extends includes/layout.pug

block content
article#page
Expand All @@ -19,5 +19,5 @@ block content
article.page
h1= _p('menu.' + page.title)
.about!= page.content
include includes/pagination
include includes/pagination.pug
//div!= paginator()
7 changes: 4 additions & 3 deletions layout/post.pug
@@ -1,4 +1,4 @@
extends includes/layout
extends includes/layout.pug

block content
article#post
Expand All @@ -25,13 +25,14 @@ block content
.post-copyright-author
span.post-copyright-meta= _p('post.copyright.author') + ": "
span.post-copyright-info
a(href=`mailto:${config.email}`) #[=config.author]
- let mailto = `mailto:${config.email}`
a(href=mailto) #[=config.author]
.post-copyright-type
span.post-copyright-meta= _p('post.copyright.link') + ": "
span.post-copyright-info
a(href=url_for(page.permalink)) #[=page.permalink]
.post-copyright-notice
span.post-copyright-meta= _p('post.copyright.copyright_notice') + ": "
span.post-copyright-info!= _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title)
include includes/pagination
include includes/pagination.pug
//div!= paginator()
4 changes: 2 additions & 2 deletions layout/tag.pug
@@ -1,4 +1,4 @@
extends includes/layout
extends includes/layout.pug

block content
div#tag
Expand All @@ -18,6 +18,6 @@ block content
time.article-time(datetime=date_xml(article.date))= date(article.date)
a.article-link(href=url_for(article.path))= article.title || 'No Title'
- })
include includes/pagination
include includes/pagination.pug
//div!= paginator()

0 comments on commit 8e7c4d7

Please sign in to comment.