# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@gmail.com>
# Date 1277914772 18000
# Node ID f14aaa98306aad0422612cba5c5385c6dcb05a53
# Parent  6ba969517b9cd76086305412b9f6c63577aba004
Register more apps in the admin site, write an actual template for the user profile page

diff -r 6ba969517b9c -r f14aaa98306a apps/profile/admin.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/apps/profile/admin.py	Wed Jun 30 11:19:32 2010 -0500
@@ -0,0 +1,4 @@
+from agora.apps.profile.models import *
+from django.contrib import admin
+
+admin.site.register(Profile)
diff -r 6ba969517b9c -r f14aaa98306a apps/profile/views.py
--- a/apps/profile/views.py	Wed Jun 30 00:04:34 2010 -0500
+++ b/apps/profile/views.py	Wed Jun 30 11:19:32 2010 -0500
@@ -1,5 +1,5 @@
 from django.shortcuts import render_to_response, get_object_or_404
-from agora.apps.profile.models import *
+from agora.apps.profile.models import Profile
 from django.contrib.auth.models import User
 from django.http import Http404
 from agora.apps.free_license.models import FreeLicense
diff -r 6ba969517b9c -r f14aaa98306a apps/snippet/admin.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/apps/snippet/admin.py	Wed Jun 30 11:19:32 2010 -0500
@@ -0,0 +1,5 @@
+from agora.apps.snippet.models import *
+from django.contrib import admin
+
+admin.site.register(Snippet)
+admin.site.register(CodeLanguage)
diff -r 6ba969517b9c -r f14aaa98306a apps/snippet/models.py
--- a/apps/snippet/models.py	Wed Jun 30 00:04:34 2010 -0500
+++ b/apps/snippet/models.py	Wed Jun 30 11:19:32 2010 -0500
@@ -9,5 +9,13 @@
     pub_date = models.DateTimeField('date uploaded')
     mod_date = models.DateTimeField('date last modified')
 
+    def __unicode__(self):
+        if self.name:
+            return self.name
+        return self.id
+
 class CodeLanguage(models.Model):
     name = models.CharField(max_length=64)
+
+    def __unicode__(self):
+        return name
diff -r 6ba969517b9c -r f14aaa98306a templates/user.djhtml
--- a/templates/user.djhtml	Wed Jun 30 00:04:34 2010 -0500
+++ b/templates/user.djhtml	Wed Jun 30 11:19:32 2010 -0500
@@ -3,7 +3,63 @@
 {{user.username}}
 {% endblock %}
 {% block boxcontents %}
-{{profile.preferred_license}} <br/>
-{{bundles}} <br/>
-{{snippets}} <br/>
-{% endblock %}
+<div id="userinfo">
+  {% if user.first_name or user.last_name %}
+  <span class="userfield">Name</span> 
+  <span class="userdata">{{user.first_name}} {{user.last_name}}</span> 
+  <br />
+  {% endif %}
+  <span class="userfield">Preferred license</span>
+  <span class="userdata">{{profile.preferred_license}}</span>
+  <br />
+  {% if profile.interests %}
+  <h4>
+    Interests
+  </h4>
+  <p class="userdata">
+    {{profile.interests}}
+  </p>
+  {% endif %}
+
+  {% if profile.blurb %}
+  <h4>
+    About {{user.username}}
+  </h4>
+  <p class="userdata">
+    {{profile.blurb}}
+  </p>
+</div>
+{% endif %}
+{% endblock %} {# boxcontents #}
+
+{% block extra-content-related %}
+{% if bundles or snippets %}
+<div id="info">
+  <h3>
+    Contributions by {{user.username}}
+  </h3>
+  <div class="whitebox">
+    {% if bundles %}
+    <h5>
+      Bundles
+    </h5>
+    <ul>
+      {% for b in bundles %}
+      <li> <a href="/{{user.username}}/{{b.name}}">{{b.name}} </a></li>
+      {% endfor %}
+    </ul>
+    {% endif %}
+    {% if snippets %}
+    <h5>
+      Snippets
+    </h5>
+    <ul>
+      {% for s in snippets %}
+      <li><a href="/snippet/{{s}}"}{{s}}</a></li>
+      {% endfor %}
+      {% endif %}
+    </ul>
+  </div>
+</div>
+{% endif %}
+{% endblock %} {# extra-content-related #}
diff -r 6ba969517b9c -r f14aaa98306a templates/whitebox.djhtml
--- a/templates/whitebox.djhtml	Wed Jun 30 00:04:34 2010 -0500
+++ b/templates/whitebox.djhtml	Wed Jun 30 11:19:32 2010 -0500
@@ -38,4 +38,5 @@
     
   </div>
 </div>
+{% block extra-content-related %}{% endblock %}
 {% endblock %}