fmouhart
/
pelican-clean-blog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with master to fix conflicts

This commit is contained in:
Toti 2016-02-26 15:37:35 -03:00
parent 49c452ca9a 5e0fb122a1
commit dbd16dba88
15 changed files with 150 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
README.md
View File

@ -18,6 +18,16 @@ To define custom header cover, set the property ``HEADER_COVER`` in ``pelicancon
HEADER_COVER = 'static/my_image.png' HEADER_COVER = 'static/my_image.png'
``` ```
### Header Color
To define a simple header background color, set the property ``HEADER_COLOR`` in ``pelicanconf.py``:
```python
HEADER_COLOR = 'black'
```
you can use any valid css color.
### Social URLs ### Social URLs
Github, Twitter and Facebook URLs set these properties: Github, Twitter and Facebook URLs set these properties:
@ -32,6 +42,13 @@ SOCIAL = (('twitter', 'https://twitter.com/myprofile'),
If you have new links add them to SOCIAL. The Name has to be the name of the corresponding FontAwesome icon. If you have new links add them to SOCIAL. The Name has to be the name of the corresponding FontAwesome icon.
### External feed URL
You can specify an external feed URL (e.g. FeedBurner) in ``SOCIAL`` using the
``rss`` or ``rss-square`` icons. The icon will be shown in the footer with the
rest of your ``SOCIAL`` accounts. A ``<link>`` tag for the external feed will be
placed in ``<head>`` instead of the default Pelican feeds.
### Code highlights ### Code highlights
This theme contains this color schemes: This theme contains this color schemes:
@ -83,9 +100,16 @@ will not see the desired results.
Accept many analytics: Accept many analytics:
- Google Analytics: ``GOOGLE_ANALYTICS``; - Google Analytics: ``GOOGLE_ANALYTICS``;
- Gauges: ``GAUGES`` - Gauges: ``GAUGES``
- Piwik: ``PIWIK_URL`` and ``PIWIK_SITE_ID``. - Piwik: ``PIWIK_URL`` and ``PIWIK_SITE_ID``.
### Twitter cards
Twitter cards are automatically generated if TWITTER_HANDLE is set:
```python
TWITTER_HANDLE = "myprofile"
```
### Other configuration ### Other configuration
- If ``ADDTHIS_PUBID`` is defined sharing buttons from AddThis will appear - If ``ADDTHIS_PUBID`` is defined sharing buttons from AddThis will appear
@ -94,11 +118,15 @@ Accept many analytics:
- Set ``SHOW_FULL_ARTICLE`` to True to show full article content on index.html - Set ``SHOW_FULL_ARTICLE`` to True to show full article content on index.html
instead of summary; instead of summary;
- Set ``SHOW_SITESUBTITLE_IN_HTML`` to True to make use of the ``SITESUBTITLE`` - Set ``SHOW_SITESUBTITLE_IN_HTML`` to True to make use of the ``SITESUBTITLE``
variable inside the <title> HTML tag; variable inside the ``<title>`` HTML tag;
### Articles ### Articles
To customize header cover to articles, insert the metadata ``header_cover``: To customize header cover to articles, insert the metadata ``header_cover``.
To customize OpenGraph images, insert the metadata ``og_image``, otherwise
``header_cover``, ``HEADER_COVER`` or a default image is used. You can also
use absolute URLs for ``og_image``. Example:
- To RST - To RST
```rst ```rst
@ -113,6 +141,7 @@ My super title
:authors: Alexis Metaireau, Conan Doyle :authors: Alexis Metaireau, Conan Doyle
:summary: Short version for index and feeds :summary: Short version for index and feeds
:header_cover: /images/posts/super-title/cover.png :header_cover: /images/posts/super-title/cover.png
:og_image: /images/posts/super-title/facebook_cover.png
``` ```
- To Markdown - To Markdown
@ -126,6 +155,7 @@ Slug: my-super-post
Authors: Alexis Metaireau, Conan Doyle Authors: Alexis Metaireau, Conan Doyle
Summary: Short version for index and feeds Summary: Short version for index and feeds
Header_Cover: /images/posts/super-title/cover.png Header_Cover: /images/posts/super-title/cover.png
Og_Image: http://example.com/facebook_cover.png
This is the content of my super blog post. This is the content of my super blog post.
``` ```

5
static/css/clean-blog.css
View File

@ -387,6 +387,11 @@ form .row:first-child .floating-label-form-group {
text-shadow: none; text-shadow: none;
background: #0085a1; background: #0085a1;
} }
img {
max-width: 100%;
height: auto;
width: auto\9; /* ie8 */
}
img::selection { img::selection {
color: white; color: white;
background: transparent; background: transparent;

2
static/css/clean-blog.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
templates/archives.html
View File

@ -6,6 +6,8 @@
<!-- Page Header --> <!-- Page Header -->
{% if HEADER_COVER %} {% if HEADER_COVER %}
<header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')"> <header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')">
{% elif HEADER_COLOR %}
<header class="intro-header" style="background-color: {{ HEADER_COLOR }}">
{% else %} {% else %}
<header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')"> <header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')">
{% endif %} {% endif %}

76
templates/article.html
View File

@ -5,28 +5,86 @@
{{ super() }} {{ super() }}
{% for keyword in article.keywords %} {% for keyword in article.keywords %}
<meta name="keywords" contents="{{keyword}}" /> <meta name="keywords" content="{{keyword}}" >
{% endfor %} {% endfor %}
{% for description in article.description %} {% if description %}
<meta name="description" contents="{{description}}" /> <meta name="description" content="{{ description }}">
{% elif article.headline %}
<meta name="description" content="{{ article.headline }}">
{% elif article.summary %}
<meta name="description" content="{{ article.summary|striptags|truncate(140) }}">
{% endif %}
{% for author in article.authors %}
<meta name="author" content="{{ author }}">
{% endfor %} {% endfor %}
{% for tag in article.tags %} {% for tag in article.tags %}
<meta name="tags" contents="{{tag}}" /> <meta name="tags" content="{{tag}}">
{% endfor %} {% endfor %}
{% endblock %} {% endblock %}
{% block twitter_card %}
{% if TWITTER_HANDLE %}
{% if article.header_cover %}
<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:image" content="{{ article.header_cover }}">
{% elif HEADER_COVER %}
<meta name="twitter:card" content="summary" />
<meta name="twitter:image" content="{{ HEADER_COVER }}">
{% else %}
<meta name="twitter:card" content="summary" />
<meta name="twitter:image" content="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg">
{% endif %}
<meta name="twitter:site" content="@{{ TWITTER_HANDLE }}" />
<meta name="twitter:title" content="{{ article.title }}" />
{% if description %}
<meta name="twitter:description" content="{{ description }}" />
{% elif article.headline %}
<meta name="twitter:description" content="{{ article.headline }}" />
{% else %}
<meta name="twitter:description" content="{{ article.summary }}" />
{% endif %}
{% if article.header_cover %}
<meta name="twitter:image" content="{{ SITEURL }}/{{ article.header_cover }}">
{% elif HEADER_COVER %}
<meta name="twitter:image" content="{{ SITEURL }}/{{ HEADER_COVER }}">
{% else %}
<meta name="twitter:image" content="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg">
{% endif %}
{% endif %}
{% endblock %}
{% block opengraph %} {% block opengraph %}
{{ super() }} {{ super() }}
<meta property="og:type" content="article"> <meta property="og:type" content="article">
<meta property="article:author" content="{{ author }}"> {% for author in article.authors %}
<meta property="article:author" content="{{ author }}" >
{% endfor %}
<meta property="og:url" content="{{ SITEURL }}/{{ article.url }}"> <meta property="og:url" content="{{ SITEURL }}/{{ article.url }}">
<meta property="og:title" content="{{ article.title }}"> <meta property="og:title" content="{{ article.title }}">
<meta property="og:description" content="{{ article.headline }}">
<meta property="og:image" content="{{ SITEURL }}/{{ article.header_cover }}">
<meta property="article:published_time" content="{{ article.date }}"> <meta property="article:published_time" content="{{ article.date }}">
{% if description %}
<meta property="og:description" content="{{ description }}">
{% elif article.headline %}
<meta property="og:description" content="{{ article.headline }}">
{% elif article.summary %}
<meta property="og:description" content="{{ article.summary|striptags|truncate(140) }}">
{% endif %}
{% if article.og_image %}
{% if article.og_image|lower|truncate(4, True, '') == "http" %}
<meta property="og:image" content="{{ article.og_image }}">
{% else %}
<meta property="og:image" content="{{ SITEURL }}/{{ article.og_image }}">
{% endif %}
{% elif article.header_cover %}
<meta property="og:image" content="{{ SITEURL }}/{{ article.header_cover }}">
{% elif HEADER_COVER %}
<meta property="og:image" content="{{ SITEURL }}/{{ HEADER_COVER }}">
{% else %}
<meta property="og:image" content="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg">
{% endif %}
{% endblock %} {% endblock %}
{% block header %} {% block header %}
@ -35,6 +93,8 @@
<header class="intro-header" style="background-image: url('{{ article.header_cover }}')"> <header class="intro-header" style="background-image: url('{{ article.header_cover }}')">
{% elif HEADER_COVER %} {% elif HEADER_COVER %}
<header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')"> <header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')">
{% elif HEADER_COLOR %}
<header class="intro-header" style="background-color: {{ HEADER_COLOR }}">
{% else %} {% else %}
<header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')"> <header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
{% endif %} {% endif %}

2
templates/author.html
View File

@ -6,6 +6,8 @@
<!-- Page Header --> <!-- Page Header -->
{% if HEADER_COVER %} {% if HEADER_COVER %}
<header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')"> <header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')">
{% elif HEADER_COLOR %}
<header class="intro-header" style="background-color: {{ HEADER_COLOR }}">
{% else %} {% else %}
<header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')"> <header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')">
{% endif %} {% endif %}

2
templates/authors.html
View File

@ -6,6 +6,8 @@
<!-- Page Header --> <!-- Page Header -->
{% if HEADER_COVER %} {% if HEADER_COVER %}
<header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')"> <header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')">
{% elif HEADER_COLOR %}
<header class="intro-header" style="background-color: {{ HEADER_COLOR }}">
{% else %} {% else %}
<header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')"> <header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')">
{% endif %} {% endif %}

22
templates/base.html
View File

@ -15,6 +15,9 @@
<title>{% block title %}{{ SITENAME }}{% if SITESUBTITLE and SHOW_SITESUBTITLE_IN_HTML %} - {{ SITESUBTITLE }}{% endif %}{% endblock title %}</title> <title>{% block title %}{{ SITENAME }}{% if SITESUBTITLE and SHOW_SITESUBTITLE_IN_HTML %} - {{ SITESUBTITLE }}{% endif %}{% endblock title %}</title>
{% for name,link in SOCIAL if name in ['rss', 'rss-square'] %}
<link href="{{ link }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
{% else %}
{% if FEED_ALL_ATOM %} {% if FEED_ALL_ATOM %}
<link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" /> <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
{% endif %} {% endif %}
@ -39,7 +42,7 @@
{% if TAG_FEED_RSS and tag %} {% if TAG_FEED_RSS and tag %}
<link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" /> <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
{% endif %} {% endif %}
{% endfor %}
<!-- Bootstrap Core CSS --> <!-- Bootstrap Core CSS -->
<link href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/bootstrap.min.css" rel="stylesheet"> <link href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/bootstrap.min.css" rel="stylesheet">
@ -77,6 +80,23 @@
{% endfor %} {% endfor %}
<meta property="og:site_name" content="{{ SITENAME }}"> <meta property="og:site_name" content="{{ SITENAME }}">
{% endblock opengraph %} {% endblock opengraph %}
{% block twitter_card %}
{% if TWITTER_HANDLE %}
<meta name="twitter:card" content="summary" />
<meta name="twitter:site" content="@{{ TWITTER_HANDLE }}" />
<meta name="twitter:title" content="{{ SITENAME }}" />
{% if SITESUBTITLE %}
<meta name="twitter:description" content="{{ SITESUBTITLE }}" />
{% else %}
<meta name="twitter:description" content="View the blog." />
{% endif %}
{% if HEADER_COVER %}
<meta name="twitter:image" content="{{ SITEURL }}/{{ HEADER_COVER }}">
{% else %}
<meta name="twitter:image" content="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg">
{% endif %}
{% endif %}
{% endblock twitter_card %}
</head> </head>
<body> <body>

2
templates/categories.html
View File

@ -6,6 +6,8 @@
<!-- Page Header --> <!-- Page Header -->
{% if HEADER_COVER %} {% if HEADER_COVER %}
<header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')"> <header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')">
{% elif HEADER_COLOR %}
<header class="intro-header" style="background-color: {{ HEADER_COLOR }}">
{% else %} {% else %}
<header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')"> <header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')">
{% endif %} {% endif %}

2
templates/category.html
View File

@ -6,6 +6,8 @@
<!-- Page Header --> <!-- Page Header -->
{% if HEADER_COVER %} {% if HEADER_COVER %}
<header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')"> <header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')">
{% elif HEADER_COLOR %}
<header class="intro-header" style="background-color: {{ HEADER_COLOR }}">
{% else %} {% else %}
<header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')"> <header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')">
{% endif %} {% endif %}

4
templates/index.html
View File

@ -5,6 +5,8 @@
<!-- Set your background image for this header on the line below. --> <!-- Set your background image for this header on the line below. -->
{% if HEADER_COVER %} {% if HEADER_COVER %}
<header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')"> <header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')">
{% elif HEADER_COLOR %}
<header class="intro-header" style="background-color: {{ HEADER_COLOR }}">
{% else %} {% else %}
<header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')"> <header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')">
{% endif %} {% endif %}
@ -34,6 +36,8 @@
</a> </a>
{% if SHOW_FULL_ARTICLE %} {% if SHOW_FULL_ARTICLE %}
{{ article.content }} {{ article.content }}
{% elif article.has_summary %}
{{ article.summary }}
{% elif article.summary %} {% elif article.summary %}
{{ article.summary|truncate(140) }} {{ article.summary|truncate(140) }}
{% endif %} {% endif %}

2
templates/page.html
View File

@ -8,6 +8,8 @@
<header class="intro-header" style="background-image: url('{{ page.header_cover }}')"> <header class="intro-header" style="background-image: url('{{ page.header_cover }}')">
{% elif HEADER_COVER %} {% elif HEADER_COVER %}
<header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')"> <header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')">
{% elif HEADER_COLOR %}
<header class="intro-header" style="background-color: {{ HEADER_COLOR }}">
{% else %} {% else %}
<header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')"> <header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')">
{% endif %} {% endif %}

2
templates/period_archives.html
View File

@ -6,6 +6,8 @@
<!-- Page Header --> <!-- Page Header -->
{% if HEADER_COVER %} {% if HEADER_COVER %}
<header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')"> <header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')">
{% elif HEADER_COLOR %}
<header class="intro-header" style="background-color: {{ HEADER_COLOR }}">
{% else %} {% else %}
<header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')"> <header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')">
{% endif %} {% endif %}

2
templates/tag.html
View File

@ -3,6 +3,8 @@
{% block header %} {% block header %}
{% if HEADER_COVER %} {% if HEADER_COVER %}
<header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')"> <header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')">
{% elif HEADER_COLOR %}
<header class="intro-header" style="background-color: {{ HEADER_COLOR }}">
{% else %} {% else %}
<header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')"> <header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')">
{% endif %} {% endif %}

2
templates/tags.html
View File

@ -6,6 +6,8 @@
<!-- Page Header --> <!-- Page Header -->
{% if HEADER_COVER %} {% if HEADER_COVER %}
<header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')"> <header class="intro-header" style="background-image: url('{{ HEADER_COVER }}')">
{% elif HEADER_COLOR %}
<header class="intro-header" style="background-color: {{ HEADER_COLOR }}">
{% else %} {% else %}
<header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')"> <header class="intro-header" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/home-bg.jpg')">
{% endif %} {% endif %}