Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	templates/packages/details.html
	templates/packages/files.html

3 files changed, 11 insertions, 8 deletions

diff --git a/templates/todolists/list.html b/templates/todolists/list.html
index a58fedc8..38d491d9 100644
--- a/templates/todolists/list.html
+++ b/templates/todolists/list.html
@@ -30,9 +30,9 @@
             <tr class="{% cycle 'odd' 'even' %}">
                 <td><a href="{{ list.get_absolute_url }}"
                         title="View todo list: {{ list.name }}">{{ list.name }}</a></td>
-                <td>{{ list.date_added }}</td>
+                <td>{{ list.date_added|date }}</td>
                 <td>{{ list.creator.get_full_name }}</td>
-                <td class="wrap">{{ list.description|safe }}</td>
+                <td class="wrap">{{ list.description|urlize }}</td>
                 <td>{{ list.pkg_count }}</td>
                 <td>{{ list.incomplete_count }}</td>
                 <td>{% ifequal list.incomplete_count 0 %}<span class="complete">Complete</span>
diff --git a/templates/todolists/public_list.html b/templates/todolists/public_list.html
index 5b957692..ceb001de 100644
--- a/templates/todolists/public_list.html
+++ b/templates/todolists/public_list.html
@@ -22,13 +22,14 @@
     </div>
 </div>
 {% if todo_lists %}
-<div id="public_todo_lists">
+<div id="public-todo-lists">
     {% for list in todo_lists %}
     <div class="box">
-        <a name="{{ list.id }}"></a>
-        <h4>{{ list.name }}</h4>
-        <div class="todo_list">
-            <div>{{ list.description|safe|linebreaks }}</div>
+        <div class="todo-list">
+            <a name="{{ list.id }}"></a>
+            <h4>{{ list.name }}</h4>
+            <p class="todo-info">{{ list.date_added|date }} - {{ list.creator.get_full_name }}</p>
+            <div>{{ list.description|urlize|linebreaks }}</div>
             <table id="todo-pkglist-{{ list.id }}" class="results todo-table">
                 <thead>
                     <tr>
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 477e0180..d4f5a08d 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -17,7 +17,9 @@
         {% endif %}
     </ul>
 
-    <p>{{list.description|safe|linebreaks}}</p>
+    <p class="todo-info">{{ list.date_added|date }} - {{ list.creator.get_full_name }}</p>
+
+    <div>{{list.description|urlize|linebreaks}}</div>
 
     <table id="dev-todo-pkglist" class="results todo-table">
         <thead>