Merge remote-tracking branch 'upstream/staging' into ikhaya-addition

chris34 · chris34 · commit 7a856e244e81 · 2015-09-19T21:46:06.000+02:00
diff --git a/inyoka_theme_default/templates/base.html b/inyoka_theme_default/templates/base.html
@@ -22,11 +22,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   {% endblock %}
 
-  <title>
-    {% block page_title %}
-      Inyoka
-    {% endblock %}
-  </title>
+  <title>{% block title %}Inyoka{% endblock %}</title>
 
   <link href="{{ href('static', 'style', 'style.css') }}" rel="stylesheet" type="text/css" />
 {% endblock %}
diff --git a/inyoka_theme_default/templates/errors/400_csrf.html b/inyoka_theme_default/templates/errors/400_csrf.html
@@ -9,6 +9,9 @@
 #}
 
 {% extends 'base.html' %}
+{% block title %}
+  400 - {{ super() }}
+{% endblock title %}
 
 {% block content %}
   <h2>{% trans %}Bad request{% endtrans %}</h2>
diff --git a/inyoka_theme_default/templates/errors/403.html b/inyoka_theme_default/templates/errors/403.html
@@ -12,6 +12,10 @@
 
 {% extends 'base.html' %}
 
+{% block title %}
+  403 - {{ super() }}
+{% endblock title %}
+
 {% block content %}
   <p>
     {% trans %}You do not have permissions to access this page.{% endtrans %}
diff --git a/inyoka_theme_default/templates/errors/404.html b/inyoka_theme_default/templates/errors/404.html
@@ -10,6 +10,10 @@
 
 {% extends 'base.html' %}
 
+{% block title %}
+  404 - {{ super() }}
+{% endblock title %}
+
 {% block content %}
   {% if err_message %}
     <p>{{ err_message }}</p>
diff --git a/inyoka_theme_default/templates/forum/base.html b/inyoka_theme_default/templates/forum/base.html
@@ -12,6 +12,10 @@
 
 {% set active_app = 'forum' %}
 
+{% block title %}
+  Forum - {{ super() }}
+{% endblock %}
+
 {% block scripts %}
   <script src="{{ href('static', 'js', 'forum.js') }}"></script>
 {% endblock %}
diff --git a/inyoka_theme_default/templates/forum/edit.html b/inyoka_theme_default/templates/forum/edit.html
@@ -10,6 +10,9 @@
 #}
 
 {% extends 'forum/base.html' %}
+{% block title %}
+  {{_('Edit') }} - {{ topic }} - {{ super() }}
+{% endblock %}
 
 {% block breadcrumb %}
   {{ super() }}
diff --git a/inyoka_theme_default/templates/forum/forum.html b/inyoka_theme_default/templates/forum/forum.html
@@ -9,6 +9,10 @@
 #}
 {% extends 'forum/base.html' %}
 
+{% block title %}
+  {{ forum }} - {{ super() }}
+{% endblock title %}
+
 {% import 'macros.html' as macros %}
 {% set rendered_pagination = macros.render_pagination(pagination) %}
 
diff --git a/inyoka_theme_default/templates/forum/topic.html b/inyoka_theme_default/templates/forum/topic.html
@@ -12,6 +12,10 @@
 
 {% extends 'forum/base.html' %}
 
+{% block title %}
+  {{ topic }} - {{ topic.forum }} - {{ super() }}
+{% endblock %}
+
 {% block breadcrumb %}
   {{ super() }}
 
diff --git a/inyoka_theme_default/templates/ikhaya/base.html b/inyoka_theme_default/templates/ikhaya/base.html
@@ -9,6 +9,10 @@
 #}
 {% extends 'base.html' %}
 
+{% block title %}
+  Ikhaya - {{ super() }}
+{% endblock %}
+
 {% set active_app = 'ikhaya' %}
 
 {% block breadcrumb %}
diff --git a/inyoka_theme_default/templates/ikhaya/detail.html b/inyoka_theme_default/templates/ikhaya/detail.html
@@ -16,6 +16,10 @@
   (_('Comments - Full'), href('ikhaya', feed|format('full'))),
   ] %}
 
+{% block title %}
+  {{ article.subject }} - {{ super() }}
+{% endblock %}
+
 {% block breadcrumb %}
   {{ super() }}
 
diff --git a/inyoka_theme_default/templates/pastebin/add.html b/inyoka_theme_default/templates/pastebin/add.html
@@ -11,6 +11,10 @@
 #}
 {% extends 'pastebin/base.html' %}
 
+{% block title %}
+  {{ _('New psate') }} - {{ super() }}
+{% endblock %}
+
 {% block breadcrumb %}
   {{ super() }}
 
diff --git a/inyoka_theme_default/templates/pastebin/base.html b/inyoka_theme_default/templates/pastebin/base.html
@@ -1,5 +1,5 @@
 {#
-    pastebin/page.html
+    pastebin/base.html
     ~~~~~~~~~~~~~~~~~~
 
     This template is included by all pastebin templates and adds the elements
@@ -10,6 +10,10 @@
 #}
 {% extends 'base.html' %}
 
+{% block title %}
+  {{ _('Pastebin') }} - {{ super() }}
+{% endblock %}
+
 {% block breadcrumb %}
   {{ super() }}
 
diff --git a/inyoka_theme_default/templates/pastebin/display.html b/inyoka_theme_default/templates/pastebin/display.html
@@ -10,6 +10,9 @@
 #}
 {% extends 'pastebin/base.html' %}
 
+{% block title %}
+  {{ entry.title }} - {{ super() }}
+{% endblock %}
 {% block breadcrumb %}
   {{ super() }}
 
diff --git a/inyoka_theme_default/templates/planet/base.html b/inyoka_theme_default/templates/planet/base.html
@@ -10,6 +10,10 @@
 #}
 {% extends 'base.html' %}
 
+{% block title %}
+  Planet - {{ super() }}
+{% endblock %}
+
 {% block breadcrumb %}
   {{ macros.breadcrumb_item(_('Planet'), href('planet')) }}
 {% endblock %}
diff --git a/inyoka_theme_default/templates/portal/base.html b/inyoka_theme_default/templates/portal/base.html
@@ -10,6 +10,10 @@
 
 {% extends 'base.html' %}
 
+{% block title %}
+  Portal - {{ super() }}
+{% endblock %}
+
 {% set active_app = 'portal' %}
 
 {% block breadcrumb %}
diff --git a/inyoka_theme_default/templates/portal/login.html b/inyoka_theme_default/templates/portal/login.html
@@ -10,6 +10,10 @@
 
 {% extends 'portal/base.html' %}
 
+{% block title %}
+  Login - {{ super() }}
+{% endblock %}
+
 {% block breadcrumb %}
   {{ super() }}
 
diff --git a/inyoka_theme_default/templates/portal/profile.html b/inyoka_theme_default/templates/portal/profile.html
@@ -9,6 +9,10 @@
 #}
 {% extends 'portal/base.html' %}
 
+{% block title %}
+  {{ user.username }} - {{ super() }}
+{% endblock %}
+
 {% block breadcrumb %}
   {{ super() }}
 
diff --git a/inyoka_theme_default/templates/portal/register.html b/inyoka_theme_default/templates/portal/register.html
@@ -10,6 +10,10 @@
 
 {% extends 'portal/base.html' %}
 
+{% block title %}
+  {{ _('Register') }} - {{ super() }}
+{% endblock %}
+
 {% block breadcrumb %}
   {{ super() }}
 
diff --git a/inyoka_theme_default/templates/portal/user_admin.html b/inyoka_theme_default/templates/portal/user_admin.html
@@ -9,6 +9,10 @@
 #}
 {% extends 'portal/base.html' %}
 
+{% block title %}
+  {{ _('Edit') }} - {{ user.username }} - {{ super() }}
+{% endblock %}
+
 {% block breadcrumb %}
   {{ super() }}
 
diff --git a/inyoka_theme_default/templates/portal/user_edit_groups.html b/inyoka_theme_default/templates/portal/user_edit_groups.html
@@ -9,6 +9,9 @@
 #}
 {% extends 'portal/user_admin.html' %}
 
+{% block title %}
+  {{ _('Group memberships') }} - {{ super() }}
+{% endblock %}
 
 {% block breadcrumb %}
   {{ super() }}
diff --git a/inyoka_theme_default/templates/portal/user_edit_privileges.html b/inyoka_theme_default/templates/portal/user_edit_privileges.html
@@ -9,6 +9,10 @@
 #}
 {% extends 'portal/user_admin.html' %}
 
+{% block title %}
+  {{ _('Privileges') }} - {{ super() }}
+{% endblock %}}
+
 {% block breadcrumb %}
   {{ super() }}
   {{ macros.breadcrumb_item(_('Privileges'), href('portal', 'user', user.urlsafe_username, 'edit', 'privileges')) }}
diff --git a/inyoka_theme_default/templates/portal/user_edit_profile.html b/inyoka_theme_default/templates/portal/user_edit_profile.html
@@ -9,6 +9,10 @@
 #}
 {% extends 'portal/user_admin.html' %}
 
+{% block title %}
+  {{ super() }}
+{% endblock %}
+
 {% block breadcrumb %}
   {{ super() }}
   {{ macros.breadcrumb_item(_('Profile'), href('portal', 'user', user.urlsafe_username, 'edit', 'profile')) }}
diff --git a/inyoka_theme_default/templates/wiki/base.html b/inyoka_theme_default/templates/wiki/base.html
@@ -10,6 +10,10 @@
 
 {% extends 'base.html' %}
 
+{% block title %}
+  Wiki - {{ super() }}
+{% endblock %}
+
 {% set active_app = 'wiki' %}
 
 {% block breadcrumb %}
