summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--conf/dev_settings.py11
-rw-r--r--requirements.txt2
-rw-r--r--sublab_project/news/templates/news/news_list.html10
-rw-r--r--sublab_project/news/urls.py8
-rw-r--r--sublab_project/templates/404.html13
-rw-r--r--sublab_project/templates/500.html130
-rw-r--r--sublab_project/templates/base.html151
-rw-r--r--sublab_project/urls.py6
9 files changed, 328 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 903440c..14b79dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
*.db
sublab_project/local_settings.py
+*.pyc
+*.swp
diff --git a/conf/dev_settings.py b/conf/dev_settings.py
index b61a979..1953653 100644
--- a/conf/dev_settings.py
+++ b/conf/dev_settings.py
@@ -1,6 +1,6 @@
import os
-from settings import SITE_ROOT
+from settings import SITE_ROOT, INSTALLED_APPS, MIDDLEWARE_CLASSES
DEBUG = True
TEMPLATE_DEBUG = DEBUG
@@ -11,3 +11,12 @@ DATABASES = {
'NAME': os.path.join(SITE_ROOT, 'sublab.db'),
}
}
+
+INSTALLED_APPS += ('debug_toolbar',)
+MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
+
+INTERNAL_IPS = ('127.0.0.1')
+
+DEBUG_TOOLBAR_CONFIG = {
+ 'INTERCEPT_REDIRECTS': False,
+}
diff --git a/requirements.txt b/requirements.txt
index c1765cc..1dc77a1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,6 @@
Django==1.3.1
South==0.7.3
gunicorn==0.13.4
+django-debug-toolbar==0.8.5
creole==1.2
+
diff --git a/sublab_project/news/templates/news/news_list.html b/sublab_project/news/templates/news/news_list.html
new file mode 100644
index 0000000..ab998e8
--- /dev/null
+++ b/sublab_project/news/templates/news/news_list.html
@@ -0,0 +1,10 @@
+{% extends 'base.html' %}
+
+{%block content %}
+ {% for post in news_list %}
+ <h3 id="{{ post.slug }}">
+ <a>{{ post.date_updated|date }} - {{ post.title }}</a>
+ </h3>
+ <p>{{ post.content }}</p>
+ {% endfor %}
+{% endblock content %}
diff --git a/sublab_project/news/urls.py b/sublab_project/news/urls.py
new file mode 100644
index 0000000..a1c5c0a
--- /dev/null
+++ b/sublab_project/news/urls.py
@@ -0,0 +1,8 @@
+from django.conf.urls.defaults import patterns, include, url
+from django.views.generic import ListView, DetailView
+
+from news.models import News
+
+urlpatterns = patterns('',
+ url(r'^$', ListView.as_view(model=News, paginate_by=8), name='news_list')
+)
diff --git a/sublab_project/templates/404.html b/sublab_project/templates/404.html
index e69de29..0aab876 100644
--- a/sublab_project/templates/404.html
+++ b/sublab_project/templates/404.html
@@ -0,0 +1,13 @@
+{% extends 'base.html' %}
+
+{% block title %}sublab - page not found{% endblock %}
+
+{# {% block motd %}{% endblock %} #}
+{% block content %}
+ Leider konnten wir die Datei zu Deiner Anfrage nicht finden. Eventuell
+ ist der Link den Du benutzt hast fehlerhaft oder veraltet. Falls Du der
+ Meinung bist, dass dieser Link funktionieren sollte, kontaktiere bitte
+ kontakt [at] sublab.org.
+
+ Hier geht es zur <a href="/">Startseite</a>.
+{% endblock %}
diff --git a/sublab_project/templates/500.html b/sublab_project/templates/500.html
index e69de29..dd87d27 100644
--- a/sublab_project/templates/500.html
+++ b/sublab_project/templates/500.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <meta charset="UTF-8">
+ <title>sublab - page not found</title>
+
+ <meta name="author" content="sublab e.V.">
+ <meta name="robots" content="index,follow">
+
+ <meta name="keywords" content="sublab, Hackerspace, Leipzig, Computer, Linux, Freie Software">
+ {# <meta name="description" lang="de" content="$template_desc_de"> #}
+ {# <meta name="description" lang="en" content="$template_desc_en"> #}
+
+ <link rel="stylesheet" href="css/sublab-2011-11-02.css" type="text/css">
+ <link rel="stylesheet" href="css/taifun.status.css" type="text/css">
+ <link rel="stylesheet" href="css/trieste.status.css" type="text/css">
+ <link rel="stylesheet" href="css/nautilus.status.css" type="text/css">
+ <link rel="shortcut icon" href="img/favicon.png">
+ </head>
+
+ <body>
+ <div class="hiddenframe">
+ <div class="frame">
+
+ <div class="logo">
+ </div>
+
+ <div class="image">
+ <p class="header">
+ <span class="header">[ <a href="/mate">mate</a> und technik ]</span>
+ </p>
+ <h1>
+ Das sublab - ein Hackerspace in Leipzig
+ </h1>
+ </div>
+
+ <div class="menu">
+ <ul id="menu">
+ <li>
+ <a href="/">Home</a>
+ </li>
+ <li>
+ <a href="/neues">Neues</a>
+ </li>
+ <li>
+ <a href="/termine">Termine</a>
+ </li>
+ <li>
+ <a href="/raeume">Räume</a>
+ </li>
+ <li>
+ <a href="/webcam">Webcams</a>
+ </li>
+ <li>
+ <a href="/lage">Lage</a>
+ </li>
+ <li>
+ <a href="/medien">Medien</a>
+ </li>
+ <li>
+ <a href="http://wiki.sublab.org">Wiki</a>
+ </li>
+ <li>
+ <a href="/kontakt">Kontakt</a>
+ </li>
+ <li>
+ <a href="/verein">Verein</a>
+ </li>
+ <li>
+ <a href="/impressum">Impressum</a>
+ </li>
+ </ul>
+ </div>
+
+ <div class="info">
+
+ <h4>
+ Statusdisplay
+ </h4>
+ <hr>
+ <div class="status">
+ <table>
+ <tr>
+ <td class="status">
+ Taifun:
+ </td>
+ <td class="statusinfo">
+ <span class="taifunonline">Online</span>&nbsp;&nbsp;<span class="taifunoffline">Offline</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="status">
+ Trieste:
+ </td>
+ <td class="status">
+ <span class="triesteonline">Online</span>&nbsp;&nbsp;<span class="triesteoffline">Offline</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="status">
+ Nautilus:
+ </td>
+ <td class="status">
+ <span class="nautilusonline">Online</span>&nbsp;&nbsp;<span class="nautilusoffline">Offline</span>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <hr>
+ <p class="member">
+ <a href="inc/sublab_ev_mitgliedsantrag.pdf">Mitglied werden</a>
+ </p>
+ </div>
+
+ <div class="content">
+ Bei der Verarbeitung deiner Anfrage ist ein Fehler aufgetreten. Falls Du der
+ Meinung bist, dass das dieser Vorgang funktionieren sollte, kontaktiere bitte
+ kontakt [at] sublab.org.<br />
+ Hier geht es zur <a href="/">Startseite</a>.
+ <hr>
+ </div>
+
+ <div class="footer">
+ </div>
+
+ </div>
+ </div>
+</body>
+
+</html>
diff --git a/sublab_project/templates/base.html b/sublab_project/templates/base.html
index e69de29..2c71ff7 100644
--- a/sublab_project/templates/base.html
+++ b/sublab_project/templates/base.html
@@ -0,0 +1,151 @@
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <meta charset="UTF-8">
+ <title>{% block title %}sublab - Ein Hackerspace in Leipzig{% endblock %}</title>
+
+ <meta name="author" content="sublab e.V.">
+ <meta name="robots" content="index,follow">
+
+ {% if meta_date %}<meta name="dcterms.date" content="{{ meta_date|date:"c"}}">{% endif %}
+ <meta name="keywords" content="sublab, Hackerspace, Leipzig, Computer, Linux, Freie Software">
+ {# <meta name="description" lang="de" content="$template_desc_de"> #}
+ {# <meta name="description" lang="en" content="$template_desc_en"> #}
+
+ <link rel="stylesheet" href="css/sublab-2011-11-02.css" type="text/css">
+ <link rel="stylesheet" href="css/taifun.status.css" type="text/css">
+ <link rel="stylesheet" href="css/trieste.status.css" type="text/css">
+ <link rel="stylesheet" href="css/nautilus.status.css" type="text/css">
+ <link rel="shortcut icon" href="img/favicon.png">
+ </head>
+
+ <body>
+ <div class="hiddenframe">
+ <div class="frame">
+
+ <div class="logo">
+ </div>
+
+ <div class="image">
+ <p class="header">
+ <span class="header">[ <a href="/mate">mate</a> und technik ]</span>
+ </p>
+ <h1>
+ Das sublab - ein Hackerspace in Leipzig
+ </h1>
+ </div>
+
+ <div class="menu">
+ <ul id="menu">
+ {% block navigation %}
+ <li>
+ <a href="/">Home</a>
+ </li>
+ <li>
+ <a href="/neues">Neues</a>
+ </li>
+ <li>
+ <a href="/termine">Termine</a>
+ </li>
+ <li>
+ <a href="/raeume">Räume</a>
+ </li>
+ <li>
+ <a href="/webcam">Webcams</a>
+ </li>
+ <li>
+ <a href="/lage">Lage</a>
+ </li>
+ <li>
+ <a href="/medien">Medien</a>
+ </li>
+ <li>
+ <a href="http://wiki.sublab.org">Wiki</a>
+ </li>
+ <li>
+ <a href="/kontakt">Kontakt</a>
+ </li>
+ <li>
+ <a href="/verein">Verein</a>
+ </li>
+ <li>
+ <a href="/impressum">Impressum</a>
+ </li>
+ {% endblock navigation %}
+ </ul>
+ </div>
+
+ <div class="info">
+
+ <h4>
+ Statusdisplay
+ </h4>
+ <hr>
+ <div class="status">
+ <table>
+ <tr>
+ <td class="status">
+ Taifun:
+ </td>
+ <td class="statusinfo">
+ <span class="taifunonline">Online</span>&nbsp;&nbsp;<span class="taifunoffline">Offline</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="status">
+ Trieste:
+ </td>
+ <td class="status">
+ <span class="triesteonline">Online</span>&nbsp;&nbsp;<span class="triesteoffline">Offline</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="status">
+ Nautilus:
+ </td>
+ <td class="status">
+ <span class="nautilusonline">Online</span>&nbsp;&nbsp;<span class="nautilusoffline">Offline</span>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <hr>
+ <p class="status">
+ {% block motd %}
+ sublab website - jetzt mit <a href="http://djangoproject.com">Django</a>
+ {% endblock %}
+ </p>
+ <hr>
+ <a href="/webcam" class="img"><img src="img/thumb.rack.webcam.jpg" alt="Webcam im Fenster" class="webcamthumb"></a>
+ <hr>
+ <a href="/img/tempgraph.png" class="img"><img src="img/thumb.tempgraph.png" alt="Temperaturen im sublab" class="webcamthumb"></a>
+ <hr>
+ <p class="member">
+ <a href="inc/sublab_ev_mitgliedsantrag.pdf">Mitglied werden</a>
+ </p>
+ </div>
+
+ <div class="content">
+ {% block content %}
+ This is where the content would be.
+ {% endblock %}
+ <hr>
+ </div>
+
+ <div class="footer">
+ <p>
+ <a href="http://wiki.vorratsdatenspeicherung.de/Ortsgruppen/Leipzig">AK Vorrat</a> |
+ <a href="http://c3le.de">c3le</a> |
+ <a href="http://leipzig.freifunk.net">Freifunk Leipzig</a> |
+ <a href="https://wiki.fsfe.org/groups/Leipzig">FSFE Leipzig</a> |
+ <a href="http://sofakind.de/lml/index.php">Linux Multimedia Lab</a> |
+ sub:lounge |
+ <a href="http://aboutradio.org">about:radio</a>
+ </p>
+ </div>
+
+ </div>
+ </div>
+</body>
+
+</html>
diff --git a/sublab_project/urls.py b/sublab_project/urls.py
index c35dcb6..7d52b8b 100644
--- a/sublab_project/urls.py
+++ b/sublab_project/urls.py
@@ -1,4 +1,5 @@
from django.conf.urls.defaults import patterns, include, url
+from django.views.generic import TemplateView
# Uncomment the next two lines to enable the admin:
from django.contrib import admin
@@ -6,12 +7,9 @@ admin.autodiscover()
urlpatterns = patterns('',
# Examples:
- # url(r'^$', 'sublab_project.views.home', name='home'),
- # url(r'^sublab_project/', include('sublab_project.foo.urls')),
-
# Uncomment the admin/doc line below to enable admin documentation:
# url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
- # Uncomment the next line to enable the admin:
url(r'^admin/', include(admin.site.urls)),
+ url(r'^', include('news.urls'))
)