# HG changeset patch # User Brian Neal # Date 1329268197 21600 # Node ID 25e00d1b99bf9e79700658e7b857883eb5482a54 # Parent b8e166ca993af05b390d37767b5726d7891e3f75 Get rid of the project name 'mysite' from the source. diff -r b8e166ca993a -r 25e00d1b99bf mysite/band/admin.py --- a/mysite/band/admin.py Tue Feb 14 18:52:57 2012 -0600 +++ b/mysite/band/admin.py Tue Feb 14 19:09:57 2012 -0600 @@ -6,28 +6,28 @@ from django.contrib import admin -from mysite.band.models import Article -from mysite.band.models import Album -from mysite.band.models import Album_Merchant -from mysite.band.models import Album_Track -from mysite.band.models import Band -from mysite.band.models import City -from mysite.band.models import Country -from mysite.band.models import Fan -from mysite.band.models import Gear -from mysite.band.models import Gig -from mysite.band.models import Label_Release -from mysite.band.models import Member -from mysite.band.models import Merchandise -from mysite.band.models import Mp3 -from mysite.band.models import Mp3_Set -from mysite.band.models import News -from mysite.band.models import Record_Label -from mysite.band.models import SiteConfig -from mysite.band.models import State -from mysite.band.models import Venue -from mysite.band.models import Video -from mysite.band.models import Video_Set +from band.models import Article +from band.models import Album +from band.models import Album_Merchant +from band.models import Album_Track +from band.models import Band +from band.models import City +from band.models import Country +from band.models import Fan +from band.models import Gear +from band.models import Gig +from band.models import Label_Release +from band.models import Member +from band.models import Merchandise +from band.models import Mp3 +from band.models import Mp3_Set +from band.models import News +from band.models import Record_Label +from band.models import SiteConfig +from band.models import State +from band.models import Venue +from band.models import Video +from band.models import Video_Set ####################################################################### diff -r b8e166ca993a -r 25e00d1b99bf mysite/band/admin_views.py --- a/mysite/band/admin_views.py Tue Feb 14 18:52:57 2012 -0600 +++ b/mysite/band/admin_views.py Tue Feb 14 19:09:57 2012 -0600 @@ -11,8 +11,8 @@ from django.shortcuts import render_to_response from django.contrib.admin.views.decorators import staff_member_required -from mysite.band.models import SiteConfig -from mysite.band.models import Fan +from band.models import SiteConfig +from band.models import Fan ####################################################################### diff -r b8e166ca993a -r 25e00d1b99bf mysite/band/models.py --- a/mysite/band/models.py Tue Feb 14 18:52:57 2012 -0600 +++ b/mysite/band/models.py Tue Feb 14 19:09:57 2012 -0600 @@ -2,7 +2,7 @@ from django.contrib.localflavor.us.models import USStateField from django.contrib.localflavor.us.models import PhoneNumberField -from mysite.photologue.models import Photo +from photologue.models import Photo import datetime import random import string diff -r b8e166ca993a -r 25e00d1b99bf mysite/band/urls.py --- a/mysite/band/urls.py Tue Feb 14 18:52:57 2012 -0600 +++ b/mysite/band/urls.py Tue Feb 14 19:09:57 2012 -0600 @@ -1,6 +1,6 @@ from django.conf.urls.defaults import * -urlpatterns = patterns('mysite.band.views', +urlpatterns = patterns('band.views', (r'^$', 'index'), (r'^bio/$', 'bio'), (r'^buy/$', 'buy'), @@ -22,7 +22,7 @@ (r'^videos/(\d+)$', 'video_detail'), ) -urlpatterns += patterns('mysite.band.admin_views', +urlpatterns += patterns('band.admin_views', (r'^admin/band/email/$', 'email'), (r'^admin/band/email_sent/$', 'email_sent'), ) diff -r b8e166ca993a -r 25e00d1b99bf mysite/band/views.py --- a/mysite/band/views.py Tue Feb 14 18:52:57 2012 -0600 +++ b/mysite/band/views.py Tue Feb 14 19:09:57 2012 -0600 @@ -18,21 +18,21 @@ from django.core.mail import send_mail from django.db import connection -from mysite.band.models import Article -from mysite.band.models import Album -from mysite.band.models import Band -from mysite.band.models import Fan -from mysite.band.models import Gear -from mysite.band.models import Gig -from mysite.band.models import Member -from mysite.band.models import Merchandise -from mysite.band.models import Mp3 -from mysite.band.models import Mp3_Set -from mysite.band.models import News -from mysite.band.models import SiteConfig -from mysite.band.models import Video_Set -from mysite.photologue.models import Gallery -from mysite.photologue.models import Photo +from band.models import Article +from band.models import Album +from band.models import Band +from band.models import Fan +from band.models import Gear +from band.models import Gig +from band.models import Member +from band.models import Merchandise +from band.models import Mp3 +from band.models import Mp3_Set +from band.models import News +from band.models import SiteConfig +from band.models import Video_Set +from photologue.models import Gallery +from photologue.models import Photo ####################################################################### diff -r b8e166ca993a -r 25e00d1b99bf mysite/settings/base.py --- a/mysite/settings/base.py Tue Feb 14 18:52:57 2012 -0600 +++ b/mysite/settings/base.py Tue Feb 14 19:09:57 2012 -0600 @@ -105,8 +105,8 @@ 'django.contrib.sessions', 'django.contrib.sites', 'django.contrib.staticfiles', - 'mysite.band', - 'mysite.photologue', + 'band', + 'photologue', ] ####################################################################### diff -r b8e166ca993a -r 25e00d1b99bf mysite/templates/admin/index.html --- a/mysite/templates/admin/index.html Tue Feb 14 18:52:57 2012 -0600 +++ b/mysite/templates/admin/index.html Tue Feb 14 19:09:57 2012 -0600 @@ -66,7 +66,7 @@ - Send Email to Mailing List + Send Email to Mailing List     diff -r b8e166ca993a -r 25e00d1b99bf mysite/templates/band/base.html --- a/mysite/templates/band/base.html Tue Feb 14 18:52:57 2012 -0600 +++ b/mysite/templates/band/base.html Tue Feb 14 19:09:57 2012 -0600 @@ -30,18 +30,18 @@
-

To see all our flyers in full size, check out our show flyer gallery.

+

To see all our flyers in full size, check out our show flyer gallery.

{% endif %} diff -r b8e166ca993a -r 25e00d1b99bf mysite/templates/band/index.html --- a/mysite/templates/band/index.html Tue Feb 14 18:52:57 2012 -0600 +++ b/mysite/templates/band/index.html Tue Feb 14 19:09:57 2012 -0600 @@ -47,7 +47,7 @@ {% endfor %} -
See all upcoming shows...
+
See all upcoming shows...
{% endif %} diff -r b8e166ca993a -r 25e00d1b99bf mysite/templates/band/mail_not_found.html --- a/mysite/templates/band/mail_not_found.html Tue Feb 14 18:52:57 2012 -0600 +++ b/mysite/templates/band/mail_not_found.html Tue Feb 14 19:09:57 2012 -0600 @@ -4,5 +4,5 @@ {% block content %}

Madeira Mailing List

Sorry, we did not find that email address in our database.

-

Back to contact page.

+

Back to contact page.

{% endblock %} diff -r b8e166ca993a -r 25e00d1b99bf mysite/templates/band/photo_detail.html --- a/mysite/templates/band/photo_detail.html Tue Feb 14 18:52:57 2012 -0600 +++ b/mysite/templates/band/photo_detail.html Tue Feb 14 19:09:57 2012 -0600 @@ -24,6 +24,6 @@ {{ photo.caption }} {% endfor %} -
Photo gallery index
+
Photo gallery index
{% endblock %} diff -r b8e166ca993a -r 25e00d1b99bf mysite/templates/band/photos.html --- a/mysite/templates/band/photos.html Tue Feb 14 18:52:57 2012 -0600 +++ b/mysite/templates/band/photos.html Tue Feb 14 19:09:57 2012 -0600 @@ -18,7 +18,7 @@ {% if galleries %} {% else %} diff -r b8e166ca993a -r 25e00d1b99bf mysite/templates/band/press_detail.html --- a/mysite/templates/band/press_detail.html Tue Feb 14 18:52:57 2012 -0600 +++ b/mysite/templates/band/press_detail.html Tue Feb 14 19:09:57 2012 -0600 @@ -25,5 +25,5 @@ Adobe Reader {% endif %} -

Press index

+

Press index

{% endblock %} diff -r b8e166ca993a -r 25e00d1b99bf mysite/templates/band/video_detail.html --- a/mysite/templates/band/video_detail.html Tue Feb 14 18:52:57 2012 -0600 +++ b/mysite/templates/band/video_detail.html Tue Feb 14 19:09:57 2012 -0600 @@ -13,6 +13,6 @@
-
Videos index
+
Videos index
{% endblock %} diff -r b8e166ca993a -r 25e00d1b99bf mysite/templates/band/videos.html --- a/mysite/templates/band/videos.html Tue Feb 14 18:52:57 2012 -0600 +++ b/mysite/templates/band/videos.html Tue Feb 14 19:09:57 2012 -0600 @@ -6,7 +6,7 @@ {% if vidsets %} {% else %} diff -r b8e166ca993a -r 25e00d1b99bf mysite/urls.py --- a/mysite/urls.py Tue Feb 14 18:52:57 2012 -0600 +++ b/mysite/urls.py Tue Feb 14 19:09:57 2012 -0600 @@ -5,10 +5,10 @@ admin.autodiscover() urlpatterns = patterns('', - (r'^', include('mysite.band.urls')), + (r'^', include('band.urls')), (r'^admin/doc/', include('django.contrib.admindocs.urls')), (r'^admin/', include(admin.site.urls)), - (r'^photologue/', include('mysite.photologue.urls')), + (r'^photologue/', include('photologue.urls')), ) if settings.DEBUG: