--- a/project/scipycon/registration/forms.py Wed Sep 14 16:16:46 2011 +0530
+++ b/project/scipycon/registration/forms.py Wed Sep 14 16:18:45 2011 +0530
@@ -99,10 +99,9 @@
a2 = self.cleaned_data['accommodation_on_2nd']
a3 = self.cleaned_data['accommodation_on_3rd']
a4 = self.cleaned_data['accommodation_on_4th']
- a5 = self.cleaned_data['accommodation_on_5th']
- a6 = self.cleaned_data['accommodation_on_6th']
+
- accommodation_days = [a1, a2, a3, a4, a5, a6].count(True)
+ accommodation_days = [a1, a2, a3, a4].count(True)
acco.sex = sex
acco.accommodation_required = accommodation_required
@@ -112,8 +111,6 @@
acco.accommodation_on_2nd = a2
acco.accommodation_on_3rd = a3
acco.accommodation_on_4th = a4
- acco.accommodation_on_5th = a5
- acco.accommodation_on_6th = a6
acco.save()
@@ -134,10 +131,8 @@
a2 = self.cleaned_data['accommodation_on_2nd']
a3 = self.cleaned_data['accommodation_on_3rd']
a4 = self.cleaned_data['accommodation_on_4th']
- a5 = self.cleaned_data['accommodation_on_5th']
- a6 = self.cleaned_data['accommodation_on_6th']
-
- selected_a_date = any([a1, a2, a3, a4, a5, a6])
+
+ selected_a_date = any([a1, a2, a3, a4])
if accommodation_required and (not sex or not selected_a_date):
#or accommodation_days == 0):
@@ -155,8 +150,6 @@
'accommodation_on_2nd',
'accommodation_on_3rd',
'accommodation_on_4th',
- 'accommodation_on_5th',
- 'accommodation_on_6th',
)
--- a/project/scipycon/registration/models.py Wed Sep 14 16:16:46 2011 +0530
+++ b/project/scipycon/registration/models.py Wed Sep 14 16:18:45 2011 +0530
@@ -81,10 +81,6 @@
default=False, verbose_name="Required for 3rd Night")
accommodation_on_4th = models.BooleanField(
default=False, verbose_name="Required for 4th Night")
- accommodation_on_5th = models.BooleanField(
- default=False, verbose_name="Required for 5th Night")
- accommodation_on_6th = models.BooleanField(
- default=False, verbose_name="Required for 6th Night")
accommodation_days = models.IntegerField(
default=0, blank=True,
--- a/project/static/css/styles.css Wed Sep 14 16:16:46 2011 +0530
+++ b/project/static/css/styles.css Wed Sep 14 16:18:45 2011 +0530
@@ -482,13 +482,13 @@
/* Login/register */
div.login
{
+ position:relative;
float: left;
}
div.register
{
- padding-left: 2em;
- padding-right: 4em;
+ position:relative;
margin: 0 0 0 270px;
border-left: 1px solid #aaa;
}
@@ -597,4 +597,4 @@
ul.entry {
font-size: 1.2em;
-}
\ No newline at end of file
+}
--- a/project/templates/user/login.html Wed Sep 14 16:16:46 2011 +0530
+++ b/project/templates/user/login.html Wed Sep 14 16:18:45 2011 +0530
@@ -38,6 +38,8 @@
</form>
</div>
+
+
<div class="register">
<h2 class="authenticate">Register</h2>