Import template layer
diff --git a/theme/templates/article.html b/theme/templates/article.html
index 103931e..11e32c5 100644
--- a/theme/templates/article.html
+++ b/theme/templates/article.html
@@ -18,10 +18,23 @@
{% endif %}
<div class="article_title">
<h1><a href="{{ SITEURL }}/{{ article.url }}" class="nohover">{{ article.title }}</a></h1>
+ {% if DISPLAY_SUBTITLE %}
+ <h4>{{ article.subtitle }}</a></h4>
+ {% endif %}
</div>
<div class="article_text">
{{ article.content }}
</div>
+ {% if article.photo_gallery %}
+ <div class="gallery">
+ {% for title, gallery in article.photo_gallery %}
+ <h1>{{ title }}</h1>
+ {% for name, photo, thumb, exif, caption in gallery %}
+ <a href="{{ SITEURL }}/{{ photo }}" title="{{ name }}" exif="{{ exif }}" caption="{{ caption }}"><img src="{{ SITEURL }}/{{ thumb }}"></a>
+ {% endfor %}
+ {% endfor %}
+ </div>
+ {% endif %}
{% if not DISPLAY_META_ABOVE_ARTICLE %}
{% include "modules/article_meta.html" %}
{% endif %}
diff --git a/theme/templates/base.html b/theme/templates/base.html
index 3d69679..b59631a 100644
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -9,11 +9,11 @@
{% block base %}{% endblock %}
{% assets filters="pyscss,cssmin", output="css/styles.%(version)s.min.css", "css/style.scss", "css/pygments.css" %}
- <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ ASSET_URL }}">
+ <link rel="stylesheet" type="text/css" href="{{ THEMEURL }}/{{ ASSET_URL }}">
{% endassets %}
{% assets filters="slimit", output="js/scripts.%(version)s.min.js", "js/lw-timeago/lw-timeago.js", "js/scroll.js", "js/email.js" %}
- <script src="{{ SITEURL }}/{{ ASSET_URL }}" type="text/javascript"></script>
+ <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">
@@ -88,6 +88,7 @@
{%- 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' %}
{% endif -%}
<i class="fa {{ class }} fa-lg"></i>
@@ -110,17 +111,21 @@
{% endif %}
</a>
<h2><a href="{{ SITEURL }}" class="nohover">{{ SITENAME }}</a></h2>
- <p>{{ TAGLINE }}</p>
+ {{ TAGLINE }}
+ {% if SOCIAL|length > 1 %}
<div class="social">
{% for name, link in SOCIAL %}
- {{ display_link(name, link, "") }}
+ {{ display_link(name, link, "") }}
{% endfor %}
</div>
+ {% endif %}
+ {% if LINKS|length > 1 %}
<ul>
{% for name, link in LINKS %}
<li>{{ display_link(name, link, name) }}</li>
{% endfor %}
</ul>
+ {% endif %}
</div>
</aside>
@@ -138,7 +143,7 @@
{% endfor %}
{% endif %}
{% if INDEX_SAVE_AS and INDEX_SAVE_AS != "index.html" %}
- | <a href="{{ SITEURL }}/{{ INDEX_SAVE_AS }}">Blog</a>
+ | <a href="{{ SITEURL }}/{{ INDEX_LINK_AS }}">Blog</a>
{% endif %}
{% if FEED_ALL_ATOM %}
| <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}">Atom Feed</a>
@@ -146,6 +151,9 @@
{% if FEED_ALL_RSS %}
| <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}">RSS Feed</a>
{% endif %}
+ {% for title, link in MENUITEMS %}
+ | <a href="{{ SITEURL }}/{{ link }}">{{ title }}</a>
+ {% endfor %}
</p>
{% endblock header %}
{% block subheader %}{% include "modules/blogsubheader.html" %}{% endblock subheader %}
@@ -158,7 +166,7 @@
{% endblock %}
<div id="ending_message">
- <p>© {{ AUTHOR }}. Built using <a href="http://getpelican.com">Pelican</a>. Theme is <a href="https://github.com/pR0Ps/pelican-subtle">subtle</a> by <a href="http://cmetcalfe.ca">Carey Metcalfe</a>. Based on <a href="https://github.com/giulivo/pelican-svbhack">svbhack</a> by Giulio Fidente.</p>
+ <p>{{ SITENAME }}. Built using <a href="http://getpelican.com">Pelican</a>. Theme is <a href="https://github.com/pR0Ps/pelican-subtle">subtle</a> by <a href="http://cmetcalfe.ca">Carey Metcalfe</a>. Based on <a href="https://github.com/giulivo/pelican-svbhack">svbhack</a> by Giulio Fidente.</p>
</div>
</main>
diff --git a/theme/templates/index.html b/theme/templates/index.html
index 1d1066f..099ed0f 100644
--- a/theme/templates/index.html
+++ b/theme/templates/index.html
@@ -3,12 +3,10 @@
{% block title %}Blog | {{ SITENAME }}{% endblock %}
{% block content %}
-{% for article in articles_page.object_list %}
+{% for article in articles_page.object_list|sort(attribute='no') %}
<article>
<div class="article_title">
- <h1><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
- </div>
- <div class="article_text">
+ <h3><a href="{{ BLOGURL }}/{{ article.url }}">{{ article.title }}</a></h3>
{{ article.summary }}
</div>
</article>
@@ -18,8 +16,10 @@
{% endfor %}
{% endblock %}
+{% if BLOCK_FOOTER %}
{% block footer %}
<footer>
{% include "modules/pagination.html" %}
</footer>
{% endblock %}
+{% endif %}
diff --git a/theme/templates/invite.html b/theme/templates/invite.html
new file mode 100644
index 0000000..e73aede
--- /dev/null
+++ b/theme/templates/invite.html
@@ -0,0 +1,53 @@
+{% 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('invite/view', 'id = inviteform'); ?>
+ <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">
+ <div class="form_errors"><?php echo form_error('passconf'); ?></div>
+ <input class="input" type="password" name="passconf" placeholder="Repeat password" id="passconf">
+ </fieldset>
+
+ <fieldset class="field">
+ <div class="form_errors"><?php echo form_error('email'); ?></div>
+ <input class="input" type="email" name="email" placeholder="example@domain.com" id="email">
+ </fieldset>
+
+ <fieldset class="field">
+ <input class="button submit" type="submit" value="Invite me">
+ </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 %}
diff --git a/theme/templates/login.html b/theme/templates/login.html
new file mode 100644
index 0000000..1d5dba0
--- /dev/null
+++ b/theme/templates/login.html
@@ -0,0 +1,43 @@
+{% 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 %}
diff --git a/theme/templates/modules/blogsubheader.html b/theme/templates/modules/blogsubheader.html
index 3bb3fbf..9ba047d 100644
--- a/theme/templates/modules/blogsubheader.html
+++ b/theme/templates/modules/blogsubheader.html
@@ -1,9 +1,9 @@
<p>
-{% if INDEX_SAVE_AS %}
-<a href="{{ SITEURL }}/{{ INDEX_SAVE_AS }}">Posts</a>
+<!--{% if INDEX_SAVE_AS %}
+<a href="{{ SITEURL }}/{{ INDEX_SAVE_AS }}">Blog</a>
{% else %}
-<a href="{{ SITEURL }}">Posts</a>
-{% endif %}
+<a href="{{ SITEURL }}">Blog</a>
+{% endif %} NOTE: This will be redundant now. -->
{% if TAGS_URL %}
| <a href="{{ SITEURL }}/{{ TAGS_URL }}">Tags</a>
{% endif %}