# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1296679037 0
# Node ID 2934a867c2ef622461d761d1ee24ee6039d675f7
# Parent  767cedc7d12ae3fe23f92a49735f8305a8defbda
Updating home page text for #147. Several other minor tweaks; adding favicon.ico.

diff -r 767cedc7d12a -r 2934a867c2ef gpp/core/fixtures/flatpages.json
--- a/gpp/core/fixtures/flatpages.json	Sun Jan 30 20:02:32 2011 +0000
+++ b/gpp/core/fixtures/flatpages.json	Wed Feb 02 20:37:17 2011 +0000
@@ -10,7 +10,7 @@
             "sites": [
                 1
             ], 
-            "content": "<p>SurfGuitar101.com is the premier place on the web for friends and fans of the world-wide phenomenon known as surf music. Surf music was created in the early 1960's in Southern California by such bands as The Belairs, Dick Dale &amp; His Deltones, and The Chantays, and popularized further by bands like The Ventures, The Astronauts, The Pyramids, &amp; The Lively Ones. Surf music was all but forgotten when The Beatles and the British Invasion landed in America in the mid to late 1960's. In the late 70's and early 1980's a revival began when bands like Jon &amp; The Nightriders, The Surf Raiders, and The Halibuts heard the call of the surf and reintroduced it to hungry audiences. This revival continues today and has spread world-wide. Today you can find surf bands not only in California, but all across America, Europe, Australia, Central and South America, and Japan.</p>\r\n<p>Join us in our forums to discuss this great form of popular music. Discover great bands old and new. Check out our podcasts as we highlight the classic surf bands and the bands of today. Meet new friends and learn about the next surf show in your town. Exchange tips on playing and performing surf music and even starting your own band!</p>\r\n<p>Thanks for being part of the greatest online community dedicated to surf music!</p>", 
+            "content": "<p>SurfGuitar101.com is the premier place on the web for friends and fans of the world-wide phenomenon known as surf music. Surf music was created in the early 1960's in Southern California by such bands as The Belairs, Dick Dale &amp; His Deltones, and The Chantays, and popularized further by bands like The Ventures, The Astronauts, The Pyramids, &amp; The Lively Ones. Surf music was all but forgotten when The Beatles and the British Invasion landed in America in the mid to late 1960's. In the late 70's and early 1980's a revival began when bands like Jon &amp; The Nightriders, The Surf Raiders, and The Halibuts heard the call of the surf and reintroduced it to hungry audiences. This revival continues today and has spread world-wide. Today you can find surf bands not only in California, but all across America, Europe, Australia, Central and South America, and Japan.</p>\r\n<p>Join us in our forums to discuss this great form of popular music. Discover great bands old and new. Check out our podcasts as we highlight the classic surf bands and the bands of today. Meet new friends and learn about the next surf show in your town. Exchange tips on playing and performing surf music and even starting your own band!</p>\r\n<p>Thanks for being part of the greatest online community dedicated to surf music!</p>\r\n<h3>A Short History of SurfGuitar101.com</h3>\r\n<p>This site started as a Yahoo Group in late October, 2001. There were several other surf music Yahoo groups at the time, so we started our focus on the musician aspect of playing surf music (hence the \"guitar 101\"). After a short time we dropped that angle and fully embraced all aspects of surf music.</p>\r\n<p>After seeing The Surf Coasters (Japan) on their first US tour in the summer of 2004, we needed a place to host our many photos and videos. The domain name surfguitar101.com was registered, and a simple static website was created to host media files as a supplement to the Yahoo group.&nbsp;</p>\r\n<p>Cramped by the confines of the Yahoo Group, in February of 2006 we launched an interactive version of the website, complete with our now famous forums. This format was kept until February, 2011 when the website software was rewritten and a new look was designed.</p>\r\n<p>The SG101 community held its first annual convention weekend in 2008 in Southern California, a tradition that continues today. Ever year our members get together for a surf music packed weekend, and each year has been bigger and better than the last. In 2010, Germany's The Space Rangers and Italy's (via Antigua) Wadadli Riders were the first non-US bands to play at the convention. Fans of surf music get to see, hear, and mingle with musicians from the original 60's bands as well as the up and coming bands of today.</p>\r\n<p>Surf's Up!</p>", 
             "enable_comments": false
         }
     }, 
@@ -25,7 +25,7 @@
             "sites": [
                 1
             ], 
-            "content": "<p><a href=\"http://surfguitar101.com/\">SurfGuitar101.com</a> was created by Brian Neal. The server-side code was written in the <a href=\"http://python.org/\">Python</a> programming language and based upon the awesome <a href=\"http://djangoproject.com/\">Django</a> Web framework. Client-side coding was done in <a href=\"http://en.wikipedia.org/wiki/JavaScript\">Javascript</a>, making heavy use of the <a href=\"http://jquery.org/\">jQuery</a> and <a href=\"http://jqueryui.com/\">jQuery UI</a> libraries.</p>\r\n<p>The site design was created by <a href=\"http://ken.crashmatics.com/\">Ken Dushane</a> of the band <a href=\"http://crashmatics.com/\">The Crashmatics</a>. Various icons and graphics were contributed by Ferenc Dobronyi and Joseph Koch. Additional icons courtesy of <a href=\"http://www.famfamfam.com/lab/icons/silk/\">FamFamFam</a>.</p>\r\n<p>The following 3rd party libraries were leveraged in the construction of this site: <a href=\"http://sourceforge.net/projects/mysql-python/\">MySQLdb</a>, <a href=\"http://www.freewisdom.org/projects/python-markdown/\">python-markdown</a>, <a href=\"http://www.pythonware.com/products/pil/\">PIL</a>, <a href=\"http://pytz.sourceforge.net/\">pytz</a>, <a href=\"http://code.google.com/p/django-tagging/\">django-tagging</a>, <a href=\"http://github.com/leah/django-elsewhere\">django-elsewhere</a>, <a href=\"http://code.google.com/p/gdata-python-client/\">gdata-python-client</a>, <a href=\"http://www.tummy.com/Community/software/python-memcached/\">python-memcached</a>, <a href=\"http://code.google.com/p/html5lib/\">html5lib</a>, <a href=\"http://tinymce.moxiecode.com/\">tinymce</a>, <a href=\"http://markitup.jaysalvat.com/home/\">markItUp!</a>, <a href=\"http://haystacksearch.org/\">Haystack</a>, <a href=\"http://github.com/notanumber/xapian-haystack/tree/master\">xapian-haystack</a>, <a href=\"http://www.blueprintcss.org/\">Blueprint</a>, <a href=\"http://jquery.malsup.com/cycle/\">jQuery Cycle</a>, <a href=\"http://www.appelsiini.net/projects/jeditable\">JEditable</a>, &amp; <a href=\"http://pypi.python.org/pypi/repoze.timeago/0.5\">repoze.timeago</a>.</p>\r\n<p>The site runs on an infrastructure powered by many open-source tools: the <a href=\"http://httpd.apache.org/\">Apache server</a> with <a href=\"http://code.google.com/p/modwsgi/\">mod_wsgi</a>, a <a href=\"http://www.mysql.com/\">MySQL database</a>, and <a href=\"http://memcached.org/\">memcached</a>. The server is running <a href=\"http://www.ubuntu.com/\">Ubuntu</a>, an operating system based upon the <a href=\"http://www.debian.org/\">Debian</a> <a href=\"http://www.gnu.org/\">GNU</a> / <a href=\"http://www.kernel.org/\">Linux</a> distribution.</p>\r\n<p>Other tools used to develop this site include <a href=\"http://subversion.apache.org/\">Subversion</a>, <a href=\"http://getfirebug.com/\">Firebug</a>, <a href=\"http://www.vim.org/\">Vim</a>, &amp; <a href=\"http://www.phpmyadmin.net/\">phpMyAdmin</a>.</p>", 
+            "content": "<p><a href=\"http://surfguitar101.com/\">SurfGuitar101.com</a> was created by Brian Neal. The server-side code is written in the <a href=\"http://python.org/\">Python</a> programming language using the awesome <a href=\"http://djangoproject.com/\">Django</a> Web framework. Client-side coding was done in <a href=\"http://en.wikipedia.org/wiki/JavaScript\">Javascript</a>, making heavy use of the <a href=\"http://jquery.org/\">jQuery</a> and <a href=\"http://jqueryui.com/\">jQuery UI</a> libraries.</p>\r\n<p>The site design was created by <a href=\"http://ken.crashmatics.com/\">Ken Dushane</a> of the band <a href=\"http://crashmatics.com/\">The Crashmatics</a>. Various icons and graphics were contributed by Ferenc Dobronyi and Joseph Koch. Additional icons courtesy of <a href=\"http://www.famfamfam.com/lab/icons/silk/\">FamFamFam</a>.</p>\r\n<p>The following 3rd party libraries were leveraged in the construction of this site: <a href=\"http://sourceforge.net/projects/mysql-python/\">MySQLdb</a>, <a href=\"http://www.freewisdom.org/projects/python-markdown/\">python-markdown</a>, <a href=\"http://www.pythonware.com/products/pil/\">PIL</a>, <a href=\"http://pytz.sourceforge.net/\">pytz</a>, <a href=\"http://code.google.com/p/django-tagging/\">django-tagging</a>, <a href=\"http://github.com/leah/django-elsewhere\">django-elsewhere</a>, <a href=\"http://code.google.com/p/gdata-python-client/\">gdata-python-client</a>, <a href=\"http://www.tummy.com/Community/software/python-memcached/\">python-memcached</a>, <a href=\"http://code.google.com/p/html5lib/\">html5lib</a>, <a href=\"http://tinymce.moxiecode.com/\">tinymce</a>, <a href=\"http://markitup.jaysalvat.com/home/\">markItUp!</a>, <a href=\"http://haystacksearch.org/\">Haystack</a>, <a href=\"http://github.com/notanumber/xapian-haystack/tree/master\">xapian-haystack</a>, <a href=\"http://www.blueprintcss.org/\">Blueprint</a>, <a href=\"http://jquery.malsup.com/cycle/\">jQuery Cycle</a>, <a href=\"http://www.appelsiini.net/projects/jeditable\">JEditable</a>, &amp; <a href=\"http://pypi.python.org/pypi/repoze.timeago/0.5\">repoze.timeago</a>.</p>\r\n<p>The site runs on an infrastructure powered by many open-source tools: the <a href=\"http://httpd.apache.org/\">Apache server</a> with <a href=\"http://code.google.com/p/modwsgi/\">mod_wsgi</a>, a <a href=\"http://www.mysql.com/\">MySQL database</a>, the <a href=\"http://xapian.org/\">Xapian</a> search engine library, and <a href=\"http://memcached.org/\">memcached</a>. The server is running <a href=\"http://www.ubuntu.com/\">Ubuntu</a>, an operating system based upon the <a href=\"http://www.debian.org/\">Debian</a> <a href=\"http://www.gnu.org/\">GNU</a> / <a href=\"http://www.kernel.org/\">Linux</a> distribution.</p>\r\n<p>Other tools used to develop this site include <a href=\"http://subversion.apache.org/\">Subversion</a>, <a href=\"http://getfirebug.com/\">Firebug</a>, <a href=\"http://www.vim.org/\">Vim</a>, &amp; <a href=\"http://www.phpmyadmin.net/\">phpMyAdmin</a>.</p>", 
             "enable_comments": false
         }
     }, 
diff -r 767cedc7d12a -r 2934a867c2ef gpp/settings.py
--- a/gpp/settings.py	Sun Jan 30 20:02:32 2011 +0000
+++ b/gpp/settings.py	Wed Feb 02 20:37:17 2011 +0000
@@ -83,7 +83,7 @@
         'django.middleware.csrf.CsrfViewMiddleware',
         'django.contrib.sessions.middleware.SessionMiddleware',
         'django.contrib.messages.middleware.MessageMiddleware',
-        'debug_toolbar.middleware.DebugToolbarMiddleware',
+        #'debug_toolbar.middleware.DebugToolbarMiddleware',
         'django.contrib.auth.middleware.AuthenticationMiddleware',
         'gpp.core.middleware.InactiveUserMiddleware',
         'gpp.core.middleware.WhosOnline',
@@ -159,8 +159,8 @@
     'smiley',
     'weblinks',
 ]
-if DEBUG:
-    INSTALLED_APPS.append('debug_toolbar')
+#if DEBUG:
+#    INSTALLED_APPS.append('debug_toolbar')
 
 LOGIN_URL = '/accounts/login/'
 LOGIN_REDIRECT_URL = '/profile/me/'
diff -r 767cedc7d12a -r 2934a867c2ef gpp/templates/base.html
--- a/gpp/templates/base.html	Sun Jan 30 20:02:32 2011 +0000
+++ b/gpp/templates/base.html	Wed Feb 02 20:37:17 2011 +0000
@@ -28,7 +28,7 @@
 {% block custom_js %}{% endblock %}
 <script type="text/javascript" src="{{ STATIC_URL }}js/jquery.cycle.all.min.js"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}js/shoutbox.js"></script>
-<!-- <link rel="shortcut icon" type="image/vnd.microsoft.com" href="{{ STATIC_URL }}images/favicon.ico" /> -->
+<link rel="shortcut icon" type="image/vnd.microsoft.com" href="{{ STATIC_URL }}favicon.ico" />
 </head>
 <body>
 <div id="page" class="container">
@@ -57,7 +57,7 @@
       <li><a href="{% url 'news-submit' %}">Submit 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 'donations-index' %}">Donations</a></li>
       <li><a href="{% url 'downloads-index' %}">Downloads</a></li>
       <li><a href="{% url 'forums-index' %}">Forums</a></li>
       <li><a href="{% url 'irc-main' %}">IRC</a></li>
diff -r 767cedc7d12a -r 2934a867c2ef gpp/templates/donations/thanks.html
--- a/gpp/templates/donations/thanks.html	Sun Jan 30 20:02:32 2011 +0000
+++ b/gpp/templates/donations/thanks.html	Wed Feb 02 20:37:17 2011 +0000
@@ -4,5 +4,8 @@
 {% block content %}
 <div class="breadcrumbs"><a href="{% url 'donations-index' %}">Donations</a> &raquo; Thanks</div>
 <h2>Thank-You For The Donation!</h2>
-<p>Thank-you for your donation to <strong>SurfGuitar101.com</strong>, it is greatly appreciated!</p>
+<p>
+Thank-you for your donation to <strong>SurfGuitar101.com</strong>, it is greatly appreciated!
+We couldn't do this site without support from people like you. You rock!
+</p>
 {% endblock %}
diff -r 767cedc7d12a -r 2934a867c2ef gpp/templates/home.html
--- a/gpp/templates/home.html	Sun Jan 30 20:02:32 2011 +0000
+++ b/gpp/templates/home.html	Wed Feb 02 20:37:17 2011 +0000
@@ -43,18 +43,12 @@
    </div>
 </div>
 <div class="span-10 last">
-<p>You are looking at a test version of the new SurfGuitar101 website, dubbed <strong>SG101 2.0</strong>. 
-The purpose of this test site is to test the new site software, to get feedback from the user base, and 
-to develop a better theme (colors, logos, layout, etc.) for the site. All bugs and feature requests are being tracked at 
-<a href="http://code.surfguitar101.com">code.surfguitar101.com</a>. Existing SG101 members are encouraged
-to sign up here and give the new site a test drive. Any and all feedback is appreciated! Thank you for
-helping to make this site be the best home on the web for fans and friends of surf music!
+<p>
+<strong>Welcome to the all new SurfGuitar101.com!</strong> We've rewritten the site software and have a new design! We hope you like the new site and features; please leave feedback in our forums.
+</p>
+<p>Since February 26, 2006, SurfGuitar101.com has been the premier home on the web for friends and fans of the world-wide phenomena known as surf music! Created in Southern California in the early 1960's, surf music is very much alive today and has spread around the globe. Join us in our forums to discuss surf music, past and present. Meet new friends and discover new bands. Want to play surf music? We have lots of forums devoted to playing, performing, and writing surf music. We have lots of discussions on gear: guitars, amps, and drums. Check out our podcasts and hear some really great tunes! Finally, we feature news and articles on the surf scene, and you'll always know where you can catch some live surf music!
 </p>
 </div>
-<p>Remember that this is a test site, and not everything is going to work. Nothing here is
-permanent. The site (content, user accounts, etc.) may be wiped at any time while we fix bugs and add features. 
-Also, I hope that the look and feel of this site can be improved! I'll need lots of help for this aspect, 
-as I'm more of a coder than a designer.</p>
 {% cache 3600 home_bulletins %}
    {% current_bulletins %}
 {% endcache %}
diff -r 767cedc7d12a -r 2934a867c2ef static/favicon.ico
Binary file static/favicon.ico has changed