From 3565007442bac32ed0a0cefcc77e6a6328ba7910 Mon Sep 17 00:00:00 2001 From: Emma Humphries Date: Tue, 6 Oct 2015 16:23:29 -0700 Subject: [PATCH 1/6] Add explicit English localization --- languages/en.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 languages/en.yml diff --git a/languages/en.yml b/languages/en.yml new file mode 100644 index 0000000..f8c87cd --- /dev/null +++ b/languages/en.yml @@ -0,0 +1,12 @@ +categories: Categories +search: Search +tags: Tags +tagcloud: Tag Cloud +tweets: Tweets +prev: Prev +next: Next +comment: Comments +archive_a: Archives +archive_b: "Archives: %s" +page: Page %d +recent_posts: Recent Posts \ No newline at end of file From 2f5daf884fbaf15ef5a6b96031f34ef1ff0156c1 Mon Sep 17 00:00:00 2001 From: Emma Humphries Date: Tue, 6 Oct 2015 16:30:08 -0700 Subject: [PATCH 2/6] Change the article partial so that it does not display a comment box if comments are turned off or not enabled. --- _config.yml | 6 +++--- layout/_partial/article.ejs | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/_config.yml b/_config.yml index 1c8e9cd..049b0aa 100644 --- a/_config.yml +++ b/_config.yml @@ -27,10 +27,10 @@ fancybox: true google_analytics: rss: -comment_provider: facebook # Facebook comment +#comment_provider: facebook facebook: - appid: 123456789012345 + appid: 1627819517467507 comment_count: 5 comment_width: 840 - comment_colorscheme: light \ No newline at end of file + comment_colorscheme: light diff --git a/layout/_partial/article.ejs b/layout/_partial/article.ejs index cd7c84a..07bc786 100644 --- a/layout/_partial/article.ejs +++ b/layout/_partial/article.ejs @@ -24,7 +24,7 @@ <%= theme.excerpt_link %> <% } %> - <% if (item.comment && config.disqus_shortname){ %> + <% if (item.comments && config.disqus_shortname){ %>
Comments
@@ -39,4 +39,6 @@ +<% if (item.comments && (config.disqus_shortname || theme.comment_provider == "facebook")){ %> <%- partial('comment') %> +<% } %> From d96cd53adbe2798c6be5c8969b559f287bcf8af3 Mon Sep 17 00:00:00 2001 From: Emma Humphries Date: Tue, 6 Oct 2015 16:31:13 -0700 Subject: [PATCH 3/6] Ignore vim .swp files --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 496ee2c..bf9dfdc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.DS_Store \ No newline at end of file +*.swp +.DS_Store From 9b90bdb38387cf1a0971df58437806625c47a29b Mon Sep 17 00:00:00 2001 From: Emma Humphries Date: Tue, 6 Oct 2015 17:27:44 -0700 Subject: [PATCH 4/6] add annotations to configuration --- _config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_config.yml b/_config.yml index 049b0aa..360f873 100644 --- a/_config.yml +++ b/_config.yml @@ -27,10 +27,10 @@ fancybox: true google_analytics: rss: -# Facebook comment -#comment_provider: facebook +# Uncomment the line below to enable facebook commenting +# comment_provider: facebook facebook: - appid: 1627819517467507 + appid: #012345012345 override with your AppId comment_count: 5 comment_width: 840 comment_colorscheme: light From 63a3665252d408a9394049bd3ea18d84ca9c62f9 Mon Sep 17 00:00:00 2001 From: Emma Humphries Date: Tue, 6 Oct 2015 17:38:26 -0700 Subject: [PATCH 5/6] update documentation --- README.md | 26 +++++++++++++++++++------- _config.yml | 4 ++-- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index e26c33a..9090d37 100644 --- a/README.md +++ b/README.md @@ -53,6 +53,13 @@ fancybox: true google_analytics: rss: + +comment_provider: facebook +facebook: + appid: 012345012345 + comment_count: 5 + comment_width: 840 + comment_colorscheme: light ``` - **menu** - Main navigation menu @@ -72,12 +79,17 @@ rss: - **fancybox** - Enable [Fancybox] - **google_analytics** - Google Analytics ID - **rss** - RSS subscription link (change if using Feedburner) - +- **comment_provider** - "facebook" (to enable Facebook comments) + - **appid** - Facebook AppId (from developer tools) + - **comment_count** - Number of commends to show + - **comment_width** - Width of comment box in pixels + - **comment_colorscheme** - Color scheme + ## Features ### Gallery Post -![](http://i.minus.com/ibp6Hbytwgof9y.jpg) +![](http://i4.minus.com/ibp6Hbytwgof9y.jpg) ``` --- @@ -91,7 +103,7 @@ photos: ### Link Post -![](http://i.minus.com/i7hBbGqh14EWo.png) +![](http://i3.minus.com/i7hBbGqh14EWo.png) ``` --- @@ -103,12 +115,12 @@ link: http://www.google.com/ ### Tweet Widget -![](http://i.minus.com/iMC8EyF9y0Y3y.PNG) +![](http://i1.minus.com/iMC8EyF9y0Y3y.PNG) ### Fancybox -![](http://i.minus.com/iHv7h7rZNqHvo.PNG) +![](http://i4.minus.com/iHv7h7rZNqHvo.PNG) -[Hexo]: http://zespia.tw/hexo/ +[Hexo]: http://hexo.io [AddThis]: https://www.addthis.com -[Fancybox]: http://fancyapps.com/fancybox/ \ No newline at end of file +[Fancybox]: http://fancyapps.com/fancybox/ diff --git a/_config.yml b/_config.yml index 360f873..10f9c98 100644 --- a/_config.yml +++ b/_config.yml @@ -6,6 +6,7 @@ widgets: - search - category - tag +- twitter excerpt_link: Read More @@ -27,10 +28,9 @@ fancybox: true google_analytics: rss: -# Uncomment the line below to enable facebook commenting # comment_provider: facebook facebook: - appid: #012345012345 override with your AppId + appid: 012345012345 comment_count: 5 comment_width: 840 comment_colorscheme: light From da4ef31419d8c72273c4ca56358402a0a8441fd4 Mon Sep 17 00:00:00 2001 From: Emma Humphries Date: Tue, 6 Oct 2015 17:41:32 -0700 Subject: [PATCH 6/6] removed hotlinked images not displaying in readme --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 9090d37..8a071b7 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,6 @@ facebook: ### Gallery Post -![](http://i4.minus.com/ibp6Hbytwgof9y.jpg) ``` --- @@ -103,8 +102,6 @@ photos: ### Link Post -![](http://i3.minus.com/i7hBbGqh14EWo.png) - ``` --- layout: link @@ -115,11 +112,9 @@ link: http://www.google.com/ ### Tweet Widget -![](http://i1.minus.com/iMC8EyF9y0Y3y.PNG) ### Fancybox -![](http://i4.minus.com/iHv7h7rZNqHvo.PNG) [Hexo]: http://hexo.io [AddThis]: https://www.addthis.com