widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

kaputtnik has proposed merging lp:~widelands-dev/widelands-website/tabbed_profile into lp:widelands-website.

Commit message:
- Replace some links with tabs
- Fix a problem when hitting 'View on Site' for privacy policies
- Rework base.html to get an id attribute for main headers

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1740113 in Widelands Website: "Add tabs to some website pages"
  https://bugs.launchpad.net/widelands-website/+bug/1740113

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/tabbed_profile/+merge/356749

This branch replaces some links with tabs and a rework of the login box. Tabs are added to all places were formerly the small green links were used. Additionally moved some right boxes to the main page header. For the social media links i have removed Google+, because it will end in 2019, see: https://en.wikipedia.org/wiki/Google%2B#Shutdown_of_consumer_version.

For an example image see (Google+ still there): https://bugs.launchpad.net/widelands-website/+bug/1740113/+attachment/5077794/+files/tabs_right_social_bold.png

I have reworked also the base template, mainly to get an html id attribute to the main headers, which are the main green header below the navigation. Main reason for this change is bug 1746528 (Website lacks contrast): The header can now easily be changed in its appereance with css. Reworking the base template caused the main amount of the diff.

If this get deployed, no one has to hit CTRL+F5: The modified css-file get automatically loaded when accessing the Website.

This branch fixes also the server error regarding privacy_policies when hitting 'View on site' in the admin page.

Do we need testing on the alpha site for this?
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/tabbed_profile into lp:widelands-website.

=== modified file 'media/css/base.css'
--- media/css/base.css	2018-02-24 11:47:40 +0000
+++ media/css/base.css	2018-10-15 17:58:30 +0000
@@ -12,7 +12,7 @@
 	font-size: 0.88em;
 	line-height: 1.4em;
 	color: #ffffee;
-    text-shadow: 1px 1px 0px #000000;
+	text-shadow: 1px 1px 0px #000000;
 }
 
 /*+++++++++++++++++++++++++*/
@@ -34,7 +34,7 @@
 }
 
 a:visited {
-  color: #C8BE93;
+	color: #e0d7b0;
 }
 
 a.missingLink {
@@ -134,6 +134,10 @@
 	margin: 0.8em 0em 0.5em 0em;
 }
 
+#content_header h1 {
+    	display: inline-block;
+}
+
 svg {
 	text-shadow: none;
 }
@@ -160,7 +164,7 @@
 }
 
 .right  {
-       text-align: right;
+	text-align: right;
 }
 
 .middle {
@@ -198,6 +202,10 @@
 	background-image: url("../img/black50.png");
 }
 
+.hidden {
+	display: none;
+}
+
 .placeholder {
   color: #aaa !important;
 }
@@ -231,6 +239,8 @@
 
 div#content {
 	margin-right: 240px;
+	display: flex;
+	flex-direction: column;
 }
 
 div#footer {
@@ -250,59 +260,61 @@
 /**********/
 /* Header */
 /**********/
-
-div#header  img{
-	position: relative;
-	z-index: 0;
-}
-
-div.loginBox {
-	width: 320px;
-	height: 71px;
-	border: 1px solid black;
-	background-color: #332f29;
-	background-image: url("../img/but1.png");
-	-moz-border-radius: 4px 4px 0px 0px;
+#logo img {
+	width: 100%;
+}
+
+#header {
+	display: flex;
+	display: -webkit-flex;
+	flex-flow: row wrap;
+	justify-content: space-between;
+	align-items: center;
+}
+
+#header .header_boxes li a, .header_boxes p {
+	font-weight: bold;
+}
+
+#header .header_boxes {
+	display: flex;
+	flex-flow: row wrap;
+	margin: 0px;
+	padding: 0px;
+	list-style-type: none;
+	border: 1px solid #474444;
 	-webkit-border-radius: 4px 4px 0px 0px;
 	-khtml-border-radius: 4px 4px 0px 0px;
-	border-radius: 4px 4px 0px 0px;
-	position: relative;
-	z-index: 0;
-	padding: 15px;
+	border-radius: 4px 4px 4px 4px;
 	box-shadow: 4px 4px 4px 0px rgba(0, 0, 0, 0.7);
-}
-
-div.loginBox div.right{
-	width: 120px;
-}
-
-div.loginBox ul {
-	margin: 0px;
-	padding: 0px;
-	list-style-type: none;
-	line-height: 1.5em;
-}
-
-div.loginBox h4 {
-	margin-bottom: 5px;
-	margin-top: 0px;
-}
-
-div.loginBox input {
-	width: 100px;
-}
-
-div.loginBox button {
-	margin: 0px;
-	padding: 0px;
-	border: 1px solid black;
-	width: 60px;
-	height: 20px;
-	border-radius: 10px;
-	background: none;
-	background-image: url("../img/black50.png");
-	outline: none;
-	color: #ffffff;
+	background-image: url("../img/wood.png");
+}
+
+#header .header_boxes li {
+	border: 1px solid rgba(90, 74, 49, 0.84);
+	padding: 2px 5px 2px 5px;
+	text-align: center;
+}
+
+#header .header_boxes img {
+	margin: 0 2px 0 2px;
+}
+
+#header li.loginBox {
+	background-image: url("../img/black20.png");
+	border: 1px solid #474444;
+	-webkit-border-radius: 4px 4px 0px 0px;
+	-khtml-border-radius: 4px 4px 0px 0px;
+	border-radius: 4px 4px 4px 4px;
+}
+
+#header p {	
+	padding: 0px;
+	margin: 0px;
+}
+
+#header img {
+	vertical-align: middle; /* to prevent a space below */
 }
 
 /****************/
@@ -319,7 +331,7 @@
 
 div.columnModule h3 {
 	margin-bottom: 10px;
-	margin-top: 8px;	/* Correction for donatebox */
+	margin-top: 8px;	/* Correction for first box */
 }
 
 div.columnModuleBox {
@@ -388,21 +400,6 @@
 	border-top: none;
 }
 
-div.columnModuleBox ul.socialMediaList {
-	height: 55px;
-}
-
-div.columnModuleBox ul.socialMediaList li {
-	float: left;
-	border: none;
-	padding: 9px;
-}
-
-input.donate {
-	border: none;
-	background: none;
-}
-
 /* News Posts */
 
 img.landing {
@@ -466,3 +463,81 @@
 .pagination .summary{
 	margin-right: 1em;
 }
+
+/****************/
+/* Tabbed views */
+/****************/
+
+.tab-list {
+	align-self: flex-end;
+	margin-bottom: 0px;
+	margin-top: -18px; /* Fix the margin of the header*/
+	z-index: 2;
+	display: flex;
+	flex-direction: row;
+	list-style: none;
+	height: 20px;
+}
+
+.tab-list a {
+	background-color: #332f29;
+	background-image: url("../img/but1.png");
+	border-radius: 4px;
+	border: 1px solid black;
+	padding: 0.5em;
+	margin: 0 0 0 0.4em;
+	box-shadow: 4px 4px 4px 0px rgba(0, 0, 0, 0.7);
+	font-size: 0.83em;
+}
+
+.tab-list a:hover {
+	border-bottom: none;
+	box-shadow: none;
+}
+
+.tab-list .active {
+	border-bottom: none;
+	box-shadow: none;
+}
+
+.tab-list li ul {
+	position: absolute;
+	list-style: none;
+	padding-left: 0px;
+	display: none;
+}
+
+.tab-list li:hover ul{
+	display: block;
+	border: 1px solid black;
+	border-radius: 4px;
+}
+
+.tab-list li ul li{
+	border-top: 1px solid black;
+}
+
+.tab-list li ul li:first-child{
+	border-top: none;
+}
+
+.tab-list li ul li a{
+  border: none;
+  margin: 0 0 0 1px;
+	display: block;
+	box-shadow: none;
+	border-radius: 0px;
+	padding: 2px 4px 2px 4px;
+}
+
+/* The max-width has to be adjusted
+   depending on the width of the logo*/
+@media (max-width: 1000px) {
+	#header {
+		justify-content: center;
+	}
+	.header_boxes {
+		justify-content: center;
+		margin-bottom: 10px !important;
+	}
+}
\ No newline at end of file

=== modified file 'media/css/navigation.css'
--- media/css/navigation.css	2017-11-06 08:52:48 +0000
+++ media/css/navigation.css	2018-10-15 17:58:30 +0000
@@ -59,7 +59,6 @@
 div#topmenu {
 	position: relative;
 	z-index: 5;
-	top: -8px;
 	clear: both;
 	height: 50px;
 	margin-bottom: 22px;

=== modified file 'media/img/download.png'
Binary files media/img/download.png	2012-05-08 21:52:15 +0000 and media/img/download.png	2018-10-15 17:58:30 +0000 differ
=== added file 'media/img/maps.png'
Binary files media/img/maps.png	1970-01-01 00:00:00 +0000 and media/img/maps.png	2018-10-15 17:58:30 +0000 differ
=== modified file 'media/img/socialmedia/facebook.png'
Binary files media/img/socialmedia/facebook.png	2012-09-09 13:40:13 +0000 and media/img/socialmedia/facebook.png	2018-10-15 17:58:30 +0000 differ
=== modified file 'media/img/socialmedia/googleplus.png'
Binary files media/img/socialmedia/googleplus.png	2012-09-09 13:40:13 +0000 and media/img/socialmedia/googleplus.png	2018-10-15 17:58:30 +0000 differ
=== modified file 'media/img/socialmedia/twitter.png'
Binary files media/img/socialmedia/twitter.png	2012-09-09 13:40:13 +0000 and media/img/socialmedia/twitter.png	2018-10-15 17:58:30 +0000 differ
=== modified file 'media/img/socialmedia/youtube.png'
Binary files media/img/socialmedia/youtube.png	2012-09-09 13:40:13 +0000 and media/img/socialmedia/youtube.png	2018-10-15 17:58:30 +0000 differ
=== modified file 'privacy_policy/models.py'
--- privacy_policy/models.py	2018-10-08 17:51:36 +0000
+++ privacy_policy/models.py	2018-10-15 17:58:30 +0000
@@ -21,4 +21,4 @@
         return self.language
     
     def get_absolute_url(self):
-        return reverse('policy_translated', kwargs={'lang': self.language})
\ No newline at end of file
+        return reverse('policy_translated', kwargs={'slug': self.slug})
\ No newline at end of file

=== modified file 'privacy_policy/views.py'
--- privacy_policy/views.py	2018-10-08 17:51:36 +0000
+++ privacy_policy/views.py	2018-10-15 17:58:30 +0000
@@ -42,4 +42,5 @@
         'languages': languages,
         'cur_lang': current_lang,
     }
+
     return render(request, 'privacy_policy.html', context)

=== modified file 'templates/404.html'
--- templates/404.html	2012-05-04 16:52:39 +0000
+++ templates/404.html	2018-10-15 17:58:30 +0000
@@ -4,8 +4,11 @@
 Not found - {{ block.super}}
 {% endblock %}
 
-{% block content %} 
-<h1>Not found...</h1>
+{% block content_header %}
+    <h1>Not found...</h1>
+{% endblock %}
+
+{% block content_main %} 
 <div class="blogEntry">
 	<p>
 		The document you requested was not found....<br />

=== modified file 'templates/500.html'
--- templates/500.html	2016-07-26 21:14:43 +0000
+++ templates/500.html	2018-10-15 17:58:30 +0000
@@ -4,8 +4,11 @@
 Internal server error - {{ block.super}}
 {% endblock %}
 
-{% block content %} 
-<h1>Internal server error</h1>
+{% block content_header %}
+    <h1>Internal server error</h1>
+{% endblock %}
+
+{% block content_main %} 
 <div class="blogEntry">
     <p> We are sorry about that...</p><br />
     <p>The widelands website administrators have been automatically informed about this issue.</p>

=== modified file 'templates/base.html'
--- templates/base.html	2018-09-04 17:01:27 +0000
+++ templates/base.html	2018-10-15 17:58:30 +0000
@@ -1,5 +1,3 @@
-{% load wl_extras %}
-
 <!DOCTYPE html>
 {% comment %}
  vim:ft=htmldjango:
@@ -19,7 +17,7 @@
 		<link href="{{ MEDIA_URL }}favicon.ico" rel="icon" />
 
 		<!--  CSS --> 
-		<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/base.css" />
+		<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/base.css?v1" />
 		<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/navigation.css" />
 		<!--[if lt IE 9]>
 		<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/base_ielt9.css" />
@@ -37,10 +35,7 @@
 		<a id="top"></a>
 		<div id="wrapper">
 			<div id="header">
-				<div class="loginBox posRight">
-					{% include "login_box.html" %}
-				</div>
-				<a href="{% url 'mainpage' %}"><img src="{{ MEDIA_URL }}img/{% wl_logo %}" class="posLeft" alt="Widelands Logo" /></a>
+				{% include "header.html" %}
 			</div>
 			<div id="topmenu">
 				<!-- Navigation -->
@@ -48,11 +43,23 @@
 			</div>
 			<div id="main" class="clear">
 				<div id="rightColumn" class="posRight">
+                    <!-- below navigation: right side -->
 					{% include "right_boxes.html" %}
 				</div>
 				<div id="content">
-					{% block content %}
-						No Content here!
+				<!-- below navigation: left side -->
+					<div id="content_header">
+					{% block content_header %}
+						<!-- the header of each page -->
+					{% endblock %}
+					</div>
+					{% block content_tabbing %}
+					<!-- used to display tabs on pages. For tabs which point to
+						 other pages, use it in base.html of the main page -->
+					{% endblock %}
+				
+					{% block content_main %}
+						<!-- all in div blogEntry -->
 					{% endblock %}
 				</div>
 			</div>

=== modified file 'templates/check_input/moderate_info.html'
--- templates/check_input/moderate_info.html	2017-11-24 10:55:59 +0000
+++ templates/check_input/moderate_info.html	2018-10-15 17:58:30 +0000
@@ -1,9 +1,10 @@
 {% extends 'base.html' %}
 
-{% block content %}
-
-<h1>All comments have to be moderated</h1>
-
+{% block content_header %}
+    <h1>All comments have to be moderated</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<p>Your comment has to be reviewd by a moderator.</p>
 		{% if act_count == max_count|add:"-1" %}

=== modified file 'templates/django_messages/base.html'
--- templates/django_messages/base.html	2017-11-08 08:32:10 +0000
+++ templates/django_messages/base.html	2018-10-15 17:58:30 +0000
@@ -10,8 +10,11 @@
 Messages - {{block.super}}
 {% endblock %}
 
-{% block content %}
-<h1>Messages: {% block msg_title %}{% endblock %}</h1>
+{% block content_header %}
+    <h1>Messages: {% block msg_title %}{% endblock %}</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	{% if messages %}
 		{% for message in messages %}

=== added file 'templates/header.html'
--- templates/header.html	1970-01-01 00:00:00 +0000
+++ templates/header.html	2018-10-15 17:58:30 +0000
@@ -0,0 +1,41 @@
+{% load wlprofile_extras %}
+{% load wl_extras %}
+
+<div id="logo">
+	<a href="{% url 'mainpage' %}"><img src=
+	"{{ MEDIA_URL }}img/{% wl_logo %}" alt=
+	"Widelands Logo"></a>
+</div>
+<ul class="header_boxes">
+	<li class="small">
+		<a href="{% url 'wiki_article' "Download" %}" title="Download">Download<br />
+		<img src="{{ MEDIA_URL }}/img/download.png" alt="Get Widelands" />
+		</a>
+	</li>
+	<li class="small">
+		<a href="{% url 'wlmaps_index' %}" title="Get new maps">Maps<br />
+		<img src="{{ MEDIA_URL }}img/maps.png" alt="Get Free Maps" />
+		</a>
+	</li>
+	<li class="small">
+		<p>Social Media</p>
+		<a href="https://www.facebook.com/WidelandsOfficial"; target="_blank">
+			<img src="{{ MEDIA_URL }}img/socialmedia/facebook.png" alt="Facebook" />
+		</a>
+	</li>
+	<li class="loginBox small">
+	<!-- Login form / User information -->
+		{% if user.is_authenticated %}
+			<a href="{% url 'profile_view' %}" title="You are logged in as {{ user }}">Your Profile</a>
+			{% if messages_inbox_count > 0 %}
+				<a href="{% url 'messages_inbox' %}" title="Number of Private Messages">({{ messages_inbox_count }})</a>
+			{% endif %}
+			<br />
+			<a href="{% url 'scheduling_find' %}?next={{ request.path|iriencode }}" title="Show other users playtimes">Playtimes</a>
+			<br />
+			<a href="{% url 'auth_logout' %}?next={{ request.path|iriencode }}">Logout</a>
+		{% else %}
+			<a href="{% url 'auth_login' %}?next={{ request.path|iriencode }}">Login/Register</a>
+		{% endif %}
+	</li>
+</ul>

=== removed file 'templates/login_box.html'
--- templates/login_box.html	2018-02-17 11:29:38 +0000
+++ templates/login_box.html	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-{% load wlprofile_extras %}
-
-<!-- Login form / User information -->
-{% if user.is_authenticated %}
-	<div class="small posLeft">
-		Welcome {{ user|user_link }},<br/>
-		<a href="{% url 'scheduling_main' %}">Playtime Scheduler</a>
-	</div>
-	<div class="right small posRight">
-		<ul>
-			<li>
-				{% if messages_inbox_count %}
-				<a href="{% url 'messages_inbox' %}" title="You have {{ messages_inbox_count }} new messages">Messages ({{ messages_inbox_count }})</a>
-				{% else %}
-				<a href="{% url 'messages_inbox' %}" title="No new message">Messages</a>
-				{% endif %}
-			</li>
-			<li><a href="{% url 'notification_notices' %}">Notifications</a></li>
-			<li><a href="{% url 'profile_edit' %}">Edit Profile</a></li>
-			<li><a href="{% url 'auth_logout' %}?next={{ request.path|iriencode }}">Logout</a></li>
-		</ul>
-	</div>
-{% else %}
-	<h4>Login</h4>
-	<div class="small center">
-		<a href="{% url 'auth_login' %}?next={{ request.path|iriencode }}">Click here to login</a><br />
-		<a href="{% url 'auth_password_reset' %}">Lost password?</a> | <a href="{% url 'registration_register' %}">Register now!</a>
-	</div>
-{% endif %}

=== modified file 'templates/mainpage.html'
--- templates/mainpage.html	2018-09-13 20:19:07 +0000
+++ templates/mainpage.html	2018-10-15 17:58:30 +0000
@@ -15,8 +15,10 @@
 <link rel="alternate" type="application/rss+xml" title="Widelands News" href="news/feed/" />
 
 {{ block.super}}{% endblock %}
-{% block content %}
-<h1>Welcome to Widelands.org</h1>
+{% block content_header %}
+	<h1>Welcome to Widelands.org</h1>
+{% endblock %}
+{% block content_main %}
 <div class="blogEntry" style="min-height: 380px;">
 	<img class="landing posRight" src="{{ MEDIA_URL }}img/welcome.jpg" alt="Welcome!" />
 	<p>
@@ -53,7 +55,9 @@
 
 {% get_latest_posts 3 as latest_posts_list %}
 {% if latest_posts_list %}
-	<h1>News</h1>
+    <div id="content_header">
+        <h1>News</h1>
+    </div>
 	{% for object in latest_posts_list %}
 		{% include "news/inlines/post_detail.html" %}
 	{% endfor %}

=== modified file 'templates/mainpage/changelog.html'
--- templates/mainpage/changelog.html	2012-05-04 16:52:39 +0000
+++ templates/mainpage/changelog.html	2018-10-15 17:58:30 +0000
@@ -7,8 +7,11 @@
 {{ block.super}}
 {% endblock %}
 
-{% block content %}
-<h1>Changelog</h1>
+{% block content_header %}
+    <h1>Changelog</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	{{ changelog|wl_markdown }}
 </div>

=== modified file 'templates/mainpage/developers.html'
--- templates/mainpage/developers.html	2017-10-30 11:58:00 +0000
+++ templates/mainpage/developers.html	2018-10-15 17:58:30 +0000
@@ -7,8 +7,10 @@
 {{ block.super}}
 {% endblock %}
 
-{% block content %}
-<h1>Widelands Development Team</h1>
+{% block content_header %}
+    <h1>Widelands Development Team</h1>
+{% endblock %}
+{% block content_main %}
 <div class="blogEntry">
 	{{ developers|safe }}
 </div>

=== modified file 'templates/mainpage/legal_notice.html'
--- templates/mainpage/legal_notice.html	2018-09-05 19:11:58 +0000
+++ templates/mainpage/legal_notice.html	2018-10-15 17:58:30 +0000
@@ -3,10 +3,11 @@
 
 {% block title %}Legal notice {{ block.super }}{% endblock %}
 
-{% block content %}
-
-<h1>Legal notice</h1>
-
+{% block content_header %}
+	<h1>Legal notice</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<p>The website <a href="https://wl.widelands.org";>widelands.org</a> is a privately owned page to exchange knowledge and experience about the free, open source game Widelands. There are no financial goal or interest.</p>
 

=== modified file 'templates/mainpage/legal_notice_thanks.html'
--- templates/mainpage/legal_notice_thanks.html	2015-08-24 19:55:58 +0000
+++ templates/mainpage/legal_notice_thanks.html	2018-10-15 17:58:30 +0000
@@ -3,10 +3,11 @@
 
 {% block title %}Impressum (Legal note) {{ block.super }}{% endblock %}
 
-{% block content %}
-
-<h1>Legal notice</h1>
-
+{% block content_header %}
+    <h1>Legal notice</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<h2>Thanks</h2>
 	

=== modified file 'templates/news/category_posts.html'
--- templates/news/category_posts.html	2017-08-16 21:13:43 +0000
+++ templates/news/category_posts.html	2018-10-15 17:58:30 +0000
@@ -5,8 +5,11 @@
 
 {% block title %} Category: {{ cur_category }} - {{ block.super }}{% endblock %}
 
-{% block content %}
-<h1>Posts for Category: {{ cur_category }}</h1>
+{% block content_header %}
+    <h1>Posts for Category: {{ cur_category }}</h1>
+{% endblock %}
+
+{% block content_main %}
 <div>
 	<div class="linksBox">
 		<a href="{% url 'news_index' %}">News Archive</a>

=== modified file 'templates/news/inlines/post_detail.html'
--- templates/news/inlines/post_detail.html	2018-10-03 10:53:41 +0000
+++ templates/news/inlines/post_detail.html	2018-10-15 17:58:30 +0000
@@ -7,18 +7,25 @@
 {% load threadedcommentstags %}
 {% load wl_markdown wlprofile_extras custom_date %}
 
+{% block content_tabbing %}
+	{% if perms.news %}
+		<ul class="small tab-list">
+            <li>
+                {% if perms.news.add_post %}<a href="/admin/news/post/add/">Add New News</a>{% endif %}
+            </li>
+            <li>
+                {% if perms.news.change_post %}<a href="/admin/news/post/{{object.id}}/">Edit</a>{% endif %}
+            </li>
+		</ul>
+    {% endif %}
+{% endblock %}
 <div class="blogEntry">
 	{% if object.has_image %}
 		<a href="{% url 'category_posts' slug=object.get_category_slug %}">
 			<img class="title posLeft" src="{{MEDIA_URL}}{{ object.image|urlencode }}" alt="{{ object.image_alt }}">
 		</a>
 	{% endif %}
-	{% if perms.news %}
-		<div class="small posRight invertedColor">
-		{% if perms.news.add_post %}<a href="/admin/news/post/add/">Add New News</a>{% endif %}
-		{% if perms.news.change_post %}| <a href="/admin/news/post/{{object.id}}/">Edit</a>{% endif %}
-		</div>
-    {% endif %}
+
 	
 	<h2><a href="{{ object.get_absolute_url }}" style="color: inherit;">{{ object.title }}</a></h2>
 	

=== modified file 'templates/news/post_archive_month.html'
--- templates/news/post_archive_month.html	2016-11-20 11:55:39 +0000
+++ templates/news/post_archive_month.html	2018-10-15 17:58:30 +0000
@@ -2,9 +2,11 @@
 
 {% block title %}{{ month|date:"F - Y" }} - {{block.super}} {% endblock %}
 
-{% block content %}
+{% block content_header %}
+    <h1>News Archive: {{ month|date:"F" }} {{ month|date:"Y" }}</h1>
+{% endblock %}
 
-<h1>News Archive: {{ month|date:"F" }} {{ month|date:"Y" }}</h1>
+{% block content_main %}
 <div class="linksBox">
 <a href="{% url 'news_index' %}">News Archiv</a> &#187; 
 <a href="{% url 'news_index' %}{{ month|date:"Y" }}/">{{ month|date:"Y" }}</a> &#187; 

=== modified file 'templates/news/post_archive_year.html'
--- templates/news/post_archive_year.html	2016-11-21 17:45:28 +0000
+++ templates/news/post_archive_year.html	2018-10-15 17:58:30 +0000
@@ -2,9 +2,11 @@
 
 {% block title %}{{ year|date:"Y" }} - {{ block.super }}{% endblock %}
 
-{% block content %}
+{% block content_header %}
+    <h1>News Archive: {{ year|date:"Y" }}</h1>
+{% endblock %}
 
-<h1>News Archive: {{ year|date:"Y" }}</h1>
+{% block content_main %}
 <div class="linksBox">
 <a href="{% url 'news_index' %}">News Archiv </a>&#187;
 <a href="{% url 'news_index' %}{{ year|date:"Y" }}">{{ year|date:"Y" }}</a> : 

=== modified file 'templates/news/post_detail.html'
--- templates/news/post_detail.html	2018-10-03 10:53:41 +0000
+++ templates/news/post_detail.html	2018-10-15 17:58:30 +0000
@@ -15,8 +15,8 @@
 	<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/comments.css" />
 {% endblock %}
 
-{% block content %}
-	<h1>News: {{ object.title }}</h1>
+{% block content_header %}
+	<h1>News: {{ object.title }}</h1><br />
 	<div class="linksBox">
 		<a href="{% url 'news_index' %}">News Archive: </a>
 		{% if object.get_previous_by_publish %}
@@ -25,7 +25,9 @@
 		{% if object.get_next_post %}
 			| <a href="{{ object.get_next_post.get_absolute_url }}">{{ object.get_next_post }} &raquo;</a> 
 		{% endif %}
-	</div>
+	</div>{% endblock %}
+
+{% block content_main %}
 
 	{% include "news/inlines/post_detail.html" %}
 

=== modified file 'templates/news/post_list.html'
--- templates/news/post_list.html	2016-12-05 20:55:28 +0000
+++ templates/news/post_list.html	2018-10-15 17:58:30 +0000
@@ -1,21 +1,30 @@
 {% extends "news/base_news.html" %}
 
-{% block content %}
-
-<h1>News Archive</h1>
-<div class="linksBox">
-	<a href="{% url 'news_index' %}">News Archive: </a>
-	{% for dateobj in date_list reversed %}
-		<a href="{% url 'news_index' %}{{ dateobj|date:'Y' }}">{{ dateobj|date:'Y' }}</a>
-		{% if not forloop.last %} | {% endif %}
-	{% endfor%}
-</div>
-{% if perms.news %}
-	<div class="small posRight linksBox">
-		{% if perms.news.add_post %}<a href="/admin/news/post/add/">Add New News</a>{% endif %}
+{% block content_header %}
+	<h1>News Archive</h1><br />
+	<div class="linksBox">
+		<a href="{% url 'news_index' %}">News Archive: </a>
+		{% for dateobj in date_list reversed %}
+			<a href="{% url 'news_index' %}{{ dateobj|date:'Y' }}">{{ dateobj|date:'Y' }}</a>
+			{% if not forloop.last %} | {% endif %}
+		{% endfor%}
 	</div>
-{% endif %}
-
+{% endblock %}
+
+
+{% block content_tabbing %}
+	{% if perms.news %}
+	<ul class="small tab-list">
+		<li>
+		{% if perms.news.add_post %}
+			<a href="/admin/news/post/add/">Add New News</a>
+		{% endif %}
+		</li>
+	</ul>
+	{% endif %}
+{% endblock %}
+
+{% block content_main %}
 {% include "news/inlines/posts_table.html" %}
 
 {% endblock %}

=== modified file 'templates/notification/base.html'
--- templates/notification/base.html	2016-05-17 19:28:38 +0000
+++ templates/notification/base.html	2018-10-15 17:58:30 +0000
@@ -1,6 +1,5 @@
-{% extends "base.html" %}
+{% extends "wlprofile/base.html" %}
 
 {% block extra_head %}
-    {#<link rel="alternate" type="application/atom+xml" title="Notices Feed" href="{% url 'notification_feed_for_user' %}" />#}
     <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/notice.css" />{{ block.super}}
 {% endblock %}
\ No newline at end of file

=== modified file 'templates/notification/notice_settings.html'
--- templates/notification/notice_settings.html	2017-08-16 21:13:43 +0000
+++ templates/notification/notice_settings.html	2018-10-15 17:58:30 +0000
@@ -7,9 +7,13 @@
 {% trans "Notifications "%} - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>{% trans "Notification Settings" %}</h1>
-
+{% block notifications %}class="active"{% endblock %}
+
+{% block content_header %}
+	<h1>{% trans "Notification Settings" %} {{ profile.user }}</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<h2>{% trans "Settings" %}</h2>
 

=== modified file 'templates/privacy_policy.html'
--- templates/privacy_policy.html	2018-10-09 18:02:07 +0000
+++ templates/privacy_policy.html	2018-10-15 17:58:30 +0000
@@ -8,9 +8,10 @@
 <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/wiki.css" />
 {% endblock %}
 
-{% block content %}
-<h1>Privacy Policy</h1>
-
+{% block content_header %}
+    <h1>Privacy Policy</h1>
+{% endblock %}
+{% block content_main %}
 <div class="blogEntry">
     {% with languages|length as count %}
     {% if count > 0 %}

=== modified file 'templates/pybb/add_post.html'
--- templates/pybb/add_post.html	2016-03-02 21:02:38 +0000
+++ templates/pybb/add_post.html	2018-10-15 17:58:30 +0000
@@ -17,7 +17,7 @@
  - {{ block.super }}
 {% endblock %}
 
-{% block content %}
+{% block content_header %}
 <h1>
 	{% if forum %}
 		{% trans "New Topic" %}
@@ -29,7 +29,8 @@
 		{% endif %}
 	{% endif %}
 </h1>
-
+{% endblock %}
+{% block content_main %}
 <div class="blogEntry">
 	<a href="{% url 'pybb_index' %}">Forums</a> &#187;
 	{% if forum %}

=== modified file 'templates/pybb/category.html'
--- templates/pybb/category.html	2016-03-02 21:02:38 +0000
+++ templates/pybb/category.html	2018-10-15 17:58:30 +0000
@@ -1,9 +1,11 @@
 {% extends 'pybb/base.html' %}
 {% load pybb_extras %}
 
-{% block content %}
-<h1>Category: {{category.name}}</h1>
+{% block content_header %}
+    <h1>Category: {{category.name}}</h1>
+{% endblock %}
 
+{% block content_main %}
 <div class="blogEntry">
 	<a href="{% url 'pybb_index' %}">Forums</a> &#187; {{category.name}}
 	<br /><br />

=== modified file 'templates/pybb/delete_post.html'
--- templates/pybb/delete_post.html	2012-04-19 19:46:21 +0000
+++ templates/pybb/delete_post.html	2018-10-15 17:58:30 +0000
@@ -5,8 +5,11 @@
 {% trans "Delete Post" %} - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>{% trans "Delete Post" %}</h1>
+{% block content_header %}
+    <h1>{% trans "Delete Post" %}</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<h3>{% trans "Are you sure you want to delete this message?" %}</h3>
 	<div class="preview-box">

=== modified file 'templates/pybb/edit_post.html'
--- templates/pybb/edit_post.html	2016-03-02 21:02:38 +0000
+++ templates/pybb/edit_post.html	2018-10-15 17:58:30 +0000
@@ -6,11 +6,11 @@
 {% trans "Edit Reply" %} - {{ block.super }}
 {% endblock %}
 
-
-{% block content %}
-
-<h1>{% trans "Edit Reply" %}</h1>
-
+{% block content_header %}
+    <h1>{% trans "Edit Reply" %}</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<a href="{% url 'pybb_index' %}">Forums</a> &#187;
 	{% pybb_link post.topic.forum.category %} &#187; 

=== modified file 'templates/pybb/forum.html'
--- templates/pybb/forum.html	2017-08-17 06:33:42 +0000
+++ templates/pybb/forum.html	2018-10-15 17:58:30 +0000
@@ -6,18 +6,28 @@
 {% load custom_date %}
 {% load pagination_tags %}
 
-{% block title %}
-{{ forum.name }} - {{ block.super }}
-{% endblock %}
-
 {% block extra_head %}
 <link rel="alternate" type="application/atom+xml" title="Latest Posts on forum '{{ forum.name }}'" href="{% url 'pybb_feed_posts' %}{{forum.id}}/"  />
 <link rel="alternate" type="application/atom+xml" title="Latest Topics on forum '{{ forum.name }}'" href="{% url 'pybb_feed_topics' %}{{forum.id}}/" />
 {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>Forum: {{ forum }}</h1>
+{% block title %}
+{{ forum.name }} - {{ block.super }}
+{% endblock %}
+
+{% block content_header %}
+	<h1>Forum: {{ forum }}</h1>
+{% endblock %}
+
+{% block content_tabbing %}
+	<ul class="tab-list small">
+		<li>
+		<a href="{% url 'pybb_add_topic' forum.id %}">New Topic</a>
+		</li>
+	</ul>
+{% endblock %}
+{% block content_main %}
 
 <div class="blogEntry">
 	<div class="breadCrumb">
@@ -25,10 +35,7 @@
 	{% pybb_link forum.category %} &#187; 
 	{{ forum }}
 	</div>
-	<a class="button posRight" href="{% url 'pybb_add_topic' forum.id %}">
-		<img src="{{ MEDIA_URL }}forum/img/new_topic.png" alt ="{% trans "New Topic" %}" class="middle" />
-		<span class="middle">{% trans "New Topic" %}</span>
-	</a>
+
 	{% autopaginate topics page_size as object_list %}
 	{% paginate using "pagination/pagination_mod.html" %}
 

=== modified file 'templates/pybb/index.html'
--- templates/pybb/index.html	2015-02-18 22:30:08 +0000
+++ templates/pybb/index.html	2018-10-15 17:58:30 +0000
@@ -1,9 +1,11 @@
 {% extends 'pybb/base.html' %}
 {% load pybb_extras %}
 
-{% block content %}
-<h1>Forums</h1>
+{% block content_header %}
+    <h1>Forums</h1>
+{% endblock %}
 
+{% block content_main %}
 {% for category in cats %}
 <div class="blogEntry">
 	<h3><a href="{{category.get_absolute_url}}" class="invertedColor">{{category.name}}</a></h3>

=== modified file 'templates/pybb/topic.html'
--- templates/pybb/topic.html	2017-10-06 08:22:32 +0000
+++ templates/pybb/topic.html	2018-10-15 17:58:30 +0000
@@ -17,8 +17,11 @@
 {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>Topic: {{ topic }} </h1>
+{% block content_header %}
+    <h1>Topic: {{ topic }} </h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<div class="breadCrumb">
 	<a href="{% url 'pybb_index' %}">Forums</a> &#187; 

=== modified file 'templates/registration/activate.html'
--- templates/registration/activate.html	2016-03-07 20:38:39 +0000
+++ templates/registration/activate.html	2018-10-15 17:58:30 +0000
@@ -7,8 +7,11 @@
 Activation - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>Activation</h1>
+{% block content_header %}
+    <h1>Activation</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<p class="errormessage">
 		An error occured: Either this account has already been activated or activation key is invalid.<br />

=== modified file 'templates/registration/activation_complete.html'
--- templates/registration/activation_complete.html	2016-03-07 20:38:39 +0000
+++ templates/registration/activation_complete.html	2018-10-15 17:58:30 +0000
@@ -7,8 +7,11 @@
 Activation - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>Activation</h1>
+{% block content_header %}
+    <h1>Activation</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<p>
 		You are now activated and can <a href="{% url 'auth_login' %}">log in</a>.

=== modified file 'templates/registration/login.html'
--- templates/registration/login.html	2016-06-26 09:04:15 +0000
+++ templates/registration/login.html	2018-10-15 17:58:30 +0000
@@ -4,9 +4,11 @@
 Login - {{ block.super }}
 {% endblock %}
 
-{% block content %}
+{% block content_header %}
+    <h1>Login</h1>
+{% endblock %}
 
-<h1>Login</h1>
+{% block content_main %}
 <div class="blogEntry">
 {% if form.errors %}
 	<p class="errormessage">

=== modified file 'templates/registration/logout.html'
--- templates/registration/logout.html	2013-06-30 11:52:47 +0000
+++ templates/registration/logout.html	2018-10-15 17:58:30 +0000
@@ -4,9 +4,11 @@
 Logout - {{ block.super }}
 {% endblock %}
 
-{% block content %}
+{% block content_header %}
+    <h1>Lougout</h1>
+{% endblock %}
 
-<h1>Lougout</h1>
+{% block content_main %}
 <div class="blogEntry">
    You have been logged out.
 </div>

=== modified file 'templates/registration/password_change_done.html'
--- templates/registration/password_change_done.html	2012-05-08 21:52:15 +0000
+++ templates/registration/password_change_done.html	2018-10-15 17:58:30 +0000
@@ -9,8 +9,11 @@
 Password Change - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>Password Change</h1>
+{% block content_header %}
+    <h1>Password Change</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<p>
 		Your password was changed successfully.

=== modified file 'templates/registration/password_change_form.html'
--- templates/registration/password_change_form.html	2012-05-16 22:31:25 +0000
+++ templates/registration/password_change_form.html	2018-10-15 17:58:30 +0000
@@ -9,8 +9,11 @@
 Password Change - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>Password Change</h1>
+{% block content_header %}
+    <h1>Password Change</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<p>
 		Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly.

=== modified file 'templates/registration/password_reset_complete.html'
--- templates/registration/password_reset_complete.html	2016-03-07 20:38:39 +0000
+++ templates/registration/password_reset_complete.html	2018-10-15 17:58:30 +0000
@@ -9,8 +9,11 @@
 Password Reset - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>Password Reset</h1>
+{% block content_header %}
+    <h1>Password Reset</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<p>
 		Your new password has been set. You may go ahead and <a href="{% url 'auth_login' %}">log in</a> now.

=== modified file 'templates/registration/password_reset_confirm.html'
--- templates/registration/password_reset_confirm.html	2012-05-16 22:31:25 +0000
+++ templates/registration/password_reset_confirm.html	2018-10-15 17:58:30 +0000
@@ -9,8 +9,11 @@
 Password Reset - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>Password Reset</h1>
+{% block content_header %}
+    <h1>Password Reset</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 {% if validlink %}
 	<p>

=== modified file 'templates/registration/password_reset_done.html'
--- templates/registration/password_reset_done.html	2012-05-08 21:52:15 +0000
+++ templates/registration/password_reset_done.html	2018-10-15 17:58:30 +0000
@@ -9,8 +9,11 @@
 Password Reset - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>Password Reset</h1>
+{% block content_header %}
+    <h1>Password Reset</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<p>
 		We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly.

=== modified file 'templates/registration/password_reset_form.html'
--- templates/registration/password_reset_form.html	2012-05-16 22:31:25 +0000
+++ templates/registration/password_reset_form.html	2018-10-15 17:58:30 +0000
@@ -9,8 +9,11 @@
 Password Reset - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>Password Reset</h1>
+{% block content_header %}
+    <h1>Password Reset</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<p>
 		Forgotten your password?

=== modified file 'templates/registration/registration_complete.html'
--- templates/registration/registration_complete.html	2012-11-15 18:55:22 +0000
+++ templates/registration/registration_complete.html	2018-10-15 17:58:30 +0000
@@ -7,8 +7,11 @@
 Registration - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>Registration</h1>
+{% block content_header %}
+    <h1>Registration</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<p>
 		Thank you for signing up. An email with the activation code has been sent to your inbox. 

=== modified file 'templates/registration/registration_form.html'
--- templates/registration/registration_form.html	2016-06-03 14:22:24 +0000
+++ templates/registration/registration_form.html	2018-10-15 17:58:30 +0000
@@ -8,8 +8,11 @@
 {% endblock %}
 {{ form.non_field_errors }} 
 
-{% block content %}
-<h1>Registration</h1>
+{% block content_header %}
+	<h1>Registration</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<form action="." method="POST">
 		<table>

=== modified file 'templates/right_boxes.html'
--- templates/right_boxes.html	2018-09-04 17:03:10 +0000
+++ templates/right_boxes.html	2018-10-15 17:58:30 +0000
@@ -5,23 +5,11 @@
  on the site
 {% endcomment %}
 
-
 {% load inbox %}
 {% load i18n %}
 {% load wlprofile_extras wlpoll_extras wlevents_extras %}
 {% load pybb_extras %}
 
-<!-- Social Media Box -->
-<div class="columnModule">
-	<h3>Social Media</h3>
-	<div class="columnModuleBox center">
-		<ul class="socialMediaList center">
-			<li><a href="https://www.facebook.com/WidelandsOfficial"; target="_blank"><img src="{{ MEDIA_URL }}img/socialmedia/facebook.png" alt="Facebook"></a></li>
-			<li><a href="https://plus.google.com/108069355276040649622"; target="_blank"><img src="{{ MEDIA_URL }}img/socialmedia/googleplus.png" alt="Google+"></a></li>
-		</ul>
-	</div>
-</div>
-
 
 <!-- Current polls if any -->
 {% get_open_polls as polls %}

=== modified file 'templates/search/search.html'
--- templates/search/search.html	2017-11-06 17:50:17 +0000
+++ templates/search/search.html	2018-10-15 17:58:30 +0000
@@ -6,10 +6,11 @@
 {{block.super}}
 {% endblock %}
 
-{% block content %}
-
+{% block content_header %}
     <h2>Search</h2>
+{% endblock %}
 
+{% block content_main %}
     <div class="blogEntry">
         <div class="closeable" title="Click to expand">Help</div>
         <ul class="search-help-hints">

=== modified file 'templates/threadedcomments/preview_comment.html'
--- templates/threadedcomments/preview_comment.html	2016-05-15 14:41:54 +0000
+++ templates/threadedcomments/preview_comment.html	2018-10-15 17:58:30 +0000
@@ -7,8 +7,11 @@
 <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/comments.css" />
 {% endblock %}
 
-{% block content %}
-<h1>Comment</h1>
+{% block content_header %}
+    <h1>Comment</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	{% if comment %}
 		<h3>Preview:</h3>

=== modified file 'templates/wiki/backlinks.html'
--- templates/wiki/backlinks.html	2017-01-17 21:25:32 +0000
+++ templates/wiki/backlinks.html	2018-10-15 17:58:30 +0000
@@ -1,15 +1,20 @@
 {% extends 'wiki/base.html' %}
 {% load wiki_extras %}
 {% load i18n %}
+
 {% block title %}
 {{ name }} - Backlinks - {{block.super}}
 {% endblock %}
 
-{% block content %}
-<div class="posRight small">
-	<a class="invertedColor" href="{% url 'wiki_article' name %}">Back to article</a>
-</div>
-<h1>{% trans "Backlinks of " %} {{ name }}</h1>
+{% block content_header %}
+	<h1>{% trans "Backlinks of " %} {{ name }}</h1>
+{% endblock %}
+
+{% block class_wiki_backl %}class="active"{% endblock %}
+{% block class_wiki_hist_atom %}class="hidden"{% endblock %}
+{% block class_wiki_edit %}class="hidden"{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	{% if found_links or found_old_links %}
 		{% if found_links %}

=== modified file 'templates/wiki/base.html'
--- templates/wiki/base.html	2016-04-26 16:10:04 +0000
+++ templates/wiki/base.html	2018-10-15 17:58:30 +0000
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load i18n %}
 
 {% block title %}
 Wiki - {{ block.super }}
@@ -10,3 +11,38 @@
 <link rel="alternate" type="application/atom+xml" title="Wiki History (Atom)" href="{% url 'wiki_history_feed_atom' %}" />
 <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/wiki.css" />
 {% endblock %}
+
+{# Define all(!) tabs for the wiki here (all in one place).
+We disable or change them in the subpages. #}
+
+{% block content_tabbing %}
+<ul class="small tab-list">
+	{% if article.id %}
+		<li>
+			<a {% block class_wiki_edit %}{% endblock %} href="{% url 'wiki_edit' article.title %}">{% trans "Edit this article" %}</a>
+		</li>
+		<li>
+			<a {% block class_wiki_back %}{% endblock %}href="{% url 'wiki_article' article.title %}">{% trans "Back to article" %}</a>
+		</li>
+		<li>
+			<a {% block class_wiki_hist %}{% endblock %} href="{% url 'wiki_article_history' article.title %}">{% trans "History" %}</a>
+		</li>
+		<li>
+			<a {% block class_wiki_backl %}{% endblock %} href="{% url 'backlinks' article.title %}">{% trans "Backlinks" %}</a>
+		</li>
+		<li>
+			<a {% block class_wiki_hist_atom %}{% endblock %} href="{% url 'wiki_article_history_feed_atom' article.title %}">{% trans "Atom feed" %}</a>
+		</li>
+
+		{% if can_observe %}
+		<li>
+			{% if is_observing %} 
+			<a {% block class_wiki_stop_obs %}{% endblock %}href="{% url 'wiki_stop_observing' article.title %}">{% trans "Stop observing" %}</a>
+			{% else %}
+			<a {% block class_wiki_obs %}{% endblock %}href="{% url 'wiki_observe' article.title %}">{% trans "Observe" %}</a>
+			{% endif %}
+		</li>
+		{% endif %}
+	{% endif %}
+</ul>
+{% endblock %}
\ No newline at end of file

=== modified file 'templates/wiki/changeset.html'
--- templates/wiki/changeset.html	2016-03-02 21:02:38 +0000
+++ templates/wiki/changeset.html	2018-10-15 17:58:30 +0000
@@ -5,12 +5,11 @@
 {% trans "Changes in" %} {{ article.title }} - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<div class="posRight small">
-	<a href="{% url 'wiki_article' article.title %}" class="invertedColor">{% trans "Back to article" %}</a>
-	| <a href="{% url 'wiki_article_history' article.title %}" class="invertedColor">{% trans "Editing history" %}</a>
-</div>
-<h1>{% trans "Changes in" %} {{ article.title }}</h1>
+{% block content_header %}
+	<h1>{% trans "Changes in" %} {{ article.title }}</h1>
+{% endblock %}
+
+{% block content_main %}
 
 <div class="blogEntry">
 	{% if changeset.old_title != article.title %}

=== modified file 'templates/wiki/edit.html'
--- templates/wiki/edit.html	2018-09-18 06:42:18 +0000
+++ templates/wiki/edit.html	2018-10-15 17:58:30 +0000
@@ -36,16 +36,15 @@
 {{ block.super }}
 {% endblock %}
 
-{% block content %}
-{% if not new_article %} 
-<div class="posRight small">
-	<a href="{% url 'wiki_article' article.title %}" class="invertedColor">{% trans "Back to article" %}</a>
-	|
-	<a href="{% url 'wiki_article_history' article.title %}" class="invertedColor">{% trans "Editing history" %}</a>
-</div>
-{% endif %}
-<h1>{% trans "Editing" %} {{ article.title }}</h1>
-
+{% block content_header %}
+	<h1>{% trans "Editing" %} {{ article.title }}</h1>
+{% endblock %}
+
+{# add the wanted classes to the tabs #}
+{% block class_wiki_edit %}class="hidden"{% endblock %}
+{% block class_wiki_hist_atom %}class="hidden"{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<p>
 	You can edit the wiki pages contents using the syntax described on the <a href="/wiki/WikiSyntax">WikiSyntax</a>.

=== modified file 'templates/wiki/history.html'
--- templates/wiki/history.html	2018-09-18 06:42:18 +0000
+++ templates/wiki/history.html	2018-10-15 17:58:30 +0000
@@ -7,7 +7,15 @@
 {% trans "Article History of" %} {{ article.title }} - {{ block.super }}
 {% endblock %}
 
-{% block content %}
+{% block content_header %}
+	<h1>{% trans "Article History of" %} {{ article.title }}</h1>
+{% endblock %}
+
+{# add the wanted classes to the tabs #}
+{% block class_wiki_edit %}class="hidden"{% endblock %}
+{% block class_wiki_hist %}class="hidden"{% endblock %}
+
+{% block content_main %}
 {% if changes|length > 1 %}
 <script type="text/javascript">
 	function check() {
@@ -55,12 +63,6 @@
 </script>
 {% endif %}
 
-<div class="posRight small">
-	<a href="{% url 'wiki_article' article.title %}" class="invertedColor">{% trans "Back to article" %}</a>
-	| <a href="{% url 'wiki_article_history_feed_atom' article.title %}"  class="invertedColor">Atom Feed</a>
-</div>
-<h1>{% trans "Article History of" %} {{ article.title }}</h1>
-
 <div class="blogEntry">
 	<form action="{% url 'wiki_revert_to_revision' article.title %}" method="post" onsubmit="return check(this);">
 		<table class="history_list">
@@ -71,8 +73,8 @@
 				<th colspan="2">{% trans "Compare" %}</th>
 				{% endif %}
 				<th>{% trans "Revert" %}</th>
-				<th>{% trans "At" %}</th>
-				<th>{% trans "User" %}</th>
+				<th class="at">{% trans "At" %}</th>
+				<th class="user">{% trans "User" %}</th>
 				<th>{% trans "Comment" %}</th>
 			</tr>
 		</thead>

=== modified file 'templates/wiki/index.html'
--- templates/wiki/index.html	2016-03-02 21:02:38 +0000
+++ templates/wiki/index.html	2018-10-15 17:58:30 +0000
@@ -4,8 +4,11 @@
 
 {% block title %}Wiki Index - {{ block.super }}{% endblock %}
 
-{% block content %}
-<h1>Wiki: Index</h1>
+{% block content_header %}
+	<h1>Wiki: Index</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	{% if articles %}
 		<p> There are {{ articles|length }} articles in this wiki:</p>

=== modified file 'templates/wiki/recentchanges.html'
--- templates/wiki/recentchanges.html	2018-09-07 20:34:55 +0000
+++ templates/wiki/recentchanges.html	2018-10-15 17:58:30 +0000
@@ -9,8 +9,11 @@
 {% trans "Recent Changes" %} - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>Wiki: {% trans "Recent Changes" %}</h1>
+{% block content_header %}
+	<h1>Wiki: {% trans "Recent Changes" %}</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 {% autopaginate changes as object_list %}
 {% paginate using "pagination/pagination_mod.html" %}

=== modified file 'templates/wiki/view.html'
--- templates/wiki/view.html	2017-01-03 15:10:23 +0000
+++ templates/wiki/view.html	2018-10-15 17:58:30 +0000
@@ -12,32 +12,20 @@
 {{ block.super}}
 {% endblock %}
 
-{% block content %}
-<div class="posRight small">
-	{% if article.id %}
-		<a class="invertedColor" href="{% url 'wiki_edit' article.title %}">{% trans "Edit this article" %}</a>
-		|
-		<a class="invertedColor" href="{% url 'wiki_article_history' article.title %}">{% trans "Editing history" %}</a>
-		|
-		<a class="invertedColor" href="{% url 'backlinks' article.title %}">{% trans "Backlinks" %}</a>
-		{% if can_observe %}
-			| 
-			{% if is_observing %} 
-			<a class="invertedColor" href="{% url 'wiki_stop_observing' article.title %}">{% trans "Stop observing" %}</a>
-			{% else %}
-			<a class="invertedColor" href="{% url 'wiki_observe' article.title %}">{% trans "Observe" %}</a>
-			{% endif %}
-		{% endif %}
-	{% endif %}
-</div>
-<h1>{{ article.title }}</h1>
-
+{% block content_header %}
+	<h1>{{ article.title }}</h1>
+{% endblock %}
+
+{# add the wanted classes to the tabs #}
+{% block class_wiki_back %}class="hidden"{% endblock %}
+{% block class_wiki_hist_atom %}class="hidden"{% endblock %}
+
+{% block content_main %}
 	{% if messages %}
 	    {% for message in messages %}
 	    <p class="errormessage">{{ message }}</p>
 	    {% endfor %}
 	{% endif %}
-
 <div class="blogEntry">
 	{% if not article.id %}
 		<p>

=== modified file 'templates/wlggz/edit_ggz.html'
--- templates/wlggz/edit_ggz.html	2013-06-13 18:59:49 +0000
+++ templates/wlggz/edit_ggz.html	2018-10-15 17:58:30 +0000
@@ -6,8 +6,11 @@
 {% trans "Set Online Gaming Password" %} - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>{% trans "Set Online Gaming Password" %}</h1>
+{% block content_header %}
+	<h1>{% trans "Set Online Gaming Password" %}</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">    
 	<form method="post" enctype="multipart/form-data">
 		<table>

=== modified file 'templates/wlhelp/building_details.html'
--- templates/wlhelp/building_details.html	2018-03-09 11:26:52 +0000
+++ templates/wlhelp/building_details.html	2018-10-15 17:58:30 +0000
@@ -7,54 +7,56 @@
 {{ building.displayname }} - {{ tribe.displayname }} - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>{{ tribe.displayname }}: {{ building.displayname }}</h1>
+{% block content_header %}
+    <h1>{{ tribe.displayname }}: {{ building.displayname }}</h1>
+{% endblock %}
+{% block content_main %}
 <div class="blogEntry">
-	<a href="{% url 'wlhelp_index' %}">Encyclopedia Index</a> &#187;
-	<a href="{% url 'wlhelp_buildings' tribe.name %}">{{ tribe.displayname }} Buildings</a> &#187;
-	{{ building.displayname }}
-	<br /><br />
-
-	<h2>Description</h2>
-	<p>{{ building.help }}</p>
-
-	<h2>Economy Graph</h2>
-	{{ building.imagemap|safe }}
-	<img src="{{ building.graph_url }}" usemap="#G" alt="Graph for {{ building.displayname }}" />
+    <a href="{% url 'wlhelp_index' %}">Encyclopedia Index</a> &#187;
+    <a href="{% url 'wlhelp_buildings' tribe.name %}">{{ tribe.displayname }} Buildings</a> &#187;
+    {{ building.displayname }}
+    <br /><br />
+
+    <h2>Description</h2>
+    <p>{{ building.help }}</p>
+
+    <h2>Economy Graph</h2>
+    {{ building.imagemap|safe }}
+    <img src="{{ building.graph_url }}" usemap="#G" alt="Graph for {{ building.displayname }}" />
 
 {% comment %}
 
 {% if building.get_build_cost %}
-	<h2>Build Cost<h2>
-	{% for costs in building.get_build_cost %}
-		{% for w in costs %}
-		<a href="{% url 'wlhelp_ware_details' w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
-		{% endfor %}
-	<br />
-	{% endfor %}
+    <h2>Build Cost<h2>
+    {% for costs in building.get_build_cost %}
+        {% for w in costs %}
+        <a href="{% url 'wlhelp_ware_details' w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
+        {% endfor %}
+    <br />
+    {% endfor %}
 {% endif %}
 
 {% if building.produces or building.trains %}
-	<h2>Produces</h2>
-	{% if building.produces and not building.trains %}
-		{% for w in building.get_ware_outputs %}
-		<a href="{% url 'wlhelp_ware_details' w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
-		{% endfor %}
-	{% else %}
-		{% for wor in building.get_worker_outputs %}
-		<img src="{{ wor.image_url }}" alt="{{ wor.name }}" />
-		{% endfor %}
-	{% endif %}
+    <h2>Produces</h2>
+    {% if building.produces and not building.trains %}
+        {% for w in building.get_ware_outputs %}
+        <a href="{% url 'wlhelp_ware_details' w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
+        {% endfor %}
+    {% else %}
+        {% for wor in building.get_worker_outputs %}
+        <img src="{{ wor.image_url }}" alt="{{ wor.name }}" />
+        {% endfor %}
+    {% endif %}
 {% endif %}
 
 {% if building.get_stored_wares %}
-	<h2>Stores</h2>
-	{% for costs in building.get_stored_wares %}
-		{% for w in costs %}
-		<a href="{% url 'wlhelp_ware_details' w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
-		{% endfor %}
-	<br />
-	{% endfor %}
+    <h2>Stores</h2>
+    {% for costs in building.get_stored_wares %}
+        {% for w in costs %}
+        <a href="{% url 'wlhelp_ware_details' w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
+        {% endfor %}
+    <br />
+    {% endfor %}
 {% endif %}
 
 {% endcomment %}

=== modified file 'templates/wlhelp/buildings.html'
--- templates/wlhelp/buildings.html	2018-03-09 12:12:02 +0000
+++ templates/wlhelp/buildings.html	2018-10-15 17:58:30 +0000
@@ -7,8 +7,11 @@
 Buildings - {{ tribe.displayname }} - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>{{ tribe.displayname }}: Buildings</h1>
+{% block content_header %}
+	<h1>{{ tribe.displayname }}: Buildings</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<div class="posRight">
 		{% include 'wlhelp/inlines/js_form_buildings.html' %}<br />

=== modified file 'templates/wlhelp/index.html'
--- templates/wlhelp/index.html	2018-03-09 11:26:52 +0000
+++ templates/wlhelp/index.html	2018-10-15 17:58:30 +0000
@@ -7,8 +7,10 @@
 {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>Encyclopedia</h1>
+{% block content_header %}
+	<h1>Encyclopedia</h1>
+{% endblock %}
+{% block content_main %}
 <div class="blogEntry">
 Encyclopedia Index
 <h2>All Tribes in Widelands:</h2>

=== modified file 'templates/wlhelp/inlines/tribes_details.html'
--- templates/wlhelp/inlines/tribes_details.html	2018-03-09 11:26:52 +0000
+++ templates/wlhelp/inlines/tribes_details.html	2018-10-15 17:58:30 +0000
@@ -1,7 +1,8 @@
 <div>
-	<img class="posLeft icon" src="{{ tribe.icon_url }}" alt="" />
+	<img class="posLeft icon" src="{{ tribe.icon_url }}" alt="Tribes Icon" />
 	<p>{{ tribe.descr }}</p>
 </div>
+
 <ul>
 	<li><a href="{% url 'wlhelp_buildings' tribe.name %}">Buildings</a></li>
 	<li><a href="{% url 'wlhelp_wares' tribe.name %}">Wares</a></li>

=== modified file 'templates/wlhelp/ware_details.html'
--- templates/wlhelp/ware_details.html	2018-03-09 11:26:52 +0000
+++ templates/wlhelp/ware_details.html	2018-10-15 17:58:30 +0000
@@ -7,8 +7,11 @@
 {{ ware.displayname }} - {{ tribe.displayname }} - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>{{ tribe.displayname }}: {{ ware.displayname }}</h1>
+{% block content_header %}
+	<h1>{{ tribe.displayname }}: {{ ware.displayname }}</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<a href="{% url 'wlhelp_index' %}">Encyclopedia Index</a> &#187;
 	<a href="{% url 'wlhelp_wares' tribe.name %}">{{ tribe.displayname }} Wares</a> &#187;

=== modified file 'templates/wlhelp/wares.html'
--- templates/wlhelp/wares.html	2018-03-31 15:51:08 +0000
+++ templates/wlhelp/wares.html	2018-10-15 17:58:30 +0000
@@ -7,8 +7,11 @@
 {{ tribe.displayname }} - Wares - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>{{ tribe.displayname }}: Wares</h1>
+{% block content_header %}
+	<h1>{{ tribe.displayname }}: Wares</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<div class="posRight">
 		{% include 'wlhelp/inlines/js_form_scripting.html' %}

=== modified file 'templates/wlhelp/worker_details.html'
--- templates/wlhelp/worker_details.html	2018-03-09 11:26:52 +0000
+++ templates/wlhelp/worker_details.html	2018-10-15 17:58:30 +0000
@@ -7,8 +7,11 @@
 {{ worker.displayname }} - {{ tribe.displayname }} - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>{{ tribe.displayname }}: {{ worker.displayname }}</h1>
+{% block content_header %}
+	<h1>{{ tribe.displayname }}: {{ worker.displayname }}</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<a href="{% url 'wlhelp_index' %}">Encyclopedia Index</a> &#187;
 	<a href="{% url 'wlhelp_workers' tribe.name %}">{{ tribe.displayname }} Workers</a> &#187;

=== modified file 'templates/wlhelp/workers.html'
--- templates/wlhelp/workers.html	2018-03-29 14:59:33 +0000
+++ templates/wlhelp/workers.html	2018-10-15 17:58:30 +0000
@@ -7,8 +7,11 @@
 Workers - {{ tribe.displayname }} - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>{{ tribe.displayname }}: Workers</h1>
+{% block content_header %}
+	<h1>{{ tribe.displayname }}: Workers</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<div class="posRight">
 		{% include 'wlhelp/inlines/js_form_scripting.html' %}

=== modified file 'templates/wlimages/upload.html'
--- templates/wlimages/upload.html	2016-11-25 12:36:59 +0000
+++ templates/wlimages/upload.html	2018-10-15 17:58:30 +0000
@@ -3,7 +3,7 @@
    vim:ft=htmldjango
 {% endcomment %}
 
-{% block content %}
+{% block content_main %}
 	<div class="blogEntry"
 		<form  enctype="multipart/form-data" action="/images/upload/" method="POST">
 		{{ upload_form.imagename.errors }}

=== modified file 'templates/wlmaps/edit_comment.html'
--- templates/wlmaps/edit_comment.html	2016-06-26 09:04:15 +0000
+++ templates/wlmaps/edit_comment.html	2018-10-15 17:58:30 +0000
@@ -1,7 +1,9 @@
 {% extends "wlmaps/base.html" %}
 
-{% block content %} 
-<h1>Edit comment: {{ map.name }}</h1>
+{% block content_header %}
+    <h1>Edit comment: {{ map.name }}</h1>
+{% endblock %}
+{% block content_main %} 
 <div class="blogEntry">
     <form enctype="multipart/form-data" action="{% url 'wlmaps_edit_comment' map.slug %}" method="post">
         <div>

=== modified file 'templates/wlmaps/index.html'
--- templates/wlmaps/index.html	2018-04-07 15:35:47 +0000
+++ templates/wlmaps/index.html	2018-10-15 17:58:30 +0000
@@ -9,9 +9,19 @@
 {% load threadedcommentstags %}
 {% load pagination_tags %}
 
-{% block content %}
-<a href="{% url 'wlmaps_upload' %}" class="posRight invertedColor small">Upload a new map</a>
-<h1>Maps</h1>
+{% block content_header %}
+	<h1>Maps</h1>
+{% endblock %}
+{% block content_tabbing %}
+	<ul class="tab-list small">
+		<li>
+			<a href="{% url 'wlmaps_upload' %}">Upload a new map</a>
+		</li>
+	</ul>
+{% endblock %}
+
+{% block content_main %}
+
 <div class="blogEntry">
 	<p>
 	The map files have to be placed in the Widelands map directory to be found by the game. Check the <a href="/wiki/Technical%20FAQ/#where_are_my_maps_and_savegames_stored">Technical FAQ</a> to find the map directory.
@@ -70,7 +80,7 @@
 						<td class="spacer"></td>
 						<td colspan="2">
 							<a class="button" href="{% url 'wlmaps_download' map.slug %}">
-								<img src="{{ MEDIA_URL }}img/download.png" alt ="" class="middle" />
+								<img src="{{ MEDIA_URL }}img/arrow_down_short.png" alt ="" class="middle" />
 								<span class="middle">Direct Download</span>
 							</a>
 						</td>

=== modified file 'templates/wlmaps/map_detail.html'
--- templates/wlmaps/map_detail.html	2018-04-07 15:35:47 +0000
+++ templates/wlmaps/map_detail.html	2018-10-15 17:58:30 +0000
@@ -32,8 +32,10 @@
 {% endif %}
 {% endblock %}
 
-{% block content %}
-<h1>Map: {{ map.name }}</h1>
+{% block content_header %}
+    <h1>Map: {{ map.name }}</h1>
+{% endblock %}
+{% block content_main %}
 <div class="blogEntry" style="padding-bottom: 3em">
 	<div>
 		<a href="{% url 'wlmaps_index' %}">Maps</a> &#187; {{ map.name }}
@@ -121,7 +123,7 @@
 	
 	<div style="margin: 1em 0px 1em 0px">
 	<a class="button posLeft" href="{% url 'wlmaps_download' map.slug %}">
-		<img src="{{ MEDIA_URL }}img/download.png" alt ="" class="middle" />
+		<img src="{{ MEDIA_URL }}img/arrow_down_short.png" alt ="" class="middle" />
 		<span class="middle">Download this map</span>
 	</a>
 	</div>

=== modified file 'templates/wlmaps/upload.html'
--- templates/wlmaps/upload.html	2016-06-26 09:04:15 +0000
+++ templates/wlmaps/upload.html	2018-10-15 17:58:30 +0000
@@ -5,8 +5,10 @@
 
 {% block title %}Upload - {{ block.super }}{% endblock %}
 
-{% block content %}
-<h1>Map Upload</h1>
+{% block content_header %}
+	<h1>Map Upload</h1>
+{% endblock %}
+{% block content_main %}
 <div class="blogEntry">
 	<div class="breadCrumb">
 		<a href="{% url 'wlmaps_index' %}">Maps</a> &#187; Upload

=== modified file 'templates/wlpoll/poll_detail.html'
--- templates/wlpoll/poll_detail.html	2017-09-23 08:52:36 +0000
+++ templates/wlpoll/poll_detail.html	2018-10-15 17:58:30 +0000
@@ -9,15 +9,33 @@
 
 {% block title %}{{ object.name }} - {{ block.super }}{% endblock %}
 
-{% block content %}
+{% block content_header %}
+	<h1>Poll: {{ object.name }}</h1>
+{% endblock %}
+
+{% block content_tabbing %}
 	{% if perms.wlpoll %}
-	<div class="small posRight">
-		{% if perms.wlpoll.add_poll %}<a href="/admin/wlpoll/poll/add/" class="invertedColor">Add New Poll</a>{% endif %}
-		{% if perms.wlpoll.change_poll %}| <a href="/admin/wlpoll/poll/{{object.id}}/" class="invertedColor">Edit</a>{% endif %}
-		{% if perms.wlpoll.delete_poll %}| <a href="/admin/wlpoll/poll/{{object.id}}/delete/" class="invertedColor">Delete</a>{% endif %}
-	</div>
+	<ul class="small tab-list">
+		{% if perms.wlpoll.add_poll %}
+			<li>
+				<a href="/admin/wlpoll/poll/add/">Add New Poll</a>
+			</li>
+		{% endif %}
+		{% if perms.wlpoll.change_poll %}
+			<li>
+				<a href="/admin/wlpoll/poll/{{object.id}}/">Edit</a>
+			</li>
+		{% endif %}
+		{% if perms.wlpoll.delete_poll %}
+			<li>
+				<a href="/admin/wlpoll/poll/{{object.id}}/delete/">Delete</a>
+			</li>
+		{% endif %}
+	</ul>
 	{% endif %}
-	<h1>Poll: {{ object.name }}</h1>
+
+{% endblock %}
+{% block content_main %}
 	<div class="blogEntry">
 		<div id="chartContainer" style="width: 100%; height: 400px"></div>
 		{% display_poll object %}		

=== modified file 'templates/wlpoll/poll_list.html'
--- templates/wlpoll/poll_list.html	2016-06-07 18:24:20 +0000
+++ templates/wlpoll/poll_list.html	2018-10-15 17:58:30 +0000
@@ -11,13 +11,23 @@
 {% load threadedcommentstags custom_date %}
 {% block title %}Poll Archive - {{ block.super }}{% endblock %}
 
-{% block content %}
+{% block content_header %}
+    <h1>Poll Archive</h1>
+{% endblock %}
+
+{% block content_tabbing %}
     {% if perms.wlpoll %}
-	<div class="small posRight">
-		{% if perms.wlpoll.add_poll %}<a href="/admin/wlpoll/poll/add/" class="invertedColor">Add New Poll</a>{% endif %}
-	</div>
+	<ul class="small tab-list">
+        <li>
+		{% if perms.wlpoll.add_poll %}
+            <a href="/admin/wlpoll/poll/add/">Add New Poll</a>
+        {% endif %}
+        </li>
+	</ul>
     {% endif %}
-    <h1>Poll Archive</h1>
+{% endblock %}
+
+{% block content_main %}
     <div class="blogEntry">
         <div class="post">
         <table>

=== modified file 'templates/wlprofile/base.html'
--- templates/wlprofile/base.html	2015-02-18 22:30:08 +0000
+++ templates/wlprofile/base.html	2018-10-15 17:58:30 +0000
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+
 {% comment %}
    vim:ft=htmldjango
 {% endcomment %}
@@ -10,3 +11,35 @@
 {% block extra_head %}
 <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/profile.css" />{{ block.super}}
 {% endblock %}
+
+{% block content_tabbing %}
+	<ul class="tab-list small">
+	{% if profile.user and user != profile.user %}
+		{% if not profile.deleted %}
+		<li>
+			<a {% block send_pm %}{% endblock %} href="{% url 'messages_compose_to' profile.user %}">Send PM</a>
+		</li>
+		{% endif %}
+	{% else %}
+		<li>
+			<a {% block profile %}{% endblock %} href="{% url 'profile_view' %}">Profile</a>
+		</li>
+		<li>
+			<a {% block edit_profile %}{% endblock %} href="{% url 'profile_edit' %}">Edit Profile</a>
+		</li>
+		<li>
+			<a {% block notifications %}{% endblock %} href="{% url 'notification_notices' %}">E-Mail settings</a>
+		</li>
+		<li>
+			<a {% block scheduling %}{% endblock %} href="{% url 'scheduling_main' %}">Game Scheduler</a>
+			<ul>
+				<li><a href="{% url 'scheduling_scheduling' %}">Define your playtime</a></li>
+				<li><a href="{% url 'scheduling_find' %}">Show playtimes</a></li>
+			</ul>
+		</li>
+		<li>
+			<a {% block messages %}{% endblock %} href="{% url 'messages_inbox' %}" title="Your private messages">Messages</a>
+		</li>
+	{% endif %}
+	</ul>
+{% endblock %}

=== modified file 'templates/wlprofile/delete_me.html'
--- templates/wlprofile/delete_me.html	2018-09-17 15:22:29 +0000
+++ templates/wlprofile/delete_me.html	2018-10-15 17:58:30 +0000
@@ -7,9 +7,10 @@
 {% trans "Delete me" %} - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>{% trans "Delete your account" %}</h1>
-
+{% block content_header %}
+	<h1>{% trans "Delete your account" %}</h1>
+{% endblock %}
+{% block content_main %}
 <div class="blogEntry">
 	<h3>Hi {{ user }},</h3>
 	<p>we are sorry that you want to leave our community <img src="/wlmedia/img/smileys/face-sad.png" alt="Sad smiley"></p>

=== modified file 'templates/wlprofile/edit_profile.html'
--- templates/wlprofile/edit_profile.html	2018-09-12 21:20:59 +0000
+++ templates/wlprofile/edit_profile.html	2018-10-15 17:58:30 +0000
@@ -6,9 +6,13 @@
 {% trans "Profile Editing" %} - {{ block.super }}
 {% endblock %}
 
-{% block content %}
-<h1>{% trans "Profile Editing" %}</h1>
-
+{% block edit_profile %}class="active"{% endblock %}
+
+{% block content_header %}
+	<h1>{% trans "Profile Editing" %}</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<form method="post" enctype="multipart/form-data" action=".">
 		<table>

=== modified file 'templates/wlprofile/view_profile.html'
--- templates/wlprofile/view_profile.html	2018-09-17 15:22:29 +0000
+++ templates/wlprofile/view_profile.html	2018-10-15 17:58:30 +0000
@@ -13,20 +13,19 @@
 	{{ block.super }}
 {% endblock %}
 
-{% block content %}
-<div class="posRight small">
-	{% ifequal user profile.user %}
-		<a class="invertedColor" href="{% url 'profile_edit' %}">Edit Profile</a>
-	{% endifequal %}
-</div>
-<h1>{% if not profile.deleted %}
+{% block profile %}class="active"{% endblock %}
+
+{% block content_header %}
+	<h1>{% if not profile.deleted %}
 		{{ profile.user.username }}'s
 	{% else %}
 		Deleted User
 	{% endif %}
 	Profile
-</h1>
+	</h1>
+{% endblock %}
 
+{% block content_main %}
 <div class="blogEntry">
 	{% if not profile.deleted %}
 		<table>
@@ -37,12 +36,7 @@
 				{% endif %}
 				</td>
 				<td>
-				{% ifnotequal user profile.user %}
-					<button onclick="window.location.href='{% url 'messages_compose_to' profile.user %}';">
-						<img src="{{ MEDIA_URL }}forum/img/send_pm.png" alt ="" class="middle" />
-						<span class="middle">{% trans "Send PM" %}</span>
-					</button>
-				{% endifnotequal %}
+
 				</td>
 			</tr>
 			<tr>
@@ -92,3 +86,4 @@
 </div>
 
 {% endblock %}
+

=== modified file 'templates/wlscheduling/base.html'
--- templates/wlscheduling/base.html	2018-02-09 16:58:51 +0000
+++ templates/wlscheduling/base.html	2018-10-15 17:58:30 +0000
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "wlprofile/base.html" %}
 {% block extra_head %}
 <link  rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/jquery-ui.multidatespicker.css" >
 <link  rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/scheduling.css" >
@@ -9,4 +9,5 @@
 
 {% block title %}
     Scheduling - {{block.super}}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+{% block scheduling %}class="active"{% endblock %}

=== modified file 'templates/wlscheduling/find.html'
--- templates/wlscheduling/find.html	2018-02-11 16:25:40 +0000
+++ templates/wlscheduling/find.html	2018-10-15 17:58:30 +0000
@@ -3,16 +3,18 @@
    vim:ft=htmldjango
 {% endcomment %}
 
-{% block content %}
+{% block content_header %}
+    <h1>Scheduling: Other users playtimes</h1>
+{% endblock %}
+
+{% block content_main %}
 <script type="text/javascript">
 document.addEventListener('DOMContentLoaded', function(){ 
     addTimeZoneWarningIfNeeded();
     addOtherUsersAvailabilities();
 }, false);
 </script>
-
 <div class="blogEntry">
-    <h1>Times other players are available</h1>
     {% include "wlscheduling/timezone-msg.html" %}
     <div id="other-users-wrapper"></div>
     <div id="no-user-to-display" hidden="hidden">Sorry currently there isn't anybody who has scheduled a gaming session. Don't hesitate to signal to other when you'll be available <a href="{% url 'scheduling_scheduling' %}">here</a></div>

=== modified file 'templates/wlscheduling/main.html'
--- templates/wlscheduling/main.html	2017-12-23 09:15:02 +0000
+++ templates/wlscheduling/main.html	2018-10-15 17:58:30 +0000
@@ -4,11 +4,12 @@
    vim:ft=htmldjango
 {% endcomment %}
 
-{% block content %}
-
-
+{% block content_header %}
+<h1>Welcome in the scheduling module!</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
-    <h1>Welcome in the scheduling module!</h1>
     <div id="main-choices" class="main-choices">
         <a href="{% url 'scheduling_scheduling' %}" >
             <button title="You know when you will be available to play and want to display when you're available and find other players that will be available at these hours">Define your playtime and find a game</button>

=== modified file 'templates/wlscheduling/scheduling.html'
--- templates/wlscheduling/scheduling.html	2018-02-11 16:25:40 +0000
+++ templates/wlscheduling/scheduling.html	2018-10-15 17:58:30 +0000
@@ -4,9 +4,11 @@
    vim:ft=htmldjango
 {% endcomment %}
 
-
-
-{% block content %}
+{% block content_header %}
+    <h1>Multiplayer</h1>
+{% endblock %}
+
+{% block content_main %}
 <script type="text/javascript">
 document.addEventListener('DOMContentLoaded', function(){ 
     var calendar = createCalendar();
@@ -21,8 +23,6 @@
 }, false);
 </script>
 
-<h1>Multiplayer</h1>
-
 <div class="blogEntry">
     <h2>Select the dates you'll be available on</h2>
     {% include "wlscheduling/timezone-msg.html" %}

=== modified file 'templates/wlscreens/index.html'
--- templates/wlscreens/index.html	2017-10-01 08:01:09 +0000
+++ templates/wlscreens/index.html	2018-10-15 17:58:30 +0000
@@ -20,9 +20,10 @@
 </script>
 {% endblock %}
 
-{% block content %}
-<h1>Screenshots</h1>
-
+{% block content_header %}
+	<h1>Screenshots</h1>
+{% endblock %}
+{% block content_main %}
 {% for c in categories %}
 	<div class="blogEntry">
 		<h2>{{ c.name }}</h2>

=== modified file 'templates/wlwebchat/index.html'
--- templates/wlwebchat/index.html	2016-07-10 13:33:12 +0000
+++ templates/wlwebchat/index.html	2018-10-15 17:58:30 +0000
@@ -5,8 +5,11 @@
 
 {% block title %}Webchat - {{ block.super }}{% endblock %}
 
-{% block content %}
-<h1>Webchat</h1>
+{% block content_header %}
+    <h1>Webchat</h1>
+{% endblock %}
+
+{% block content_main %}
 <div class="blogEntry">
 	<p>
 	This is a webchat applet provided by the <a href="http://www.freenode.net";>freenode network</a>. This is a convenient

=== modified file 'wiki/views.py'
--- wiki/views.py	2018-09-18 06:42:18 +0000
+++ wiki/views.py	2018-10-15 17:58:30 +0000
@@ -671,6 +671,8 @@
 
     context = {'found_links': found_links,
                'found_old_links': found_old_links,
-               'name': title}
+               'name': title,
+               'article': this_article,
+               }
     return render(request, 'wiki/backlinks.html',
                               context,)

=== modified file 'wlscheduling/views.py'
--- wlscheduling/views.py	2018-02-04 21:49:55 +0000
+++ wlscheduling/views.py	2018-10-15 17:58:30 +0000
@@ -16,6 +16,7 @@
 #########
 # Views #
 #########
+@login_required
 def scheduling_main (request):
     return render(request, 'wlscheduling/main.html')