diff options
27 files changed, 115 insertions, 18 deletions
diff --git a/notebook/README.md b/notebook/README.md index 765f172..d765b9a 100644 --- a/notebook/README.md +++ b/notebook/README.md @@ -50,4 +50,10 @@ On the articles, we added these variables : <meta name="twitter:title" content="{{ article.title }}"> <meta name="twitter:description" content="{{ article.Summary }}"> -The `article.summary` variable must be set on the header of the Rest/Markdown article source file (tag : `Summary:`). If not, the first `SUMMARY_MAX_LENGTH` words from the blog post will be used as a default summary.
\ No newline at end of file +The `article.summary` variable must be set on the header of the Rest/Markdown article source file (tag : `Summary:`). If not, the first `SUMMARY_MAX_LENGTH` words from the blog post will be used as a default summary. + +## Icons + +The social icons are from Font-Awesome, and colorized by myself. + +Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome diff --git a/notebook/screenshot.png b/notebook/screenshot.png Binary files differindex 9fb973c..0e17b4a 100644 --- a/notebook/screenshot.png +++ b/notebook/screenshot.png diff --git a/notebook/screenshot_list.png b/notebook/screenshot_list.png Binary files differindex cdcfc27..f4f8afa 100644 --- a/notebook/screenshot_list.png +++ b/notebook/screenshot_list.png diff --git a/notebook/screenshot_source_code.png b/notebook/screenshot_source_code.png Binary files differindex 346e136..d55817e 100644 --- a/notebook/screenshot_source_code.png +++ b/notebook/screenshot_source_code.png diff --git a/notebook/static/css/notebook.css b/notebook/static/css/notebook.css index 828c8d5..7ae545b 100644 --- a/notebook/static/css/notebook.css +++ b/notebook/static/css/notebook.css @@ -20,7 +20,7 @@ body > article, footer { line-height: 1.6em; display: block; max-width: 600px; - margin: 40px auto; + margin: 40px auto auto 285px; padding: 20px 10px 0; } diff --git a/notebook/static/images/icons/facebook.png b/notebook/static/images/icons/facebook.png Binary files differindex a7914b4..ca08481 100644 --- a/notebook/static/images/icons/facebook.png +++ b/notebook/static/images/icons/facebook.png diff --git a/notebook/static/images/icons/facebook2.png b/notebook/static/images/icons/facebook2.png Binary files differnew file mode 100644 index 0000000..684bc66 --- /dev/null +++ b/notebook/static/images/icons/facebook2.png diff --git a/notebook/static/images/icons/github.png b/notebook/static/images/icons/github.png Binary files differindex 348db81..54899e1 100644 --- a/notebook/static/images/icons/github.png +++ b/notebook/static/images/icons/github.png diff --git a/notebook/static/images/icons/github2.png b/notebook/static/images/icons/github2.png Binary files differnew file mode 100644 index 0000000..9c53e29 --- /dev/null +++ b/notebook/static/images/icons/github2.png diff --git a/notebook/static/images/icons/gplus.png b/notebook/static/images/icons/gplus.png Binary files differnew file mode 100644 index 0000000..82097aa --- /dev/null +++ b/notebook/static/images/icons/gplus.png diff --git a/notebook/static/images/icons/gplus2.png b/notebook/static/images/icons/gplus2.png Binary files differnew file mode 100644 index 0000000..f4cf5c7 --- /dev/null +++ b/notebook/static/images/icons/gplus2.png diff --git a/notebook/static/images/icons/linkedin.png b/notebook/static/images/icons/linkedin.png Binary files differindex feb0496..70aea1c 100644 --- a/notebook/static/images/icons/linkedin.png +++ b/notebook/static/images/icons/linkedin.png diff --git a/notebook/static/images/icons/phone.png b/notebook/static/images/icons/phone.png Binary files differnew file mode 100644 index 0000000..d683017 --- /dev/null +++ b/notebook/static/images/icons/phone.png diff --git a/notebook/static/images/icons/phone2.png b/notebook/static/images/icons/phone2.png Binary files differnew file mode 100644 index 0000000..2c87889 --- /dev/null +++ b/notebook/static/images/icons/phone2.png diff --git a/notebook/static/images/icons/pinterest.png b/notebook/static/images/icons/pinterest.png Binary files differnew file mode 100644 index 0000000..c345fae --- /dev/null +++ b/notebook/static/images/icons/pinterest.png diff --git a/notebook/static/images/icons/rss.png b/notebook/static/images/icons/rss.png Binary files differindex 7d4e85d..eb648c3 100644 --- a/notebook/static/images/icons/rss.png +++ b/notebook/static/images/icons/rss.png diff --git a/notebook/static/images/icons/twitter.png b/notebook/static/images/icons/twitter.png Binary files differindex 3a2d328..94b8c22 100644 --- a/notebook/static/images/icons/twitter.png +++ b/notebook/static/images/icons/twitter.png diff --git a/notebook/static/images/icons/twitter2.png b/notebook/static/images/icons/twitter2.png Binary files differnew file mode 100644 index 0000000..6a806ff --- /dev/null +++ b/notebook/static/images/icons/twitter2.png diff --git a/notebook/templates/archives.html b/notebook/templates/archives.html index 32e78a3..352ecd9 100644 --- a/notebook/templates/archives.html +++ b/notebook/templates/archives.html @@ -1,4 +1,16 @@ {% extends "base.html" %} +{% block head %} +{{ super() }} +<meta name="twitter:creator" content="{{ TWITTER_USERNAME }}"> +<meta name="twitter:url" content="{{ SITEURL }}/archives.html"> +<meta name="twitter:title" content="{{ SITENAME }} ~ Archives"> +<meta name="twitter:description" content="{{ SITENAME }} ~ Archives du site"> + +<!-- Facebook Meta Data --> +<meta property="og:title" content="{{ SITENAME }} ~ Archives" /> +<meta property="og:description" content="{{ SITENAME }} ~ Archives" /> +<meta property="og:image" content="{{ AVATAR }}" /> +{% endblock head %} {% block content %} <h1>Archives</h1> diff --git a/notebook/templates/article.html b/notebook/templates/article.html index f3d6212..2fa83c2 100644 --- a/notebook/templates/article.html +++ b/notebook/templates/article.html @@ -1,10 +1,15 @@ {% extends "base.html" %} {% block head %} {{ super() }} -<meta name="twitter:creator" content="{{ article.author }}"> +<meta name="twitter:creator" content="{{ TWITTER_USERNAME }}"> <meta name="twitter:url" content="{{ SITEURL }}/{{ article.url }}"> -<meta name="twitter:title" content="{{ article.title }}"> +<meta name="twitter:title" content="{{ SITENAME }} ~ {{ article.title }}"> <meta name="twitter:description" content="{{ article.summary }}"> + +<!-- Facebook Meta Data --> +<meta property="og:title" content="{{ SITENAME }} ~ {{ article.title }}" /> +<meta property="og:description" content="{{ article.summary }}" /> +<meta property="og:image" content="{{ AVATAR }}" /> {% endblock head %} {% block title %}{{ article.title }}{% endblock %} {% block content %} @@ -27,11 +32,13 @@ </div> <div class="entry-social"> - <span class="twitter"><a href="https://twitter.com/home/?status={{ article.title }}%20%7C%20{{ SITEURL }}/{{article.url}}%20by%20@{{TWITTER_USERNAME}}" target="_blank">Twitter</a></span> + <span class="twitter"><a target="_blank" rel="nofollow" onclick="javascript:window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=400,width=700');return false;" title="Twitter" href="https://twitter.com/share?url={{ SITEURL }}/{{ article.url }}&text={{ article.title }}&via={{TWITTER_USERNAME}}">Twitter</a></span> + + <span class="gplus"><a target="_blank" title="Google +" href="https://plus.google.com/share?url={{ SITEURL }}/{{article.url}}&hl=fr" rel="nofollow" onclick="javascript:window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=450,width=650');return false;">Google+</a></span> - <span class="gplus"><a href="http://plus.google.com/share?url={{ SITEURL }}/{{article.url}}&hl=fr" target="_blank">Google+</a></span> + <span class="facebook"><a target="_blank" title="Facebook" rel="nofollow" onclick="javascript:window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=500,width=700');return false;" href="https://www.facebook.com/sharer.php?u={{ SITEURL }}/{{article.url}}&t={{ article.title }}">Facebook</a></span> - <span class="facebook"><a href="http://www.facebook.com/sharer.php?u={{ SITEURL }}/{{article.url}}&t={{ article.title }}" target="_blank">Facebook</a></span> + <a target="_blank" title="Linkedin" href="https://www.linkedin.com/shareArticle?mini=true&url=<{{ SITEURL }}/{{ article.url }}&title={{ article.title }}" rel="nofollow" onclick="javascript:window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=450,width=650');return false;">Linkedin</a> <span class="mail"><a href="mailto:?subject={{ article.title }}&body=Viens découvrir un article à propos de [{{ article.title }}] sur le site de {{ AUTHOR }}. {{ SITEURL }}/{{article.url}}" title="Share by Email" target="_blank">Mail</a></span> </div> @@ -50,7 +57,7 @@ dsq.type = 'text/javascript'; dsq.async = true; dsq.src = 'http://{{ DISQUS_SITENAME }}.disqus.com/embed.js'; (document.getElementsByTagName('head')[0] || - document.getElementsByTagName('body')[0]).appendChild(dsq); + document.getElementsByTagName('body')[0]).appendChild(dsq); })(); </script> </div> diff --git a/notebook/templates/author.html b/notebook/templates/author.html index 8c18a4c..624ac82 100644 --- a/notebook/templates/author.html +++ b/notebook/templates/author.html @@ -1,2 +1,14 @@ {% extends "index.html" %} +{% block head %} +{{ super() }} +<meta name="twitter:creator" content="{{ TWITTER_USERNAME }}"> +<meta name="twitter:url" content="{{ SITEURL }}/{{ author.url }}"> +<meta name="twitter:title" content="{{ SITENAME }} ~ {{ author }}"> +<meta name="twitter:description" content="Articles de {{ author }}"> + +<!-- Facebook Meta Data --> +<meta property="og:title" content="{{ SITENAME }} ~ {{ author }}" /> +<meta property="og:description" content="Articles de {{ author }}" /> +<meta property="og:image" content="{{ AVATAR }}" /> +{% endblock head %} {% block title %}{{ SITENAME }} - {{ author }}{% endblock %}
\ No newline at end of file diff --git a/notebook/templates/base.html b/notebook/templates/base.html index 6e9c24d..5483e93 100644 --- a/notebook/templates/base.html +++ b/notebook/templates/base.html @@ -3,20 +3,24 @@ <head> {% block head %} <meta charset="utf-8"> + <!-- Site Meta Data --> <title>{% block title %}{{ SITENAME }}{% endblock %}</title> <meta name="description" content=""> <meta name="author" content="{{ AUTHOR }}"> + <!-- Style Meta Data --> <link rel="stylesheet" href="{{ SITEURL }}/theme/css/notebook.css" type="text/css" /> <link rel="shortcut icon" href="{{ SITEURL }}/{{ AVATAR}}"> + <!-- Feed Meta Data --> <link href="{{ SITEURL }}/{{ FEED }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" /> {% if FEED_RSS %} <link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" /> {% endif %} + <!-- Twitter Feed --> <meta name="twitter:card" content="summary"> - <meta name="twitter:site" content="{{ SITENAME }}"> + <meta name="twitter:site" content="{{ TWITTER_USERNAME }}"> <meta name="twitter:image" content="{{ SITEURL }}/{{ AVATAR }}"> {% endblock %} </head> @@ -70,9 +74,9 @@ <address id="about" class="vcard body"> {% if FIREFOX_BANNERS %} <div align="center"> - {% for id, img, alt in FIREFOX_BANNERS %} - <a href="http://affiliates.mozilla.org/link/banner/{{ id }}" target="_blank"><img src="{{ img }}" alt="{{ alt }}"/></a> - {% endfor %} + {% for id, img, alt in FIREFOX_BANNERS %} + <a href="http://affiliates.mozilla.org/link/banner/{{ id }}" target="_blank"><img src="{{ img }}" alt="{{ alt }}"/></a> + {% endfor %} </div> {% endif %} Blog powered by <a href="http://getpelican.com/">Pelican</a>, diff --git a/notebook/templates/categories.html b/notebook/templates/categories.html index 8ea08c4..e24fd40 100644 --- a/notebook/templates/categories.html +++ b/notebook/templates/categories.html @@ -1,4 +1,16 @@ {% extends "base.html" %} +{% block head %} +{{ super() }} +<meta name="twitter:creator" content="{{ TWITTER_USERNAME }}"> +<meta name="twitter:url" content="{{ SITEURL }}/categories.html"> +<meta name="twitter:title" content="{{ SITENAME }} ~ Catégories"> +<meta name="twitter:description" content="{{ SITENAME }} ~ Catégories du site"> + +<!-- Facebook Meta Data --> +<meta property="og:title" content="{{ SITENAME }} ~ Catégories" /> +<meta property="og:description" content="{{ SITENAME }} ~ Catégories" /> +<meta property="og:image" content="{{ AVATAR }}" /> +{% endblock head %} {% block content %} <h2>Categories</h2> <ul class="category_folder"> diff --git a/notebook/templates/category.html b/notebook/templates/category.html index ed909a5..ccbbeab 100644 --- a/notebook/templates/category.html +++ b/notebook/templates/category.html @@ -1,2 +1,14 @@ {% extends "index.html" %} +{% block head %} +{{ super() }} +<meta name="twitter:creator" content="{{ TWITTER_USERNAME }}"> +<meta name="twitter:url" content="{{ SITEURL }}/{{ category.url }}"> +<meta name="twitter:title" content="{{ SITENAME }} ~ {{ category }}"> +<meta name="twitter:description" content="Articles de {{ category }}"> + +<!-- Facebook Meta Data --> +<meta property="og:title" content="{{ SITENAME }} ~ {{ category }}" /> +<meta property="og:description" content="Articles de {{ category }}" /> +<meta property="og:image" content="{{ AVATAR }}" /> +{% endblock head %} {% block title %}{{ SITENAME }} - {{ category }}{% endblock %}
\ No newline at end of file diff --git a/notebook/templates/index.html b/notebook/templates/index.html index 80e8897..fced918 100644 --- a/notebook/templates/index.html +++ b/notebook/templates/index.html @@ -1,4 +1,16 @@ {% extends "base.html" %} +{% block head %} +{{ super() }} +<meta name="twitter:creator" content="{{ TWITTER_USERNAME }}"> +<meta name="twitter:url" content="{{ SITEURL }}"> +<meta name="twitter:title" content="{{ SITENAME }}"> +<meta name="twitter:description" content="{{ SIDEBAR_DIGEST }}"> + +<!-- Facebook Meta Data --> +<meta property="og:title" content="{{ SITENAME }}" /> +<meta property="og:description" content="{{ SIDEBAR_DIGEST }}" /> +<meta property="og:image" content="{{ AVATAR }}" /> +{% endblock head %} {% block content_title %}{% endblock %} {% block content %} {% if articles %} diff --git a/notebook/templates/tag.html b/notebook/templates/tag.html index aadd7a5..c0b8d77 100644 --- a/notebook/templates/tag.html +++ b/notebook/templates/tag.html @@ -1,2 +1,14 @@ {% extends "index.html" %} +{% block head %} +{{ super() }} +<meta name="twitter:creator" content="{{ TWITTER_USERNAME }}"> +<meta name="twitter:url" content="{{ SITEURL }}/{{ tag.url }}"> +<meta name="twitter:title" content="{{ SITENAME }} ~ {{ tag }}"> +<meta name="twitter:description" content="Articles de {{ tag }}"> + +<!-- Facebook Meta Data --> +<meta property="og:title" content="{{ SITENAME }} ~ {{ tag }}" /> +<meta property="og:description" content="Articles de {{ tag }}" /> +<meta property="og:image" content="{{ AVATAR }}" /> +{% endblock head %} {% block title %}{{ SITENAME }} - {{ tag }}{% endblock %}
\ No newline at end of file diff --git a/notebook/templates/tags.html b/notebook/templates/tags.html index 03d3fbb..90bfc19 100644 --- a/notebook/templates/tags.html +++ b/notebook/templates/tags.html @@ -1,13 +1,21 @@ {% extends "base.html" %} +{% block head %} +{{ super() }} +<meta name="twitter:creator" content="{{ TWITTER_USERNAME }}"> +<meta name="twitter:url" content="{{ SITEURL }}/tags.html"> +<meta name="twitter:title" content="{{ SITENAME }} ~ Tags"> +<meta name="twitter:description" content="{{ SITENAME }} ~ Tags du site"> + +<!-- Facebook Meta Data --> +<meta property="og:title" content="{{ SITENAME }} ~ Tags" /> +<meta property="og:description" content="{{ SITENAME }} ~ Tags" /> +<meta property="og:image" content="{{ AVATAR }}" /> +{% endblock head %} {% block content %} <h2>Tags</h2> <ul> -{% for tag in tag_cloud %} -<li class="tag"> - <a href="{{ SITEURL }}/{{ tag.0.url }}"> - {{ tag.0 }} - </a> -</li> +{% for tag, articles in tags %} + <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</li> {% endfor %} </ul> {% endblock %} |
