aboutsummaryrefslogtreecommitdiffstats
path: root/waterspill-en
diff options
context:
space:
mode:
authorThe Dod <unclezzzen@gmail.com>2012-11-05 12:51:12 +0700
committerThe Dod <unclezzzen@gmail.com>2012-11-05 12:51:12 +0700
commitbd942f2d4f6df52e2aa4ff44d4050da0f260d76e (patch)
tree87722bedef5215b19de69abb7a85441be36ca227 /waterspill-en
parent662052faa4749d3fec2ff1149e853f71d5c2b434 (diff)
downloadpelican-themes-bd942f2d4f6df52e2aa4ff44d4050da0f260d76e.tar.gz
initial commit
Diffstat (limited to 'waterspill-en')
-rw-r--r--waterspill-en/screenshot-suppressed-categories.pngbin0 -> 924923 bytes
-rw-r--r--waterspill-en/screenshot.pngbin0 -> 932213 bytes
-rw-r--r--waterspill-en/static/css/pygment.css205
-rw-r--r--waterspill-en/static/css/style.css215
-rw-r--r--waterspill-en/static/images/background.jpgbin0 -> 2523 bytes
-rw-r--r--waterspill-en/static/images/body.gifbin0 -> 3005 bytes
-rw-r--r--waterspill-en/static/images/bottom.gifbin0 -> 1589 bytes
-rw-r--r--waterspill-en/static/images/header.gifbin0 -> 5458 bytes
-rw-r--r--waterspill-en/static/images/hr.gifbin0 -> 616 bytes
-rw-r--r--waterspill-en/static/images/menubar.gifbin0 -> 3460 bytes
-rw-r--r--waterspill-en/static/images/spill.gifbin0 -> 93904 bytes
-rw-r--r--waterspill-en/templates/analytics.html11
-rw-r--r--waterspill-en/templates/archives.html25
-rw-r--r--waterspill-en/templates/article.html37
-rw-r--r--waterspill-en/templates/base.html131
-rw-r--r--waterspill-en/templates/categories.html18
-rw-r--r--waterspill-en/templates/category.html2
-rw-r--r--waterspill-en/templates/index.html46
-rw-r--r--waterspill-en/templates/page.html16
-rw-r--r--waterspill-en/templates/tag.html2
-rw-r--r--waterspill-en/templates/tags.html10
-rw-r--r--waterspill-en/templates/twitter.html3
22 files changed, 721 insertions, 0 deletions
diff --git a/waterspill-en/screenshot-suppressed-categories.png b/waterspill-en/screenshot-suppressed-categories.png
new file mode 100644
index 0000000..832f691
--- /dev/null
+++ b/waterspill-en/screenshot-suppressed-categories.png
Binary files differ
diff --git a/waterspill-en/screenshot.png b/waterspill-en/screenshot.png
new file mode 100644
index 0000000..3e25c0c
--- /dev/null
+++ b/waterspill-en/screenshot.png
Binary files differ
diff --git a/waterspill-en/static/css/pygment.css b/waterspill-en/static/css/pygment.css
new file mode 100644
index 0000000..594b0fa
--- /dev/null
+++ b/waterspill-en/static/css/pygment.css
@@ -0,0 +1,205 @@
+.hll {
+background-color:#FFFFCC;
+}
+.c {
+color:#408090;
+font-style:italic;
+}
+.err {
+border:1px solid #FF0000;
+}
+.k {
+color:#007020;
+font-weight:bold;
+}
+.o {
+color:#666666;
+}
+.cm {
+color:#408090;
+font-style:italic;
+}
+.cp {
+color:#007020;
+}
+.c1 {
+color:#408090;
+font-style:italic;
+}
+.cs {
+background-color:#FFF0F0;
+color:#408090;
+}
+.gd {
+color:#A00000;
+}
+.ge {
+font-style:italic;
+}
+.gr {
+color:#FF0000;
+}
+.gh {
+color:#000080;
+font-weight:bold;
+}
+.gi {
+color:#00A000;
+}
+.go {
+color:#303030;
+}
+.gp {
+color:#C65D09;
+font-weight:bold;
+}
+.gs {
+font-weight:bold;
+}
+.gu {
+color:#800080;
+font-weight:bold;
+}
+.gt {
+color:#0040D0;
+}
+.kc {
+color:#007020;
+font-weight:bold;
+}
+.kd {
+color:#007020;
+font-weight:bold;
+}
+.kn {
+color:#007020;
+font-weight:bold;
+}
+.kp {
+color:#007020;
+}
+.kr {
+color:#007020;
+font-weight:bold;
+}
+.kt {
+color:#902000;
+}
+.m {
+color:#208050;
+}
+.s {
+color:#4070A0;
+}
+.na {
+color:#4070A0;
+}
+.nb {
+color:#007020;
+}
+.nc {
+color:#0E84B5;
+font-weight:bold;
+}
+.no {
+color:#60ADD5;
+}
+.nd {
+color:#555555;
+font-weight:bold;
+}
+.ni {
+color:#D55537;
+font-weight:bold;
+}
+.ne {
+color:#007020;
+}
+.nf {
+color:#06287E;
+}
+.nl {
+color:#002070;
+font-weight:bold;
+}
+.nn {
+color:#0E84B5;
+font-weight:bold;
+}
+.nt {
+color:#062873;
+font-weight:bold;
+}
+.nv {
+color:#BB60D5;
+}
+.ow {
+color:#007020;
+font-weight:bold;
+}
+.w {
+color:#BBBBBB;
+}
+.mf {
+color:#208050;
+}
+.mh {
+color:#208050;
+}
+.mi {
+color:#208050;
+}
+.mo {
+color:#208050;
+}
+.sb {
+color:#4070A0;
+}
+.sc {
+color:#4070A0;
+}
+.sd {
+color:#4070A0;
+font-style:italic;
+}
+.s2 {
+color:#4070A0;
+}
+.se {
+color:#4070A0;
+font-weight:bold;
+}
+.sh {
+color:#4070A0;
+}
+.si {
+color:#70A0D0;
+font-style:italic;
+}
+.sx {
+color:#C65D09;
+}
+.sr {
+color:#235388;
+}
+.s1 {
+color:#4070A0;
+}
+.ss {
+color:#517918;
+}
+.bp {
+color:#007020;
+}
+.vc {
+color:#BB60D5;
+}
+.vg {
+color:#BB60D5;
+}
+.vi {
+color:#BB60D5;
+}
+.il {
+color:#208050;
+}
diff --git a/waterspill-en/static/css/style.css b/waterspill-en/static/css/style.css
new file mode 100644
index 0000000..6fd1871
--- /dev/null
+++ b/waterspill-en/static/css/style.css
@@ -0,0 +1,215 @@
+* { margin: 0; padding: 0; }
+dd { margin-left: 23px }
+
+/* *** General Styles *** */
+
+body {
+ background: url(../images/background.jpg);
+ color: #293331;
+ font: 16px Georgia, "Times New Roman", Times, serif;
+ text-align: center;
+}
+
+pre { font-size:12px }
+
+a {
+ color: #293331;
+}
+
+a:hover {
+ background: #a7aa9e;
+}
+
+#header a,
+#topMenu a,
+.blogItem h2 a,
+.blogMeta a {
+ text-decoration: none;
+}
+
+p {
+ line-height: 1.5em;
+ padding: 5px 0;
+}
+
+h1,
+h2,
+h3 {
+ font-weight: normal;
+}
+
+blockquote {
+ background: url(../images/body.gif) top left repeat-y;
+ font-size: 18px;
+ font-style: italic;
+ padding: 5px 0 5px 30px;
+}
+
+ul,
+ol {
+ margin-left: 20px;
+ line-height: 1.6em;
+}
+
+/* *** Layout *** */
+
+#container {
+ background: url(../images/spill.gif) no-repeat top right;
+ margin: 0 auto;
+ text-align: left;
+ width: 780px;
+}
+
+#header {
+ background: url(../images/header.gif) no-repeat;
+ height: 109px;
+ padding: 0 10px 0 20px;
+}
+
+#topMenu {
+ background: url(../images/menubar.gif) no-repeat;
+ height: 48px;
+}
+
+#sidebar {
+ float: right;
+ padding: 20px 30px 10px 0;
+ text-align: right;
+ width: 150px;
+}
+
+#mainContent {
+ background: url(../images/body.gif) repeat-y;
+ padding: 20px 250px 10px 40px;
+}
+
+#footer {
+ background: url(../images/bottom.gif) no-repeat;
+ font-size: 14px;
+ height: 70px;
+ padding: 0 10px 0 20px;
+}
+
+/* *** Header Styles *** */
+
+#header h1 {
+ font-size: 48px;
+ font-weight: normal;
+ padding: 20px 0 0 170px;
+}
+
+#header h2 {
+ font-size: 20px;
+ font-weight: normal;
+ text-align: right;
+}
+
+#header a:hover {
+ background: none;
+}
+
+/* *** Top Menu Styles *** */
+
+#topMenu ul {
+ font-size: 26px;
+ line-height: 1em;
+ list-style: none;
+ padding: 14px 30px 0 0;
+ text-align: right;
+}
+
+#topMenu li {
+ display: inline;
+}
+
+#topMenu a:hover {
+ background: url(../images/hr.gif) center center no-repeat;
+}
+
+/* *** Blog Styles *** */
+
+.blogItem {
+ padding-bottom: 20px;
+}
+
+.blogItem h2,
+.blogItem h3 {
+ font-weight: normal;
+}
+
+.blogItem h2 a:hover,
+.blogItem h3 a:hover {
+ background: none;
+ text-decoration: underline;
+}
+
+.blogItem h2 {
+ font-size: 24px;
+}
+
+.blogItem h3 {
+ background: url(../images/hr.gif) bottom left no-repeat;
+ font-size: 18px;
+ padding-bottom: 6px;
+}
+
+.blogItem h3.blogMeta {
+ background-position: top left;
+ padding: 6px 0 0 0;
+ text-align: right;
+}
+
+/* *** Sidebar Styles *** */
+
+#sidebar h3 {
+ font-size: 24px;
+ font-weight: normal;
+}
+
+#sidebar ul {
+ line-height: 1.8em;
+ list-style: none;
+ padding-bottom: 20px;
+}
+
+#sidebar ul a {
+ text-decoration: none;
+}
+
+/* *** Comments Styles *** */
+
+#comments {
+ margin: 20px 0 0 20px;
+}
+
+#comments li {
+ margin-bottom: 10px;
+}
+
+.commentSep {
+ background: url(../images/hr.gif) bottom left no-repeat;
+}
+
+/* *** Footer Styles *** */
+
+#footer p {
+ padding: 30px 0 0 0;
+ text-align: center;
+}
+
+.floatR, .align-right {
+ float: right;
+ margin-left: 8px;
+}
+
+.floatL, .align-left {
+ float: left;
+ margin-right: 8px;
+}
+
+.clearfloat {
+ clear:both;
+ height:0;
+ font-size: 1px;
+ line-height: 0px;
+}
diff --git a/waterspill-en/static/images/background.jpg b/waterspill-en/static/images/background.jpg
new file mode 100644
index 0000000..d68ebff
--- /dev/null
+++ b/waterspill-en/static/images/background.jpg
Binary files differ
diff --git a/waterspill-en/static/images/body.gif b/waterspill-en/static/images/body.gif
new file mode 100644
index 0000000..0fd3a24
--- /dev/null
+++ b/waterspill-en/static/images/body.gif
Binary files differ
diff --git a/waterspill-en/static/images/bottom.gif b/waterspill-en/static/images/bottom.gif
new file mode 100644
index 0000000..7696480
--- /dev/null
+++ b/waterspill-en/static/images/bottom.gif
Binary files differ
diff --git a/waterspill-en/static/images/header.gif b/waterspill-en/static/images/header.gif
new file mode 100644
index 0000000..35889b8
--- /dev/null
+++ b/waterspill-en/static/images/header.gif
Binary files differ
diff --git a/waterspill-en/static/images/hr.gif b/waterspill-en/static/images/hr.gif
new file mode 100644
index 0000000..fecffc8
--- /dev/null
+++ b/waterspill-en/static/images/hr.gif
Binary files differ
diff --git a/waterspill-en/static/images/menubar.gif b/waterspill-en/static/images/menubar.gif
new file mode 100644
index 0000000..485ad21
--- /dev/null
+++ b/waterspill-en/static/images/menubar.gif
Binary files differ
diff --git a/waterspill-en/static/images/spill.gif b/waterspill-en/static/images/spill.gif
new file mode 100644
index 0000000..c536c7a
--- /dev/null
+++ b/waterspill-en/static/images/spill.gif
Binary files differ
diff --git a/waterspill-en/templates/analytics.html b/waterspill-en/templates/analytics.html
new file mode 100644
index 0000000..f19c7a6
--- /dev/null
+++ b/waterspill-en/templates/analytics.html
@@ -0,0 +1,11 @@
+{% if GOOGLE_ANALYTICS %}
+ <script type="text/javascript">
+ var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+ </script>
+ <script type="text/javascript">
+ try {
+ var pageTracker = _gat._getTracker("{{GOOGLE_ANALYTICS}}");
+ pageTracker._trackPageview();
+ } catch(err) {}</script>
+{% endif %}
diff --git a/waterspill-en/templates/archives.html b/waterspill-en/templates/archives.html
new file mode 100644
index 0000000..c485aeb
--- /dev/null
+++ b/waterspill-en/templates/archives.html
@@ -0,0 +1,25 @@
+{% extends "base.html" %}
+{% block title %}Archives of {{ SITENAME }}{% endblock %}
+{% block content %}
+
+<div class="blogItem">
+<dl>
+ <h2>Archives of {{ SITENAME }}</h2>
+ {% for article in dates %}
+ <dt>{{ article.locale_date }}</dt>
+ <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
+
+ {% endfor %}
+ </dl>
+
+
+</div>
+
+
+
+{% endblock %}
+
+
+
+
+
diff --git a/waterspill-en/templates/article.html b/waterspill-en/templates/article.html
new file mode 100644
index 0000000..dcef284
--- /dev/null
+++ b/waterspill-en/templates/article.html
@@ -0,0 +1,37 @@
+{% extends "base.html" %}
+{% block title %}{{ article.title }}{% endblock %}
+{% block content %}
+
+
+<div class="blogItem">
+
+ <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
+ <h3>{{ article.locale_date }}</h3>
+
+ {{ article.content }}
+ {% include 'twitter.html' %}
+
+ <h3 class="blogMeta">By <a href="#">{{ article.author }}</a>{% if not SUPPRESS_ITEM_CATEGORIES %}, Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>{% endif %}</h3>
+ <h3 class="blogMeta">Tags: {% for tag in article.tags %}
+<span><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> / </span>
+{% endfor %}</h3>
+
+ </div><!-- end #blogItem -->
+{% if DISQUS_SITENAME %}
+<div class="blogItem">
+
+ <h2>Comments</h2>
+<div id="disqus_thread"></div>
+ <script type="text/javascript">
+ var disqus_identifier = "{{ article.url }}";
+ (function() {
+ var dsq = document.createElement('script'); 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);
+ })();
+ </script>
+ </div>
+ {% endif %}
+
+ <!-- end #content -->
+{% endblock %}
diff --git a/waterspill-en/templates/base.html b/waterspill-en/templates/base.html
new file mode 100644
index 0000000..3ba518c
--- /dev/null
+++ b/waterspill-en/templates/base.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+ <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
+<link href="{{ SITEURL }}/theme/css/style.css" rel="stylesheet" type="text/css" media="screen" />
+<link href="{{ SITEURL }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
+{% if FEED_RSS %}
+<link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+{% endif %}
+
+ <!--[if IE]>
+ <style type="text/css">
+ .twoColFixRtHdr #mainContent { zoom: 1; }
+ </style>
+ <![endif]-->
+
+</head>
+
+<body>
+
+<div id="container">
+
+ <div id="header">
+ <h1><a href="{{ SITEURL }}">{{ SITENAME }}</h1>
+ {% if SITESUBTITLE %}<h2>{{ SITESUBTITLE }}</h2>{% endif %}
+
+ </div><!-- end #header -->
+
+ <div id="topMenu">
+
+ <ul>
+ {% for item in BEFORE_MENU %}
+ <li><a href="{{ item.url }}">{{ item.name }}</li>
+ <li>&ndash;</li>
+ {% endfor %}
+ <li><a href="{{ SITEURL }}">Home</a></li>
+ <li>&ndash;</li>
+ <li><a href="{{ SITEURL }}/archives.html">Archives</a></li>
+ {% for item in AFTER_MENU %}
+ <li>&ndash;</li>
+ <li><a href="{{ item.url }}">{{ item.name }}</li>
+ {% endfor %}
+
+ </ul>
+
+ </div><!-- end #topMenu -->
+
+ <div id="sidebar">
+ <ul>
+ {% if DISPLAY_PAGES_ON_MENU %}
+ <li>
+ <h3>Pages</h3>
+ <ul>
+ {% for page in PAGES %}
+ <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
+ {% endfor %}
+ </ul>
+ </li>
+ {% endif %}
+ {% if not SUPPRESS_CATEGORIES_ON_MENU %}
+ <li>
+ <h3>Categories</h3>
+ <ul>
+ {% for cat, null in categories %}
+ <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
+ {% endfor %}
+ </ul>
+ </li>
+ {% endif %}
+ {% if LINKS %}
+ <li>
+ <h3>Blogroll</h3>
+ <ul>
+ {% for name, link in LINKS %}
+ <li><a href="{{ link }}">{{ name }}</a></li>
+ {% endfor %}
+ </ul>
+ </li>
+ {% endif %}
+ {% if SOCIAL %}
+ <li>
+ <h3>Social</h3>
+ <ul>
+ {% if FEED_ATOM %}
+ <li><a href="{{ SITEURL }}/{{ FEED_ATOM }}" rel="alternate">Atom feed</a></li>
+ {% endif %}
+ {% if FEED_RSS %}
+ <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate">Flux Rss</a></li>
+ {% endif %}
+ {% for name, link in SOCIAL %}
+ <li><a href="{{ link }}">{{ name }}</a></li>
+ {% endfor %}
+ </ul>
+ </li><!-- /.social -->
+ {% endif %}
+ {% if tags %}
+ <li>
+ <h3>Tags</h3>
+ <ul>
+ {% for tag, articles in tags %}
+ <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a></li>
+ {% endfor %}
+ </ul>
+ </li>
+ {% endif %}
+ </ul>
+ </div><!-- end #sidebar -->
+
+ <div id="mainContent">
+
+ {% block content %}
+ {% endblock %}
+
+ </div><!-- end #mainContent -->
+
+<div class="clearfloat"></div>
+
+ <div id="footer">
+
+ <p><a href="http://css4free.com/" title="free CSS web site designs">Free CSS Gallery</a></p>
+ <p>Proudly powered by <a href="http://getpelican.com">pelican</a>, which takes great advantages of <a href="http://python.org">python</a>.
+ </div><!-- end #footer -->
+
+</div><!-- end #container -->
+{% include 'analytics.html' %}
+</body>
+</html>
diff --git a/waterspill-en/templates/categories.html b/waterspill-en/templates/categories.html
new file mode 100644
index 0000000..b32f5cb
--- /dev/null
+++ b/waterspill-en/templates/categories.html
@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+{% block content %}
+
+<div class="blogItem">
+ {% if articles %}
+ {% for article in articles %}
+ {% if loop.index == 1 %}
+ <ul>
+ {% for category, articles in categories %}
+ <li>{{ category }}</li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+ </div>
+
+{% endblock %}
diff --git a/waterspill-en/templates/category.html b/waterspill-en/templates/category.html
new file mode 100644
index 0000000..56f8e93
--- /dev/null
+++ b/waterspill-en/templates/category.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ category }}{% endblock %}
diff --git a/waterspill-en/templates/index.html b/waterspill-en/templates/index.html
new file mode 100644
index 0000000..fecab05
--- /dev/null
+++ b/waterspill-en/templates/index.html
@@ -0,0 +1,46 @@
+{% extends "base.html" %}
+{% block content_title %}{% endblock %}
+{% block content %}
+ {% if articles %}
+ {% for article in articles %}
+ {% if loop.index == 1 %}
+
+ <div class="blogItem">
+
+ <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
+ <h3>{{ article.locale_date }}</h3>
+
+ {{ article.content }}
+
+
+ <h3 class="blogMeta">By <a href="#">{{ article.author }}</a>{% if not SUPPRESS_ITEM_CATEGORIES %}, Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>{% endif %}</h3>
+ {% if article.tags %}<h3 class="blogMeta">Tags: {% for tag in article.tags %}
+<span><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> / </span>
+{% endfor %}</h3>{% endif %}
+
+ </div><!-- end #blogItem -->
+ {% if loop.length > 1 %}
+ <div class="blogItem">
+ <h2>Other articles</h2>
+ </div>
+{% endif %}
+{% else %}
+ <div class="blogItem">
+
+ <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
+ <h3>{{ article.locale_date }}</h3>
+
+ {{ article.summary }}
+<h3 class="blogMeta">By <a href="#">{{ article.author }}</a>{% if not SUPPRESS_ITEM_CATEGORIES %}, Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>{% endif %}</h3>
+ <a href="{{ SITEURL }}/{{ article.url }}">Cuntinue reading …</a>
+
+
+
+
+ </div><!-- end #blogItem -->
+ {% endif %}
+{% endfor %}
+{% else %}
+
+{% endif %}
+{% endblock content %}
diff --git a/waterspill-en/templates/page.html b/waterspill-en/templates/page.html
new file mode 100644
index 0000000..f9a091a
--- /dev/null
+++ b/waterspill-en/templates/page.html
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+{% block title %}{{ page.title }}{% endblock %}
+{% block content %}
+
+<div class="blogItem">
+ <h2><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></h3>
+ {{ page.content }}
+ {% include 'twitter.html' %}
+
+ {% if PDF_PROCESSOR %}<h3 class="blogMeta"><a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">get
+ the pdf</a></h3>{% endif %}
+
+
+</div>
+
+{% endblock %}
diff --git a/waterspill-en/templates/tag.html b/waterspill-en/templates/tag.html
new file mode 100644
index 0000000..68cdcba
--- /dev/null
+++ b/waterspill-en/templates/tag.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ tag }}{% endblock %}
diff --git a/waterspill-en/templates/tags.html b/waterspill-en/templates/tags.html
new file mode 100644
index 0000000..1fd478c
--- /dev/null
+++ b/waterspill-en/templates/tags.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+{% block content %}
+<div class="blogItem">
+<ul>
+{% for tag, articles in tags %}
+ <li>{{ tag }}</li>
+{% endfor %}
+</ul>
+</div>
+{% endblock %}
diff --git a/waterspill-en/templates/twitter.html b/waterspill-en/templates/twitter.html
new file mode 100644
index 0000000..94a9ba9
--- /dev/null
+++ b/waterspill-en/templates/twitter.html
@@ -0,0 +1,3 @@
+{% if TWITTER_USERNAME %}
+<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+{% endif %}