Merge pull request #98 from scipy-conference/finaid_deadline

add deadline and information for financial aid for #96

Author: codersquid

scipy2014/templates/participate/financial_aid.html

@@ -51,6 +51,7 @@ <h2>Instructions</h2>
 <li>Nominator's Email</li>
 <li>Community Contribution -- Briefly describe the applicant's recent contributions to the scientific Python community</li>
 <li>Description of Need -- Briefly describe the applicant's level of need.</li>
+<li>Indicate yes or no to apply to be considered for women or under-represented group scholarship</li>
 </ul>
 
 

scipy2014/templates/site_base.html

@@ -58,8 +58,13 @@
             </div>
 
             <h1><a href="{% url home %}"><img src="{% static "img/scipy2014_logo_simple.png" %}" width="387" height="100" style="margin-top: 0.5em;"></a></h1>
+
               <div class="header_tagline">Scientific Computing with Python <br /> Austin, Texas &#8226; July 6-12
-                            <br /><span class="highlight" style="font-family: Arial, non-serif; padding: 0 4em 0 4em;"><em>Abstract submission deadline: April 1st</em></span></div>
+              <br />
+              <span class="highlight" style="font-family: Arial, non-serif; padding: 0 4em 0 4em;"><em>Abstract submission deadline: April 1st</em></span>
+              <br />
+              <span class="highlight" style="font-family: Arial, non-serif; padding: 0 4em 0 4em;"><em>Financial aid application deadline: April 1st</em></span>
+                    </div>
         </header>
         <div class="navbar">
             <div class="navbar-inner">

scipy2014/templates/site_base_hp.html

@@ -59,7 +59,11 @@
 
             <h1><a href="{% url home %}"><img src="{% static "img/scipy2014_logo_simple.png" %}" width="387" height="100" style="margin-top: 0.5em;"></a></h1>
               <div class="header_tagline">Scientific Computing with Python <br /> Austin, Texas &#8226; July 6-12
-              <br /><span class="highlight" style="font-family: Arial, non-serif; padding: 0 4em 0 4em;"><em>Abstract submission deadline: April 1st</em></span></div>
+              <br />
+              <span class="highlight" style="font-family: Arial, non-serif; padding: 0 4em 0 4em;"><em>Abstract submission deadline: April 1st</em></span>
+              <br />
+              <span class="highlight" style="font-family: Arial, non-serif; padding: 0 4em 0 4em;"><em>Financial aid application deadline: April 1st</em></span>
+          </div>
         </header>
         <div class="navbar">
             <div class="navbar-inner">