@@ -8,7 +8,7 @@ {% if object_list.count %} {% for term in object_list %} - <h2>{{ term.name }} <a href="http://twitter.com/{{ term.social_user }}/status/{{ term.status_id }}" title="{{ term.name }}"><span class="author">@{{ term.social_user }}</span></a></h2> + <h2>{{ term.name|safe }} <a href="http://twitter.com/{{ term.social_user }}/status/{{ term.status_id }}" title="{{ term.date_added }}"><span class="author">@{{ term.social_user }}</span></a></h2> <p>{{ term.meaning|safe }}</p> {% endfor %} {% else %} templates/socialdict/letter_list.html @@ -6,7 +6,7 @@ {% if object_list.count %} {% for term in object_list %} - <h2>{{ term.name }} <a href="http://twitter.com/{{ term.social_user }}/status/{{ term.status_id }}" title="{{ term.name }}"><span class="author">@{{ term.social_user }}</span></a></h2> + <h2>{{ term.name|safe }} <a href="http://twitter.com/{{ term.social_user }}/status/{{ term.status_id }}" title="{{ term.date_added }}"><span class="author">@{{ term.social_user }}</span></a></h2> <p>{{ term.meaning|safe }}</p> {% endfor %} {% else %} templates/socialdict/term_list.html d29e257cd949d9a2b7ab7539ac84a5a4214463c5 d316d31e2dabfe8c0bcdbe5d92521ef56d25aafd Julen Ruiz Aizpuru julenx@gmail.com http://github.com/julen/hitzokei/commit/af8e61c65c0769a53848ea6f44b0d5e2a4985263 af8e61c65c0769a53848ea6f44b0d5e2a4985263 2009-11-02T10:22:04-08:00 2009-11-02T10:22:04-08:00 Merge branch 'master' of github.com:julen/hitzokei Conflicts: static/css/base.css cafb27e341c4352a0ec6aceef78fc00905fe64d7 Julen Ruiz Aizpuru julenx@gmail.com