Browse files

Feedback from friends

  • Loading branch information...
1 parent 2199ae1 commit 6bfc69c8c6ddcc2990bdb97d88f08112db607562 Nitya Oberoi committed Feb 14, 2012
Showing with 31 additions and 33 deletions.
  1. +6 −0 guest/forms.py
  2. +7 −17 media/css/screen.css
  3. +3 −0 templates/500.html
  4. +0 −8 templates/confirmation.html
  5. +5 −0 templates/corinthians.html
  6. +9 −8 templates/index.html
  7. +1 −0 urls.py
View
6 guest/forms.py
@@ -14,6 +14,12 @@ class GuestForm(forms.ModelForm):
class Meta:
model = Guest
exclude = ('message', 'updated')
+
+ def clean_count(self):
+ count = self.cleaned_data.get('count', 0)
+ if count > 5:
+ raise forms.ValidationError("Please RSVP for 5 people or less.")
+ return count
class GuestEmailForm(forms.ModelForm):
email = forms.CharField(max_length=100, required=True, label="Email:")
View
24 media/css/screen.css
@@ -29,7 +29,7 @@ a, a:hover, a:visited {
cursor: pointer;
}
-.event-tip .tipsy-inner{
+.event-tip .tipsy-inner {
background-color: #303;
}
@@ -168,16 +168,13 @@ article p {
margin-top: 10px;
}
-#welcome article p,
-#welcome article a { color: #ccc; }
-#welcome article a { text-decoration: underline; }
-#welcome article a:hover { color: #fff; }
+#welcome article p { color: #ccc; }
/* The Bride */
#the-bride article {
background: url(../img/purple-grain.png) repeat #303;
border: 1px solid rgba(150,150,150,0.1);
- top: 160px;
+ top: 110px;
right: 90px;
width: 445px;
}
@@ -193,20 +190,11 @@ article p {
width: 430px;
box-shadow: 0 0 25px rgba(0,0,0,0.3);
}
-#the-groom .photograph {
- background: url(../img/photo.png) transparent 40% 100px no-repeat fixed;
- min-height: 1000px;
- padding: 0;
- margin: 0;
- width: 100%;
- position: relative;
- margin: 0 auto;
-}
/* Our Story */
#our-story article {
background: url(../img/grain.png) repeat #333;
- top: 170px;
+ top: 15%;
right: 90px;
width: 450px;
}
@@ -273,7 +261,7 @@ nav#side-nav a:hover, a.active {
z-index: 9999;
}
#site-bottomnav a, a.icon-home{
- margin: 0 7px 0 0 !important;
+ margin: 2px 7px 0 0 !important;
width: 45px;
height: 45px;
text-indent: -9000px;
@@ -344,7 +332,9 @@ nav#side-nav a:hover, a.active {
.fancybox-body form select{
width: 262px;
height: 30px;
+ appearance: none;
-webkit-appearance:none;
+ -moz-appearance:none;
border-radius: 0px;
-webkit-border-radius:0px;
-moz-border-radius: 0px;
View
3 templates/500.html
@@ -0,0 +1,3 @@
+<html>
+<body> 500 error </body>
+</html>
View
8 templates/confirmation.html
@@ -1,8 +0,0 @@
-<html>
-<body>
- <div>Confirmation Page for {{email}}</div>
- {% for rsvp in rsvps %}
- <div>{{rsvp}}</div>
- {% endfor %}
-</body>
-</html>
View
5 templates/corinthians.html
@@ -0,0 +1,5 @@
+
+
+<h5>Venue</h5>
+The Corinthians Bon Boutique Hotel<br /> Nyati County,NIBM Annexe, South Pune,<br />Pune-411060
+<h5>Getting here</h5>
View
17 templates/index.html
@@ -18,9 +18,9 @@
<li><a href="#the-bride" class="tip" title="The Bride">the-bride</a></li>
<li><a href="#the-groom" class="tip" title="The Groom">the-groom</a></li>
<li><a href="#our-story" class="tip" title="Our Story">our-story</a></li>
- <li><a href="#the-engagement" class="tip" title="The Engagement">the-engagement</a></li>
+ <li><a href="#the-proposal" class="tip" title="The Proposal">the-proposal</a></li>
<li><a href="#the-wedding-1" class="tip" title="Wedding - Events &amp; Details">the-wedding-1</a></li>
- <li><a href="#the-wedding-2" class="tip" title="Guest Information &amp; Recommendations">the-wedding-2</a></li>
+ <li><a href="#the-wedding-2" class="tip" title="Guest Information &amp; Recommended Reading">the-wedding-2</a></li>
</ul>
</nav>
@@ -53,7 +53,7 @@
<section id="the-groom" class="story" data-speed="6" data-type="background" data-offsety="265">
<article>
<h2>The Groom</h2>
- <p>Sriram was born and brought up in Chennai where he grew up with his sister, parents, and patti (grandmother). He went to UT Austin for his Bachelors in Electrical Engineering and on graduating, joined Google as a software engineer in California. Three years later, and after much coaxing (by me), he finally relented and left the west coast for New York. Last year, he moved to Spotify to pursue his interest in solving core backend engineering problems and loves it there.</p>
+ <p>Sriram was born and brought up in Chennai where he grew up with his sister, parents, and paati (grandmother). He went to UT Austin for his Bachelors in Electrical Engineering and on graduating, joined Google as a software engineer in California. Three years later, and after much coaxing (by me), he finally relented and left the west coast for New York. Last year, he moved to Spotify to pursue his interest in solving core backend engineering problems and loves it there.</p>
<p>Sriram is extremely passionate about music; he loves everything from psychedelic rock to classical carnatic. He's also an extremely adept percussionist, in all senses of the word. He first started playing the mirundangam at age 6 after some prodding from his mom and developed a natural sense of rhythm. At university, Sriram played for a band called Omkara. Later, he taught himself the tabla and drums, and he now regularly jams with friends to the tunes of Led Zep, Floyd etc. His other passions include traveling - he's travelled across 17 countries in 6 continents over the past 5 years and is always willing to partake in the next adventure even if it means hiccuping all the way up to the summit of Kilimanjaro.</p>
</article>
</section>
@@ -70,7 +70,7 @@
</section>
<!-- Section #5 / Engagement -->
- <section id="the-engagement" class="story" data-speed="5" data-type="background" data-offsety="700">
+ <section id="the-proposal" class="story" data-speed="5" data-type="background" data-offsety="700">
<article>
<h2>The Proposal</h2>
<div class="textbox">
@@ -83,26 +83,27 @@
<!-- Section #6 / Wedding -1 -->
- <section id="the-wedding-1" class="story" data-speed="10" data-type="background" data-offsety="480">
+ <section id="the-wedding-1" class="story" data-speed="10" data-type="background" data-offsety="470">
<article>
<h2>Wedding - Events &amp; Details</h2>
<div class="textbox">
+ <p>We're getting married in Pune at the <span class="event-tip" title="">Corinthians Bon Boutique Hotel.</span>
<h4>Saturday, June 9th, 2012</h4>
<p><h5 class="event-tip" title="The <strong>mehndi</strong> ceremony is a colorful musical celebration where the ladies, including the bride, get ornate mehndi patterns applied on their hands.">Mehndi Ceremony: 11am - 3pm.</h5>
<span style="float:right">Attire: Casual</span>
</p>
- <p><h5 class="event-tip" title="The <strong>baraat</strong> is the groom's wedding procession where the groom rides on a horse, accompanied by a band. Once the groom's party arrives at the wedding, they are received by the bride's side. Later, the bride and the groom exchange garlands (<strong>jaimala</strong>).">Baraat Swagat, Jaimala &amp; Sangeet: 7pm onwards.</h5>
+ <p><h5 class="event-tip" title="The <strong>baraat</strong> is the groom's wedding procession where the groom rides on a horse, accompanied by a band. Once the groom's party arrives at the wedding, they are received by the bride's side. Later, the bride and the groom exchange garlands (<strong>jaimala</strong>).">Baraat Swagat, Jaimala &amp; Sangeet @ The Grand Ballroom: 7pm onwards.</h5>
<span style="float:right">Attire: Traditional Indian</span>
</p>
<h4>Sunday, June 10th, 2012</h4>
<p><h5 class="event-tip" title="<strong>Nichayathartham</strong>, the engagement ceremony, followed by <strong>Muhurtham</strong>, traditional Tamil Iyer style.">
- The Wedding: 10am - 12pm.</h5>
+ The Wedding @ The Grand Ballroom: 10am - 12pm.</h5>
<span style="float:right">Attire: Traditional Indian</span>
</p>
- <p><h5>Reception, Dance: 7.30pm onwards.</h5>
+ <p><h5>Reception, Dance @ The North Ballroom: 7.30pm onwards.</h5>
<span style="float:right">Attire: Ethnic/Formal</span>
</p>
</div>
View
1 urls.py
@@ -8,4 +8,5 @@
url(r'^$', 'guest.views.home', name='home'),
url(r'^rsvp_login$', 'guest.views.rsvp_login', name='rsvp_login'),
url(r'^rsvp$', 'guest.views.rsvp', name='rsvp'),
+ url(r'^hotel$', direct_to_template, {'template': 'corinthians.html'}, name='hotel'),
)

0 comments on commit 6bfc69c

Please sign in to comment.