# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1244774248 0
# Node ID 48b221d304c63089365513aeb4f00dfd9993a544
# Parent  f21771118fb22ec2e510c652941f57a5b846ef2b
Removed old legal application urls from main urls file. (Forgot to do this in last commit.) Added flatpages support. Added some links on the base template.

diff -r f21771118fb2 -r 48b221d304c6 gpp/core/admin.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gpp/core/admin.py	Fri Jun 12 02:37:28 2009 +0000
@@ -0,0 +1,12 @@
+from django.contrib import admin
+from django.contrib.flatpages.models import FlatPage
+from django.contrib.flatpages.admin import FlatPageAdmin as FlatPageAdminOld
+from django.conf import settings
+
+class FlatPageAdmin(FlatPageAdminOld):
+    class Media:
+        js = settings.GPP_THIRD_PARTY_JS['tiny_mce']
+
+# We have to unregister it, and then reregister
+admin.site.unregister(FlatPage)
+admin.site.register(FlatPage, FlatPageAdmin)
diff -r f21771118fb2 -r 48b221d304c6 gpp/settings.py
--- a/gpp/settings.py	Fri Jun 12 01:35:13 2009 +0000
+++ b/gpp/settings.py	Fri Jun 12 02:37:28 2009 +0000
@@ -74,6 +74,7 @@
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
 )
 
 ROOT_URLCONF = 'gpp.urls'
@@ -102,6 +103,7 @@
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.markup',
+    'django.contrib.flatpages',
     'elsewhere',
     'tagging',
     'accounts',
diff -r f21771118fb2 -r 48b221d304c6 gpp/templates/accounts/register.html
--- a/gpp/templates/accounts/register.html	Fri Jun 12 01:35:13 2009 +0000
+++ b/gpp/templates/accounts/register.html	Fri Jun 12 02:37:28 2009 +0000
@@ -9,8 +9,8 @@
    only (no spaces).</li>
    <li>An email address is required to use this site. A confirmation email will be sent to the
    address you supply, and it is necessary to complete the registration process.</li>
-   <li>You must agree to our <a href="#" target="_blank">Terms of Service</a>.</li>
-   <li>You must agree to our <a href="#" target="_blank">Privacy Policy</a>.</li>
+   <li>You must agree to our <a href="/policy/tos/" target="_blank">Terms of Service</a>.</li>
+   <li>You must agree to our <a href="/policy/privacy/" target="_blank">Privacy Policy</a>.</li>
 </ul>
 <form action="." method="post">
 <table>
diff -r f21771118fb2 -r 48b221d304c6 gpp/templates/base.html
--- a/gpp/templates/base.html	Fri Jun 12 01:35:13 2009 +0000
+++ b/gpp/templates/base.html	Fri Jun 12 02:37:28 2009 +0000
@@ -52,6 +52,7 @@
       <li><a href="{% url news-index_page page=1 %}">News</a></li>
       <li><a href="{% url gcalendar-index %}">Calendar</a></li>
       <li><a href="{% url contact-form %}">Contact</a></li>
+      <li><a href="{% url donations-index %}">Donations</a></li>
       <li><a href="{% url irc-main %}">IRC</a></li>
       <li><a href="{% url bio-members %}">Member List</a></li>
       <li><a href="{% url membermap-index %}">Member Map</a></li>
@@ -78,7 +79,19 @@
    TODO: Should put links to various policies down here. Additional navigation could go here.
    Add a colophon.
    </p>
-   <p>SurfGuitar101.com &copy; 2009 by Brian Neal</p>
+   <p>
+   <a href="{% url contact-form %}">Contact Us</a> &bull;
+   <a href="/about/">About Us</a> &bull;
+   <a href="/policy/tos/">Terms of Service</a> &bull; 
+   <a href="/policy/privacy/">Privacy Policy</a> &bull;
+   <a href="/colophon/">Colophon</a>
+   </p>
+   <p>
+   SurfGuitar101.com &copy; 2009 by Brian Neal.
+   All comments and user contributed articles are property of the posters. 
+   </p>
+   <p>Thanks to all the surf bands, past and present. And thanks to all the fans who care about and keep surf
+   music alive.</p>
 </div>
 
 {% if debug %}
diff -r f21771118fb2 -r 48b221d304c6 gpp/templates/flatpages/default.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gpp/templates/flatpages/default.html	Fri Jun 12 02:37:28 2009 +0000
@@ -0,0 +1,6 @@
+{% extends 'base.html' %}
+{% block title %}{{ flatpage.title }}{% endblock %}
+{% block content %}
+<h2>{{ flatpage.title }}</h2>
+{{ flatpage.content }}
+{% endblock %}
diff -r f21771118fb2 -r 48b221d304c6 gpp/urls.py
--- a/gpp/urls.py	Fri Jun 12 01:35:13 2009 +0000
+++ b/gpp/urls.py	Fri Jun 12 02:37:28 2009 +0000
@@ -24,7 +24,6 @@
       {'feed_dict': feeds },
       'feeds-news'),
    (r'^irc/', include('irc.urls')),
-   (r'^legal/', include('legal.urls')),
    (r'^links/', include('weblinks.urls')),
    (r'^member_map/', include('membermap.urls')),
    (r'^messages/', include('messages.urls')),
diff -r f21771118fb2 -r 48b221d304c6 media/css/base.css
--- a/media/css/base.css	Fri Jun 12 01:35:13 2009 +0000
+++ b/media/css/base.css	Fri Jun 12 02:37:28 2009 +0000
@@ -54,6 +54,9 @@
 #footer p {
    margin: 1em;
 } 
+#footer a {
+   color: #0ff;
+}
 ul.app-menu {
    text-align: center;
    list-style: none;