[Oi-commits] r1103 - in trunk: st/templatetags templates/petition

[oi-commits at pardus.org.tr]

Author: jnmbk
Date: Sat Mar  1 07:06:07 2008
New Revision: 1103

Modified:
   trunk/st/templatetags/library.py
   trunk/templates/petition/petitioner_list.html
   trunk/templates/petition/sign.html
Log:
I see that django already had it

Modified: trunk/st/templatetags/library.py
=================================================================
--- trunk/st/templatetags/library.py	(original)
+++ trunk/st/templatetags/library.py	Sat Mar  1 07:06:07 2008
@@ -4,7 +4,7 @@
 from datetime import datetime
 from django.template import Library
 from django.utils.timesince import timesince
-from oi.settings import MEDIA_ROOT, MEDIA_URL, CITY_LIST
+from oi.settings import MEDIA_ROOT, MEDIA_URL
 
 register = Library()
 
@@ -65,17 +65,3 @@
         return "%s sonra" % timesince(cmp,value)
     else:
         return "%s önce" % timesince(value,cmp)
-
- at register.filter
-def cityname(value, arg=None):
-    # binary search the city name
-    i = 0
-    j = len(CITY_LIST)
-    k = (i + j) / 2
-    while i < j:
-        k = (i + j) / 2
-        if value > CITY_LIST[k][0]:
-            i = k + 1
-        else:
-            j = k
-    return CITY_LIST[i][1]

Modified: trunk/templates/petition/petitioner_list.html
=================================================================
--- trunk/templates/petition/petitioner_list.html	(original)
+++ trunk/templates/petition/petitioner_list.html	Sat Mar  1 07:06:07 2008
@@ -20,7 +20,7 @@
     {% endif %}
     {% for petitioner in petitioner_list %}
     <ul class="sidebar_firststeps">
-        <li style="margin-bottom:-10px;">{{ petitioner.firstname|escape }} {{ petitioner.lastname|escape }} - {{ petitioner.city|cityname }} - {{ petitioner.job|escape }} {% if petitioner.homepage|escape %}<a href="{{ petitioner.homepage|escape }}" target="_blank"><img src="/media/dijital/img/forum/msg_sim.gif" border="0" /></a>{% else %}-{% endif %} {{ petitioner.signed|timedelta }}</li>
+        <li style="margin-bottom:-10px;">{{ petitioner.firstname|escape }} {{ petitioner.lastname|escape }} - {{ petitioner.get_city_display }} - {{ petitioner.job|escape }} {% if petitioner.homepage|escape %}<a href="{{ petitioner.homepage|escape }}" target="_blank"><img src="/media/dijital/img/forum/msg_sim.gif" border="0" /></a>{% else %}-{% endif %} {{ petitioner.signed|timedelta }}</li>
     </ul>
     {% endfor %}
     {% if is_paginated %}

Modified: trunk/templates/petition/sign.html
=================================================================
--- trunk/templates/petition/sign.html	(original)
+++ trunk/templates/petition/sign.html	Sat Mar  1 07:06:07 2008
@@ -36,7 +36,7 @@
     <span>Son 20 imza:</span>
     {% for petitioner in petitioners %}
     <ul class="sidebar_firststeps">
-        <li style="margin-bottom:-10px;">{{ petitioner.firstname|escape }} {{ petitioner.lastname|escape }} - {{ petitioner.city|cityname }} - {{ petitioner.job|escape }} {% if petitioner.homepage|escape %}<a href="{{ petitioner.homepage|escape }}" target="_blank"><img src="/media/dijital/img/forum/msg_sim.gif" border="0" /></a>{% else %}-{% endif %} {{ petitioner.signed|timedelta }}</li>
+        <li style="margin-bottom:-10px;">{{ petitioner.firstname|escape }} {{ petitioner.lastname|escape }} - {{ petitioner.get_city_display }} - {{ petitioner.job|escape }} {% if petitioner.homepage|escape %}<a href="{{ petitioner.homepage|escape }}" target="_blank"><img src="/media/dijital/img/forum/msg_sim.gif" border="0" /></a>{% else %}-{% endif %} {{ petitioner.signed|timedelta }}</li>
     </ul>
     {% endfor %}
     <span><a href="/petition/liste/?page=1">Tüm İmzalar</a></span>