[Oi-commits] r1154 - in trunk: profile templates/forum templates/user

[oi-commits at pardus.org.tr]

Author: jnmbk
Date: Sat Mar 22 19:15:20 2008
New Revision: 1154

Modified:
   trunk/profile/urls.py
   trunk/profile/views.py
   trunk/templates/forum/topic.html
   trunk/templates/user/profile.html
Log:
profile fixes and enchancements

Modified: trunk/profile/urls.py
=================================================================
--- trunk/profile/urls.py	(original)
+++ trunk/profile/urls.py	Sat Mar 22 19:15:20 2008
@@ -30,5 +30,5 @@
     (r'^kayip/$', 'oi.profile.views.lost_password'),
     (r'^kayip/degistir/(?P<key>[\w-]+)/$', 'oi.profile.views.change_password'),
     #(r'^kullanici/(?P<name>[\w-]+)/yorumlar/$', 'oi.profile.views.user_comments'),
-    (r'^(?P<name>[\w-]+)/$', 'oi.profile.views.user_profile'),
+    (r'^profil/(?P<name>[\w-]+)/$', 'oi.profile.views.user_profile'),
 )

Modified: trunk/profile/views.py
=================================================================
--- trunk/profile/views.py	(original)
+++ trunk/profile/views.py	Sat Mar 22 19:15:20 2008
@@ -43,6 +43,9 @@
             u.get_profile().signature = form.cleaned_data['signature']
             u.get_profile().avatar = Avatar.objects.get(id=form.cleaned_data['avatar'])
             u.get_profile().city = form.cleaned_data['city']
+            u.get_profile().jabber = form.cleaned_data['jabber']
+            u.get_profile().msn = form.cleaned_data['msn']
+            u.get_profile().icq = form.cleaned_data['icq']
             u.get_profile().birthday = form.cleaned_data['birthday']
             u.get_profile().show_email = form.cleaned_data['show_email']
             u.get_profile().save()
@@ -70,6 +73,9 @@
                         'lastname': u.last_name,
                         'avatar': u.get_profile().avatar.id,
                         'birthday': birthday,
+                        'jabber': u.get_profile().jabber,
+                        'msn': u.get_profile().msn,
+                        'icq': u.get_profile().icq,
                         'homepage': u.get_profile().homepage,
                         'signature': u.get_profile().signature,
                         'city': u.get_profile().city,
@@ -117,6 +123,9 @@
             profile.show_email = form.cleaned_data['show_email']
             profile.key_expires = key_expires
             profile.avatar = Avatar.objects.get(id=1)
+            profile.jabber = form.cleaned_data['jabber']
+            profile.msn = form.cleaned_data['msn']
+            profile.icq = form.cleaned_data['icq']
             profile.save()
 
             for number in form.cleaned_data['contributes']: # it's ManyToManyField's unique id

Modified: trunk/templates/forum/topic.html
=================================================================
--- trunk/templates/forum/topic.html	(original)
+++ trunk/templates/forum/topic.html	Sat Mar 22 19:15:20 2008
@@ -28,7 +28,7 @@
         <!-- post.author.avatar buraya gelecek --><img src="/media/dijital/img/forum/avatar.jpg" /><br/><br/>
         {% if perms.forum.can_see_post_ip %}({{ post.ip }})<br/><br/>{% endif %}
         Kayıt Tarihi: {{ post.author.date_joined|date:"d-m-Y" }}<br/>
-        <!-- <a href="/kullanici/duzenle/"><img src="/media/dijital/img/forum/bilgi.jpg" border="0"</a><br/> -->
+        <a href="/kullanici/profil/{{ post.author }}"><img src="/media/dijital/img/forum/bilgi.jpg" border="0" /></a><br/>
     </div>
     <div id="post_message">
         <div id="post_message_top">

Modified: trunk/templates/user/profile.html
=================================================================
--- trunk/templates/user/profile.html	(original)
+++ trunk/templates/user/profile.html	Sat Mar 22 19:15:20 2008
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Kullanıcı: {{ infoname }} -{% endblock %}
+{% block title %}Kullanıcı profili: {{ info }} - {% endblock %}
 
 {% block header_menu %}
     {% include "header.html" %}
@@ -34,7 +34,9 @@
         <ul>
             {% if info.get_profile.show_email %}<li>E-posta: <a href="mailto:{{ info.email }}">{{ info.email }}</a></li>{% endif %}
             <li>Web: {{ info.get_profile.homepage }}</li>
-            <li>Jabber: {{ info.get_profile.im }}</li>
+            <li>Jabber: {{ info.get_profile.jabber }}</li>
+            <li>MSN: {{ info.get_profile.msn }}</li>
+            <li>ICQ: {{ info.get_profile.icq }}</li>
         </ul>
     </div>
 </div>