Merge branch 'hotfix/0.2.8'

account/templates/hammertime.html

@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block body %}
+    <div class="container">
+        <div class="row">
+            <div class="span6 offset3">
+                <h1>Stop, Hammer-time!</h1>
+            </div>
+        </div>
+        <div class="row">
+            <div class="text-center span4 offset4" style="background-color: #eee;">
+
+                <img src="{{ STATIC_URL }}img/mchammer.gif" />
+            </div>
+        </div>
+    </div>
+{% endblock body %}

account/views.py

@@ -266,3 +266,6 @@ def admin(request):
     #username = cleaned_data.get('username')
     #admin_username = self._request.user.username
     #admin_password = self._request.session['ldap_password']
+
+def hammertime(request):
+    return render(request, 'hammertime.html', {})

cbmi/conf/locale/de/LC_MESSAGES/django.po

@@ -0,0 +1,39 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-10-25 20:39+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/base.html:53
+msgid "member interface"
+msgstr ""
+
+#: templates/base.html:89
+msgid ""
+"On this website any member can view and\n"
+"                    edit their data stored in the LDAP directory of\n"
+"                    c-base."
+msgstr ""
+
+#: templates/base.html:94
+msgid ""
+"If you are a new member and don't have a\n"
+"                    password yet, please contact one of the following people:"
+msgstr ""
+
+#: templates/base.html:112
+msgid "Sign in"
+msgstr ""

cbmi/urls.py

@@ -4,6 +4,7 @@ from django.contrib import admin
 admin.autodiscover()
 
 urlpatterns = patterns('',
+    url(r'^stop/hammertime/$', 'account.views.hammertime', name="hammertime"),
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     url(r'^admin/', include(admin.site.urls)),