Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge conflicts

  • Loading branch information...
commit c4e784bc3cb402d73cf9cc984f9beaa829c7b21f 2 parents e2a00d7 + 841b8e2
Nitya Oberoi authored
Showing with 30 additions and 35 deletions.
  1. +30 −35 templates/index.html
View
65 templates/index.html
@@ -22,7 +22,7 @@
<li><a href="#the-wedding-2" class="tip" title="Guest Information &amp; Recommendations">the-wedding-2</a></li>
</ul>
</nav>
-
+
<div id="site-bottomnav" data-controller="SiteFunctions">
<!--<a id="contact-us" href="mailto:nityaandsriram@gmail.com" title="Contact Us" class="icon-contact function-tip">Contact Us</a>-->
<a id="rsvp" title="RSVP" class="icon-rsvp function-tip" href="{% url rsvp_login %}">RSVP</a>
@@ -37,18 +37,18 @@
<h4>June 9-10, 2012</h4>
</article>
</section>
-
+
<!-- Section #2 / Bride & Groom -->
<section id="the-bride" class="story" data-speed="6" data-type="background" data-offsety="150">
<article>
<h2>The Bride</h2>
<p>Nitya grew up in Kuwait but her roots still lie in India. She went to UT Austin to pursue Bachelors in Computer Science and Advertising. After a summer internship in Goldman Sachs, she decided she had to partake in doing "God's work" and joined Goldman Sachs in New York full-time in 2006.</p>
<p>After 4 years in the financial world, Nitya decided she'd had enough and decided to pursue her true passions - technology and web development. After a short stint in Lime Wire, she joined Yipit as their 6th employee and has been happily hacking away ever since.</p>
- <p>Nitya closely fits both the cancerian and southpaw stereotypes. She is highly creative and obsessive about her artwork. In fact, Nitya has never lived in an apartment that she didn't paint and decorate herself. Luckily (for me), she takes very little help while doing so.</p>
+ <p>Nitya closely fits both the cancerian and lefty (though she claims "ambidextrous") stereotypes. She is highly creative and obsessive about her artwork. In fact, Nitya has never lived in an apartment that she didn't paint and decorate herself. Luckily (for me), she takes very little help while doing so.</p>
<p>Nitya's biggest passion is probably still travel, specifically adventure travel. Besides trying out various adventure sports, she occasionally pushes the envelope with outrageously daring experiences like spending a week with minimal supplies learning survival skills in the Utah wilderness. Perhaps for this reason, if not any other, she'd be the person I pick to be with if I were stranded on a deserted island.</p>
</article>
</section>
-
+
<section id="the-groom" class="story" data-speed="6" data-type="background" data-offsety="265">
<article>
<h2>The Groom</h2>
@@ -72,13 +72,13 @@
<section id="the-engagement" class="story" data-speed="5" data-type="background" data-offsety="700">
<article>
<h2>The Proposal</h2>
- <div class="textbox">
+ <div class="textbox">
<h5>Stella Point, Aug 22 2011 - 8.00 a.m.</h5>
<p>About five hundred feet beneath Africa's highest peak (Uhuru), balancing unsteadily on a knelt position after an arduous trek uphill, I popped the question "Nitya, would you like to take our relationship to greater heights?" and offered her a ring in exchange for her hand. She said "yes, of course!" and I was overwhelmed with joy.</p>
<p>During the five-day ascent up the mountain, I had felt my body struggling under the hostile conditions but each time, I was able to push through a bit further with the hopes of proposing to Nitya near the top. After the proposal, we hugged and I realized how lucky I was to get that far up and have my dreams come true. For a moment, reaching the summit was merely a bonus experience!</p>
</div>
</article>
- </section>
+ </section>
<!-- Section #6 / Wedding -1 -->
@@ -87,44 +87,43 @@
<h2>Wedding - Events &amp; Details</h2>
<div class="textbox">
<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>
+ <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>
<span style="float:right">Attire: Ethnic</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>
<span style="float:right">Attire: Ethnic</span>
</p>
-
+
<p><h5>Reception, Dance: 7.30pm onwards</h5>
<span style="float:right">Attire: Ethnic/Formal</span>
</p>
</div>
</article>
</section>
-
+
<!-- Section #7 / Wedding -2 -->
<section id="the-wedding-2" class="story" data-speed="10" data-type="background" data-offsety="505">
<article>
<h2>Guest Information</h2>
<div class="textbox">
<ul>
- <li>We request all our guests to RSVP via the RSVP link on the top left of the screen.</li>
- <li>For our non-indian citizen guests, we encourage that you acquire your <a href="https://www.indian-visa.com/" target="_blank">Indian Visas</a> well before May and send us a copy so we can provide it to the hotel.</li>
+ <li>We request all our guests to RSVP via the icon on the top left corner of the screen.</li>
+ <li>For our non-indian citizen guests, we encourage that you acquire your <a href="https://www.indian-visa.com/" target="_blank">Indian Visas</a> well before May and send us a copy in email so we can provide it to the hotel.</li>
</ul>
- <h2>Recommendations</h2>
- <p>We've put together a list of recommendations for our guests to do while they're in India. We suggest </p>
- <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. o.</p>
- <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p>
- </div>
+ <h2>Recommended Reading</h2>
+ <p>Here's some information about <a href="http://www.lonelyplanet.com/india/maharashtra/pune" target="_blank">Pune</a> if you are interested in looking around the town.</p>
+ <p>If you are traveling around after or before, <a href="http://www.lonelyplanet.com/india/mumbai-bombay" target="_blank">Mumbai</a> is a great city to check out.</p>
+ </div>
</article>
</section>
-
+
</div> <!-- // End of #main -->
{% endblock %}
{% block extra_js %}
@@ -138,12 +137,12 @@
<script type="text/javascript">
jQuery(function($) {
-
+
$('.tip').tipsy({gravity: 'w', fade: true, delayIn: 100});
$('.function-tip').tipsy({
- gravity: 'n',
- fade: true,
- delayIn: 100,
+ gravity: 'n',
+ fade: true,
+ delayIn: 100,
offset: 7
});
$('.event-tip').tipsy({
@@ -154,21 +153,19 @@
html: true,
className: 'event-tip'
});
-
+
$(window).load(function() {
$('#loading').animate({"left" : "100%"});
});
$('#thanks_dialog').dialog();
-
+
$('#rsvp').fancybox({
centerOnScroll: true,
overlayColor: '#333',
hideOnOverlayClick: false
});
-
-
-
+
$("#photos").click(function() {
//$("a.fancybox").attr('rel', 'gallery').fancybox();
@@ -182,7 +179,7 @@
'../img/fixed/image7.jpg',
'../img/fixed/image8.jpg',
'../img/fixed/image9.jpg',
- '../img/fixed/image10.jpg',],
+ '../img/fixed/image10.jpg',],
{
'padding' : 0,
'transitionIn' : 'none',
@@ -191,12 +188,10 @@
'changeFade' : 0
});
});
- //
- // $('#site-bottomnav a').live('click', function(e){
- // $('#site-bottomnav a').not($(this))
- // $(this).html().modal();
- // })
-
+ /*$('#site-bottomnav a').live('click', function(e){
+
+ $(this).html().modal();
+ })*/
});
</script>
{% endblock %}
Please sign in to comment.
Something went wrong with that request. Please try again.