diff --git a/README.rst b/README.rst index df79148..3340aa6 100644 --- a/README.rst +++ b/README.rst @@ -1,3 +1,31 @@ +This fork adds the *waterspill-en* (as seen on `this blog`_). + +.. _this blog: https://dubiousdod.org/blog/ + +Differences from *waterspill* are: + +* Language is English +* Font is larger (I have bad eyesight :) ) +* Tags aren't mentioned if you have none (both at the article level and on the sidebar) +* It's possible to suppress category display +* It's possible to add custom items before/after the main menu + +Example pelicanconf.py snippet: +:: + + BEFORE_MENU = [ + {'name':"Main site", 'url':'/'}, + ] + + AFTER_MENU = [ + {'name':"Gallery", 'url':'http://example.com/galleries/mygallery'}, + ] + + SUPPRESS_CATEGORIES_ON_MENU = True + SUPPRESS_ITEM_CATEGORIES = True + +------------------------------- + Pelican themes ############## diff --git a/waterspill-en/license.md b/waterspill-en/license.md new file mode 100644 index 0000000..d3e5b2d --- /dev/null +++ b/waterspill-en/license.md @@ -0,0 +1,9 @@ +Copyright (c) 2012 The Dod + +Original French [waterspill](https://github.com/getpelican/pelican-themes/tree/master/waterspill) theme Copyright (c) 2010 *Freeculture* + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/waterspill-en/screenshot-suppressed-categories.png b/waterspill-en/screenshot-suppressed-categories.png new file mode 100644 index 0000000..832f691 Binary files /dev/null and b/waterspill-en/screenshot-suppressed-categories.png differ diff --git a/waterspill-en/screenshot.png b/waterspill-en/screenshot.png new file mode 100644 index 0000000..3e25c0c Binary files /dev/null and b/waterspill-en/screenshot.png 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 Binary files /dev/null and b/waterspill-en/static/images/background.jpg differ diff --git a/waterspill-en/static/images/body.gif b/waterspill-en/static/images/body.gif new file mode 100644 index 0000000..0fd3a24 Binary files /dev/null and b/waterspill-en/static/images/body.gif differ diff --git a/waterspill-en/static/images/bottom.gif b/waterspill-en/static/images/bottom.gif new file mode 100644 index 0000000..7696480 Binary files /dev/null and b/waterspill-en/static/images/bottom.gif differ diff --git a/waterspill-en/static/images/header.gif b/waterspill-en/static/images/header.gif new file mode 100644 index 0000000..35889b8 Binary files /dev/null and b/waterspill-en/static/images/header.gif differ diff --git a/waterspill-en/static/images/hr.gif b/waterspill-en/static/images/hr.gif new file mode 100644 index 0000000..fecffc8 Binary files /dev/null and b/waterspill-en/static/images/hr.gif differ diff --git a/waterspill-en/static/images/menubar.gif b/waterspill-en/static/images/menubar.gif new file mode 100644 index 0000000..485ad21 Binary files /dev/null and b/waterspill-en/static/images/menubar.gif differ diff --git a/waterspill-en/static/images/spill.gif b/waterspill-en/static/images/spill.gif new file mode 100644 index 0000000..c536c7a Binary files /dev/null and b/waterspill-en/static/images/spill.gif 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 %} + + +{% 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 %} + +
+
+

Archives of {{ SITENAME }}

+ {% for article in dates %} +
{{ article.locale_date }}
+
{{ article.title }}
+ + {% endfor %} +
+ + +
+ + + +{% endblock %} + + + + + diff --git a/waterspill-en/templates/article.html b/waterspill-en/templates/article.html new file mode 100644 index 0000000..a4aa4de --- /dev/null +++ b/waterspill-en/templates/article.html @@ -0,0 +1,37 @@ +{% extends "base.html" %} +{% block title %}{{ article.title }}{% endblock %} +{% block content %} + + +
+ +

{{ article.title }}

+

{{ article.locale_date }}

+ + {{ article.content }} + {% include 'twitter.html' %} + +

By {{ article.author }}{% if not SUPPRESS_ITEM_CATEGORIES %}, Category: {{ article.category }}{% endif %}

+ {% if article.tags %}

Tags: {% for tag in article.tags %} +{{ tag }} / +{% endfor %}

{% endif %} + +
+{% if DISQUS_SITENAME %} +
+ +

Comments

+
+ +
+ {% endif %} + + +{% endblock %} diff --git a/waterspill-en/templates/base.html b/waterspill-en/templates/base.html new file mode 100644 index 0000000..a60034e --- /dev/null +++ b/waterspill-en/templates/base.html @@ -0,0 +1,131 @@ + + + + + + + + {% block title %}{{ SITENAME }}{%endblock%} + + +{% if FEED_RSS %} + +{% endif %} + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + {% block content %} + {% endblock %} + +
+ +
+ + + +
+{% include 'analytics.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 %} + +
+ {% if articles %} + {% for article in articles %} + {% if loop.index == 1 %} + + {% endif %} + {% endfor %} + {% endif %} +
+ +{% 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..338155a --- /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 %} + +
+ +

{{ article.title }}

+

{{ article.locale_date }}

+ + {{ article.content }} + + +

By {{ article.author }}{% if not SUPPRESS_ITEM_CATEGORIES %}, Category: {{ article.category }}{% endif %}

+ {% if article.tags %}

Tags: {% for tag in article.tags %} +{{ tag }} / +{% endfor %}

{% endif %} + +
+ {% if loop.length > 1 %} +
+

Other articles

+
+{% endif %} +{% else %} +
+ +

{{ article.title }}

+

{{ article.locale_date }}

+ + {{ article.summary }} +

By {{ article.author }}{% if not SUPPRESS_ITEM_CATEGORIES %}, Category: {{ article.category }}{% endif %}

+ Continue reading … + + + + +
+ {% 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 %} + +
+

{{ page.title }}

+ {{ page.content }} + {% include 'twitter.html' %} + + {% if PDF_PROCESSOR %}

get + the pdf

{% endif %} + + +
+ +{% 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 %} +
+ +
+{% 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 %} +Tweet +{% endif %}