Mercurial > public > madeira
changeset 40:25e00d1b99bf
Get rid of the project name 'mysite' from the source.
| author | Brian Neal <bgneal@gmail.com> |
|---|---|
| date | Tue, 14 Feb 2012 19:09:57 -0600 |
| parents | b8e166ca993a |
| children | 63e4211628e1 |
| files | mysite/band/admin.py mysite/band/admin_views.py mysite/band/models.py mysite/band/urls.py mysite/band/views.py mysite/settings/base.py mysite/templates/admin/index.html mysite/templates/band/base.html mysite/templates/band/gigs.html mysite/templates/band/index.html mysite/templates/band/mail_not_found.html mysite/templates/band/photo_detail.html mysite/templates/band/photos.html mysite/templates/band/press_detail.html mysite/templates/band/video_detail.html mysite/templates/band/videos.html mysite/urls.py |
| diffstat | 17 files changed, 67 insertions(+), 67 deletions(-) [+] |
line wrap: on
line diff
--- 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 #######################################################################
--- 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 #######################################################################
--- 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
--- 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'), )
--- 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 #######################################################################
--- 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', ] #######################################################################
--- 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 @@ <!-- ============================================================================== --> - <tr><th scope="row"><a href="{% url mysite.band.admin_views.email %}">Send Email to Mailing List</a></th> + <tr><th scope="row"><a href="{% url band.admin_views.email %}">Send Email to Mailing List</a></th> <td> </td> <td> </td> </tr>
--- 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 @@ <div id="navleft" class="span-4 append-1"> <ul> - <li><a href="{% url 'mysite.band.views.index' %}">Home</a></li> - <li><a href="{% url 'mysite.band.views.news' %}">News</a></li> - <li><a href="{% url 'mysite.band.views.bio' %}">Biography</a></li> - <li><a href="{% url 'mysite.band.views.gigs' %}">Shows</a></li> - <li><a href="{% url 'mysite.band.views.press_index' %}">Press</a></li> - <li><a href="{% url 'mysite.band.views.songs' %}">Songs</a></li> - <li><a href="{% url 'mysite.band.views.photos_index' %}">Photos</a></li> - <li><a href="{% url 'mysite.band.views.videos_index' %}">Videos</a></li> - <li><a href="{% url 'mysite.band.views.flyers' %}">Flyers</a></li> - <li><a href="{% url 'mysite.band.views.buy' %}">Buy</a></li> - <li><a href="{% url 'mysite.band.views.contact' %}">Contact</a></li> - <li><a href="{% url 'mysite.band.views.mail' %}">Mailing List</a></li> + <li><a href="{% url 'band.views.index' %}">Home</a></li> + <li><a href="{% url 'band.views.news' %}">News</a></li> + <li><a href="{% url 'band.views.bio' %}">Biography</a></li> + <li><a href="{% url 'band.views.gigs' %}">Shows</a></li> + <li><a href="{% url 'band.views.press_index' %}">Press</a></li> + <li><a href="{% url 'band.views.songs' %}">Songs</a></li> + <li><a href="{% url 'band.views.photos_index' %}">Photos</a></li> + <li><a href="{% url 'band.views.videos_index' %}">Videos</a></li> + <li><a href="{% url 'band.views.flyers' %}">Flyers</a></li> + <li><a href="{% url 'band.views.buy' %}">Buy</a></li> + <li><a href="{% url 'band.views.contact' %}">Contact</a></li> + <li><a href="{% url 'band.views.mail' %}">Mailing List</a></li> <li><a href="http://myspace.com/themadeira">Myspace</a></li> <li><a href="http://facebook.com/themadeira">Facebook</a></li> <li><a href="http://www.youtube.com/user/TheMadeiraSurf">YouTube</a></li>
--- a/mysite/templates/band/gigs.html Tue Feb 14 18:52:57 2012 -0600 +++ b/mysite/templates/band/gigs.html Tue Feb 14 19:09:57 2012 -0600 @@ -103,7 +103,7 @@ {% endfor %} </div> <div clear="all"></div> - <center><p>To see all our flyers in full size, check out our <a href="{% url 'mysite.band.views.flyers' %}">show flyer gallery</a>.</p></center> + <center><p>To see all our flyers in full size, check out our <a href="{% url 'band.views.flyers' %}">show flyer gallery</a>.</p></center> </div> {% endif %}
--- 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 @@ </li> {% endfor %} </ul> -<center><a href="{% url 'mysite.band.views.gigs' %}">See all upcoming shows...</a></center> +<center><a href="{% url 'band.views.gigs' %}">See all upcoming shows...</a></center> </div> {% endif %}
--- 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 %} <h1>Madeira Mailing List</h1> <p>Sorry, we did not find that email address in our database.</p> -<p>Back to <a href="{% url 'mysite.band.views.contact' %}">contact page</a>.</p> +<p>Back to <a href="{% url 'band.views.contact' %}">contact page</a>.</p> {% endblock %}
--- 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 @@ <img src="{{ photo.get_thumbnail_url }}" alt="{{ photo.caption }}" title="{{ photo.caption }}" /></a> {% endfor %} </div> -<center><a href="{% url 'mysite.band.views.photos_index' %}">Photo gallery index</a></center> +<center><a href="{% url 'band.views.photos_index' %}">Photo gallery index</a></center> {% endblock %}
--- 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 %} <ul> {% for gallery in galleries %} - <li><a href="{% url 'mysite.band.views.photo_detail' gallery.id %}">{{ gallery.title }}</a></li> + <li><a href="{% url 'band.views.photo_detail' gallery.id %}">{{ gallery.title }}</a></li> {% endfor %} </ul> {% else %}
--- 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 @@ <img src="{{ STATIC_URL }}images/get_adobe_reader.gif" alt="Adobe Reader" title="Get Adobe Reader" border="0" align="middle" /></a> {% endif %} -<p><a href="{% url 'mysite.band.views.press_index' %}">Press index</a></p> +<p><a href="{% url 'band.views.press_index' %}">Press index</a></p> {% endblock %}
--- 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 @@ </table> </div> <br /> -<center><a href="{% url 'mysite.band.views.videos_index' %}">Videos index</a></center> +<center><a href="{% url 'band.views.videos_index' %}">Videos index</a></center> {% endblock %}
--- 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 %} <ul> {% for set in vidsets %} - <li><a href="{% url 'mysite.band.views.video_detail' set.id %}">{{ set.title }}</a></li> + <li><a href="{% url 'band.views.video_detail' set.id %}">{{ set.title }}</a></li> {% endfor %} </ul> {% else %}
--- 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: