pelican-subtle-giggi: update release v2
diff --git a/theme/templates/article.html b/theme/templates/article.html
index 11e32c5..d8bd049 100644
--- a/theme/templates/article.html
+++ b/theme/templates/article.html
@@ -38,6 +38,22 @@
{% if not DISPLAY_META_ABOVE_ARTICLE %}
{% include "modules/article_meta.html" %}
{% endif %}
+ {% if article.video_gallery %}
+ <div class="gallery">
+ {% for title, gallery in article.video_gallery %}
+ <h1>{{ title }}</h1>
+ {% for video, width, height, format in gallery %}
+ <video width="{{ width }}" height="{{ height }}" controls>
+ <source src="{{ SITEURL }}/{{ video }}" type="video/{{ format }}">
+ Your browser does not support the video tag.
+ </video>
+ {% endfor %}
+ {% endfor %}
+ </div>
+ {% endif %}
+ {% if not DISPLAY_META_ABOVE_ARTICLE %}
+ {% include "modules/article_meta.html" %}
+ {% endif %}
{% if DISQUS_SITENAME %}
<div id="article_comments">
diff --git a/theme/templates/base.html b/theme/templates/base.html
index b59631a..d71a6f6 100644
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -16,7 +16,7 @@
<script src="{{ THEMEURL }}/{{ ASSET_URL }}" type="text/javascript"></script>
{% endassets%}
- <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet">
+ <link href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" rel="stylesheet">
{% if FEED_ALL_ATOM %}
<link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
@@ -48,7 +48,7 @@
{# Choosing a specific link icon #}
{%- if temp.startswith('bitcoin:') %}{% set class = 'fa-btc' %}
{% elif temp.startswith('irc:') %}{% set class = 'fa-comments' %}
- {% elif temp.startswith('mailto:') %}{% set class = 'fa-envelope' %}
+ {% elif temp.startswith('mailto:') %}{% set class = 'fa fa-envelope' %}
{% elif temp.startswith('skype:') %}{% set class = 'fa-skype' -%}
{%- elif temp.endswith('.pdf') or
@@ -56,42 +56,43 @@
temp.endswith('.doc') or
temp.endswith('.docx') %}{% set class = 'fa-file-text' -%}
- {%- elif temp.startswith('500px.com') %}{% set class = 'fa-500px' %}
- {% elif temp.startswith('behance.net') %}{% set class = 'fa-behance' %}
- {% elif temp.startswith('bitbucket.org') %}{% set class = 'fa-bitbucket' %}
- {% elif temp.startswith('codepen.io') %}{% set class = 'fa-codepen' %}
- {% elif temp.startswith('delicious.com') %}{% set class = 'fa-delicious' %}
- {% elif temp.startswith('deviantart.com') %}{% set class = 'fa-deviantart' %}
- {% elif temp.startswith('facebook.com') %}{% set class = 'fa-facebook' %}
- {% elif temp.startswith('flickr.com') %}{% set class = 'fa-flickr' %}
- {% elif temp.startswith('foursquare.com') %}{% set class = 'fa-foursquare' %}
- {% elif temp.startswith('github.com') %}{% set class = 'fa-github' %}
- {% elif temp.startswith('gitlab.com') %}{% set class = 'fa-gitlab' %}
- {% elif temp.startswith('instagram.com') %}{% set class = 'fa-instagram' %}
- {% elif temp.startswith('last.fm') %}{% set class = 'fa-lastfm' %}
- {% elif temp.startswith('linkedin.com') %}{% set class = 'fa-linkedin' %}
- {% elif temp.startswith('news.ycombinator.com') %}{% set class = 'fa-hacker-news' %}
- {% elif temp.startswith('pinterest.com') %}{% set class = 'fa-pinterest' %}
- {% elif temp.startswith('plus.google.com') %}{% set class = 'fa-google-plus-official' %}
- {% elif temp.startswith('reddit.com') %}{% set class = 'fa-reddit' %}
- {% elif temp.startswith('snapchat.com') %}{% set class = 'fa-snapchat-ghost' %}
- {% elif temp.startswith('spotify.com') %}{% set class = 'fa-spotify' %}
- {% elif temp.startswith('stackoverflow.com') %}{% set class = 'fa-stack-overflow' %}
- {% elif temp.startswith('steamcommunity.com') %}{% set class = 'fa-steam' %}
- {% elif temp.startswith('soundcloud.com') %}{% set class = 'fa-soundcloud' %}
- {% elif temp.startswith('twitch.tv') %}{% set class = 'fa-twitch' %}
- {% elif temp.startswith('twitter.com') %}{% set class = 'fa-twitter' %}
- {% elif temp.startswith('vimeo.com') %}{% set class = 'fa-vimeo-square' %}
- {% elif temp.startswith('vine.co') %}{% set class = 'fa-vine' %}
- {% elif temp.startswith('youtube.com') %}{% set class = 'fa-youtube' -%}
- {% elif temp.startswith('keybase.io') %}{% set class = 'fa-key' -%}
+ {%- elif temp.startswith('500px.com') %}{% set class = 'fa fa-500px fa-lg' %}
+ {% elif temp.startswith('behance.net') %}{% set class = 'fa behance fa-lg' %}
+ {% elif temp.startswith('bitbucket.org') %}{% set class = 'fa bitbucket fa-lg' %}
+ {% elif temp.startswith('codepen.io') %}{% set class = 'fa codepen fa-lg' %}
+ {% elif temp.startswith('delicious.com') %}{% set class = 'fa delicious fa-lg' %}
+ {% elif temp.startswith('deviantart.com') %}{% set class = 'fa deviantart fa-lg' %}
+ {% elif temp.startswith('facebook.com') %}{% set class = 'fa facebook fa-lg' %}
+ {% elif temp.startswith('flickr.com') %}{% set class = 'fa flickr fa-lg' %}
+ {% elif temp.startswith('foursquare.com') %}{% set class = 'fa foursquare fa-lg' %}
+ {% elif temp.startswith('github.com') %}{% set class = 'fa github fa-lg' %}
+ {% elif temp.startswith('gitlab.com') %}{% set class = 'fa gitlab fa-lg' %}
+ {% elif temp.startswith('instagram.com') %}{% set class = 'fa instagram fa-lg' %}
+ {% elif temp.startswith('last.fm') %}{% set class = 'fa lastfm fa-lg' %}
+ {% elif temp.startswith('linkedin.com') %}{% set class = 'fa linkedin fa-lg' %}
+ {% elif temp.startswith('news.ycombinator.com') %}{% set class = 'fa hacker-news fa-lg' %}
+ {% elif temp.startswith('pinterest.com') %}{% set class = 'fa pinterest fa-lg' %}
+ {% elif temp.startswith('plus.google.com') %}{% set class = 'fa google-plus-official fa-lg' %}
+ {% elif temp.startswith('reddit.com') %}{% set class = 'fa reddit fa-lg' %}
+ {% elif temp.startswith('snapchat.com') %}{% set class = 'fa snapchat-ghost fa-lg' %}
+ {% elif temp.startswith('spotify.com') %}{% set class = 'fa spotify fa-lg' %}
+ {% elif temp.startswith('stackoverflow.com') %}{% set class = 'fa stack-overflow fa-lg' %}
+ {% elif temp.startswith('steamcommunity.com') %}{% set class = 'fa steam fa-lg' %}
+ {% elif temp.startswith('soundcloud.com') %}{% set class = 'fa soundcloud fa-lg' %}
+ {% elif temp.startswith('twitch.tv') %}{% set class = 'fa twitch fa-lg' %}
+ {% elif temp.startswith('twitter.com') %}{% set class = 'fa twitter fa-lg' %}
+ {% elif temp.startswith('vimeo.com') %}{% set class = 'fa vimeo-square fa-lg' %}
+ {% elif temp.startswith('vine.co') %}{% set class = 'fa vine fa-lg' %}
+ {% elif temp.startswith('youtube.com') %}{% set class = 'fa youtube fa-lg' -%}
+ {% elif temp.startswith('keybase.io') %}{% set class = 'fa key fa-lg' -%}
+ {% elif temp.endswith('/gitles') %}{% set class = 'fas fa-code-branch' %}
- {%- elif '.stackexchange.com' in temp %}{% set class = 'fa-stack-exchange' %}
- {% elif '.tumblr.com' in temp %}{% set class = 'fa-tumblr' %}
- {% elif 'debian.org' in temp %}{% set class = 'fa fa-linux fa-lg' %}
+ {%- elif '.stackexchange.com' in temp %}{% set class = 'fa fa-stack-exchange fa-lg' %}
+ {% elif '.tumblr.com' in temp %}{% set class = 'fa fa-tumblr fa-lg' %}
+ {% elif 'debian.org' in temp %}{% set class = 'fab fa-linux' %}
{% endif -%}
- <i class="fa {{ class }} fa-lg"></i>
+<i class="{{ class }}" style="font-size:1.5em"></i>
{%- endmacro -%}
{%- macro display_link(name, link, text) -%}
@@ -133,26 +134,25 @@
<header>
{% block header %}
<p id="header">
- <a href="{{ SITEURL }}">Home</a>
-
{% if DISPLAY_PAGES_ON_MENU %}
{% for p in pages %}
{% if p.url != "index.html" %}
- | <a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a>
+ <a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a> |
{% endif %}
{% endfor %}
{% endif %}
{% if INDEX_SAVE_AS and INDEX_SAVE_AS != "index.html" %}
- | <a href="{{ SITEURL }}/{{ INDEX_LINK_AS }}">Blog</a>
+ <a href="{{ SITEURL }}/{{ INDEX_LINK_URL }}">Blog</a> |
{% endif %}
{% if FEED_ALL_ATOM %}
- | <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}">Atom Feed</a>
+ <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}">Atom Feed</a> |
{% endif %}
{% if FEED_ALL_RSS %}
- | <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}">RSS Feed</a>
+ <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}">RSS Feed</a> |
{% endif %}
{% for title, link in MENUITEMS %}
- | <a href="{{ SITEURL }}/{{ link }}">{{ title }}</a>
+ <a href="{{ SITEURL }}/{{ link }}">{{ title }}</a>
+ {% if not loop.last %}|{% endif %}
{% endfor %}
</p>
{% endblock header %}
diff --git a/theme/templates/login.html b/theme/templates/login.html
deleted file mode 100644
index 1d5dba0..0000000
--- a/theme/templates/login.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "base.html" %}
-{% block title %}{{ page.title|striptags|escape }} | {{ SITENAME }}{% endblock %}
-
-{% block subheader %}{% endblock %}
-
-{% block content %}
-
-<article>
- <div class="article_title">
- <h1><a href="{{ SITEURL }}/{{ page.url }}" class="nohover">{{ page.title }}</a></h1>
- </div>
- <div class="article_text">
- {{ page.content }}
- </div>
- <div class="article_text">
- <?php echo form_open('login/view', 'id = loginform'); ?>
- <fieldset class="field">
- <div class="form_errors"><?php echo form_error('username'); ?></div>
- <input class="input" type="text" name="username" placeholder="Username" id="username">
- </fieldset>
-
- <fieldset class="field">
- <div class="form_errors"><?php echo form_error('password'); ?></div>
- <input class="input" type="password" name="password" placeholder="Password" id="password">
- </fieldset>
-
- <fieldset class="field">
- <input class="button submit" type="submit" value="Login">
- </fieldset>
-
- <fieldset class="field">
- <div class="form_errors"><?php echo form_error('submit_msg'); ?></div>
- <div class="submit_msg"><?php echo form_message(); ?></div>
- <input type="hidden" name="submit_msg" id="submit_msg">
- </fieldset>
- </form>
- </div>
-</article>
-{% endblock %}
-
-{% block scripts %}
-{{ super() }}
-{% endblock scripts %}