# HG changeset patch
# User nishanth
# Date 1271396671 -19800
# Node ID b7e47cc393421d9980a49f8e5ca31e9424a91312
# Parent  4a23f99f26f97a924b1b9bfb607c85f25decc1a0
renamed the project to ws_app and modified imports accordingly .

diff -r 4a23f99f26f9 -r b7e47cc39342 feedback/models.py
--- a/feedback/models.py	Fri Apr 16 00:05:42 2010 +0530
+++ b/feedback/models.py	Fri Apr 16 11:14:31 2010 +0530
@@ -1,7 +1,7 @@
 from django.db import models
 from django.contrib.auth.models import User
 
-from workshop.reg.models import Event
+from ws_app.reg.models import Event
 
 TOPICS_CHOICES = (('1', 'Very relevant'),
                   ('2', 'Relevant'),
diff -r 4a23f99f26f9 -r b7e47cc39342 feedback/site/urls.py
--- a/feedback/site/urls.py	Fri Apr 16 00:05:42 2010 +0530
+++ b/feedback/site/urls.py	Fri Apr 16 11:14:31 2010 +0530
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 
-from workshop.feedback import views as feed_views
+from ws_app.feedback import views as feed_views
 
 urlpatterns = patterns('',
     ('^submit/(\w+)$', feed_views.submit_feedback),
diff -r 4a23f99f26f9 -r b7e47cc39342 feedback/utils.py
--- a/feedback/utils.py	Fri Apr 16 00:05:42 2010 +0530
+++ b/feedback/utils.py	Fri Apr 16 11:14:31 2010 +0530
@@ -1,7 +1,7 @@
 """ A collection of utilities for feedback app.
 """
 
-from workshop.feedback.models import *
+from ws_app.feedback.models import *
 
 LONG_FIELD_NAME = {'topics': "Range of topics covered:",
                    'depth': "Depth of coverage:",
diff -r 4a23f99f26f9 -r b7e47cc39342 feedback/views.py
--- a/feedback/views.py	Fri Apr 16 00:05:42 2010 +0530
+++ b/feedback/views.py	Fri Apr 16 11:14:31 2010 +0530
@@ -1,10 +1,10 @@
 from django.shortcuts import render_to_response, redirect
 
-from workshop.reg.models import Event
+from ws_app.reg.models import Event
 
-from workshop.feedback.models import Feedback, FeedLog
-from workshop.feedback.forms import FeedbackForm
-from workshop.feedback.utils import make_day_report
+from ws_app.feedback.models import Feedback, FeedLog
+from ws_app.feedback.forms import FeedbackForm
+from ws_app.feedback.utils import make_day_report
 
 from django.http import HttpResponse
 
diff -r 4a23f99f26f9 -r b7e47cc39342 reg/events.py
--- a/reg/events.py	Fri Apr 16 00:05:42 2010 +0530
+++ b/reg/events.py	Fri Apr 16 11:14:31 2010 +0530
@@ -4,8 +4,8 @@
 from django.core.mail import send_mail
 from django.db import IntegrityError
 
-from workshop.reg.models import Profile, Event
-from workshop.reg.utils import gen_key
+from ws_app.reg.models import Profile, Event
+from ws_app.reg.utils import gen_key
 
 def create_user(email, password, first_name="", last_name="", gender="M", profession="S", affiliated_to="", interests="" ):
     """ create a user with random username and set the password.
diff -r 4a23f99f26f9 -r b7e47cc39342 reg/forms.py
--- a/reg/forms.py	Fri Apr 16 00:05:42 2010 +0530
+++ b/reg/forms.py	Fri Apr 16 11:14:31 2010 +0530
@@ -5,7 +5,7 @@
 from django.contrib.auth.models import User
 from django.contrib.auth import authenticate
 
-from workshop.reg.models import Profile, Event, GENDER_CHOICES, PROFESSION_CHOICES
+from ws_app.reg.models import Profile, Event, GENDER_CHOICES, PROFESSION_CHOICES
 
 class LoginForm(forms.Form):
     """ a form to handle login.
diff -r 4a23f99f26f9 -r b7e47cc39342 reg/site/urls.py
--- a/reg/site/urls.py	Fri Apr 16 00:05:42 2010 +0530
+++ b/reg/site/urls.py	Fri Apr 16 11:14:31 2010 +0530
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 
-from workshop.reg import views as reg_views
+from ws_app.reg import views as reg_views
 
 urlpatterns = patterns('',
     (r'^$', reg_views.homepage),
diff -r 4a23f99f26f9 -r b7e47cc39342 reg/views.py
--- a/reg/views.py	Fri Apr 16 00:05:42 2010 +0530
+++ b/reg/views.py	Fri Apr 16 11:14:31 2010 +0530
@@ -9,11 +9,11 @@
 
 from django.shortcuts import render_to_response, redirect
 
-from workshop.reg.models import Event, Profile
-from workshop.reg import forms as reg_forms
-from workshop.reg import events as reg_events
+from ws_app.reg.models import Event, Profile
+from ws_app.reg import forms as reg_forms
+from ws_app.reg import events as reg_events
 
-from workshop.feedback.models import Feedback, FeedLog
+from ws_app.feedback.models import Feedback, FeedLog
 
 def homepage(request):
     """ see if the user is active.
diff -r 4a23f99f26f9 -r b7e47cc39342 settings.py
--- a/settings.py	Fri Apr 16 00:05:42 2010 +0530
+++ b/settings.py	Fri Apr 16 11:14:31 2010 +0530
@@ -1,4 +1,4 @@
-# Django settings for workshop project.
+# Django settings for ws_app project.
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
@@ -63,7 +63,7 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
 )
 
-ROOT_URLCONF = 'workshop.urls'
+ROOT_URLCONF = 'ws_app.urls'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
@@ -78,9 +78,9 @@
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',
-    'workshop.feedback',
-    'workshop.reg',
-    #'workshop.quiz',
+    'ws_app.feedback',
+    'ws_app.reg',
+    #'ws_app.quiz',
 )
 
 AUTH_PROFILE_MODULE = 'reg.Profile'
diff -r 4a23f99f26f9 -r b7e47cc39342 urls.py
--- a/urls.py	Fri Apr 16 00:05:42 2010 +0530
+++ b/urls.py	Fri Apr 16 11:14:31 2010 +0530
@@ -6,7 +6,7 @@
 
 urlpatterns = patterns('',
     # Example:
-    # (r'^workshop/', include('workshop.foo.urls')),
+    # (r'^ws_app/', include('ws_app.foo.urls')),
 
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs' 
     # to INSTALLED_APPS to enable admin documentation:
@@ -15,7 +15,7 @@
     # Uncomment the next line to enable the admin:
     (r'^reg_admin/', include(admin.site.urls)),
 
-    (r'^reg/', include('workshop.reg.site.urls')),
-    #(r'^quiz/', include('workshop.quiz.site.urls')),
-    (r'^feedback/', include('workshop.feedback.site.urls')),
+    (r'^reg/', include('ws_reg.reg.site.urls')),
+    #(r'^quiz/', include('ws_reg.quiz.site.urls')),
+    (r'^feedback/', include('ws_reg.feedback.site.urls')),
 )