Added get_full_name to event and used in required templates.

3 files changed, 20 insertions, 6 deletions

diff --git a/project/scipycon/base/models.py b/project/scipycon/base/models.py
index 9041e77..0e8d7c4 100644
--- a/project/scipycon/base/models.py
+++ b/project/scipycon/base/models.py
@@ -26,6 +26,9 @@ class Event(models.Model):
     def __unicode__(self):
         return '%s %s' % (self.name, self.turn)
 
+    def get_full_name(self):
+        return self.__unicode__()
+
 
 class Timeline(models.Model):
     """Timeline of the program
diff --git a/project/templates/registration/registrations.html b/project/templates/registration/registrations.html
index da8b38a..e15a4a1 100644
--- a/project/templates/registration/registrations.html
+++ b/project/templates/registration/registrations.html
@@ -6,7 +6,7 @@ Registrations
 
 {% block content %}
 
-<h1>Submit Registration</h1>
+<h1>Registration Statistics</h1>
 
     {% if over_reg %}
     <div class="notice">
@@ -18,9 +18,16 @@ Registrations
     </div>
     {% endif %}
 
-<p>Currently <strong>{{ registrations }}</strong> persons have registered to attend SciPy.in 2009.</p>
-
-<p>To attend SciPy.in 2009 please <a href="/submit-registration/">register</a></p>
-
+<p>
+  Currently <strong>{{ registrations }}</strong> people have registered
+  to attend {{ event.get_full_name }}.
+</p>
+
+{% if not registration %}
+  <p>
+    To attend {{ event.get_full_name }} please <a href="
+    {% url scipycon_submit_registration params.scope %}">register</a>
+  </p>
+{% endif %}
 
 {% endblock %}
diff --git a/project/templates/user/_usermenu.html b/project/templates/user/_usermenu.html
index 0360393..46b02a8 100644
--- a/project/templates/user/_usermenu.html
+++ b/project/templates/user/_usermenu.html
@@ -1,11 +1,15 @@
 <div class="right">
     <ul class="horizontal-menu">
         <li>
-            <a href="{% url scipycon_account params.scope %}">My Profile</a>
+            <a href="{% url scipycon_account params.scope %}">My Account</a>
         </li>
         <li>
             <a href="{% url scipycon_edit_profile params.scope %}">Edit Profile</a>
         </li>
+        {% comment %} <li>
+            <a href="{% url scipycon_edit_registration params.scope registration.id %}">Edit Registration</a>
+        </li>
+        {% endcomment %}
         <li>
             <a href="{% url scipycon_password params.scope %}">Change Password</a>
         </li>