# HG changeset patch
# User Amit Sethi
# Date 1293186741 -19800
# Node ID 704af5be5fb99e2d8afa17846c795e9aefd96936
# Parent  206a8a72d77c5477328e4f3aaa7a965e2de7f073# Parent  a52775d210e3e2cc71726c7b805dd55e991f7c57
Merging heads

diff -r a52775d210e3 -r 704af5be5fb9 project/static/img/scipy2-press-release.pdf
Binary file project/static/img/scipy2-press-release.pdf has changed
diff -r a52775d210e3 -r 704af5be5fb9 project/templates/about/publicity.html
--- a/project/templates/about/publicity.html	Sun Dec 12 03:27:21 2010 +0530
+++ b/project/templates/about/publicity.html	Fri Dec 24 16:02:21 2010 +0530
@@ -7,5 +7,13 @@
 <p>
 Download Poster (<a href="/static/img/scipy-poster-A3.png">A3 (3.6M)</a> | <a href="/static/img/scipy-poster-A4.png">A4 (1.7M)</a>)
 </p>
+<h2>Press Release</h2>
+<p>
+Download Press Release (<a href="/static/img/scipy2-press-release.pdf">here</a>)
+</p>
+
+
 </div>
+
+
 {% endblock content %}
diff -r a52775d210e3 -r 704af5be5fb9 project/templates/user/account.html
--- a/project/templates/user/account.html	Sun Dec 12 03:27:21 2010 +0530
+++ b/project/templates/user/account.html	Fri Dec 24 16:02:21 2010 +0530
@@ -6,7 +6,7 @@
 
 
 {% if registration %}
-   <h2>Please get your badges for scipy.in 2010 <a href="/{{ params.scope }}/badge/">here</a></h2>
+   <h2>Please get your badges for scipy.in 2010 <a href="{{ params.scope }}/badge/">here</a></h2>
 {% endif %}
 
 <h1>My Profile: {{ user.first_name }} {{user.last_name}}</h1>
@@ -130,7 +130,7 @@
             {% if talk.approved %}
               <span>Accepted</span>
             {% else %}
-              <a href="/{{ params.scope }}/edit-talk/{{ talk.id }}/" title="Edit">Edit</a>
+              <a href="/edit-talk/{{ talk.id }}/" title="Edit">Edit</a>
             {% endif %}
           </td>
         </tr>