From oi-commits at pardus.org.tr Tue Apr 1 07:50:49 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 07:50:49 +0300 (EEST) Subject: [Oi-commits] r1167 - trunk/templates/forum Message-ID: <20080401045049.6A0F27C0034@liste.uludag.org.tr> Author: jnmbk Date: Tue Apr 1 07:50:49 2008 New Revision: 1167 Modified: trunk/templates/forum/topic.html Log: extra location bar at the bottom Modified: trunk/templates/forum/topic.html ================================================================= --- trunk/templates/forum/topic.html (original) +++ trunk/templates/forum/topic.html Tue Apr 1 07:50:49 2008 @@ -138,5 +138,8 @@
{% paginator %}
{% endif %} +
+
Ana Sayfa > Forum > {{ forum.name|escape }} > {{ topic.title|escape }}
+
{% endblock %} {% block sidebartop %}{% endblock %} From oi-commits at pardus.org.tr Wed Apr 2 14:10:36 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 2 Apr 2008 14:10:36 +0300 (EEST) Subject: [Oi-commits] r1168 - in trunk: media/avatar profile/sql Message-ID: <20080402111036.CA63A7C00C3@liste.uludag.org.tr> Author: jnmbk Date: Wed Apr 2 14:10:36 2008 New Revision: 1168 Added: trunk/media/avatar/ trunk/media/avatar/pard01.png (contents, props changed) trunk/media/avatar/pard02.png (contents, props changed) trunk/media/avatar/pard03.png (contents, props changed) trunk/media/avatar/pard04.png (contents, props changed) trunk/media/avatar/pard05.png (contents, props changed) trunk/media/avatar/pard06.png (contents, props changed) trunk/media/avatar/pard07.png (contents, props changed) trunk/media/avatar/pard08.png (contents, props changed) trunk/media/avatar/peng01.png (contents, props changed) trunk/media/avatar/peng02.png (contents, props changed) trunk/media/avatar/peng03.png (contents, props changed) trunk/media/avatar/peng04.png (contents, props changed) trunk/media/avatar/peng05.png (contents, props changed) trunk/media/avatar/peng06.png (contents, props changed) trunk/media/avatar/peng07.png (contents, props changed) trunk/media/avatar/peng08.png (contents, props changed) trunk/profile/sql/ trunk/profile/sql/avatar.sql Log: avatars and initial data From oi-commits at pardus.org.tr Wed Apr 2 15:06:55 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 2 Apr 2008 15:06:55 +0300 (EEST) Subject: [Oi-commits] r1169 - trunk/st Message-ID: <20080402120655.A32DD7C00CC@liste.uludag.org.tr> Author: jnmbk Date: Wed Apr 2 15:06:55 2008 New Revision: 1169 Modified: trunk/st/forms.py Log: clean unwanted tags and attributes Modified: trunk/st/forms.py ================================================================= --- trunk/st/forms.py (original) +++ trunk/st/forms.py Wed Apr 2 15:06:55 2008 @@ -1,3 +1,4 @@ +from BeautifulSoup import BeautifulSoup, Comment from django import newforms as forms import re @@ -9,7 +10,22 @@ def __init__(self,*args,**kwargs): """ Calling the upper function""" - super(XssField,self).__init__(*args,**kwargs) + super(XssField, self).__init__(*args, **kwargs) + + def clean(self, value): + super(XssField, self).clean(value) + validTags = "address em p i strong b u a h1 h2 h3 h4 h5 h6 pre br img span sub sup ol ul li".split() + validAttrs = "align alt border href src style target title".split() + soup = BeautifulSoup(value) + comments = soup.findAll(text=lambda text:isinstance(text, Comment)) + [comment.extract() for comment in comments] + for tag in soup.findAll(True): + if tag.name not in validTags: + tag.hidden = True + elif tag.name == "a": + tag["target"] = "_blank" + tag.attrs = [(attr, val) for attr, val in tag.attrs if attr in validAttrs] + return soup.renderContents().decode('utf8') class CommentForm(forms.Form): """ The comment thingy add validation please...""" From oi-commits at pardus.org.tr Wed Apr 2 15:10:05 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 2 Apr 2008 15:10:05 +0300 (EEST) Subject: [Oi-commits] r1170 - trunk Message-ID: <20080402121005.2581C7C00CC@liste.uludag.org.tr> Author: jnmbk Date: Wed Apr 2 15:10:04 2008 New Revision: 1170 Modified: trunk/README Log: BeautifulSoup dependency Modified: trunk/README ================================================================= --- trunk/README (original) +++ trunk/README Wed Apr 2 15:10:04 2008 @@ -1,6 +1,7 @@ Requires: Django environment (Python, Web Server (Apache recommended), mod_python (if Apache preferred), Django*) Python Imaging Library (PIL) + BeautifulSoup DBMS (MySQL recommended) * We're using r7046 of Django, so use: svn co http://code.djangoproject.com/svn/django/trunk -r7046 From oi-commits at pardus.org.tr Wed Apr 2 15:56:23 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 2 Apr 2008 15:56:23 +0300 (EEST) Subject: [Oi-commits] r1171 - trunk/profile Message-ID: <20080402125623.16A4B7C00C0@liste.uludag.org.tr> Author: jnmbk Date: Wed Apr 2 15:56:22 2008 New Revision: 1171 Modified: trunk/profile/forms.py trunk/profile/models.py Log: max_length for signature Modified: trunk/profile/forms.py ================================================================= --- trunk/profile/forms.py (original) +++ trunk/profile/forms.py Wed Apr 2 15:56:22 2008 @@ -97,7 +97,7 @@ jabber = forms.EmailField(label='Jabber', max_length=50, required=False) icq = forms.EmailField(label='ICQ', max_length=50, required=False) show_email = forms.BooleanField(label='E-posta Adresini G?ster', required=False, help_text='Profil sayfas?nda di?erleri e-posta adresinizi g?rs?n m??') - signature = forms.CharField(label='?mza', widget=forms.Textarea(attrs={'rows': 7, 'cols': 45}), required=False, help_text='Forumdaki her iletinizin alt?nda g?r?necek imzan?z (zorunlu de?il)') + signature = forms.CharField(label='?mza', widget=forms.Textarea(attrs={'rows': 7, 'cols': 45}), required=False, help_text='Forumdaki her iletinizin alt?nda g?r?necek imzan?z (zorunlu de?il)', max_length=512) avatar = forms.ChoiceField(label='Avatar', widget=forms.Select(attrs={"onchange":"updateAvatar(this);"})) def __init__(self,*args,**kwargs): Modified: trunk/profile/models.py ================================================================= --- trunk/profile/models.py (original) +++ trunk/profile/models.py Wed Apr 2 15:56:22 2008 @@ -85,7 +85,7 @@ contributes_summary = models.TextField('Katk? A??klamas?', blank=True) activation_key = models.CharField(max_length=40) key_expires = models.DateTimeField() - signature = models.TextField('?mza', blank=True) + signature = models.TextField('?mza', blank=True, max_length=512) def __str__(self): return self.user.username From oi-commits at pardus.org.tr Wed Apr 2 16:04:44 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 2 Apr 2008 16:04:44 +0300 (EEST) Subject: [Oi-commits] r1172 - trunk/profile Message-ID: <20080402130444.3A8757C00C0@liste.uludag.org.tr> Author: jnmbk Date: Wed Apr 2 16:04:33 2008 New Revision: 1172 Modified: trunk/profile/forms.py Log: some help text and xss protection Modified: trunk/profile/forms.py ================================================================= --- trunk/profile/forms.py (original) +++ trunk/profile/forms.py Wed Apr 2 16:04:33 2008 @@ -14,6 +14,7 @@ from oi.middleware import threadlocals from oi.settings import CITY_LIST from oi.st.models import Contribute +from oi.st.forms import XssField from oi.profile.models import * class RegisterForm(forms.Form): @@ -97,7 +98,7 @@ jabber = forms.EmailField(label='Jabber', max_length=50, required=False) icq = forms.EmailField(label='ICQ', max_length=50, required=False) show_email = forms.BooleanField(label='E-posta Adresini G?ster', required=False, help_text='Profil sayfas?nda di?erleri e-posta adresinizi g?rs?n m??') - signature = forms.CharField(label='?mza', widget=forms.Textarea(attrs={'rows': 7, 'cols': 45}), required=False, help_text='Forumdaki her iletinizin alt?nda g?r?necek imzan?z (zorunlu de?il)', max_length=512) + signature = XssField(label='?mza', widget=forms.Textarea(attrs={'rows': 7, 'cols': 45}), required=False, help_text='Forumdaki her iletinizin alt?nda g?r?necek imzan?z (html taglar? kullanabilirsiniz, en fazla 512 karakter olabilir)', max_length=512) avatar = forms.ChoiceField(label='Avatar', widget=forms.Select(attrs={"onchange":"updateAvatar(this);"})) def __init__(self,*args,**kwargs): From oi-commits at pardus.org.tr Wed Apr 2 17:35:26 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 2 Apr 2008 17:35:26 +0300 (EEST) Subject: [Oi-commits] r1173 - trunk/templates/user Message-ID: <20080402143526.A7F3B7C00B7@liste.uludag.org.tr> Author: jnmbk Date: Wed Apr 2 17:35:26 2008 New Revision: 1173 Modified: trunk/templates/user/profile.html Log: cosmetics Modified: trunk/templates/user/profile.html ================================================================= --- trunk/templates/user/profile.html (original) +++ trunk/templates/user/profile.html Wed Apr 2 17:35:26 2008 @@ -17,9 +17,8 @@ {% if info %}
-

{{ info }}

-

Avatar

+

{{ info }}

From oi-commits at pardus.org.tr Wed Apr 2 17:46:33 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 2 Apr 2008 17:46:33 +0300 (EEST) Subject: [Oi-commits] r1174 - in trunk: profile templates/user Message-ID: <20080402144634.0C978864002@liste.uludag.org.tr> Author: jnmbk Date: Wed Apr 2 17:46:33 2008 New Revision: 1174 Modified: trunk/profile/forms.py trunk/templates/user/profile_edit.html Log: cosmetics in profile edit Modified: trunk/profile/forms.py ================================================================= --- trunk/profile/forms.py (original) +++ trunk/profile/forms.py Wed Apr 2 17:46:33 2008 @@ -88,6 +88,7 @@ return field_data class ProfileEditForm(forms.Form): + avatar = forms.ChoiceField(label='Avatar', widget=forms.Select(attrs={"onchange":"updateAvatar(this);"})) firstname = forms.CharField(label='Ad?', max_length=30) lastname = forms.CharField(label='Soyad?', max_length=30) birthday = forms.DateField(label='Do?um Tarihi', input_formats=('%d/%m/%Y', '%d/%m/%y'), help_text='23/4/1985 gibi') @@ -99,7 +100,6 @@ icq = forms.EmailField(label='ICQ', max_length=50, required=False) show_email = forms.BooleanField(label='E-posta Adresini G?ster', required=False, help_text='Profil sayfas?nda di?erleri e-posta adresinizi g?rs?n m??') signature = XssField(label='?mza', widget=forms.Textarea(attrs={'rows': 7, 'cols': 45}), required=False, help_text='Forumdaki her iletinizin alt?nda g?r?necek imzan?z (html taglar? kullanabilirsiniz, en fazla 512 karakter olabilir)', max_length=512) - avatar = forms.ChoiceField(label='Avatar', widget=forms.Select(attrs={"onchange":"updateAvatar(this);"})) def __init__(self,*args,**kwargs): super(ProfileEditForm, self).__init__(*args, **kwargs) Modified: trunk/templates/user/profile_edit.html ================================================================= --- trunk/templates/user/profile_edit.html (original) +++ trunk/templates/user/profile_edit.html Wed Apr 2 17:46:33 2008 @@ -33,10 +33,17 @@
{% for field in form %} -
-
{% if field.help_text %}
{{ field.help_text }}{% endif %}{% if field.errors %}
{{ field.errors }}{% endif %}
-
{{ field }}{% ifequal field.name "avatar" %}
avatar{% endifequal %}
-
+ {% ifequal field.name "avatar" %} +
+
{% if field.errors %}
{{ field.errors }}
{% endif %} + {{ field }}
avatar +
+ {% else %} +
+
{% if field.help_text %}
{{ field.help_text }}{% endif %}{% if field.errors %}
{{ field.errors }}{% endif %}
+
{{ field }}
+
+ {% endifequal %} {% endfor %}
Parolay? De?i?tir
From oi-commits at pardus.org.tr Wed Apr 2 17:51:11 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 2 Apr 2008 17:51:11 +0300 (EEST) Subject: [Oi-commits] r1175 - trunk/templates/forum Message-ID: <20080402145111.74A76864002@liste.uludag.org.tr> Author: jnmbk Date: Wed Apr 2 17:51:11 2008 New Revision: 1175 Modified: trunk/templates/forum/topic.html Log: one less
looks better Modified: trunk/templates/forum/topic.html ================================================================= --- trunk/templates/forum/topic.html (original) +++ trunk/templates/forum/topic.html Wed Apr 2 17:51:11 2008 @@ -23,8 +23,8 @@
{{ post.author }}{% if post.author.is_staff %}
Forum Y?neticisi{% endif %}


- avatar

- {% if perms.forum.can_see_post_ip %}({{ post.ip }})

{% endif %} + avatar
+ {% if perms.forum.can_see_post_ip %}({{ post.ip }})
{% endif %} Kay?t Tarihi: {{ post.author.date_joined|date:"d-m-Y" }}

From oi-commits at pardus.org.tr Wed Apr 2 23:10:15 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 2 Apr 2008 23:10:15 +0300 (EEST) Subject: [Oi-commits] r1176 - trunk/templates/forum Message-ID: <20080402201015.98164864003@liste.uludag.org.tr> Author: jnmbk Date: Wed Apr 2 23:10:15 2008 New Revision: 1176 Modified: trunk/templates/forum/post_edit.html trunk/templates/forum/reply.html Log: sync Modified: trunk/templates/forum/post_edit.html ================================================================= --- trunk/templates/forum/post_edit.html (original) +++ trunk/templates/forum/post_edit.html Wed Apr 2 23:10:15 2008 @@ -28,11 +28,11 @@ {% else %}
- {{ post.author }}

-

- {% if perms.forum.can_see_post_ip %}({{ post.ip }})

{% endif %} + {{ post.author }}{% if post.author.is_staff %}
Forum Y?neticisi{% endif %}


+ avatar
+ {% if perms.forum.can_see_post_ip %}({{ post.ip }})
{% endif %} Kay?t Tarihi: {{ post.author.date_joined|date:"d-m-Y" }}
- +
Modified: trunk/templates/forum/reply.html ================================================================= --- trunk/templates/forum/reply.html (original) +++ trunk/templates/forum/reply.html Wed Apr 2 23:10:15 2008 @@ -28,11 +28,11 @@ {% else %}
- {{ post.author }}

-

- {% if perms.forum.can_see_post_ip %}({{ post.ip }})

{% endif %} + {{ post.author }}{% if post.author.is_staff %}
Forum Y?neticisi{% endif %}


+ avatar
+ {% if perms.forum.can_see_post_ip %}({{ post.ip }})
{% endif %} Kay?t Tarihi: {{ post.author.date_joined|date:"d-m-Y" }}
- +
From oi-commits at pardus.org.tr Thu Apr 3 08:08:21 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 3 Apr 2008 08:08:21 +0300 (EEST) Subject: [Oi-commits] r1177 - trunk/profile Message-ID: <20080403050821.BF9B17C00B4@liste.uludag.org.tr> Author: jnmbk Date: Thu Apr 3 08:08:21 2008 New Revision: 1177 Modified: trunk/profile/forms.py Log: work properly in firefox (thanks to Necmettin Begiter) Modified: trunk/profile/forms.py ================================================================= --- trunk/profile/forms.py (original) +++ trunk/profile/forms.py Thu Apr 3 08:08:21 2008 @@ -88,7 +88,7 @@ return field_data class ProfileEditForm(forms.Form): - avatar = forms.ChoiceField(label='Avatar', widget=forms.Select(attrs={"onchange":"updateAvatar(this);"})) + avatar = forms.ChoiceField(label='Avatar', widget=forms.Select(attrs={"onchange":"updateAvatar(this)", "onkeyup":"updateAvatar(this)"})) firstname = forms.CharField(label='Ad?', max_length=30) lastname = forms.CharField(label='Soyad?', max_length=30) birthday = forms.DateField(label='Do?um Tarihi', input_formats=('%d/%m/%Y', '%d/%m/%y'), help_text='23/4/1985 gibi') From oi-commits at pardus.org.tr Thu Apr 3 13:27:15 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 3 Apr 2008 13:27:15 +0300 (EEST) Subject: [Oi-commits] r1178 - trunk/media/js/tinymce Message-ID: <20080403102715.482B2864972@liste.uludag.org.tr> Author: jnmbk Date: Thu Apr 3 13:27:14 2008 New Revision: 1178 Modified: trunk/media/js/tinymce/forum.js Log: enable gecko-spellcheck, disable non-working copy&paste buttons and context menu Modified: trunk/media/js/tinymce/forum.js ================================================================= --- trunk/media/js/tinymce/forum.js (original) +++ trunk/media/js/tinymce/forum.js Thu Apr 3 13:27:14 2008 @@ -1,7 +1,7 @@ tinyMCE.init({ mode : "textareas", theme : "advanced", - theme_advanced_buttons1 : "copy,paste,undo,redo,charmap,search,replace,|,link,unlink,image,emotions,|,code", + theme_advanced_buttons1 : "undo,redo,charmap,search,replace,|,link,unlink,image,emotions,|,code", theme_advanced_buttons2 : "formatselect,fontsizeselect,bold,italic,underline,strikethrough,sub,sup,|,justifyleft,justifycenter,justifyright,justifyfull,outdent,indent,|,bullist,numlist,|,forecolor,backcolor,removeformat", theme_advanced_buttons3 : "", theme_advanced_toolbar_location : "top", @@ -16,6 +16,7 @@ height : "300", extended_valid_elements : "a[name|href|target|title],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]", advimage_update_dimensions_onchange: true, - plugins : "advimage,autosave,contextmenu,searchreplace,table,visualchars,advlink,emotions,media,style,template,xhtmlxtras", + plugins : "advimage,autosave,searchreplace,table,visualchars,advlink,emotions,media,style,template,xhtmlxtras", + gecko_spellcheck : true, language : "tr", }); From oi-commits at pardus.org.tr Thu Apr 3 13:54:26 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 3 Apr 2008 13:54:26 +0300 (EEST) Subject: [Oi-commits] r1179 - trunk/templates/user Message-ID: <20080403105426.CF4FC864911@liste.uludag.org.tr> Author: jnmbk Date: Thu Apr 3 13:54:26 2008 New Revision: 1179 Modified: trunk/templates/user/profile.html Log: simple link for web page Modified: trunk/templates/user/profile.html ================================================================= --- trunk/templates/user/profile.html (original) +++ trunk/templates/user/profile.html Thu Apr 3 13:54:26 2008 @@ -33,7 +33,7 @@

?leti?im Bilgileri

    {% if info.get_profile.show_email %}
  • E-posta: {{ info.email }}
  • {% endif %} -
  • Web: {{ info.get_profile.homepage }}
  • +
  • Web: {{ info.get_profile.homepage }}
  • Jabber: {{ info.get_profile.jabber }}
  • MSN: {{ info.get_profile.msn }}
  • ICQ: {{ info.get_profile.icq }}
  • From oi-commits at pardus.org.tr Thu Apr 3 16:10:07 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 3 Apr 2008 16:10:07 +0300 (EEST) Subject: [Oi-commits] r1180 - trunk/templates/forum Message-ID: <20080403131007.D720C7C0073@liste.uludag.org.tr> Author: akin Date: Thu Apr 3 16:10:07 2008 New Revision: 1180 Modified: trunk/templates/forum/forum_list.html Log: minik bir d?zeltme Modified: trunk/templates/forum/forum_list.html ================================================================= --- trunk/templates/forum/forum_list.html (original) +++ trunk/templates/forum/forum_list.html Thu Apr 3 16:10:07 2008 @@ -68,7 +68,8 @@
Kilitli Konu Kilitli (yeni iletilere kapal?)
- Kilitli ve Okunmam?? Konu Kilitli ve yeni ileti var
+ Kilitli ve Okunmam?? Konu Kilitli ve okunmam?? ileti var
Sabit Konu Sabit (her zaman ?stte kal?r)
From oi-commits at pardus.org.tr Fri Apr 4 14:12:14 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 4 Apr 2008 14:12:14 +0300 (EEST) Subject: [Oi-commits] r1181 - in trunk: media/css templates/forum Message-ID: <20080404111214.E4B927C0133@liste.uludag.org.tr> Author: jnmbk Date: Fri Apr 4 14:12:14 2008 New Revision: 1181 Modified: trunk/media/css/forum.css trunk/templates/forum/forum_detail.html trunk/templates/forum/forum_list.html Log: link to user profiles in all forum pages Modified: trunk/media/css/forum.css ================================================================= --- trunk/media/css/forum.css (original) +++ trunk/media/css/forum.css Fri Apr 4 14:12:14 2008 @@ -8,6 +8,10 @@ text-decoration: underline; } a:visited { color: #551A8B; } +a.profile_link { + text-decoration: none; + color: #333333; +} /*The colors end here */ /* header */ Modified: trunk/templates/forum/forum_detail.html ================================================================= --- trunk/templates/forum/forum_detail.html (original) +++ trunk/templates/forum/forum_detail.html Fri Apr 4 14:12:14 2008 @@ -30,7 +30,7 @@
{{ topic.posts }}
{{ topic.views }}
-
{{ topic.topic_latest_post.edited|date:"d F Y H:i" }}
{{ topic.topic_latest_post.author }}
+
{{ topic.topic_latest_post.edited|date:"d F Y H:i" }}
{{ topic.topic_latest_post.author }}
{% endif %} Modified: trunk/templates/forum/forum_list.html ================================================================= --- trunk/templates/forum/forum_list.html (original) +++ trunk/templates/forum/forum_list.html Fri Apr 4 14:12:14 2008 @@ -30,7 +30,7 @@
{{ forum.name|escape }}
{{ forum.description }}
{{ forum.topics }}
{{ forum.posts }}
-
{% if forum.forum_latest_post %}{{ forum.forum_latest_post.edited|date:"d F Y H:i" }}
{{ forum.forum_latest_post.author }} {% else %}Hen?z ileti yok{% endif %} +
{% if forum.forum_latest_post %}{{ forum.forum_latest_post.edited|date:"d F Y H:i" }}
{{ forum.forum_latest_post.author }} {% else %}Hen?z ileti yok{% endif %}
{% endif %} From oi-commits at pardus.org.tr Fri Apr 4 14:15:04 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 4 Apr 2008 14:15:04 +0300 (EEST) Subject: [Oi-commits] r1182 - trunk/templates/forum Message-ID: <20080404111504.36A4B7C0133@liste.uludag.org.tr> Author: jnmbk Date: Fri Apr 4 14:15:03 2008 New Revision: 1182 Modified: trunk/templates/forum/forum_list.html Log: profile links also for last 5 posts Modified: trunk/templates/forum/forum_list.html ================================================================= --- trunk/templates/forum/forum_list.html (original) +++ trunk/templates/forum/forum_list.html Fri Apr 4 14:15:03 2008 @@ -43,7 +43,7 @@ {% for post in latest_posts %}
[ {{ post.topic.forum }} ]
-
{{ post.topic }} {{ post.author|escape }}
+
{{ post.topic }} {{ post.author }}
{% endfor %} From oi-commits at pardus.org.tr Fri Apr 4 19:55:50 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 4 Apr 2008 19:55:50 +0300 (EEST) Subject: [Oi-commits] r1183 - in branches: django_0_96_1 stable Message-ID: <20080404165550.ED54B7C0127@liste.uludag.org.tr> Author: jnmbk Date: Fri Apr 4 19:55:50 2008 New Revision: 1183 Added: branches/django_0_96_1/ - copied from r1182, branches/stable/ Removed: branches/stable/ Log: change branch name, new stable will come From oi-commits at pardus.org.tr Fri Apr 4 19:56:33 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 4 Apr 2008 19:56:33 +0300 (EEST) Subject: [Oi-commits] r1184 - branches/stable Message-ID: <20080404165633.DE07A7C0045@liste.uludag.org.tr> Author: jnmbk Date: Fri Apr 4 19:56:33 2008 New Revision: 1184 Added: branches/stable/ - copied from r1183, trunk/ Log: new stable branch From oi-commits at pardus.org.tr Sat Apr 5 09:04:08 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 5 Apr 2008 09:04:08 +0300 (EEST) Subject: [Oi-commits] r1185 - trunk/poll Message-ID: <20080405060408.8D5E7138409D@liste.pardus.org.tr> Author: jnmbk Date: Sat Apr 5 09:04:08 2008 New Revision: 1185 Added: trunk/poll/ trunk/poll/models.py Log: initial model for poll application From oi-commits at pardus.org.tr Sat Apr 5 13:07:12 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 5 Apr 2008 13:07:12 +0300 (EEST) Subject: [Oi-commits] r1186 - trunk/templates/user Message-ID: <20080405100713.0033113840A2@liste.pardus.org.tr> Author: jnmbk Date: Sat Apr 5 13:07:12 2008 New Revision: 1186 Modified: trunk/templates/user/register.html Log: forgot the / Modified: trunk/templates/user/register.html ================================================================= --- trunk/templates/user/register.html (original) +++ trunk/templates/user/register.html Sat Apr 5 13:07:12 2008 @@ -30,7 +30,7 @@ {% endfor %}
- ?zg?rl?k??in ??erik Politikas? 'n? okudum ve

+ ?zg?rl?k??in ??erik Politikas? 'n? okudum ve

 
{% endif %} From oi-commits at pardus.org.tr Sat Apr 5 13:36:40 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 5 Apr 2008 13:36:40 +0300 (EEST) Subject: [Oi-commits] r1187 - branches/stable/templates/user Message-ID: <20080405103640.6956913840A6@liste.pardus.org.tr> Author: jnmbk Date: Sat Apr 5 13:36:40 2008 New Revision: 1187 Modified: branches/stable/templates/user/register.html Log: merge Modified: branches/stable/templates/user/register.html ================================================================= --- branches/stable/templates/user/register.html (original) +++ branches/stable/templates/user/register.html Sat Apr 5 13:36:40 2008 @@ -30,7 +30,7 @@ {% endfor %}
- ?zg?rl?k??in ??erik Politikas? 'n? okudum ve

+ ?zg?rl?k??in ??erik Politikas? 'n? okudum ve

 
{% endif %} From necmettin.begiter at gmail.com Sat Apr 5 20:09:04 2008 From: necmettin.begiter at gmail.com (Necmettin Begiter) Date: Sat, 5 Apr 2008 20:09:04 +0300 Subject: [Oi-commits] r1186 - trunk/templates/user In-Reply-To: <20080405100713.0033113840A2@liste.pardus.org.tr> References: <20080405100713.0033113840A2@liste.pardus.org.tr> Message-ID: <3787dfa80804051009n7a9fbed9g9a78802344306b7d@mail.gmail.com> 2008/4/5, oi-commits at pardus.org.tr : >
  Author: jnmbk Date: Sun Apr 6 14:48:49 2008 New Revision: 1188 Modified: trunk/media/dijital/img/bg.jpg Log: 1/5 of current size Modified: trunk/media/dijital/img/bg.jpg ================================================================= Binary files. No diff available. From oi-commits at pardus.org.tr Sun Apr 6 14:53:48 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sun, 6 Apr 2008 14:53:48 +0300 (EEST) Subject: [Oi-commits] r1189 - branches/stable/media/dijital/img Message-ID: <20080406115348.1630213840C0@liste.pardus.org.tr> Author: jnmbk Date: Sun Apr 6 14:53:47 2008 New Revision: 1189 Modified: branches/stable/media/dijital/img/bg.jpg Log: merge Modified: branches/stable/media/dijital/img/bg.jpg ================================================================= Binary files. No diff available. From ugur.jnmbk at gmail.com Wed Apr 9 13:38:02 2008 From: ugur.jnmbk at gmail.com (=?UTF-8?Q?U=C4=9Fur_=C3=87etin?=) Date: Wed, 9 Apr 2008 13:38:02 +0300 Subject: [Oi-commits] r1184 - branches/stable In-Reply-To: <20080404165633.DE07A7C0045@liste.uludag.org.tr> References: <20080404165633.DE07A7C0045@liste.uludag.org.tr> Message-ID: <9dca79e40804090338pc9bb515wb0d3af31d8ea1806@mail.gmail.com> 2008/4/4, oi-commits at pardus.org.tr : > Added: > branches/stable/ > - copied from r1183, trunk/ > Log: > new stable branch Bunu a??klayal?m. ?u anki ozgurlukicin.com stable branch?ndan g?ncellenecek. soap ise trunktan g?ncellenecek. -- U?ur ?etin From ugur.jnmbk at gmail.com Wed Apr 9 13:40:32 2008 From: ugur.jnmbk at gmail.com (=?UTF-8?Q?U=C4=9Fur_=C3=87etin?=) Date: Wed, 9 Apr 2008 13:40:32 +0300 Subject: [Oi-commits] r1186 - trunk/templates/user In-Reply-To: <3787dfa80804051009n7a9fbed9g9a78802344306b7d@mail.gmail.com> References: <20080405100713.0033113840A2@liste.pardus.org.tr> <3787dfa80804051009n7a9fbed9g9a78802344306b7d@mail.gmail.com> Message-ID: <9dca79e40804090340u74b5a885kfc436a2da3eafeb5@mail.gmail.com> 2008/4/5, Necmettin Begiter : > >
onClick="javascript:window.location.href='/'"/>   > Biraz g?z?ne sokar gibi oldu ama m?kemmeliyet?ilik i?te ;) Bu ve benzeri html/css do?rulamas?n? bozan ?eylerin tamam?n? yak?n bir zaman i?inde ??zmeyi d???n?yorum, biraz sab?r :) . -- U?ur ?etin From oi-commits at pardus.org.tr Wed Apr 9 14:04:14 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 9 Apr 2008 14:04:14 +0300 (EEST) Subject: [Oi-commits] r1190 - trunk/profile Message-ID: <20080409110414.DF98413840E5@liste.pardus.org.tr> Author: jnmbk Date: Wed Apr 9 14:04:14 2008 New Revision: 1190 Modified: trunk/profile/forms.py Log: max_length is 20 now Modified: trunk/profile/forms.py ================================================================= --- trunk/profile/forms.py (original) +++ trunk/profile/forms.py Wed Apr 9 14:04:14 2008 @@ -18,7 +18,7 @@ from oi.profile.models import * class RegisterForm(forms.Form): - username = forms.CharField(label='Kullan?c? Ad?', max_length=30, help_text='En az 3, en fazla 30 karakter') + username = forms.CharField(label='Kullan?c? Ad?', max_length=20, help_text='En az 3, en fazla 20 karakter') firstname = forms.CharField(label='Ad?', max_length=30) lastname = forms.CharField(label='Soyad?', max_length=30) birthday = forms.DateField(label='Do?um Tarihi', input_formats=('%d/%m/%Y', '%d/%m/%Y'), help_text='23/4/1985 gibi') From oi-commits at pardus.org.tr Wed Apr 9 14:08:59 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 9 Apr 2008 14:08:59 +0300 (EEST) Subject: [Oi-commits] r1191 - trunk/templates/forum Message-ID: <20080409110859.23B4F1384111@liste.pardus.org.tr> Author: jnmbk Date: Wed Apr 9 14:08:58 2008 New Revision: 1191 Modified: trunk/templates/forum/new_topic.html Log: address bar at the top of new topic page Modified: trunk/templates/forum/new_topic.html ================================================================= --- trunk/templates/forum/new_topic.html (original) +++ trunk/templates/forum/new_topic.html Wed Apr 9 14:08:58 2008 @@ -6,6 +6,9 @@ {% block content %} {% if user.is_authenticated %} + {% if form.errors %} Ba?l?k a??lamad?, l?tfen a?a??daki hatalar? d?zeltin
{% endif %} From oi-commits at pardus.org.tr Wed Apr 9 19:25:08 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 9 Apr 2008 19:25:08 +0300 (EEST) Subject: [Oi-commits] r1192 - in trunk: profile templates templates/user Message-ID: <20080409162508.CB819138412B@liste.pardus.org.tr> Author: jnmbk Date: Wed Apr 9 19:25:08 2008 New Revision: 1192 Added: trunk/profile/settings.py Modified: trunk/profile/forms.py trunk/profile/models.py trunk/profile/views.py trunk/templates/base.html trunk/templates/user/profile_edit.html Log: show location with a gmap Modified: trunk/profile/forms.py ================================================================= --- trunk/profile/forms.py (original) +++ trunk/profile/forms.py Wed Apr 9 19:25:08 2008 @@ -100,6 +100,8 @@ icq = forms.EmailField(label='ICQ', max_length=50, required=False) show_email = forms.BooleanField(label='E-posta Adresini G?ster', required=False, help_text='Profil sayfas?nda di?erleri e-posta adresinizi g?rs?n m??') signature = XssField(label='?mza', widget=forms.Textarea(attrs={'rows': 7, 'cols': 45}), required=False, help_text='Forumdaki her iletinizin alt?nda g?r?necek imzan?z (html taglar? kullanabilirsiniz, en fazla 512 karakter olabilir)', max_length=512) + latitude = forms.DecimalField('Enlem', max_digits=10, decimal_places=6) + longitude = forms.DecimalField('Boylam', max_digits=10, decimal_places=6) def __init__(self,*args,**kwargs): super(ProfileEditForm, self).__init__(*args, **kwargs) Modified: trunk/profile/models.py ================================================================= --- trunk/profile/models.py (original) +++ trunk/profile/models.py Wed Apr 9 19:25:08 2008 @@ -86,6 +86,8 @@ activation_key = models.CharField(max_length=40) key_expires = models.DateTimeField() signature = models.TextField('?mza', blank=True, max_length=512) + latitude = models.DecimalField('Enlem', max_digits=10, decimal_places=6, default=0) + longitude = models.DecimalField('Boylam', max_digits=10, decimal_places=6, default=0) def __str__(self): return self.user.username Modified: trunk/profile/views.py ================================================================= --- trunk/profile/views.py (original) +++ trunk/profile/views.py Wed Apr 9 19:25:08 2008 @@ -19,6 +19,7 @@ from oi.profile.models import Avatar, Profile, LostPassword from oi.profile.forms import RegisterForm, ProfileEditForm, LostPasswordForm, ChangePasswordForm, ResetPasswordForm +from oi.profile.settings import googleMapsApiKey from oi.st.wrappers import render_response from oi.petition.models import Petitioner @@ -48,18 +49,22 @@ 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().latitude = form.cleaned_data['latitude'] + u.get_profile().longitude = form.cleaned_data['longitude'] u.get_profile().save() u.save() return render_response(request, 'user/profile_edit.html', { - 'profile_updated': True, + "profile_updated": True, + "apikey": googleMapsApiKey, "numberofpetitioners": numberofpetitioners, "petitionpercent": petitionpercent, 'form': form, }) else: return render_response(request, 'user/profile_edit.html', { - 'form': form, + "form": form, + "apikey": googleMapsApiKey, "numberofpetitioners": numberofpetitioners, "petitionpercent": petitionpercent, }) @@ -80,6 +85,8 @@ 'signature': u.get_profile().signature, 'city': u.get_profile().city, 'email': u.email, + 'latitude': u.get_profile().latitude, + 'longitude': u.get_profile().longitude, 'show_email': u.get_profile().show_email} form = ProfileEditForm(default_data) @@ -87,6 +94,7 @@ return render_response(request, 'user/profile_edit.html', { "form": form, + "apikey": googleMapsApiKey, "numberofpetitioners": numberofpetitioners, "petitionpercent": petitionpercent, }) Modified: trunk/templates/base.html ================================================================= --- trunk/templates/base.html (original) +++ trunk/templates/base.html Wed Apr 9 19:25:08 2008 @@ -22,7 +22,7 @@ {% block extrahead %}{% endblock %} - + {% block header_menu %} {% endblock %} Modified: trunk/templates/user/profile_edit.html ================================================================= --- trunk/templates/user/profile_edit.html (original) +++ trunk/templates/user/profile_edit.html Wed Apr 9 19:25:08 2008 @@ -3,8 +3,47 @@ {% block title %}Profil D?zenle - {% endblock %} {% block extrahead %} + + {% endblock %} +{% block extrabody %} onload="load()" onunload="GUnload()"{% endblock %} + {% block header_menu %} {% include "header.html" %} {% endblock %} @@ -45,6 +84,7 @@ {% endifequal %} {% endfor %} +
From oi-commits at pardus.org.tr Wed Apr 9 19:49:13 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 9 Apr 2008 19:49:13 +0300 (EEST) Subject: [Oi-commits] r1193 - in trunk: profile templates/user Message-ID: <20080409164913.B5872138413A@liste.pardus.org.tr> Author: jnmbk Date: Wed Apr 9 19:49:13 2008 New Revision: 1193 Modified: trunk/profile/forms.py trunk/templates/user/profile_edit.html Log: small fixes Modified: trunk/profile/forms.py ================================================================= --- trunk/profile/forms.py (original) +++ trunk/profile/forms.py Wed Apr 9 19:49:13 2008 @@ -100,8 +100,8 @@ icq = forms.EmailField(label='ICQ', max_length=50, required=False) show_email = forms.BooleanField(label='E-posta Adresini G?ster', required=False, help_text='Profil sayfas?nda di?erleri e-posta adresinizi g?rs?n m??') signature = XssField(label='?mza', widget=forms.Textarea(attrs={'rows': 7, 'cols': 45}), required=False, help_text='Forumdaki her iletinizin alt?nda g?r?necek imzan?z (html taglar? kullanabilirsiniz, en fazla 512 karakter olabilir)', max_length=512) - latitude = forms.DecimalField('Enlem', max_digits=10, decimal_places=6) - longitude = forms.DecimalField('Boylam', max_digits=10, decimal_places=6) + latitude = forms.DecimalField(label='Enlem', max_digits=10, decimal_places=6) + longitude = forms.DecimalField(label='Boylam', max_digits=10, decimal_places=6) def __init__(self,*args,**kwargs): super(ProfileEditForm, self).__init__(*args, **kwargs) Modified: trunk/templates/user/profile_edit.html ================================================================= --- trunk/templates/user/profile_edit.html (original) +++ trunk/templates/user/profile_edit.html Wed Apr 9 19:49:13 2008 @@ -8,7 +8,7 @@ // {% endifequal %} {% endfor %} -
+
From oi-commits at pardus.org.tr Wed Apr 9 20:13:35 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 9 Apr 2008 20:13:35 +0300 (EEST) Subject: [Oi-commits] r1194 - in trunk: media/css templates/user Message-ID: <20080409171336.10D2413840CB@liste.pardus.org.tr> Author: jnmbk Date: Wed Apr 9 20:13:35 2008 New Revision: 1194 Modified: trunk/media/css/style.css trunk/templates/user/profile_edit.html Log: cosmetics Modified: trunk/media/css/style.css ================================================================= --- trunk/media/css/style.css (original) +++ trunk/media/css/style.css Wed Apr 9 20:13:35 2008 @@ -888,6 +888,16 @@ border: 1px solid #45586F; } +#profileEditForm input[type=text]{ + width:230px; +} + +div.googlemap { + width: 407px; + height: 300px; + clear: left; + overflow: hidden; +} /* Footer */ #footer_new { background-color: #6992A6; Modified: trunk/templates/user/profile_edit.html ================================================================= --- trunk/templates/user/profile_edit.html (original) +++ trunk/templates/user/profile_edit.html Wed Apr 9 20:13:35 2008 @@ -70,7 +70,7 @@ document.avatarImage.src = "/media/" + obj[obj.selectedIndex].value; } -
+ {% for field in form %} {% ifequal field.name "avatar" %}
@@ -84,7 +84,7 @@ {% endifequal %} {% endfor %} -
+
From oi-commits at pardus.org.tr Wed Apr 9 20:33:20 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 9 Apr 2008 20:33:20 +0300 (EEST) Subject: [Oi-commits] r1195 - in trunk: media/css templates/user Message-ID: <20080409173320.75F5313840F7@liste.pardus.org.tr> Author: jnmbk Date: Wed Apr 9 20:33:20 2008 New Revision: 1195 Modified: trunk/media/css/style.css trunk/templates/user/profile.html trunk/templates/user/profile_edit.html Log: show map in profile page Modified: trunk/media/css/style.css ================================================================= --- trunk/media/css/style.css (original) +++ trunk/media/css/style.css Wed Apr 9 20:33:20 2008 @@ -898,6 +898,13 @@ clear: left; overflow: hidden; } + +div.googlemap2 { + width: 200px; + height: 150px; + float: right; + overflow: hidden; +} /* Footer */ #footer_new { background-color: #6992A6; Modified: trunk/templates/user/profile.html ================================================================= --- trunk/templates/user/profile.html (original) +++ trunk/templates/user/profile.html Wed Apr 9 20:33:20 2008 @@ -2,6 +2,48 @@ {% block title %}Kullan?c? profili: {{ info }} - {% endblock %} +{% block extrabody %} onload="load()" onunload="GUnload()"{% endblock %} + +{% block extrahead %} + + +{% endblock %} + {% block header_menu %} {% include "header.html" %} {% endblock %} @@ -17,6 +59,7 @@ {% if info %}
+

{{ info }}

Modified: trunk/templates/user/profile_edit.html ================================================================= --- trunk/templates/user/profile_edit.html (original) +++ trunk/templates/user/profile_edit.html Wed Apr 9 20:33:20 2008 @@ -85,6 +85,7 @@ {% endifequal %} {% endfor %}
+
From oi-commits at pardus.org.tr Wed Apr 9 20:35:05 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 9 Apr 2008 20:35:05 +0300 (EEST) Subject: [Oi-commits] r1196 - trunk/profile Message-ID: <20080409173505.4939613840F7@liste.pardus.org.tr> Author: jnmbk Date: Wed Apr 9 20:35:05 2008 New Revision: 1196 Modified: trunk/profile/views.py Log: forgot apikey Modified: trunk/profile/views.py ================================================================= --- trunk/profile/views.py (original) +++ trunk/profile/views.py Wed Apr 9 20:35:05 2008 @@ -104,6 +104,7 @@ info = get_object_or_404(User, username=name) numberofpetitioners = Petitioner.objects.filter(is_active=True).count() petitionpercent = numberofpetitioners / 30 + apikey = googleMapsApiKey if not info.is_active: del info return render_response(request, 'user/profile.html', locals()) From oi-commits at pardus.org.tr Wed Apr 9 20:39:56 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 9 Apr 2008 20:39:56 +0300 (EEST) Subject: [Oi-commits] r1197 - in trunk: media/css templates/user Message-ID: <20080409173956.98AF713840F7@liste.pardus.org.tr> Author: jnmbk Date: Wed Apr 9 20:39:56 2008 New Revision: 1197 Modified: trunk/media/css/style.css trunk/templates/user/profile.html Log: clean map code, map at the bottom Modified: trunk/media/css/style.css ================================================================= --- trunk/media/css/style.css (original) +++ trunk/media/css/style.css Wed Apr 9 20:39:56 2008 @@ -898,13 +898,6 @@ clear: left; overflow: hidden; } - -div.googlemap2 { - width: 200px; - height: 150px; - float: right; - overflow: hidden; -} /* Footer */ #footer_new { background-color: #6992A6; Modified: trunk/templates/user/profile.html ================================================================= --- trunk/templates/user/profile.html (original) +++ trunk/templates/user/profile.html Wed Apr 9 20:39:56 2008 @@ -19,24 +19,13 @@ var lng = {{ info.get_profile.longitude }}; var ltd = {{ info.get_profile.latitude }}; - if ((lng.value != 0) || (ltd.value != 0)) { + if ((lng.value != 0.000000) || (ltd.value != 0.000000)) { center = new GLatLng(ltd.value, lng.value); heightLevel = 9; } map.setCenter(center, heightLevel); - map.addControl(new GSmallMapControl()); - map.addControl(new GMapTypeControl()); var marker = new GMarker(center); - - GEvent.addListener(marker, "dragstart", function() { - map.closeInfoWindow(); - }); - GEvent.addListener(marker, "dragend", function() { - marker.openInfoWindowHtml("Koordinatlar:
" + marker.getLatLng().lng().toFixed(6) + "
" + marker.getLatLng().lat().toFixed(6)); - lng.value = marker.getLatLng().lng().toFixed(6); - ltd.value = marker.getLatLng().lat().toFixed(6); - }); map.addOverlay(marker); } } @@ -59,7 +48,6 @@ {% if info %}
-

{{ info }}

@@ -83,6 +71,7 @@
+
{% else %} B?yle bir kullan?c? yok!
{% endif %} From oi-commits at pardus.org.tr Wed Apr 9 20:41:42 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 9 Apr 2008 20:41:42 +0300 (EEST) Subject: [Oi-commits] r1198 - trunk/templates/user Message-ID: <20080409174142.AE3C613840F7@liste.pardus.org.tr> Author: jnmbk Date: Wed Apr 9 20:41:42 2008 New Revision: 1198 Modified: trunk/templates/user/profile.html Log: fixy Modified: trunk/templates/user/profile.html ================================================================= --- trunk/templates/user/profile.html (original) +++ trunk/templates/user/profile.html Wed Apr 9 20:41:42 2008 @@ -19,8 +19,8 @@ var lng = {{ info.get_profile.longitude }}; var ltd = {{ info.get_profile.latitude }}; - if ((lng.value != 0.000000) || (ltd.value != 0.000000)) { - center = new GLatLng(ltd.value, lng.value); + if ((lng != 0) || (ltd != 0)) { + center = new GLatLng(ltd, lng); heightLevel = 9; } map.setCenter(center, heightLevel); From oi-commits at pardus.org.tr Wed Apr 9 20:46:00 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 9 Apr 2008 20:46:00 +0300 (EEST) Subject: [Oi-commits] r1199 - trunk/templates/user Message-ID: <20080409174600.B3877138411E@liste.pardus.org.tr> Author: jnmbk Date: Wed Apr 9 20:46:00 2008 New Revision: 1199 Modified: trunk/templates/user/profile_edit.html Log: 5px space from top Modified: trunk/templates/user/profile_edit.html ================================================================= --- trunk/templates/user/profile_edit.html (original) +++ trunk/templates/user/profile_edit.html Wed Apr 9 20:46:00 2008 @@ -85,8 +85,7 @@ {% endifequal %} {% endfor %}
-
-
+
From oi-commits at pardus.org.tr Wed Apr 9 21:01:13 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 9 Apr 2008 21:01:13 +0300 (EEST) Subject: [Oi-commits] r1200 - in branches/stable: media/css profile templates templates/forum templates/user Message-ID: <20080409180113.E74EC13840E5@liste.pardus.org.tr> Author: jnmbk Date: Wed Apr 9 21:01:13 2008 New Revision: 1200 Added: branches/stable/profile/settings.py - copied unchanged from r1199, trunk/profile/settings.py Modified: branches/stable/media/css/style.css branches/stable/profile/forms.py branches/stable/profile/models.py branches/stable/profile/views.py branches/stable/templates/base.html branches/stable/templates/forum/new_topic.html branches/stable/templates/user/profile.html branches/stable/templates/user/profile_edit.html Log: merge googlemaps feature Modified: branches/stable/media/css/style.css ================================================================= --- branches/stable/media/css/style.css (original) +++ branches/stable/media/css/style.css Wed Apr 9 21:01:13 2008 @@ -888,6 +888,16 @@ border: 1px solid #45586F; } +#profileEditForm input[type=text]{ + width:230px; +} + +div.googlemap { + width: 407px; + height: 300px; + clear: left; + overflow: hidden; +} /* Footer */ #footer_new { background-color: #6992A6; Modified: branches/stable/profile/forms.py ================================================================= --- branches/stable/profile/forms.py (original) +++ branches/stable/profile/forms.py Wed Apr 9 21:01:13 2008 @@ -18,7 +18,7 @@ from oi.profile.models import * class RegisterForm(forms.Form): - username = forms.CharField(label='Kullan?c? Ad?', max_length=30, help_text='En az 3, en fazla 30 karakter') + username = forms.CharField(label='Kullan?c? Ad?', max_length=20, help_text='En az 3, en fazla 20 karakter') firstname = forms.CharField(label='Ad?', max_length=30) lastname = forms.CharField(label='Soyad?', max_length=30) birthday = forms.DateField(label='Do?um Tarihi', input_formats=('%d/%m/%Y', '%d/%m/%Y'), help_text='23/4/1985 gibi') @@ -100,6 +100,8 @@ icq = forms.EmailField(label='ICQ', max_length=50, required=False) show_email = forms.BooleanField(label='E-posta Adresini G?ster', required=False, help_text='Profil sayfas?nda di?erleri e-posta adresinizi g?rs?n m??') signature = XssField(label='?mza', widget=forms.Textarea(attrs={'rows': 7, 'cols': 45}), required=False, help_text='Forumdaki her iletinizin alt?nda g?r?necek imzan?z (html taglar? kullanabilirsiniz, en fazla 512 karakter olabilir)', max_length=512) + latitude = forms.DecimalField(label='Enlem', max_digits=10, decimal_places=6) + longitude = forms.DecimalField(label='Boylam', max_digits=10, decimal_places=6) def __init__(self,*args,**kwargs): super(ProfileEditForm, self).__init__(*args, **kwargs) Modified: branches/stable/profile/models.py ================================================================= --- branches/stable/profile/models.py (original) +++ branches/stable/profile/models.py Wed Apr 9 21:01:13 2008 @@ -86,6 +86,8 @@ activation_key = models.CharField(max_length=40) key_expires = models.DateTimeField() signature = models.TextField('?mza', blank=True, max_length=512) + latitude = models.DecimalField('Enlem', max_digits=10, decimal_places=6, default=0) + longitude = models.DecimalField('Boylam', max_digits=10, decimal_places=6, default=0) def __str__(self): return self.user.username Modified: branches/stable/profile/views.py ================================================================= --- branches/stable/profile/views.py (original) +++ branches/stable/profile/views.py Wed Apr 9 21:01:13 2008 @@ -19,6 +19,7 @@ from oi.profile.models import Avatar, Profile, LostPassword from oi.profile.forms import RegisterForm, ProfileEditForm, LostPasswordForm, ChangePasswordForm, ResetPasswordForm +from oi.profile.settings import googleMapsApiKey from oi.st.wrappers import render_response from oi.petition.models import Petitioner @@ -48,18 +49,22 @@ 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().latitude = form.cleaned_data['latitude'] + u.get_profile().longitude = form.cleaned_data['longitude'] u.get_profile().save() u.save() return render_response(request, 'user/profile_edit.html', { - 'profile_updated': True, + "profile_updated": True, + "apikey": googleMapsApiKey, "numberofpetitioners": numberofpetitioners, "petitionpercent": petitionpercent, 'form': form, }) else: return render_response(request, 'user/profile_edit.html', { - 'form': form, + "form": form, + "apikey": googleMapsApiKey, "numberofpetitioners": numberofpetitioners, "petitionpercent": petitionpercent, }) @@ -80,6 +85,8 @@ 'signature': u.get_profile().signature, 'city': u.get_profile().city, 'email': u.email, + 'latitude': u.get_profile().latitude, + 'longitude': u.get_profile().longitude, 'show_email': u.get_profile().show_email} form = ProfileEditForm(default_data) @@ -87,6 +94,7 @@ return render_response(request, 'user/profile_edit.html', { "form": form, + "apikey": googleMapsApiKey, "numberofpetitioners": numberofpetitioners, "petitionpercent": petitionpercent, }) @@ -96,6 +104,7 @@ info = get_object_or_404(User, username=name) numberofpetitioners = Petitioner.objects.filter(is_active=True).count() petitionpercent = numberofpetitioners / 30 + apikey = googleMapsApiKey if not info.is_active: del info return render_response(request, 'user/profile.html', locals()) Modified: branches/stable/templates/base.html ================================================================= --- branches/stable/templates/base.html (original) +++ branches/stable/templates/base.html Wed Apr 9 21:01:13 2008 @@ -22,7 +22,7 @@ {% block extrahead %}{% endblock %} - + {% block header_menu %} {% endblock %} Modified: branches/stable/templates/forum/new_topic.html ================================================================= --- branches/stable/templates/forum/new_topic.html (original) +++ branches/stable/templates/forum/new_topic.html Wed Apr 9 21:01:13 2008 @@ -6,6 +6,9 @@ {% block content %} {% if user.is_authenticated %} + {% if form.errors %} Ba?l?k a??lamad?, l?tfen a?a??daki hatalar? d?zeltin
{% endif %} Modified: branches/stable/templates/user/profile.html ================================================================= --- branches/stable/templates/user/profile.html (original) +++ branches/stable/templates/user/profile.html Wed Apr 9 21:01:13 2008 @@ -2,6 +2,37 @@ {% block title %}Kullan?c? profili: {{ info }} - {% endblock %} +{% block extrabody %} onload="load()" onunload="GUnload()"{% endblock %} + +{% block extrahead %} + + +{% endblock %} + {% block header_menu %} {% include "header.html" %} {% endblock %} @@ -40,6 +71,7 @@
+
{% else %} B?yle bir kullan?c? yok!
{% endif %} Modified: branches/stable/templates/user/profile_edit.html ================================================================= --- branches/stable/templates/user/profile_edit.html (original) +++ branches/stable/templates/user/profile_edit.html Wed Apr 9 21:01:13 2008 @@ -3,8 +3,47 @@ {% block title %}Profil D?zenle - {% endblock %} {% block extrahead %} + + {% endblock %} +{% block extrabody %} onload="load()" onunload="GUnload()"{% endblock %} + {% block header_menu %} {% include "header.html" %} {% endblock %} @@ -31,7 +70,7 @@ document.avatarImage.src = "/media/" + obj[obj.selectedIndex].value; } -
+ {% for field in form %} {% ifequal field.name "avatar" %}
@@ -45,7 +84,8 @@ {% endifequal %} {% endfor %} -
+
+
From oi-commits at pardus.org.tr Thu Apr 10 17:14:10 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 10 Apr 2008 17:14:10 +0300 (EEST) Subject: [Oi-commits] r1201 - trunk/templates/flatpages Message-ID: <20080410141410.1C39B1384170@liste.pardus.org.tr> Author: jnmbk Date: Thu Apr 10 17:14:09 2008 New Revision: 1201 Modified: trunk/templates/flatpages/about.html Log: add e-dergi link and tag icon Modified: trunk/templates/flatpages/about.html ================================================================= --- trunk/templates/flatpages/about.html (original) +++ trunk/templates/flatpages/about.html Thu Apr 10 17:14:09 2008 @@ -6,14 +6,11 @@ {% block pagetype %}page{% endblock %} {% block header_menu %} - - {% include "header.html" %} + {% include "header.html" %} {% endblock %}
{% block ust_menu %} - - {% include "ust_menu_ayrinti.html" %} - + {% include "ust_menu_ayrinti.html" %} {% endblock %}
@@ -35,6 +32,7 @@ {% ifnotequal flatpage.url "/hakkinda/icerik-politikasi/" %}??erik Politikas?
{% endifnotequal %} {% ifnotequal flatpage.url "/hakkinda/gizlilik-politikasi/" %}Gizlilik Politikas?
{% endifnotequal %} {% ifnotequal flatpage.url "/hakkinda/gezegen-kurallari/" %}Gezegen Kurallar?
{% endifnotequal %} + {% ifnotequal flatpage.url "/e-dergi/" %}E-Dergi
{% endifnotequal %} {% ifnotequal flatpage.url "/hakkinda/" %}Hakk?nda
{% endifnotequal %} {% ifnotequal flatpage.url "/bize_ulasmak_icin/" %}Bize Ula??n
{% endifnotequal %}
@@ -45,7 +43,7 @@
From oi-commits at pardus.org.tr Thu Apr 10 17:59:59 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 10 Apr 2008 17:59:59 +0300 (EEST) Subject: [Oi-commits] r1202 - in trunk: media/img templates/news Message-ID: <20080410145959.889251384125@liste.pardus.org.tr> Author: jnmbk Date: Thu Apr 10 17:59:58 2008 New Revision: 1202 Added: trunk/media/img/oi-edergi-kapak.jpg (contents, props changed) Modified: trunk/templates/news/news_main.html Log: e-dergi box in news Modified: trunk/templates/news/news_main.html ================================================================= --- trunk/templates/news/news_main.html (original) +++ trunk/templates/news/news_main.html Thu Apr 10 17:59:58 2008 @@ -32,6 +32,15 @@ {% endblock %} {% block sidebar %} + {% if seminar %} @@ -45,7 +43,7 @@
Modified: branches/stable/templates/news/news_main.html ================================================================= --- branches/stable/templates/news/news_main.html (original) +++ branches/stable/templates/news/news_main.html Thu Apr 10 18:07:18 2008 @@ -32,6 +32,15 @@ {% endblock %} {% block sidebar %} + {% if seminar %}