diff options
| author | Anoop Jacob Thomas | 2010-11-18 12:29:07 +0530 |
|---|---|---|
| committer | Anoop Jacob Thomas | 2010-11-18 12:29:07 +0530 |
| commit | aec524dd0f372a248af7f947dfe091609de8b9cc (patch) | |
| tree | dc1f496684be1543ca9c7c4057062f43ba7f5dc2 | |
| parent | a5ac45a3fef34745e16a5cf2f03b894e28a9b541 (diff) | |
| parent | 73b83c40d6e97dbef647dda0f78039a1d6bac4f4 (diff) | |
| download | scipycon-aec524dd0f372a248af7f947dfe091609de8b9cc.tar.gz scipycon-aec524dd0f372a248af7f947dfe091609de8b9cc.tar.bz2 scipycon-aec524dd0f372a248af7f947dfe091609de8b9cc.zip | |
Merged heads.
| -rw-r--r-- | project/scipycon/user/views.py | 5 | ||||
| -rw-r--r-- | project/templates/user/dump.html | 16 |
2 files changed, 8 insertions, 13 deletions
diff --git a/project/scipycon/user/views.py b/project/scipycon/user/views.py index 5f3b1be..5822157 100644 --- a/project/scipycon/user/views.py +++ b/project/scipycon/user/views.py @@ -31,6 +31,9 @@ from project.scipycon.utils import set_message_cookie #User_dump Http404 Error from django.http import Http404 +#for user_dump creation +from project.scipycon.registration.models import Accommodation + @login_required def account(request, scope, template_name="user/account.html"): @@ -297,7 +300,7 @@ def get_user_dump(request, scope,template_name='user/dump.html'): accomodation_require = Accommodation.objects.filter(user__username=obj.registrant.username)[0] row['sex'] = accomodation_require.sex except: - row['sex'] = 'Acco. Unspecified' + row['sex'] = '-' row['city'] = obj.city row['organization'] = obj.organisation row['occupation'] = obj.occupation diff --git a/project/templates/user/dump.html b/project/templates/user/dump.html index 6caa25d..061201b 100644 --- a/project/templates/user/dump.html +++ b/project/templates/user/dump.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"
lang="en" xml:lang="en">
<head>
-<title>Dump</title>
+<title>Scipy User Dump</title>
<meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
<meta name="generator" content="Org-mode"/>
<meta name="generated" content="2010-11-12 18:35:22 IST"/>
@@ -71,20 +71,12 @@ lang="en" xml:lang="en"> <body>
<div id="content">
-<h1 class="title">Dump</h1>
+<h1 class="title">User Dump</h1>
+
-<div id="table-of-contents">
-<h2>Table of Contents</h2>
-<div id="text-table-of-contents">
-<ul>
-<li><a href="#sec-1">1 Scipy Dump </a></li>
-</ul>
-</div>
-</div>
<div id="outline-container-1" class="outline-2">
-<h2 id="sec-1"><span class="section-number-2">1</span> Scipy Dump 12 Nov 6:34 </h2>
<div class="outline-text-2" id="text-1">
@@ -109,7 +101,7 @@ L - Bring a Laptop <colgroup><col align="left" /><col align="left" /><col align="left" /><col align="left" /><col align="left" /><col align="left" /><col align="right" /><col align="right" /><col align="right" /><col align="right" />
</colgroup>
<tbody>
-<tr><td>first name</sub></td><td>last name</sub></td><td>Gender</td><td>City</td><td>Organization</td><td>Occupation</td><td>C</td><td>S</td><td>T</td><td>L</td></tr>
+<tr><td><i>first name</i></td><td><i>last name</i></td><td><i>Gender</i></td><td><i>City</i></td><td><i>Organization</i></td><td><i>Occupation</i></td><td></i>C</td><td><i>S</i></td><td><i>T</i></td><td><i>L</i></td></tr>
{% for row in rows %}
<tr><td>{{ row.first_name }}</td><td>{{ row.last_name }}</td><td>{{ row.sex }}</td><td>{{ row.city }}</td><td>{{ row.organization }}</td><td>{{ row.occupation }}</td><td>{{ row.conference }}</td><td>{{ row.sprint }}</td><td>{{ row.tutorial }}</td><td>{{ row.wifi }}</td></tr>
|