{{ sem.date|date:"d F Y" }}
{{ sem.description }}
Yer: {{ sem.place.name }}
Modified: trunk/urls.py ================================================================= --- trunk/urls.py (original) +++ trunk/urls.py Mon Jul 2 13:03:35 2007 @@ -115,7 +115,7 @@ #Gezegen (r'^gezegen/', include('oi.feedjack.urls')), - #FIXME: Delete this... + #FIXME: Delete this when development ends (r'^test/$', 'oi.st.views.test'), #Django @@ -123,4 +123,4 @@ (r'^admin/upload/image/$', 'oi.upload.views.image_upload'), (r'^admin/', include('django.contrib.admin.urls')), (r'^media/(.*)$', 'django.views.static.serve', {'document_root': '%s/media' % DOCUMENT_ROOT, 'show_indexes': True}), -) +) \ No newline at end of file From oi-commits at pardus.org.tr Mon Jul 2 13:05:57 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 2 Jul 2007 13:05:57 +0300 (EEST) Subject: [Oi-commits] r402 - trunk/templates/news Message-ID: <20070702100557.3530C7C0022@liste.uludag.org.tr> Author: ahmet Date: Mon Jul 2 13:05:56 2007 New Revision: 402 Modified: trunk/templates/news/news_main.html Log: typo Modified: trunk/templates/news/news_main.html ================================================================= --- trunk/templates/news/news_main.html (original) +++ trunk/templates/news/news_main.html Mon Jul 2 13:05:56 2007 @@ -25,10 +25,10 @@ {% block sidebar %} {% if seminar %} -

Pardus ?ehrinizde

Pardus Etkinlikleri

{% for sem in seminar %} -

{{ sem.date|date:"d F Y" }}
{{ sem.description }}
Yer: {{ sem.place.name }}
From oi-commits at pardus.org.tr Mon Jul 2 14:33:21 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 2 Jul 2007 14:33:21 +0300 (EEST) Subject: [Oi-commits] r403 - in trunk: st st/templatetags templates templates/download Message-ID: <20070702113321.8E9507C002B@liste.uludag.org.tr> Author: ahmet Date: Mon Jul 2 14:33:21 2007 New Revision: 403 Added: trunk/templates/download/ trunk/templates/download/download.html trunk/templates/download/download_relnotes.html Removed: trunk/templates/download.html trunk/templates/download_relnotes.html Modified: trunk/st/models.py trunk/st/templatetags/library.py trunk/st/views.py Log: simgeye gerek yok Modified: trunk/st/models.py ================================================================= --- trunk/st/models.py (original) +++ trunk/st/models.py Mon Jul 2 14:33:21 2007 @@ -238,7 +238,6 @@ slug = models.SlugField('SEF Ba?l?k', prepopulate_from=("title",)) sum = models.TextField('?zet', blank=False) text = models.TextField('Metin', blank=False) - icon = models.ImageField(upload_to='oyun/') license = models.ManyToManyField(License) installed_size = models.IntegerField('Kurulu boyut', help_text='Byte cinsinden') download_size = models.IntegerField('?ndirilecek boyut', help_text='Byte cinsinden') Modified: trunk/st/templatetags/library.py ================================================================= --- trunk/st/templatetags/library.py (original) +++ trunk/st/templatetags/library.py Mon Jul 2 14:33:21 2007 @@ -65,4 +65,4 @@ else: return "%s ?nce" % timesince(value,cmp) -register.filter('timedelta',timedelta) +register.filter(timedelta) \ No newline at end of file Modified: trunk/st/views.py ================================================================= --- trunk/st/views.py (original) +++ trunk/st/views.py Mon Jul 2 14:33:21 2007 @@ -215,11 +215,11 @@ def download(request): version = PardusVersion.objects.filter(status=1).order_by('-number')[:1][0] mirrors = PardusMirror.objects.filter(status=1).order_by('-name') - return render_response(request, 'download.html', locals()) + return render_response(request, 'download/download.html', locals()) def download_detail_releasenotes(request, version): releasenote = get_object_or_404(PardusVersion, number=version).releasenote - return render_response(request, 'download_relnotes.html', locals()) + return render_response(request, 'download/download_relnotes.html', locals()) def videobox(request, video): vid = get_object_or_404(Video, file=("upload/video/%s.flv" % video)) From oi-commits at pardus.org.tr Mon Jul 2 14:33:54 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 2 Jul 2007 14:33:54 +0300 (EEST) Subject: [Oi-commits] r404 - trunk/st Message-ID: <20070702113354.59EC17C002C@liste.uludag.org.tr> Author: ahmet Date: Mon Jul 2 14:33:54 2007 New Revision: 404 Modified: trunk/st/models.py Log: nas?l oluyor da her seferinde unutuyorum? Modified: trunk/st/models.py ================================================================= --- trunk/st/models.py (original) +++ trunk/st/models.py Mon Jul 2 14:33:54 2007 @@ -267,7 +267,7 @@ class Admin: fields = ( ('Genel', {'fields': ('title', 'sum', 'text', 'videos', 'tags', 'update', 'status')}), - ('Oyun bilgileri', {'fields': ('icon', 'url', 'path', 'learning_time', 'license', 'installed_size', 'download_size')}), + ('Oyun bilgileri', {'fields': ('url', 'path', 'learning_time', 'license', 'installed_size', 'download_size')}), ('De?erlendirme', {'fields': ('gameplay', 'graphics', 'sound', 'scenario', 'atmosphere')}), ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) From oi-commits at pardus.org.tr Mon Jul 2 14:35:36 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 2 Jul 2007 14:35:36 +0300 (EEST) Subject: [Oi-commits] r405 - in trunk/templates: game package Message-ID: <20070702113536.6B8D77C002B@liste.uludag.org.tr> Author: ahmet Date: Mon Jul 2 14:35:36 2007 New Revision: 405 Modified: trunk/templates/game/game_detail.html trunk/templates/game/game_main.html trunk/templates/package/package_detail.html trunk/templates/package/package_main.html Log: d?zeltmeler Modified: trunk/templates/game/game_detail.html ================================================================= --- trunk/templates/game/game_detail.html (original) +++ trunk/templates/game/game_detail.html Mon Jul 2 14:35:36 2007 @@ -22,13 +22,9 @@

Son g?ncelleme: {{ game.update|timedelta }}

{% endblock %} -{% block sidebar %} - +{% block sidebartop %}{% endblock %} +{% block sidebar %}

Bilgiler

Lisans: {% for license in licenses %}{{ license.name }} {% endfor %}
Modified: trunk/templates/game/game_main.html ================================================================= --- trunk/templates/game/game_main.html (original) +++ trunk/templates/game/game_main.html Mon Jul 2 14:35:36 2007 @@ -21,4 +21,4 @@ {% endfor %} {% paginator %} -{% endblock %} +{% endblock %} \ No newline at end of file Modified: trunk/templates/package/package_detail.html ================================================================= --- trunk/templates/package/package_detail.html (original) +++ trunk/templates/package/package_detail.html Mon Jul 2 14:35:36 2007 @@ -22,6 +22,8 @@

Son g?ncelleme: {{ package.update|timedelta }}

{% endblock %} +{% block sidebartop %}{% endblock %} + {% block sidebar %}

Ayr?nt?lar

{% endfor %} -
{% paginator %} -{% endblock %} - -{% block sidebar %} -

Be?enilen paketler

- -{% endblock %} +{% endblock %} \ No newline at end of file From oi-commits at pardus.org.tr Mon Jul 2 17:13:27 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 2 Jul 2007 17:13:27 +0300 (EEST) Subject: [Oi-commits] r406 - trunk/media/img/niceforms Message-ID: <20070702141327.755327C001B@liste.uludag.org.tr> Author: ahmet Date: Mon Jul 2 17:13:27 2007 New Revision: 406 Modified: trunk/media/img/niceforms/input_bg.png trunk/media/img/niceforms/input_left.png trunk/media/img/niceforms/input_left_xon.png trunk/media/img/niceforms/input_right.png trunk/media/img/niceforms/input_right_xon.png Log: niceforms fix Modified: trunk/media/img/niceforms/input_bg.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/niceforms/input_left.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/niceforms/input_left_xon.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/niceforms/input_right.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/niceforms/input_right_xon.png ================================================================= Binary files. No diff available. From oi-commits at pardus.org.tr Mon Jul 2 17:14:00 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 2 Jul 2007 17:14:00 +0300 (EEST) Subject: [Oi-commits] r407 - in trunk: media/css media/img templates Message-ID: <20070702141400.6C7DB7C001D@liste.uludag.org.tr> Author: ahmet Date: Mon Jul 2 17:14:00 2007 New Revision: 407 Added: trunk/media/img/input_password.png (contents, props changed) trunk/media/img/input_username.png (contents, props changed) Modified: trunk/media/css/style.css trunk/media/img/topbar_bg.png trunk/templates/base.html Log: g?zellikler serisi... Modified: trunk/media/css/style.css ================================================================= --- trunk/media/css/style.css (original) +++ trunk/media/css/style.css Mon Jul 2 17:14:00 2007 @@ -479,17 +479,13 @@ } #topbar { - border-bottom: 1px solid black; + border-bottom: 1px solid #AEB8BE; background-image: url('/media/img/topbar_bg.png'); - width: auto; - padding: 0px; padding-bottom: 5px; - padding-top: 5px; - margin: 0px; font-family: Verdana,Arial,Sans,Helvetica; font-size: 11px; - color: black; - height: 20px; + color: #5A5E60; + height: 30px; text-align: center; } @@ -504,8 +500,14 @@ text-decoration: none; } +#topbar_content input, img { + border: 2px; +} + #topbar_content { font-weight: bold; + margin: 0; + padding: 0; } #pop { @@ -1072,4 +1074,22 @@ .planet_title a:hover, .planet_meta a:hover, .planet_author a:hover, .planet_content a:hover { text-decoration: underline; +} + +input#id_username { + padding: 0px; + padding-left: 18px; + background: #ffffff url('/media/img/input_username.png') no-repeat; + vertical-align: middle; +} + +input#id_password { + padding: 0px; + padding-left: 18px; + background: #ffffff url('/media/img/input_password.png') no-repeat; + vertical-align: middle; +} + +input#form_submit { + vertical-align: middle; } \ No newline at end of file Modified: trunk/media/img/topbar_bg.png ================================================================= Binary files. No diff available. Modified: trunk/templates/base.html ================================================================= --- trunk/templates/base.html (original) +++ trunk/templates/base.html Mon Jul 2 17:14:00 2007 @@ -13,7 +13,14 @@

@@ -37,6 +44,17 @@

- + \ No newline at end of file From oi-commits at pardus.org.tr Mon Jul 2 17:19:10 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 2 Jul 2007 17:19:10 +0300 (EEST) Subject: [Oi-commits] r408 - trunk/forum Message-ID: <20070702141910.A1D747C001E@liste.uludag.org.tr> Author: ahmet Date: Mon Jul 2 17:19:10 2007 New Revision: 408 Modified: trunk/forum/models.py trunk/forum/views.py Log: delete metodlar?n? eklemeyi unutmayay?m Modified: trunk/forum/models.py ================================================================= --- trunk/forum/models.py (original) +++ trunk/forum/models.py Mon Jul 2 17:19:10 2007 @@ -53,6 +53,14 @@ f.save() super(Thread, self).save() + def delete(self): + if self.id: + f = Forum.objects.get(id=self.forum.id) + f.threads -= 1 + f.save() + + super(Thread, self).delete() + class Admin: pass @@ -73,6 +81,7 @@ def save(self): new_post = False + if not self.id: self.time = datetime.now() new_post = True @@ -90,6 +99,22 @@ f.posts += 1 f.save() + def delete(self): + if self.id: + t = Thread.objects.get(id=self.thread.id) + #FIXME: set the latest post after deletion + #t.thread_latest_post_id = self.id + t.posts -= 1 + t.save() + + f = Forum.objects.get(id=self.thread.forum.id) + #FIXME: set the latest post after deletion + #f.forum_latest_post_id = self.id + f.posts -= 1 + f.save() + + super(Post, self).delete() + class Admin: pass Modified: trunk/forum/views.py ================================================================= --- trunk/forum/views.py (original) +++ trunk/forum/views.py Mon Jul 2 17:19:10 2007 @@ -59,13 +59,16 @@ """ if not request.user.is_authenticated: raise HttpResponseServerError + f = get_object_or_404(Forum, slug=forum) t = get_object_or_404(Thread, pk=thread) + if t.closed: raise HttpResponseServerError + body = request.POST.get('body', False) p = Post( - thread=t, + thread=t, author=request.user, body=body, time=datetime.now(), From oi-commits at pardus.org.tr Mon Jul 2 17:19:19 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 2 Jul 2007 17:19:19 +0300 (EEST) Subject: [Oi-commits] r409 - trunk Message-ID: <20070702141919.D1B547C001E@liste.uludag.org.tr> Author: ahmet Date: Mon Jul 2 17:19:19 2007 New Revision: 409 Modified: trunk/TODO Log: tek sat?r olsun Modified: trunk/TODO ================================================================= --- trunk/TODO (original) +++ trunk/TODO Mon Jul 2 17:19:19 2007 @@ -26,7 +26,4 @@ - CSS optimizations - Statistic tool for entire web site - Add about page, (btw do not forget 'django powered' icon in it) -- Add a tickbox for system base apps like kopete, konqueror etc beside -installed size and package size. This way it should remove the integer -number and insert a string like "Temel sistem bile?eni" or something -like that. +- Add a tickbox for system base apps like kopete, konqueror etc beside installed size and package size. This way it should remove the integer number and insert a string like "Temel sistem bile?eni" or something like that. From oi-commits at pardus.org.tr Mon Jul 2 18:24:56 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 2 Jul 2007 18:24:56 +0300 (EEST) Subject: [Oi-commits] r410 - in trunk: . profile st templates/user Message-ID: <20070702152457.0CEAE7C001D@liste.uludag.org.tr> Author: ahmet Date: Mon Jul 2 18:24:56 2007 New Revision: 410 Added: trunk/profile/ trunk/profile/__init__.py trunk/profile/models.py trunk/profile/views.py Modified: trunk/st/models.py trunk/st/views.py trunk/templates/user/login.html trunk/templates/user/register.html trunk/urls.py Log: profili ay?r Modified: trunk/st/models.py ================================================================= --- trunk/st/models.py (original) +++ trunk/st/models.py Mon Jul 2 18:24:56 2007 @@ -11,15 +11,10 @@ from django.db import models from django.contrib.auth.models import User -from django import newforms as forms from oi.middleware import threadlocals from oi.settings import CITY_LIST, MEDIA_ROOT, MEDIA_URL -#========== -# DB Models -#========== - class Tag(models.Model): name = models.CharField('Etiket', maxlength = 32, blank=False, unique=True) @@ -39,10 +34,8 @@ verbose_name = "Etiket" verbose_name_plural = "Etiketler" - class Contribute(models.Model): - """ Contributes select field in user register page """ - name = models.CharField('Ad', maxlength=32, blank=False, unique=True) + name = models.CharField('Tan?m', maxlength=64, blank=False, unique=True) def __str__(self): return self.name @@ -56,51 +49,6 @@ verbose_name = "Katk? Ad?" verbose_name_plural = "Katk? Adlar?" -class IgnoredUsername(models.Model): - """ Ignored user name model to prevent the site from slang :) This is controlled in register page""" - name = models.CharField("Kullan?c? ad?", maxlength=30) - - def __str__(self): - return self.name - - class Admin: - list_display = ('name',) - ordering = ['-name'] - search_fields = ['name'] - - class Meta: - verbose_name = "Yasaklanan Kullan?c? Ad?" - verbose_name_plural = "Yasaklanan Kullan?c? Adlar?" - -class UserProfile(models.Model): - user = models.ForeignKey(User, unique=True) - homepage = models.URLField('Ana Sayfa', blank=True) - birthday = models.DateField() - im = models.EmailField('Ba?lant? Adresi', blank=True, help_text='Jabber, Gtalk, Msn vs.') - city = models.CharField('?ehir', choices=CITY_LIST, maxlength=40) - show_email = models.BooleanField('E-posta G?ster', default=0) - contributes = models.ManyToManyField(Contribute, blank=True, verbose_name='Katk?lar') - contributes_summary = models.TextField('Katk? A??klamas?', blank=True) - activation_key = models.CharField(maxlength=40) - key_expires = models.DateTimeField() - - def __str__(self): - return self.user.username - - class Admin: - fields = ( - ('?yelik Bilgileri', {'fields': ('homepage','im', 'city', 'birthday', 'contributes', 'contributes_summary', 'show_email',)}), - ('Di?er', {'fields': ('activation_key', 'key_expires'), 'classes': 'collapse',}), - ) - - list_display = ('user', 'city',) - ordering = ['-user'] - search_fields = ['user'] - - class Meta: - verbose_name = "Kullan?c? Profili" - verbose_name_plural = "Kullan?c? Profilleri" - class ScreenShot(models.Model): desc = models.TextField('A??klama') file = models.ImageField(upload_to='ekran_goruntusu/') @@ -406,133 +354,4 @@ class Meta: verbose_name = "Pardus Yans?s?" - verbose_name_plural = "Pardus Yans?lar?" - -#====== -# Forms -#====== - -class RegisterForm(forms.Form): - username = forms.CharField(label='Kullan?c? Ad?', max_length=30, help_text='En az 3, en fazla 30 karakter') - firstname = forms.CharField(label='?sim', max_length=30) - lastname = forms.CharField(label='Soyisim', max_length=30) - birthday = forms.DateField(label='Do?um Tarihi', help_text='10/5/1985 gibi.') - email = forms.EmailField(label='E-Posta') - password = forms.CharField(label='Parola', max_length=32, widget=forms.PasswordInput,) - password_again = forms.CharField(label='Parola (tekrar)', max_length=32, widget=forms.PasswordInput, help_text='En az 5 karakter') - city = forms.ChoiceField(label='?ehir', choices=CITY_LIST) - homepage = forms.URLField(label='Web Sayfas?', verify_exists=False, required=False, help_text='(zorunlu de?il)') - contributes = forms.ModelMultipleChoiceField(label='Katk? Ba?l?klar?', queryset=Contribute.objects.all(), required=False, help_text='Bize nas?l katk?da bulunabilirsiniz? (ctrl ile birden fazla se?im yap?labilir, zorunlu de?il)') - contributes_summary = forms.CharField(label='A??klama', widget=forms.Textarea, required=False, help_text='Katk? sa?layabilecekseniz a??klama yaz?n (zorunlu de?il)') - show_email = forms.BooleanField(label='E-posta Adresini G?ster', required=False, help_text='Profil sayfas?nda di?erleri e-posta adresinizi g?rebilsin mi?') - - def clean_username(self): - field_data = self.clean_data['username'] - - if not field_data: - return '' - - if len(field_data.split(' ')) != 1: - raise forms.ValidationError(u"Kullan?c? ad?nda bo?luk olmamal?d?r") - - if len(field_data) < 3: - raise forms.ValidationError(u"Kullan?c? ad? en az 3 karakter olmal?d?r") - - regexp = re.compile("\w+") - if not regexp.match(field_data): - raise forms.ValidationError(u"Kullan?c? ad? ge?ersiz") - - ignored = IgnoredUsername.objects.filter(name__iexact=field_data) - if len(ignored) > 0: - raise forms.ValidationError(u"Bu kullan?c? ad?n?n al?nmas? yasaklanm??") - - u = User.objects.filter(username__iexact=field_data) - if len(u) > 0: - raise forms.ValidationError(u"Bu kullan?c? ad? daha ?nce al?nm??") - - return self.clean_data['username'] - - - def clean_password_again(self): - field_data = self.clean_data['password_again'] - password = self.clean_data['password'] - if not field_data: - return '' - - if len(field_data.split(' ')) != 1: - raise forms.ValidationError(u"Parolada bo?luk olmamal?d?r") - - if len(field_data) < 5: - raise forms.ValidationError(u"Parola en az 5 karakter olmal?d?r") - - if (password or field_data) and password != field_data: - raise forms.ValidationError(u"Parolalar e?le?miyor") - - return field_data - -class ProfileEditForm(forms.Form): - firstname = forms.CharField(label='?sim', max_length=30) - lastname = forms.CharField(label='Soyisim', max_length=30) - birthday = forms.DateField(label='Do?um Tarihi', help_text='10/5/1985 gibi.') - email = forms.EmailField(label='E-posta') - city = forms.ChoiceField(label='?ehir', choices=CITY_LIST) - homepage = forms.URLField(label='Ana Sayfa', required=False, help_text='http:// ile ba?lamay? unutmay?n') - old_password = forms.CharField(label='Eski Parola', widget=forms.PasswordInput, max_length=32, required=False) - password = forms.CharField(label='Parola', widget=forms.PasswordInput, max_length=32, required=False, help_text='De?i?tirmek istiyorsan?z her ikisini de doldurun') - password_again = forms.CharField(label='Parola (yeniden)', widget=forms.PasswordInput, max_length=32, 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??') - - def set_user(self, user): - self.user = user - - def clean_old_password(self): - field_data = self.clean_data['old_password'] - if not field_data: - return '' - else: - if len(field_data.split(' ')) != 1: - raise forms.ValidationError(u"Parolada bo?luk olmamal?d?r") - - if len(field_data) < 5: - raise forms.ValidationError(u"Parola en az 5 karakter olmal?d?r") - - return field_data - - def clean_password(self): - field_data = self.clean_data['password'] - if not field_data: - return '' - else: - if len(field_data.split(' ')) != 1: - raise forms.ValidationError(u"Parolada bo?luk olmamal?d?r") - - if len(field_data) < 5: - raise forms.ValidationError(u"Parola en az 5 karakter olmal?d?r") - - return field_data - - def clean_password_again(self): - field_data = self.clean_data['password_again'] - password = self.clean_data['password'] - old_password = self.clean_data['old_password'] - - if old_password or password or field_data: - if field_data and password and old_password: - if len(field_data.split(' ')) != 1: - raise forms.ValidationError(u"Parolada bo?luk olmamal?d?r") - - if len(field_data) < 5: - raise forms.ValidationError(u"Parola en az 5 karakter olmal?d?r") - - if (password or field_data) and password != field_data: - raise forms.ValidationError(u"Parolalar e?le?miyor") - - u = User.objects.get(username=self.user.username) - if not u.check_password(old_password): - raise forms.ValidationError(u"Eski parola yanl??") - - return field_data - else: - raise forms.ValidationError(u"Parolay? de?i?tirmek i?in her 3 alan? da doldurun") - else: - return '' + verbose_name_plural = "Pardus Yans?lar?" \ No newline at end of file Modified: trunk/st/views.py ================================================================= --- trunk/st/views.py (original) +++ trunk/st/views.py Mon Jul 2 18:24:56 2007 @@ -8,16 +8,12 @@ import sha, datetime, random from os import path -from django.http import HttpResponseRedirect - -from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User -from django.core.mail import send_mail from django.shortcuts import get_object_or_404 -from oi.settings import DEFAULT_FROM_EMAIL, LOGIN_REDIRECT_URL, NEWS_IN_HOMEPAGE, WEB_URL, PROFILE_EDIT_URL +from oi.settings import NEWS_IN_HOMEPAGE, WEB_URL -from oi.st.models import FS, Game, News, Package, ScreenShot, Tag, UserProfile, RegisterForm, ProfileEditForm, PardusVersion, PardusMirror, Video +from oi.st.models import FS, Game, News, Package, ScreenShot, Tag, RegisterForm, ProfileEditForm, PardusVersion, PardusMirror, Video from oi.st.wrappers import render_response from oi.flatpages.models import FlatPage @@ -81,137 +77,6 @@ raise Http404 return render_response(request, 'tag/tag_detail.html', locals()) - at login_required -def user_dashboard(request): - return render_response(request, 'user/dashboard.html') - - at login_required -def user_profile_edit(request): - u = request.user - if request.method == 'POST': - form = ProfileEditForm(request.POST) - form.set_user(request.user) - - if form.is_valid(): - if len(form.clean_data['password']) > 0: - u.set_password(form.clean_data['password']) - - u.first_name = form.clean_data['firstname'] - u.last_name = form.clean_data['lastname'] - u.email = form.clean_data['email'] - u.get_profile().homepage = form.clean_data['homepage'] - u.get_profile().city = form.clean_data['city'] - u.get_profile().birthday = form.clean_data['birthday'] - u.get_profile().show_email = form.clean_data['show_email'] - u.get_profile().save() - u.save() - - return HttpResponseRedirect(PROFILE_EDIT_URL) - else: - return render_response(request, 'user/profile_edit.html', {'form': form}) - else: - # convert returned value "day/month/year" - get = str(u.get_profile().birthday) - get = get.split("-") - - birthday = "%s/%s/%s" % (get[2], get[1], get[0]) - default_data = {'firstname': u.first_name, - 'lastname': u.last_name, - 'birthday': birthday, - 'homepage': u.get_profile().homepage, - 'city': u.get_profile().city, - 'email': u.email, - 'show_email': u.get_profile().show_email} - - form = ProfileEditForm(default_data) - form.set_user(request.user) - - return render_response(request, 'user/profile_edit.html', {'form': form}) - -def user_profile(request, name): - try: - info = User.objects.get(username=name) - except User.DoesNotExist: - raise Http404 - return render_response(request, 'user/profile.html', locals()) - -def user_register(request): - if request.method == 'POST': - form = RegisterForm(request.POST) - if form.is_valid(): - user = User.objects.create_user(form.clean_data['username'], form.clean_data['email'], form.clean_data['password']) - user.first_name = form.clean_data['firstname'] - user.last_name = form.clean_data['lastname'] - user.is_active = False - user.save() - - # create a key - salt = sha.new(str(random.random())).hexdigest()[:5] - activation_key = sha.new(salt+form.clean_data['username']).hexdigest() # yes, i'm paranoiac - key_expires = datetime.datetime.today() + datetime.timedelta(2) - - profile = UserProfile(user=user) - profile.homepage = form.clean_data['homepage'] - profile.birthday = form.clean_data['birthday'] - profile.city = form.clean_data['city'] - profile.contributes_summary = form.clean_data['contributes_summary'] - profile.activation_key = activation_key - profile.show_email = form.clean_data['show_email'] - profile.key_expires = key_expires - profile.save() - - for number in form.clean_data['contributes']: # it's ManyToManyField's unique id - user.get_profile().contributes.add(number) - - now = datetime.datetime.now() - (date, hour) = now.isoformat()[:16].split("T") - email_dict = {'date': date, - 'hour': hour, - 'ip': request.META['REMOTE_ADDR'], - 'user': form.clean_data['username'], - 'link': 'http://www.ozgurlukicin.com/confirm/%s/%s' % (form.clean_data['username'], activation_key)} - - email_subject = u"Ozgurlukicin.com Kullan?c? Hesab?, %(user)s" - email_body = u"""Merhaba! -%(date)s %(hour)s tarihinde %(ip)s ip adresli bilgisayardan yapt???n?z Ozgurlukicin.com kullan?c? hesab?n?z? onaylamak i?in a?a??daki linke 48 saat i?erisinde t?klay?n?z. - -%(link)s - -Te?ekk?rler, -Ozgurlukicin.com""" - email_to = form.clean_data['email'] - email_recipient = ["turkay.eren at gmail.com"] # this is just for testing, it should be changed when authentication system has been finished - - send_mail(email_subject, email_body % email_dict, DEFAULT_FROM_EMAIL, email_recipient, fail_silently=False) - - return render_response(request, 'user/register_done.html', {'form': form, - 'user': form.clean_data['username']}) - else: - return render_response(request, 'user/register.html', {'form': form}) - else: - form = RegisterForm() - return render_response(request, 'user/register.html', {'form': form}) - -def user_confirm(request, name, key): - if request.user.is_authenticated(): - return render_response(request, 'user/confirm.html', {'authenticated': True}) - elif len(User.objects.filter(username=name)) == 0: - return render_response(request, 'user/confirm.html', {'no_user': True}) - else: - u = User.objects.get(username=name) - if u.is_active: - return render_response(request, 'user/confirm.html', {'actived': True}) - elif u.get_profile().activation_key == key: - if u.get_profile().key_expires < datetime.datetime.today(): - u.delete() - return render_response(request, 'user/confirm.html', {'key_expired': True}) - else: - u.is_active = True - u.save() - return render_response(request, 'user/confirm.html', {'ok': True}) - else: - return render_response(request, 'user/confirm.html', {'key_incorrect': True}) - def download(request): version = PardusVersion.objects.filter(status=1).order_by('-number')[:1][0] mirrors = PardusMirror.objects.filter(status=1).order_by('-name') Modified: trunk/templates/user/login.html ================================================================= --- trunk/templates/user/login.html (original) +++ trunk/templates/user/login.html Mon Jul 2 18:24:56 2007 @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}Giri? - {% endblock %} +{% block title %}Kullan?c? Giri?i - {% endblock %} {% block content %} @@ -12,17 +12,14 @@

Kullan?c? ad?n?z ve parolan?z uyu?muyor, l?tfen tekrar deneyin.

{% endif %} - - +

+ +

{% else %} Zaten giri? yapm??s?n?z. ??k?? yapmak i?in t?klay?n
{% endif %} Modified: trunk/templates/user/register.html ================================================================= --- trunk/templates/user/register.html (original) +++ trunk/templates/user/register.html Mon Jul 2 18:24:56 2007 @@ -2,63 +2,26 @@ {% block title %}Kay?t - {% endblock %} -{% block extrahead %} - - - -{% endblock %} - - - {% block content %} -
- - -{% if form.errors %} -?yelik i?leminiz tamamlanamad?, l?tfen formu eksiksiz doldurunuz
-{% endif %} - -{% if user.is_authenticated %} -
-Zaten giri? yapm??s?n?z, ana sayfaya gitmek i?in t?klay?n - -{% else %} - -
- - -{% endif %} -{% endblock %} +

+ {% if form.errors %} + ?yelik i?leminiz tamamlanamad?, l?tfen formu eksiksiz doldurunuz
+ {% endif %} + + {% if user.is_authenticated %} +
+ Zaten giri? yapm??s?n?z, ana sayfaya gitmek i?in t?klay?n + {% else %} + + {% endif %} +

+{% endblock %} \ No newline at end of file Modified: trunk/urls.py ================================================================= --- trunk/urls.py (original) +++ trunk/urls.py Mon Jul 2 18:24:56 2007 @@ -73,11 +73,12 @@ (r'^kullanici/liste/sayfa/(?P[0-9]+)/$', 'django.views.generic.list_detail.object_list', dict(user_dict)), (r'^kullanici/giris/$', 'django.contrib.auth.views.login', {'template_name': 'user/login.html'}), (r'^kullanici/cikis/$', 'django.contrib.auth.views.logout', {'template_name': 'user/logout.html'}), - (r'^kullanici/kayit/$', 'oi.st.views.user_register'), - (r'^kullanici/onay/(?P[\w-]+)/(?P[\w-]+)/$', 'oi.st.views.user_confirm'), - (r'^kullanici/duzenle/$', 'oi.st.views.user_profile_edit'), - (r'^kullanici/dashboard/$', 'oi.st.views.user_dashboard'), - (r'^kullanici/(?P[\w-]+)/$', 'oi.st.views.user_profile'), + (r'^kullanici/kayit/$', 'oi.profile.views.user_register'), + (r'^kullanici/onay/(?P[\w-]+)/(?P[\w-]+)/$', 'oi.profile.views.user_confirm'), + (r'^kullanici/duzenle/$', 'oi.profile.views.user_profile_edit'), + (r'^kullanici/dashboard/$', 'oi.profile.views.user_dashboard'), + #(r'^kullanici/(?P[\w-]+)/yorumlar/$', 'oi.profile.views.user_comments'), + (r'^kullanici/(?P[\w-]+)/$', 'oi.profile.views.user_profile'), #First Steps (r'^ia/$', 'django.views.generic.list_detail.object_list', dict(fs_dict, page=1)), From oi-commits at pardus.org.tr Mon Jul 2 18:25:50 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 2 Jul 2007 18:25:50 +0300 (EEST) Subject: [Oi-commits] r411 - trunk Message-ID: <20070702152550.BB3947C001D@liste.uludag.org.tr> Author: ahmet Date: Mon Jul 2 18:25:50 2007 New Revision: 411 Modified: trunk/settings.py Log: ay?rd?k len Modified: trunk/settings.py ================================================================= --- trunk/settings.py (original) +++ trunk/settings.py Mon Jul 2 18:25:50 2007 @@ -55,7 +55,7 @@ NEWS_IN_HOMEPAGE = 4 # For extending User class -AUTH_PROFILE_MODULE = 'st.UserProfile' +AUTH_PROFILE_MODULE = 'profile.Profile' # Login stuff, we use different urls for authentication. LOGIN_URL = '/kullanici/giris/' @@ -63,7 +63,6 @@ LOGOUT_URL = '/kullanici/cikis/' PROFILE_EDIT_URL = '/kullanici/duzenle/' - TIME_ZONE = 'Europe/Istanbul' LANGUAGE_CODE = 'tr' SITE_ID = 1 From oi-commits at pardus.org.tr Mon Jul 2 18:33:09 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 2 Jul 2007 18:33:09 +0300 (EEST) Subject: [Oi-commits] r412 - trunk/st Message-ID: <20070702153309.32EB57C001D@liste.uludag.org.tr> Author: ahmet Date: Mon Jul 2 18:33:08 2007 New Revision: 412 Modified: trunk/st/views.py Log: grr Modified: trunk/st/views.py ================================================================= --- trunk/st/views.py (original) +++ trunk/st/views.py Mon Jul 2 18:33:08 2007 @@ -13,7 +13,7 @@ from oi.settings import NEWS_IN_HOMEPAGE, WEB_URL -from oi.st.models import FS, Game, News, Package, ScreenShot, Tag, RegisterForm, ProfileEditForm, PardusVersion, PardusMirror, Video +from oi.st.models import FS, Game, News, Package, ScreenShot, Tag, PardusVersion, PardusMirror, Video from oi.st.wrappers import render_response from oi.flatpages.models import FlatPage @@ -92,4 +92,4 @@ return render_response(request, 'videobox.html', locals()) def test(request): - return render_response(request, 'test.html') \ No newline at end of file + return render_response(request, 'test.html') From turkay.eren at gmail.com Tue Jul 3 05:59:38 2007 From: turkay.eren at gmail.com (Eren =?ISO-8859-9?B?VPxya2F5?=) Date: Tue, 3 Jul 2007 05:59:38 +0300 Subject: [Oi-commits] r412 - trunk/st In-Reply-To: <20070702153309.32EB57C001D@liste.uludag.org.tr> References: <20070702153309.32EB57C001D@liste.uludag.org.tr> Message-ID: <20070703055938.1cbd39e9.turkay.eren@gmail.com> On Mon, 2 Jul 2007 18:33:09 +0300 (EEST) oi-commits at pardus.org.tr wrote: > def test(request): > - return render_response(request, 'test.html') > \ No newline at end of file > + return render_response(request, 'test.html') render_response(requiest, 'test.html') ... From ahmet at pardusman.org Tue Jul 3 11:09:11 2007 From: ahmet at pardusman.org (Ahmet =?utf-8?q?AYG=C3=9CN?=) Date: Tue, 3 Jul 2007 11:09:11 +0300 Subject: [Oi-commits] r412 - trunk/st In-Reply-To: <20070703055938.1cbd39e9.turkay.eren@gmail.com> References: <20070702153309.32EB57C001D@liste.uludag.org.tr> <20070703055938.1cbd39e9.turkay.eren@gmail.com> Message-ID: <200707031109.15543.ahmet@pardusman.org> On Tuesday 03 July 2007 05:59:38 Eren T?rkay wrote: > render_response(requiest, 'test.html') ... Nas?l? -- Ahmet AYG?N - ahmet~pardusman.org -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part. Url : http://liste.pardus.org.tr/oi-commits/attachments/20070703/ba131aac/attachment.pgp From turkay.eren at gmail.com Tue Jul 3 11:07:42 2007 From: turkay.eren at gmail.com (Eren =?ISO-8859-9?B?VPxya2F5?=) Date: Tue, 3 Jul 2007 11:07:42 +0300 Subject: [Oi-commits] r412 - trunk/st In-Reply-To: <200707031109.15543.ahmet@pardusman.org> References: <20070702153309.32EB57C001D@liste.uludag.org.tr> <20070703055938.1cbd39e9.turkay.eren@gmail.com> <200707031109.15543.ahmet@pardusman.org> Message-ID: <20070703110742.94fd8068.turkay.eren@gmail.com> On Tue, 3 Jul 2007 11:09:11 +0300 Ahmet AYG?N wrote: > On Tuesday 03 July 2007 05:59:38 Eren T?rkay wrote: > > render_response(requiest, 'test.html') ... > Nas?l? request olcakt? :P Author: erenturkay Date: Sat Jun 30 19:47:00 2007 New Revision: 396 Modified: trunk/feedjack/views.py Log: render_response wrapper'i kullan?lmal?, ileride base.html'de request.user objesini kullanaca??z, her view'?n render_response ile d?nd?rmesi ?art.. From oi-commits at pardus.org.tr Tue Jul 3 14:24:56 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 3 Jul 2007 14:24:56 +0300 (EEST) Subject: [Oi-commits] r413 - trunk Message-ID: <20070703112456.8C97A7C0013@liste.uludag.org.tr> Author: ahmet Date: Tue Jul 3 14:24:56 2007 New Revision: 413 Modified: trunk/urls.py Log: order_by Modified: trunk/urls.py ================================================================= --- trunk/urls.py (original) +++ trunk/urls.py Tue Jul 3 14:24:56 2007 @@ -13,28 +13,28 @@ from oi.seminar.models import Seminar user_dict = { - 'queryset': User.objects.all(), + 'queryset': User.objects.all().order_by('name'), 'template_name': 'user/user_list.html', 'paginate_by': USER_PER_PAGE, 'template_object_name': 'user' } package_dict = { - 'queryset': Package.objects.filter(status=1), + 'queryset': Package.objects.filter(status=1).order_by('name'), 'template_name': 'package/package_main.html', 'paginate_by': PACKAGE_PER_PAGE, 'template_object_name': 'package' } game_dict = { - 'queryset': Game.objects.filter(status=1), + 'queryset': Game.objects.filter(status=1).order_by('title'), 'template_name': 'game/game_main.html', 'paginate_by': GAME_PER_PAGE, 'template_object_name': 'game' } fs_dict = { - 'queryset': FS.objects.filter(status=1), + 'queryset': FS.objects.filter(status=1).order_by('title'), 'template_name': 'fs/fs_main.html', 'paginate_by': FS_PER_PAGE, 'template_object_name': 'fs' @@ -45,11 +45,11 @@ 'template_name': 'news/news_main.html', 'paginate_by': NEWS_PER_PAGE, 'template_object_name': 'news', - 'extra_context': {'seminar': Seminar.objects.filter(status=1)} + 'extra_context': {'seminar': Seminar.objects.filter(status=1).order_by('date')} } tag_dict = { - 'queryset': Tag.objects.all(), + 'queryset': Tag.objects.all().order_by('name'), 'template_name': 'tag/tag_main.html', 'paginate_by': TAG_PER_PAGE, 'template_object_name': 'tag' From oi-commits at pardus.org.tr Tue Jul 3 14:59:07 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 3 Jul 2007 14:59:07 +0300 (EEST) Subject: [Oi-commits] r414 - trunk/templates/tag Message-ID: <20070703115907.4B39B7C000E@liste.uludag.org.tr> Author: ahmet Date: Tue Jul 3 14:59:07 2007 New Revision: 414 Modified: trunk/templates/tag/tag_detail.html Log: Modified: trunk/templates/tag/tag_detail.html ================================================================= --- trunk/templates/tag/tag_detail.html (original) +++ trunk/templates/tag/tag_detail.html Tue Jul 3 14:59:07 2007 @@ -44,6 +44,7 @@ {% block section_logo %}

{% endblock %} {% block content %} +

'{{ tag|escape }}' etiketli i?erik a?a??da listelenmektedir,
g?rmek istedi?iniz i?erik t?r?n?n (Oyun, Paket, ?lk ad?m, vb.) ?zerine t?klay?n.

{{ tag|escape }} etiketli i?erik

{% if news %} From oi-commits at pardus.org.tr Tue Jul 3 15:01:14 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 3 Jul 2007 15:01:14 +0300 (EEST) Subject: [Oi-commits] r415 - trunk/templates/tag Message-ID: <20070703120114.BEE907C000E@liste.uludag.org.tr> Author: ahmet Date: Tue Jul 3 15:01:14 2007 New Revision: 415 Modified: trunk/templates/tag/tag_detail.html Log: Modified: trunk/templates/tag/tag_detail.html ================================================================= --- trunk/templates/tag/tag_detail.html (original) +++ trunk/templates/tag/tag_detail.html Tue Jul 3 15:01:14 2007 @@ -44,7 +44,6 @@ {% block section_logo %}

{% endblock %} {% block content %} -

'{{ tag|escape }}' etiketli i?erik a?a??da listelenmektedir,
g?rmek istedi?iniz i?erik t?r?n?n (Oyun, Paket, ?lk ad?m, vb.) ?zerine t?klay?n.

{{ tag|escape }} etiketli i?erik

{% if news %} @@ -146,5 +145,6 @@ {% endfor %}

{% endif %} +

'{{ tag|escape }}' etiketli i?erik a?a??da listelenmektedir,
g?rmek istedi?iniz i?erik t?r?n?n (Oyun, Paket, ?lk ad?m, vb.) ?zerine t?klay?n.

{% endblock %} From oi-commits at pardus.org.tr Tue Jul 3 15:58:31 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 3 Jul 2007 15:58:31 +0300 (EEST) Subject: [Oi-commits] r416 - in trunk: . media/css media/img st templates Message-ID: <20070703125831.F22D77C000E@liste.uludag.org.tr> Author: ahmet Date: Tue Jul 3 15:58:31 2007 New Revision: 416 Added: trunk/media/img/fs_title.png (contents, props changed) trunk/media/img/games_title.png (contents, props changed) trunk/media/img/packages_title.png (contents, props changed) Modified: trunk/media/css/style.css trunk/media/img/news_title.png trunk/st/views.py trunk/templates/base.html trunk/templates/home.html trunk/urls.py Log: zorro Modified: trunk/media/css/style.css ================================================================= --- trunk/media/css/style.css (original) +++ trunk/media/css/style.css Tue Jul 3 15:58:31 2007 @@ -563,7 +563,6 @@ font-weight: bold; padding-top: 5px; padding-left: 12px; - width: 290px; height: 25px; margin-top: 10px; } @@ -574,12 +573,80 @@ } .news_content { - width: 280px; padding-left: 10px; - padding-right: 6px; + padding-right: 16px; color: #9218A4; } +.packages_title { + background: url('/media/img/packages_title.png') no-repeat; + font-size: 14px; + font-weight: bold; + padding-top: 5px; + padding-left: 12px; + height: 25px; + margin-top: 10px; + width: 280px; +} + +.packages_title a { + color: #ffffff; + text-decoration: none; +} + +.packages_content { + width: 280px; + padding-left: 10px; + padding-right: 16px; + color: #C85700; +} + +.games_title { + background: url('/media/img/games_title.png') no-repeat; + font-size: 14px; + font-weight: bold; + padding-top: 5px; + padding-left: 12px; + height: 25px; + margin-top: 10px; + width: 280px; +} + +.games_title a { + color: #ffffff; + text-decoration: none; +} + +.games_content { + width: 280px; + padding-left: 10px; + padding-right: 16px; + color: #33718B; +} + +.fss_title { + background: url('/media/img/fs_title.png') no-repeat; + font-size: 14px; + font-weight: bold; + padding-top: 5px; + padding-left: 12px; + height: 25px; + margin-top: 10px; + width: 280px; +} + +.fss_title a { + color: #ffffff; + text-decoration: none; +} + +.fss_content { + width: 280px; + padding-left: 10px; + padding-right: 16px; + color: #69A200; +} + /* header */ #header { Modified: trunk/media/img/news_title.png ================================================================= Binary files. No diff available. Modified: trunk/st/views.py ================================================================= --- trunk/st/views.py (original) +++ trunk/st/views.py Tue Jul 3 15:58:31 2007 @@ -11,7 +11,7 @@ from django.contrib.auth.models import User from django.shortcuts import get_object_or_404 -from oi.settings import NEWS_IN_HOMEPAGE, WEB_URL +from oi.settings import WEB_URL, NEWS_IN_HOMEPAGE, PACKAGES_IN_HOMEPAGE, GAMES_IN_HOMEPAGE, FS_IN_HOMEPAGE from oi.st.models import FS, Game, News, Package, ScreenShot, Tag, PardusVersion, PardusMirror, Video from oi.st.wrappers import render_response @@ -19,6 +19,9 @@ def home(request): news = News.objects.filter(status=1).order_by('-date')[:NEWS_IN_HOMEPAGE] + packages = Package.objects.filter(status=1).order_by('-update')[:PACKAGES_IN_HOMEPAGE] + games = Game.objects.filter(status=1).order_by('-update')[:GAMES_IN_HOMEPAGE] + fss = FS.objects.filter(status=1).order_by('-update')[:FS_IN_HOMEPAGE] return render_response(request, 'home.html', locals()) def fs_detail(request, slug): Modified: trunk/templates/base.html ================================================================= --- trunk/templates/base.html (original) +++ trunk/templates/base.html Tue Jul 3 15:58:31 2007 @@ -55,7 +55,7 @@ {% endif %}

+ {% endblock %} {% block sidebar %} {% endblock %} Modified: trunk/templates/home.html ================================================================= --- trunk/templates/home.html (original) +++ trunk/templates/home.html Tue Jul 3 15:58:31 2007 @@ -3,10 +3,37 @@ {% block content %}

{% for object in news %} -

{% endfor %}

+
+

+ {% for package in packages %} +

+ {% endfor %} +

+
+

+ {% for game in games %} +

+ {% endfor %} +

+
+

+ {% for fs in fss %} +

+ {% endfor %} +

{% endblock %} \ No newline at end of file Modified: trunk/urls.py ================================================================= --- trunk/urls.py (original) +++ trunk/urls.py Tue Jul 3 15:58:31 2007 @@ -41,7 +41,7 @@ } news_dict = { - 'queryset': News.objects.filter(status=1), + 'queryset': News.objects.filter(status=1).order_by('-date'), 'template_name': 'news/news_main.html', 'paginate_by': NEWS_PER_PAGE, 'template_object_name': 'news', From oi-commits at pardus.org.tr Tue Jul 3 16:04:22 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 3 Jul 2007 16:04:22 +0300 (EEST) Subject: [Oi-commits] r417 - in trunk/templates: . news Message-ID: <20070703130422.4039E7C000E@liste.uludag.org.tr> Author: ahmet Date: Tue Jul 3 16:04:21 2007 New Revision: 417 Modified: trunk/templates/home.html trunk/templates/news/news_main.html Log: hehe Modified: trunk/templates/home.html ================================================================= --- trunk/templates/home.html (original) +++ trunk/templates/home.html Tue Jul 3 16:04:21 2007 @@ -2,10 +2,10 @@ {% block content %}

- {% for object in news %} -

+ {% for new in news %} +

{% endfor %}

Modified: trunk/templates/news/news_main.html ================================================================= --- trunk/templates/news/news_main.html (original) +++ trunk/templates/news/news_main.html Tue Jul 3 16:04:21 2007 @@ -11,7 +11,7 @@ {% block content %}

{% for news in news_list %} -

From oi-commits at pardus.org.tr Tue Jul 3 16:16:26 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 3 Jul 2007 16:16:26 +0300 (EEST) Subject: [Oi-commits] r418 - trunk Message-ID: <20070703131626.3A6327C000E@liste.uludag.org.tr> Author: ahmet Date: Tue Jul 3 16:16:25 2007 New Revision: 418 Modified: trunk/settings.py Log: dd Modified: trunk/settings.py ================================================================= --- trunk/settings.py (original) +++ trunk/settings.py Tue Jul 3 16:16:25 2007 @@ -52,7 +52,10 @@ SEMINAR_PER_PAGE = 10 # News in homepage -NEWS_IN_HOMEPAGE = 4 +NEWS_IN_HOMEPAGE = 2 +PACKAGES_IN_HOMEPAGE = 2 +GAMES_IN_HOMEPAGE = 2 +FS_IN_HOMEPAGE = 2 # For extending User class AUTH_PROFILE_MODULE = 'profile.Profile' From oi-commits at pardus.org.tr Tue Jul 3 16:36:14 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 3 Jul 2007 16:36:14 +0300 (EEST) Subject: [Oi-commits] r419 - trunk/media/css Message-ID: <20070703133614.C9B777C000E@liste.uludag.org.tr> Author: ahmet Date: Tue Jul 3 16:36:14 2007 New Revision: 419 Modified: trunk/media/css/style.css Log: overflow Modified: trunk/media/css/style.css ================================================================= --- trunk/media/css/style.css (original) +++ trunk/media/css/style.css Tue Jul 3 16:36:14 2007 @@ -576,6 +576,7 @@ padding-left: 10px; padding-right: 16px; color: #9218A4; + overflow: auto; } .packages_title { From oi-commits at pardus.org.tr Tue Jul 3 16:55:37 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 3 Jul 2007 16:55:37 +0300 (EEST) Subject: [Oi-commits] r420 - trunk/media/img/banner Message-ID: <20070703135537.D51247C000E@liste.uludag.org.tr> Author: ahmet Date: Tue Jul 3 16:55:37 2007 New Revision: 420 Added: trunk/media/img/banner/ trunk/media/img/banner/banner01.png (contents, props changed) trunk/media/img/banner/banner02.png (contents, props changed) trunk/media/img/banner/banner03.png (contents, props changed) Log: bannerlar From oi-commits at pardus.org.tr Tue Jul 3 17:06:18 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 3 Jul 2007 17:06:18 +0300 (EEST) Subject: [Oi-commits] r421 - in trunk/templates: . fs game news package Message-ID: <20070703140618.486C07C000E@liste.uludag.org.tr> Author: ahmet Date: Tue Jul 3 17:06:18 2007 New Revision: 421 Modified: trunk/templates/fs/fs_main.html trunk/templates/game/game_main.html trunk/templates/news/news_main.html trunk/templates/package/package_main.html trunk/templates/paginator.html Log: ?tiraz etmemek laz?m, hadi ettin bari denedikten sonra komit et :D Modified: trunk/templates/fs/fs_main.html ================================================================= --- trunk/templates/fs/fs_main.html (original) +++ trunk/templates/fs/fs_main.html Tue Jul 3 17:06:18 2007 @@ -20,5 +20,5 @@

{% endfor %} -{% paginator %} -{% endblock %} +{% if is_paginated %}{% paginator %}{% endif %} +{% endblock %} \ No newline at end of file Modified: trunk/templates/game/game_main.html ================================================================= --- trunk/templates/game/game_main.html (original) +++ trunk/templates/game/game_main.html Tue Jul 3 17:06:18 2007 @@ -20,5 +20,5 @@

{% endfor %} -{% paginator %} +{% if is_paginated %}{% paginator %}{% endif %} {% endblock %} \ No newline at end of file Modified: trunk/templates/news/news_main.html ================================================================= --- trunk/templates/news/news_main.html (original) +++ trunk/templates/news/news_main.html Tue Jul 3 17:06:18 2007 @@ -18,7 +18,7 @@ {% endfor %}

-{% paginator %} +{% if is_paginated %}{% paginator %}{% endif %} {% endblock %} {% block sidebartop %}{% endblock %} Modified: trunk/templates/package/package_main.html ================================================================= --- trunk/templates/package/package_main.html (original) +++ trunk/templates/package/package_main.html Tue Jul 3 17:06:18 2007 @@ -20,5 +20,5 @@

{% endfor %} -{% paginator %} +{% if is_paginated %}{% paginator %}{% endif %} {% endblock %} \ No newline at end of file Modified: trunk/templates/paginator.html ================================================================= --- trunk/templates/paginator.html (original) +++ trunk/templates/paginator.html Tue Jul 3 17:06:18 2007 @@ -1,5 +1,3 @@ -{% if is_paginated %} -

{% spaceless %} {% if show_first %}?lk{% endif %} @@ -15,6 +13,4 @@ {% if show_last %}Son{% endif %} {% endspaceless %}
Her sayfada {{ results_per_page }} kay?t olmak ?zere {{ pages }} sayfada toplam {{ hits }} kay?t listeleniyor. -

- -{% endif %} +

\ No newline at end of file From turkay.eren at gmail.com Tue Jul 3 18:33:21 2007 From: turkay.eren at gmail.com (Eren =?ISO-8859-9?B?VPxya2F5?=) Date: Tue, 3 Jul 2007 18:33:21 +0300 Subject: [Oi-commits] r418 - trunk In-Reply-To: <20070703131626.3A6327C000E@liste.uludag.org.tr> References: <20070703131626.3A6327C000E@liste.uludag.org.tr> Message-ID: <20070703183321.d8de8021.turkay.eren@gmail.com> On Tue, 3 Jul 2007 16:16:26 +0300 (EEST) oi-commits at pardus.org.tr wrote: > # News in homepage > -NEWS_IN_HOMEPAGE = 4 > +NEWS_IN_HOMEPAGE = 2 > +PACKAGES_IN_HOMEPAGE = 2 > +GAMES_IN_HOMEPAGE = 2 > +FS_IN_HOMEPAGE = 2 Ya bunlar? database'den mi ayarlasak diyorum? Config modelimiz olur, admin panelinden rahat?a ayarlan?r. B?ylece koda elleme ve sunucuya restart atma gibi bi zorunlulu?umuz olmaz? From turkay.eren at gmail.com Tue Jul 3 18:34:06 2007 From: turkay.eren at gmail.com (Eren =?ISO-8859-9?B?VPxya2F5?=) Date: Tue, 3 Jul 2007 18:34:06 +0300 Subject: [Oi-commits] r421 - in trunk/templates: . fs game news package In-Reply-To: <20070703140618.486C07C000E@liste.uludag.org.tr> References: <20070703140618.486C07C000E@liste.uludag.org.tr> Message-ID: <20070703183406.d90657fa.turkay.eren@gmail.com> On Tue, 3 Jul 2007 17:06:18 +0300 (EEST) oi-commits at pardus.org.tr wrote: > trunk/templates/paginator.html > Log: > ?tiraz etmemek laz?m, hadi ettin bari denedikten sonra komit et :D Erww!! Nas?l ya? ?al??mas? laz?m? From oi-commits at pardus.org.tr Wed Jul 4 07:31:01 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 4 Jul 2007 07:31:01 +0300 (EEST) Subject: [Oi-commits] r422 - trunk/templates/user Message-ID: <20070704043101.E565C7C0022@liste.uludag.org.tr> Author: erenturkay Date: Wed Jul 4 07:31:01 2007 New Revision: 422 Modified: trunk/templates/user/register.html Log: url d?zelt, bu arada profil sayfas?n? ay?rmakla bi?eyler k?rm???n. Yeni bir Blog class'? neden olu?turdun? Ayr?ca kay?t sayfas?na bakarsan formlar?n ?ok k?t? g?r?nd???n? g?receksin. Modified: trunk/templates/user/register.html ================================================================= --- trunk/templates/user/register.html (original) +++ trunk/templates/user/register.html Wed Jul 4 07:31:01 2007 @@ -19,9 +19,9 @@ {% if field.errors %}

{% endif %} {% endfor %}
- ?zg?rl?k??in ??erik Politikas? 'n? okudum ve

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

{% endif %}

-{% endblock %} \ No newline at end of file +{% endblock %} From oi-commits at pardus.org.tr Wed Jul 4 08:12:32 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 4 Jul 2007 08:12:32 +0300 (EEST) Subject: [Oi-commits] r423 - in trunk: . profile Message-ID: <20070704051232.350267C0022@liste.uludag.org.tr> Author: erenturkay Date: Wed Jul 4 08:12:31 2007 New Revision: 423 Modified: trunk/profile/models.py trunk/profile/views.py trunk/settings.py Log: k?r?klar? alal?m. model i?erisinde birden fazla primary key kullan?lam?yor, sadece ForeignKey olmas? gerek, di?erleri eski haline d?ns?n. Kay?t sayfas?na da bir baksan iyi olur. Modified: trunk/profile/models.py ================================================================= --- trunk/profile/models.py (original) +++ trunk/profile/models.py Wed Jul 4 08:12:31 2007 @@ -30,25 +30,12 @@ verbose_name = "Yasaklanan Kullan?c? Ad?" verbose_name_plural = "Yasaklanan Kullan?c? Adlar?" -class Blog(models.Model): - url = models.URLField("Blog", blank=False) - - def __str__(self): - return self.url - -class IM(models.Model): - protocol = models.CharField("Protokol", maxlength=16, blank=False) - address = models.CharField("Adres", maxlength=96, blank=False, unique=True) - - def __str__(self): - return self.address - class Profile(models.Model): user = models.ForeignKey(User, unique=True) - birthday = models.DateField() - homepage = models.OneToOneField(Blog, blank=True) - im = models.OneToOneField(IM, blank=True) - city = models.CharField('?ehir', choices=CITY_LIST, maxlength=40) + birthday = models.DateField(blank=True) + homepage = models.URLField('Ana Sayfa', blank=True, verify_exists=False, unique=False) + im = models.EmailField('IM', maxlength=50, blank=True) + city = models.CharField('?ehir', blank=True, choices=CITY_LIST, maxlength=40) show_email = models.BooleanField('E-posta G?ster', default=0) contributes = models.ManyToManyField(Contribute, blank=True, verbose_name='Katk?lar') contributes_summary = models.TextField('Katk? A??klamas?', blank=True) @@ -60,7 +47,7 @@ class Admin: fields = ( - ('?yelik Bilgileri', {'fields': ('homepage','im', 'city', 'birthday', 'contributes', 'contributes_summary', 'show_email',)}), + ('?yelik Bilgileri', {'fields': ('user', 'homepage','im', 'city', 'birthday', 'contributes', 'contributes_summary', 'show_email',)}), ('Di?er', {'fields': ('activation_key', 'key_expires'), 'classes': 'collapse',}), ) @@ -102,8 +89,8 @@ if not regexp.match(field_data): raise forms.ValidationError(u"Kullan?c? ad? ge?ersiz") - ignored = IgnoredUsername.objects.filter(name__iexact=field_data) - if len(ignored) > 0: + forbidden = ForbiddenUsername.objects.filter(name__iexact=field_data) + if len(forbidden) > 0: raise forms.ValidationError(u"Bu kullan?c? ad?n?n al?nmas? yasaklanm??") u = User.objects.filter(username__iexact=field_data) Modified: trunk/profile/views.py ================================================================= --- trunk/profile/views.py (original) +++ trunk/profile/views.py Wed Jul 4 08:12:31 2007 @@ -17,7 +17,7 @@ from oi.settings import DEFAULT_FROM_EMAIL, LOGIN_REDIRECT_URL, WEB_URL, PROFILE_EDIT_URL -from oi.profile.models import UserProfile +from oi.profile.models import Profile, RegisterForm, ProfileEditForm from oi.st.wrappers import render_response @login_required @@ -89,7 +89,7 @@ activation_key = sha.new(salt+form.clean_data['username']).hexdigest() # yes, i'm paranoiac key_expires = datetime.datetime.today() + datetime.timedelta(2) - profile = UserProfile(user=user) + profile = Profile(user=user) profile.homepage = form.clean_data['homepage'] profile.birthday = form.clean_data['birthday'] profile.city = form.clean_data['city'] @@ -149,4 +149,4 @@ u.save() return render_response(request, 'user/confirm.html', {'ok': True}) else: - return render_response(request, 'user/confirm.html', {'key_incorrect': True}) \ No newline at end of file + return render_response(request, 'user/confirm.html', {'key_incorrect': True}) Modified: trunk/settings.py ================================================================= --- trunk/settings.py (original) +++ trunk/settings.py Wed Jul 4 08:12:31 2007 @@ -116,6 +116,7 @@ 'oi.bug', 'oi.feedjack', 'oi.seminar', + 'oi.profile', ) CITY_LIST = ( From oi-commits at pardus.org.tr Wed Jul 4 08:28:42 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 4 Jul 2007 08:28:42 +0300 (EEST) Subject: [Oi-commits] r424 - in trunk/templates: . user Message-ID: <20070704052842.DE8837C0022@liste.uludag.org.tr> Author: erenturkay Date: Wed Jul 4 08:28:42 2007 New Revision: 424 Added: trunk/templates/user/homepage_sidebar.html Modified: trunk/templates/base.html trunk/templates/user/dashboard.html Log: yan taraf kalabal?k yapmas?n, ayr? yerden include olsun, kullan?c? login olduktan sonra merhaba, profil sayfan?z hede h?d? desin. ileride bu b?l?me 'Sitemizde ?u kadar oyun, ?u kadar paket filan var da diyebilir' Modified: trunk/templates/base.html ================================================================= --- trunk/templates/base.html (original) +++ trunk/templates/base.html Wed Jul 4 08:28:42 2007 @@ -46,14 +46,7 @@ {% block sidebartop %}

Kullan?c? Kutusu

{% endblock %} @@ -72,4 +65,4 @@

Hakk?nda Takip et Hata raporla

- \ No newline at end of file + Modified: trunk/templates/user/dashboard.html ================================================================= --- trunk/templates/user/dashboard.html (original) +++ trunk/templates/user/dashboard.html Wed Jul 4 08:28:42 2007 @@ -6,6 +6,6 @@ Merhaba, {{ user.username }}!
-Aram?za {{ user.date_joined }} tarihinde kat?lm??s?n?z.

?stiyorsan?z profilinizi buraya t?klayarak d?zenleyebilirsiniz. +Aram?za {{ user.date_joined }} tarihinde kat?lm??s?n.

?stiyorsan kullan?c? bilgilerini buraya t?klayarak d?zenleyebilirsin. {% endblock %} From turkay.eren at gmail.com Wed Jul 4 09:28:24 2007 From: turkay.eren at gmail.com (Eren =?ISO-8859-9?B?VPxya2F5?=) Date: Wed, 4 Jul 2007 09:28:24 +0300 Subject: [Oi-commits] r422 - trunk/templates/user In-Reply-To: <20070704043101.E565C7C0022@liste.uludag.org.tr> References: <20070704043101.E565C7C0022@liste.uludag.org.tr> Message-ID: <20070704092824.e5d6d3c8.turkay.eren@gmail.com> On Wed, 4 Jul 2007 07:31:01 +0300 (EEST) oi-commits at pardus.org.tr wrote: > Log: > url d?zelt, bu arada profil sayfas?n? ay?rmakla bi?eyler k?rm???n. > Yeni bir Blog class'? neden olu?turdun? Ayr?ca kay?t sayfas?na > bakarsan formlar?n ?ok k?t? g?r?nd???n? g?receksin. ?ok fazla resmi olmu? yav :P Uykulu uykulu commit yapmamak laz?m.. #django kanal?nda birden fazla primary key kullanamazs?n demi?lerdi ki #?yle, sadece 1 tane ForeignKey ve OneToOneField kullan?labiliyor. From ahmet at pardusman.org Wed Jul 4 10:06:36 2007 From: ahmet at pardusman.org (Ahmet =?iso-8859-9?q?AYG=DCN?=) Date: Wed, 4 Jul 2007 10:06:36 +0300 Subject: [Oi-commits] r422 - trunk/templates/user In-Reply-To: <20070704092824.e5d6d3c8.turkay.eren@gmail.com> References: <20070704043101.E565C7C0022@liste.uludag.org.tr> <20070704092824.e5d6d3c8.turkay.eren@gmail.com> Message-ID: <200707041006.38919.ahmet@pardusman.org> On Wednesday 04 July 2007 09:28:24 Eren T?rkay wrote: > #django kanal?nda birden fazla primary key kullanamazs?n demi?lerdi ki > #?yle, sadece 1 tane ForeignKey ve OneToOneField kullan?labiliyor. #django kanal?n? d?verim... :D -- Ahmet AYG?N - ahmet~pardusman.org -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part. Url : http://liste.pardus.org.tr/oi-commits/attachments/20070704/6b7dfd70/attachment-0001.pgp From ahmet at pardusman.org Wed Jul 4 10:06:12 2007 From: ahmet at pardusman.org (Ahmet =?utf-8?q?AYG=C3=9CN?=) Date: Wed, 4 Jul 2007 10:06:12 +0300 Subject: [Oi-commits] r422 - trunk/templates/user In-Reply-To: <20070704043101.E565C7C0022@liste.uludag.org.tr> References: <20070704043101.E565C7C0022@liste.uludag.org.tr> Message-ID: <200707041006.16743.ahmet@pardusman.org> On Wednesday 04 July 2007 07:31:01 oi-commits at pardus.org.tr wrote: > url d?zelt, bu arada profil sayfas?n? ay?rmakla bi?eyler k?rm???n. Yeni bir > Blog class'? neden olu?turdun? Ayr?ca kay?t sayfas?na bakarsan formlar?n > ?ok k?t? g?r?nd???n? g?receksin. Just relax, hepsinin fark?nday?m. -- Ahmet AYG?N - ahmet~pardusman.org -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part. Url : http://liste.pardus.org.tr/oi-commits/attachments/20070704/4c92caad/attachment.pgp From ahmet at pardusman.org Wed Jul 4 10:04:33 2007 From: ahmet at pardusman.org (Ahmet =?iso-8859-9?q?AYG=DCN?=) Date: Wed, 4 Jul 2007 10:04:33 +0300 Subject: [Oi-commits] r418 - trunk In-Reply-To: <20070703183321.d8de8021.turkay.eren@gmail.com> References: <20070703131626.3A6327C000E@liste.uludag.org.tr> <20070703183321.d8de8021.turkay.eren@gmail.com> Message-ID: <200707041004.35932.ahmet@pardusman.org> On Tuesday 03 July 2007 18:33:21 Eren T?rkay wrote: > Ya bunlar? database'den mi ayarlasak diyorum? Config modelimiz olur, > admin panelinden rahat?a ayarlan?r. B?ylece koda elleme ve sunucuya > restart atma gibi bi zorunlulu?umuz olmaz? Hi? gerek yok, tasar?mda de?i?iklik olmad?k?a bunlarla i?imiz olmayacak. Tasar?mda de?i?iklik demek zaten bu dosyalar? m?nc?klay?p sunucuyu yeniden ba?latacaks?n demek. -- Ahmet AYG?N - ahmet~pardusman.org -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part. Url : http://liste.pardus.org.tr/oi-commits/attachments/20070704/08b97131/attachment.pgp From ahmet at pardusman.org Wed Jul 4 10:05:07 2007 From: ahmet at pardusman.org (Ahmet =?iso-8859-9?q?AYG=DCN?=) Date: Wed, 4 Jul 2007 10:05:07 +0300 Subject: [Oi-commits] r421 - in trunk/templates: . fs game news package In-Reply-To: <20070703183406.d90657fa.turkay.eren@gmail.com> References: <20070703140618.486C07C000E@liste.uludag.org.tr> <20070703183406.d90657fa.turkay.eren@gmail.com> Message-ID: <200707041005.10193.ahmet@pardusman.org> On Tuesday 03 July 2007 18:34:06 Eren T?rkay wrote: > Erww!! Nas?l ya? ?al??mas? laz?m? ?al??mas? laz?m ayr? mesele, denedin mi onu s?yle :) -- Ahmet AYG?N - ahmet~pardusman.org -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part. Url : http://liste.pardus.org.tr/oi-commits/attachments/20070704/fe4f9e0a/attachment.pgp From ahmet at pardusman.org Wed Jul 4 10:08:08 2007 From: ahmet at pardusman.org (Ahmet =?utf-8?q?AYG=C3=9CN?=) Date: Wed, 4 Jul 2007 10:08:08 +0300 Subject: [Oi-commits] r423 - in trunk: . profile In-Reply-To: <20070704051232.350267C0022@liste.uludag.org.tr> References: <20070704051232.350267C0022@liste.uludag.org.tr> Message-ID: <200707041008.11415.ahmet@pardusman.org> On Wednesday 04 July 2007 08:12:32 oi-commits at pardus.org.tr wrote: > k?r?klar? alal?m. model i?erisinde birden fazla primary key kullan?lam?yor, > sadece ForeignKey olmas? gerek, di?erleri eski haline d?ns?n. Kay?t > sayfas?na da bir baksan iyi olur. Birazc?k sakin olsan ne g?zel olacak, Blog ve IM modellerini sildikten sonra nas?l ForeignKey olarak kullanabilirsin ki? -- Ahmet AYG?N - ahmet~pardusman.org -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part. Url : http://liste.pardus.org.tr/oi-commits/attachments/20070704/69c17d84/attachment.pgp From ahmet at pardusman.org Wed Jul 4 10:10:42 2007 From: ahmet at pardusman.org (Ahmet =?utf-8?q?AYG=C3=9CN?=) Date: Wed, 4 Jul 2007 10:10:42 +0300 Subject: [Oi-commits] r424 - in trunk/templates: . user In-Reply-To: <20070704052842.DE8837C0022@liste.uludag.org.tr> References: <20070704052842.DE8837C0022@liste.uludag.org.tr> Message-ID: <200707041010.44803.ahmet@pardusman.org> On Wednesday 04 July 2007 08:28:42 oi-commits at pardus.org.tr wrote: > yan taraf kalabal?k yapmas?n, ayr? yerden include olsun, kullan?c? login > olduktan sonra merhaba, profil sayfan?z hede h?d? desin. ileride bu b?l?me > 'Sitemizde ?u kadar oyun, ?u kadar paket filan var da diyebilir' Sitenin bir?ok yeri i?in fikirlerimiz var, g?n i?inde ofiste konu?ulan ve karar verilenleri listeye bildirmek ?u zaman k?tl???nda zaman kayb?na sebep olaca?? i?in yapm?yoruz, uzakta olman?n bir dezavantaj? bu. -- Ahmet AYG?N - ahmet~pardusman.org -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part. Url : http://liste.pardus.org.tr/oi-commits/attachments/20070704/1b0cddf9/attachment.pgp From turkay.eren at gmail.com Wed Jul 4 11:08:25 2007 From: turkay.eren at gmail.com (Eren =?ISO-8859-9?B?VPxya2F5?=) Date: Wed, 4 Jul 2007 11:08:25 +0300 Subject: [Oi-commits] r418 - trunk In-Reply-To: <200707041004.35932.ahmet@pardusman.org> References: <20070703131626.3A6327C000E@liste.uludag.org.tr> <20070703183321.d8de8021.turkay.eren@gmail.com> <200707041004.35932.ahmet@pardusman.org> Message-ID: <20070704110825.7ad0aded.turkay.eren@gmail.com> On Wed, 4 Jul 2007 10:04:33 +0300 Ahmet AYG?N wrote: > On Tuesday 03 July 2007 18:33:21 Eren T?rkay wrote: > > Ya bunlar? database'den mi ayarlasak diyorum? Config modelimiz olur, > > admin panelinden rahat?a ayarlan?r. B?ylece koda elleme ve sunucuya > > restart atma gibi bi zorunlulu?umuz olmaz? > Hi? gerek yok, tasar?mda de?i?iklik olmad?k?a bunlarla i?imiz > olmayacak. Tasar?mda de?i?iklik demek zaten bu dosyalar? m?nc?klay?p > sunucuyu yeniden ba?latacaks?n demek. OK, sadece bi fikirdi :) From turkay.eren at gmail.com Wed Jul 4 11:10:25 2007 From: turkay.eren at gmail.com (Eren =?ISO-8859-9?B?VPxya2F5?=) Date: Wed, 4 Jul 2007 11:10:25 +0300 Subject: [Oi-commits] r421 - in trunk/templates: . fs game news package In-Reply-To: <200707041005.10193.ahmet@pardusman.org> References: <20070703140618.486C07C000E@liste.uludag.org.tr> <20070703183406.d90657fa.turkay.eren@gmail.com> <200707041005.10193.ahmet@pardusman.org> Message-ID: <20070704111025.a15952d7.turkay.eren@gmail.com> On Wed, 4 Jul 2007 10:05:07 +0300 Ahmet AYG?N wrote: > On Tuesday 03 July 2007 18:34:06 Eren T?rkay wrote: > > Erww!! Nas?l ya? ?al??mas? laz?m? > ?al??mas? laz?m ayr? mesele, denedin mi onu s?yle :) Hay?r :P Sen de sayfalama yap?nca linklerin do?rulu?unu kontrol etmemi?tin (h?h) H?l? da sayfalama d?zg?n de?il :) http://beta.ozgurlukicin.com/paket/ http://beta.ozgurlukicin.com/2/ ?eklinde link veriyor, daha once dedi?im gibi, /paket/ url'sini /paket/sayfa/1'e yonlendirelim, (remember; linux itself is a hack) From turkay.eren at gmail.com Wed Jul 4 11:12:52 2007 From: turkay.eren at gmail.com (Eren =?ISO-8859-9?B?VPxya2F5?=) Date: Wed, 4 Jul 2007 11:12:52 +0300 Subject: [Oi-commits] r423 - in trunk: . profile In-Reply-To: <200707041008.11415.ahmet@pardusman.org> References: <20070704051232.350267C0022@liste.uludag.org.tr> <200707041008.11415.ahmet@pardusman.org> Message-ID: <20070704111252.c095ae2e.turkay.eren@gmail.com> On Wed, 4 Jul 2007 10:08:08 +0300 Ahmet AYG?N wrote: > On Wednesday 04 July 2007 08:12:32 oi-commits at pardus.org.tr wrote: > > k?r?klar? alal?m. model i?erisinde birden fazla primary key > > kullan?lam?yor, sadece ForeignKey olmas? gerek, di?erleri eski > > haline d?ns?n. Kay?t sayfas?na da bir baksan iyi olur. > Birazc?k sakin olsan ne g?zel olacak, Blog ve IM modellerini > sildikten sonra nas?l ForeignKey olarak kullanabilirsin ki? User modeli ForeignKey olarak al?n?yor? Anlad???m kadary?la OneToOneField de primary key e?le?tirmesi yap?yor, o y?zden 2 tane OneToOne kullanam?yoruz? From turkay.eren at gmail.com Wed Jul 4 11:14:37 2007 From: turkay.eren at gmail.com (Eren =?ISO-8859-9?B?VPxya2F5?=) Date: Wed, 4 Jul 2007 11:14:37 +0300 Subject: [Oi-commits] r424 - in trunk/templates: . user In-Reply-To: <200707041010.44803.ahmet@pardusman.org> References: <20070704052842.DE8837C0022@liste.uludag.org.tr> <200707041010.44803.ahmet@pardusman.org> Message-ID: <20070704111437.7630b806.turkay.eren@gmail.com> On Wed, 4 Jul 2007 10:10:42 +0300 Ahmet AYG?N wrote: > On Wednesday 04 July 2007 08:28:42 oi-commits at pardus.org.tr wrote: > > yan taraf kalabal?k yapmas?n, ayr? yerden include olsun, kullan?c? > > login olduktan sonra merhaba, profil sayfan?z hede h?d? desin. > > ileride bu b?l?me 'Sitemizde ?u kadar oyun, ?u kadar paket filan > > var da diyebilir' > Sitenin bir?ok yeri i?in fikirlerimiz var, g?n i?inde ofiste > konu?ulan ve karar verilenleri listeye bildirmek ?u zaman k?tl???nda > zaman kayb?na sebep olaca?? i?in yapm?yoruz, uzakta olman?n bir > dezavantaj? bu. Sakin olmad???m? s?yleyen ilk ki?i de?ilsin :| :\ Bi taraflar bozuk olunca rahat olam?yorum i?te, hi? de?ilse ufaktan ?al??mas? rahatlat?yor beni :P Art?k 1 hafta sonra ofiste konusur hallederiz eksikleri. From oi-commits at pardus.org.tr Wed Jul 4 13:35:14 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 4 Jul 2007 13:35:14 +0300 (EEST) Subject: [Oi-commits] r425 - in trunk: . media/css media/js/tinymce upload Message-ID: <20070704103514.4600F7C0022@liste.uludag.org.tr> Author: ahmet Date: Wed Jul 4 13:35:14 2007 New Revision: 425 Modified: trunk/media/css/style.css trunk/media/js/tinymce/textareas.js trunk/upload/models.py trunk/urls.py Log: some fixes Modified: trunk/media/css/style.css ================================================================= --- trunk/media/css/style.css (original) +++ trunk/media/css/style.css Wed Jul 4 13:35:14 2007 @@ -1096,8 +1096,9 @@ } .planet_date { - margin-top: 10px; + margin-top: 20px; margin-left: 4px; + margin-bottom: -15px; height: 26px; width: 120px; padding-top: 4px; Modified: trunk/media/js/tinymce/textareas.js ================================================================= --- trunk/media/js/tinymce/textareas.js (original) +++ trunk/media/js/tinymce/textareas.js Wed Jul 4 13:35:14 2007 @@ -23,7 +23,7 @@ function oiFileBrowser (field_name, url, type, win) { tinyMCE.openWindow({ - file : "/admin/upload/" + type + "/", + file : "/admin/upload/image/add/", title : "File Browser", width : 300, height : 100, Modified: trunk/upload/models.py ================================================================= --- trunk/upload/models.py (original) +++ trunk/upload/models.py Wed Jul 4 13:35:14 2007 @@ -12,3 +12,6 @@ def __str__(self): return self.file + + class Admin: + pass \ No newline at end of file Modified: trunk/urls.py ================================================================= --- trunk/urls.py (original) +++ trunk/urls.py Wed Jul 4 13:35:14 2007 @@ -121,7 +121,7 @@ #Django (r'^$', 'oi.st.views.home'), - (r'^admin/upload/image/$', 'oi.upload.views.image_upload'), + (r'^admin/upload/image/add/$', 'oi.upload.views.image_upload'), (r'^admin/', include('django.contrib.admin.urls')), (r'^media/(.*)$', 'django.views.static.serve', {'document_root': '%s/media' % DOCUMENT_ROOT, 'show_indexes': True}), ) \ No newline at end of file From oi-commits at pardus.org.tr Wed Jul 4 13:47:07 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 4 Jul 2007 13:47:07 +0300 (EEST) Subject: [Oi-commits] r426 - in trunk: media/img st templates/game Message-ID: <20070704104707.167DB7C0022@liste.uludag.org.tr> Author: ahmet Date: Wed Jul 4 13:47:06 2007 New Revision: 426 Modified: trunk/media/img/sidebar_download.png trunk/st/views.py trunk/templates/game/game_detail.html Log: some fixes Modified: trunk/media/img/sidebar_download.png ================================================================= Binary files. No diff available. Modified: trunk/st/views.py ================================================================= --- trunk/st/views.py (original) +++ trunk/st/views.py Wed Jul 4 13:47:06 2007 @@ -38,6 +38,8 @@ game = get_object_or_404(Game, slug=slug) tags = game.tags.all() videos = game.videos.all() + for video in videos: + video.name = path.splitext(video.file)[0].split('/')[2] licenses = game.license.all() game.avg = ((game.gameplay+game.graphics+game.sound+game.scenario+game.atmosphere)/5.0) return render_response(request, 'game/game_detail.html', locals()) Modified: trunk/templates/game/game_detail.html ================================================================= --- trunk/templates/game/game_detail.html (original) +++ trunk/templates/game/game_detail.html Wed Jul 4 13:47:06 2007 @@ -52,7 +52,7 @@ {% if videos %}

?lgili Videolar

- + {% endif %}

Yazar

From oi-commits at pardus.org.tr Wed Jul 4 14:18:20 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 4 Jul 2007 14:18:20 +0300 (EEST) Subject: [Oi-commits] r427 - in trunk/templates: . user Message-ID: <20070704111820.8490D7C0022@liste.uludag.org.tr> Author: ahmet Date: Wed Jul 4 14:18:20 2007 New Revision: 427 Removed: trunk/templates/user/homepage_sidebar.html Modified: trunk/templates/base.html Log: Ertesi g?n gazetelerin 3. sayfas?nda yazacaklar: Yapt??? de?i?iklikleri denemeden depoya komit eden Eren T?rkay'?n evine gelen ??pheli paketin i?inden bomba yerine o g?ne kadar yapt??? komitlerin hepsi diff olarak ??kt?. Paketi kimin b?rakt??? ?zerine yo?unla?an g?venlik g??leri Eren'in ?al??ma arkada?lar?ndan ??pheleniyorlar. Modified: trunk/templates/base.html ================================================================= --- trunk/templates/base.html (original) +++ trunk/templates/base.html Wed Jul 4 14:18:20 2007 @@ -46,7 +46,17 @@ {% block sidebartop %}

Kullan?c? Kutusu

{% endblock %} @@ -65,4 +75,4 @@

Hakk?nda Takip et Hata raporla

{% for package in packages %}

Paket: {{ package.name }}

{% endfor %} @@ -22,7 +22,7 @@

{% for game in games %}

Oyun: {{ game.title }}

{% endfor %} @@ -31,7 +31,7 @@

{% for fs in fss %}

?lk ad?m: {{ fs.title }}

{% endfor %} From oi-commits at pardus.org.tr Wed Jul 4 14:58:51 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 4 Jul 2007 14:58:51 +0300 (EEST) Subject: [Oi-commits] r431 - trunk/media/css Message-ID: <20070704115851.A18E57C0026@liste.uludag.org.tr> Author: ahmet Date: Wed Jul 4 14:58:51 2007 New Revision: 431 Modified: trunk/media/css/style.css Log: anasayfas?n?g?zelle?tiremediklerimizdenmisiniz? Modified: trunk/media/css/style.css ================================================================= --- trunk/media/css/style.css (original) +++ trunk/media/css/style.css Wed Jul 4 14:58:51 2007 @@ -567,7 +567,7 @@ margin-top: 10px; } -.news_title a { +.news_title, .news_title a { color: #ffffff; text-decoration: none; } @@ -590,7 +590,7 @@ width: 280px; } -.packages_title a { +.packages_title, .packages_title a { color: #ffffff; text-decoration: none; } @@ -613,7 +613,7 @@ width: 280px; } -.games_title a { +.games_title, .games_title a { color: #ffffff; text-decoration: none; } @@ -636,7 +636,7 @@ width: 280px; } -.fss_title a { +.fss_title, .fss_title a { color: #ffffff; text-decoration: none; } From oi-commits at pardus.org.tr Wed Jul 4 16:02:22 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 4 Jul 2007 16:02:22 +0300 (EEST) Subject: [Oi-commits] r432 - in trunk: . media/img Message-ID: <20070704130222.26FEB7C002B@liste.uludag.org.tr> Author: ahmet Date: Wed Jul 4 16:02:21 2007 New Revision: 432 Modified: trunk/media/img/planet_header_logo.png trunk/urls.py Log: Ali istedi. Modified: trunk/media/img/planet_header_logo.png ================================================================= Binary files. No diff available. Modified: trunk/urls.py ================================================================= --- trunk/urls.py (original) +++ trunk/urls.py Wed Jul 4 16:02:21 2007 @@ -57,19 +57,19 @@ urlpatterns = patterns('', #News - (r'^haber/$', 'django.views.generic.list_detail.object_list', dict(news_dict, page=1)), + (r'^haber/$', 'django.views.generic.simple.redirect_to', {'url': "sayfa/1/"}), (r'^haber/sayfa/(?P[0-9]+)/$', 'django.views.generic.list_detail.object_list', dict(news_dict)), (r'^haber/(?P.*)/yazdir/$', 'oi.st.views.news_printable'), (r'^haber/(?P.*)/$', 'oi.st.views.news_detail'), #Packages - (r'^paket/$', 'django.views.generic.list_detail.object_list', dict(package_dict, page=1)), + (r'^paket/$', 'django.views.generic.simple.redirect_to', {'url': "sayfa/1/"}), (r'^paket/sayfa/(?P[0-9]+)/$', 'django.views.generic.list_detail.object_list', dict(package_dict)), (r'^paket/(?P.*)/yazdir/$', 'oi.st.views.pkg_printable'), (r'^paket/(?P.*)/$', 'oi.st.views.pkg_detail'), #User management - (r'^kullanici/liste/$', 'django.views.generic.list_detail.object_list', dict(user_dict, page=1)), + (r'^kullanici/liste/$', 'django.views.generic.simple.redirect_to', {'url': "sayfa/1/"}), (r'^kullanici/liste/sayfa/(?P[0-9]+)/$', 'django.views.generic.list_detail.object_list', dict(user_dict)), (r'^kullanici/giris/$', 'django.contrib.auth.views.login', {'template_name': 'user/login.html'}), (r'^kullanici/cikis/$', 'django.contrib.auth.views.logout', {'template_name': 'user/logout.html'}), @@ -81,19 +81,19 @@ (r'^kullanici/(?P[\w-]+)/$', 'oi.profile.views.user_profile'), #First Steps - (r'^ia/$', 'django.views.generic.list_detail.object_list', dict(fs_dict, page=1)), + (r'^ia/$', 'django.views.generic.simple.redirect_to', {'url': "sayfa/1/"}), (r'^ia/sayfa/(?P[0-9]+)/$', 'django.views.generic.list_detail.object_list', dict(fs_dict)), (r'^ia/(?P.*)/yazdir/$', 'oi.st.views.fs_printable'), (r'^ia/(?P.*)/$', 'oi.st.views.fs_detail'), #Games - (r'^oyun/$', 'django.views.generic.list_detail.object_list', dict(game_dict, page=1)), + (r'^oyun/$', 'django.views.generic.simple.redirect_to', {'url': "sayfa/1/"}), (r'^oyun/sayfa/(?P[0-9]+)/$', 'django.views.generic.list_detail.object_list', dict(game_dict)), (r'^oyun/(?P.*)/yazdir/$', 'oi.st.views.game_printable'), (r'^oyun/(?P.*)/$', 'oi.st.views.game_detail'), #Tags - (r'^etiket/$', 'django.views.generic.list_detail.object_list', dict(tag_dict, page=1)), + (r'^etiket/$', 'django.views.generic.simple.redirect_to', {'url': "sayfa/1/"}), (r'^etiket/sayfa/(?P[0-9]+)/$', 'django.views.generic.list_detail.object_list', dict(tag_dict)), (r'^etiket/(?P.*)/$', 'oi.st.views.tag_detail'), From turkay.eren at gmail.com Wed Jul 4 16:08:16 2007 From: turkay.eren at gmail.com (Eren =?ISO-8859-9?B?VPxya2F5?=) Date: Wed, 4 Jul 2007 16:08:16 +0300 Subject: [Oi-commits] r432 - in trunk: . media/img In-Reply-To: <20070704130222.26FEB7C002B@liste.uludag.org.tr> References: <20070704130222.26FEB7C002B@liste.uludag.org.tr> Message-ID: <20070704160816.fbacdc0c.turkay.eren@gmail.com> On Wed, 4 Jul 2007 16:02:22 +0300 (EEST) oi-commits at pardus.org.tr wrote: > Modified: > trunk/media/img/planet_header_logo.png > trunk/urls.py > Log: > Ali istedi. "Linux itself is a hack"i kabul etmiyoduk hani? ;P 2 haftad?r ba??r?yom bunun i?in, ?imdi mi yap?yonuz :P From ahmet at pardusman.org Wed Jul 4 16:15:58 2007 From: ahmet at pardusman.org (Ahmet =?iso-8859-9?q?AYG=DCN?=) Date: Wed, 4 Jul 2007 16:15:58 +0300 Subject: [Oi-commits] r432 - in trunk: . media/img In-Reply-To: <20070704160816.fbacdc0c.turkay.eren@gmail.com> References: <20070704130222.26FEB7C002B@liste.uludag.org.tr> <20070704160816.fbacdc0c.turkay.eren@gmail.com> Message-ID: <200707041616.01889.ahmet@pardusman.org> On Wednesday 04 July 2007 16:08:16 Eren T?rkay wrote: > "Linux itself is a hack"i kabul etmiyoduk hani? ;P Hala etmiyorum. > 2 haftad?r ba??r?yom bunun i?in, ?imdi mi yap?yonuz :P Hala yanl?? y?ntem oldu?unu savunuyorum. -- Ahmet AYG?N - ahmet~pardusman.org -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part. Url : http://liste.pardus.org.tr/oi-commits/attachments/20070704/133fbdc3/attachment-0001.pgp From oi-commits at pardus.org.tr Wed Jul 4 16:14:35 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 4 Jul 2007 16:14:35 +0300 (EEST) Subject: [Oi-commits] r433 - trunk Message-ID: <20070704131436.04EFA7C0026@liste.uludag.org.tr> Author: ahmet Date: Wed Jul 4 16:14:35 2007 New Revision: 433 Modified: trunk/TODO Log: aa Modified: trunk/TODO ================================================================= --- trunk/TODO (original) +++ trunk/TODO Wed Jul 4 16:14:35 2007 @@ -22,6 +22,7 @@ - avatar support / lost password support +- Find a better way of pagination stuff - FreeComment support for news (also maybe packages, games etc.) - CSS optimizations - Statistic tool for entire web site From oi-commits at pardus.org.tr Wed Jul 4 17:07:13 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 4 Jul 2007 17:07:13 +0300 (EEST) Subject: [Oi-commits] r434 - in trunk: templates/file_upload upload Message-ID: <20070704140713.1F0807C0026@liste.uludag.org.tr> Author: ahmet Date: Wed Jul 4 17:07:12 2007 New Revision: 434 Modified: trunk/templates/file_upload/file_upload_success.html trunk/upload/views.py Log: d?zelt Modified: trunk/templates/file_upload/file_upload_success.html ================================================================= --- trunk/templates/file_upload/file_upload_success.html (original) +++ trunk/templates/file_upload/file_upload_success.html Wed Jul 4 17:07:12 2007 @@ -18,6 +18,6 @@ -

{{ site_url }}upload/image/{{ filename }}

/media/upload/image/{{ filename }}

\ No newline at end of file Modified: trunk/upload/views.py ================================================================= --- trunk/upload/views.py (original) +++ trunk/upload/views.py Wed Jul 4 17:07:12 2007 @@ -31,7 +31,7 @@ if not errors: if not path.exists(MEDIA_ROOT + "upload/image/" + new_data['file_file']['filename']): manipulator.save(new_data) - return render_to_response('file_upload/file_upload_success.html', {'filename': new_data['file_file']['filename'], 'site_url': MEDIA_URL}) + return render_to_response('file_upload/file_upload_success.html', {'filename': new_data['file_file']['filename']}) else: return render_to_response('file_upload/file_upload.html', {'form': form, 'errors': errors}) errors = new_data = {} From oi-commits at pardus.org.tr Wed Jul 4 17:16:02 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 4 Jul 2007 17:16:02 +0300 (EEST) Subject: [Oi-commits] r435 - trunk/media/img Message-ID: <20070704141602.9BE927C0026@liste.uludag.org.tr> Author: ahmet Date: Wed Jul 4 17:16:02 2007 New Revision: 435 Modified: trunk/media/img/logo.png trunk/media/img/planet_header_bg.png Log: logo beyaz, beyaz logo, lo go be yaz, be yaz lo go Modified: trunk/media/img/logo.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/planet_header_bg.png ================================================================= Binary files. No diff available. From oi-commits at pardus.org.tr Wed Jul 4 17:33:17 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 4 Jul 2007 17:33:17 +0300 (EEST) Subject: [Oi-commits] r436 - trunk/feedjack/bin Message-ID: <20070704143317.407A07C0026@liste.uludag.org.tr> Author: ahmet Date: Wed Jul 4 17:33:16 2007 New Revision: 436 Modified: trunk/feedjack/bin/feedjack_update.py Log: g?ncelle Modified: trunk/feedjack/bin/feedjack_update.py ================================================================= --- trunk/feedjack/bin/feedjack_update.py (original) +++ trunk/feedjack/bin/feedjack_update.py Wed Jul 4 17:33:16 2007 @@ -17,7 +17,7 @@ import feedparser -VERSION = '0.9.9' +VERSION = '0.9.10' URL = 'http://www.feedjack.org/' USER_AGENT = 'Feedjack %s - %s' % (VERSION, URL) @@ -38,10 +38,10 @@ """ return datetime.datetime.fromtimestamp(time.mktime(ttime)) -def get_tags(entry, tagdict): +def get_tags(entry): """ Returns a list of tag objects from an entry. """ - from oi.feedjack import models + from feedjack import models fcat = [] if entry.has_key('tags'): @@ -59,16 +59,16 @@ tagname = zcat.lower() while ' ' in tagname: tagname = tagname.replace(' ', ' ') + tagname = tagname.strip() if not tagname or tagname == ' ': continue - if tagname not in tagdict: + if not models.Tag.objects.filter(name=tagname): cobj = models.Tag(name=tagname) cobj.save() - tagdict[tagname] = cobj - fcat.append(tagdict[tagname]) + fcat.append(models.Tag.objects.get(name=tagname)) return fcat -def get_entry_data(entry, feed, tagdict): +def get_entry_data(entry, feed): """ Retrieves data from a post and returns it in a tuple. """ try: @@ -91,30 +91,30 @@ author = encode(entry.get('author', entry.get('creator', ''))) if not author_email: author_email = 'nospam at nospam.com' - + try: content = encode(entry.content[0].value) except: content = encode(entry.get('summary', entry.get('description', ''))) - + if entry.has_key('modified_parsed'): date_modified = mtime(entry.modified_parsed) else: date_modified = None - fcat = get_tags(entry, tagdict) + fcat = get_tags(entry) comments = encode(entry.get('comments', '')) return (link, title, guid, author, author_email, content, date_modified, \ fcat, comments) -def process_entry(entry, fpf, feed, postdict, tagdict, options): +def process_entry(entry, fpf, feed, postdict, options): """ Process a post in a feed and saves it in the DB if necessary. """ - from oi.feedjack import models + from feedjack import models (link, title, guid, author, author_email, content, date_modified, fcat, \ - comments) = get_entry_data(entry, feed, tagdict) + comments) = get_entry_data(entry, feed) if options.verbose: print 'entry:' @@ -169,15 +169,15 @@ tobj.save() [tobj.tags.add(tcat) for tcat in fcat] -def process_feed(feed, tagdict, options): +def process_feed(feed, options): """ Downloads and parses a feed. """ - from oi.feedjack import models + from feedjack import models if options.verbose: - print '#\n# Processing feed:', feed.feed_url, '\n#' + print '#\n# Processing feed (%d):' % feed.id, feed.feed_url, '\n#' else: - print '# Processing feed:', feed.feed_url + print '# Processing feed (%d):' % feed.id, feed.feed_url # we check the etag and the modified time to save bandwith and avoid bans try: @@ -240,7 +240,7 @@ for entry in fpf.entries: try: - process_entry(entry, fpf, feed, postdict, tagdict, options) + process_entry(entry, fpf, feed, postdict, options) except: (etype, eobj, etb) = sys.exc_info() print '! -------------------------' @@ -252,15 +252,15 @@ return 0 -def update_feeds(tagdict, options): +def update_feeds(options): """ Updates all active feeds. """ - from oi.feedjack import models + from feedjack import models #for feed in models.Feed.objects.filter(is_active=True).iterator(): for feed in models.Feed.objects.filter(is_active=True): try: - process_feed(feed, tagdict, options) + process_feed(feed, options) except: (etype, eobj, etb) = sys.exc_info() print '! -------------------------' @@ -286,8 +286,7 @@ if options.settings: os.environ["DJANGO_SETTINGS_MODULE"] = options.settings - from oi.feedjack import models, fjcache - tagdict = dict([(tag.name, tag) for tag in models.Tag.objects.all()]) + from feedjack import models, fjcache # settting socket timeout (default= 10 seconds) socket.setdefaulttimeout(options.timeout) @@ -295,7 +294,7 @@ if options.feed: for feed in options.feed: try: - process_feed(models.Feed.objects.get(pk=feed), tagdict, options) + process_feed(models.Feed.objects.get(pk=feed), options) except models.Feed.DoesNotExist: print '! Unknown feed id: ', feed elif options.site: @@ -304,11 +303,11 @@ models.Site.objects.get(pk=int(options.site)).subscriber_set.all()] for feed in feeds: try: - process_feed(feed, tagdict, options) + process_feed(feed, options) except models.Feed.DoesNotExist: print '! Unknown site id: ', feed else: - update_feeds(tagdict, options) + update_feeds(options) # removing the cached data in all sites, this will only work with the # memcached, db and file backends From oi-commits at pardus.org.tr Wed Jul 4 17:34:04 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 4 Jul 2007 17:34:04 +0300 (EEST) Subject: [Oi-commits] r437 - trunk/feedjack/bin Message-ID: <20070704143404.8E52D7C0026@liste.uludag.org.tr> Author: ahmet Date: Wed Jul 4 17:34:04 2007 New Revision: 437 Modified: trunk/feedjack/bin/feedjack_update.py Log: d?zel Modified: trunk/feedjack/bin/feedjack_update.py ================================================================= --- trunk/feedjack/bin/feedjack_update.py (original) +++ trunk/feedjack/bin/feedjack_update.py Wed Jul 4 17:34:04 2007 @@ -41,7 +41,7 @@ def get_tags(entry): """ Returns a list of tag objects from an entry. """ - from feedjack import models + from oi.feedjack import models fcat = [] if entry.has_key('tags'): @@ -111,7 +111,7 @@ def process_entry(entry, fpf, feed, postdict, options): """ Process a post in a feed and saves it in the DB if necessary. """ - from feedjack import models + from oi.feedjack import models (link, title, guid, author, author_email, content, date_modified, fcat, \ comments) = get_entry_data(entry, feed) @@ -172,7 +172,7 @@ def process_feed(feed, options): """ Downloads and parses a feed. """ - from feedjack import models + from oi.feedjack import models if options.verbose: print '#\n# Processing feed (%d):' % feed.id, feed.feed_url, '\n#' @@ -255,7 +255,7 @@ def update_feeds(options): """ Updates all active feeds. """ - from feedjack import models + from oi.feedjack import models #for feed in models.Feed.objects.filter(is_active=True).iterator(): for feed in models.Feed.objects.filter(is_active=True): @@ -286,7 +286,7 @@ if options.settings: os.environ["DJANGO_SETTINGS_MODULE"] = options.settings - from feedjack import models, fjcache + from oi.feedjack import models, fjcache # settting socket timeout (default= 10 seconds) socket.setdefaulttimeout(options.timeout) From oi-commits at pardus.org.tr Thu Jul 5 14:26:30 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 5 Jul 2007 14:26:30 +0300 (EEST) Subject: [Oi-commits] r438 - trunk/st Message-ID: <20070705112630.D0ADC7C001B@liste.uludag.org.tr> Author: ahmet Date: Thu Jul 5 14:26:30 2007 New Revision: 438 Modified: trunk/st/models.py Log: gereksiz Modified: trunk/st/models.py ================================================================= --- trunk/st/models.py (original) +++ trunk/st/models.py Thu Jul 5 14:26:30 2007 @@ -266,7 +266,7 @@ list_filter = ['date'] ordering = ['-date'] search_fields = ['title', 'author', 'text'] - js = ("js/tinymce/tiny_mce.js", "js/tinymce/textareas.js", "js/getElementsBySelector.js", "js/filebrowser/AddFileBrowser.js",) + js = ("js/tinymce/tiny_mce.js", "js/tinymce/textareas.js") class Meta: verbose_name = "Haber" @@ -354,4 +354,4 @@ class Meta: verbose_name = "Pardus Yans?s?" - verbose_name_plural = "Pardus Yans?lar?" \ No newline at end of file + verbose_name_plural = "Pardus Yans?lar?" From oi-commits at pardus.org.tr Thu Jul 5 22:29:42 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 5 Jul 2007 22:29:42 +0300 (EEST) Subject: [Oi-commits] r439 - trunk/templates/tag Message-ID: <20070705192942.AAD957C0032@liste.uludag.org.tr> Author: havan Date: Thu Jul 5 22:29:42 2007 New Revision: 439 Modified: trunk/templates/tag/tag_detail.html Log: a?a??da de?il yukar?da de (tag template) Modified: trunk/templates/tag/tag_detail.html ================================================================= --- trunk/templates/tag/tag_detail.html (original) +++ trunk/templates/tag/tag_detail.html Thu Jul 5 22:29:42 2007 @@ -145,6 +145,6 @@ {% endfor %}

{% endif %} -

'{{ tag|escape }}' etiketli i?erik a?a??da listelenmektedir,
g?rmek istedi?iniz i?erik t?r?n?n (Oyun, Paket, ?lk ad?m, vb.) ?zerine t?klay?n.

'{{ tag|escape }}' etiketli i?erik yukar?da listelenmektedir,
g?rmek istedi?iniz i?erik t?r?n?n (Oyun, Paket, ?lk ad?m, vb.) ?zerine t?klay?n.

{% endblock %} From oi-commits at pardus.org.tr Sun Jul 8 14:19:04 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sun, 8 Jul 2007 14:19:04 +0300 (EEST) Subject: [Oi-commits] r440 - trunk Message-ID: <20070708111904.6DDB77C0025@liste.uludag.org.tr> Author: ahmet Date: Sun Jul 8 14:19:04 2007 New Revision: 440 Added: trunk/AUTHORS trunk/COPYING trunk/README Log: L?ker'i k?raca??ma kafam? k?rar?m daha iyi. From oi-commits at pardus.org.tr Thu Jul 12 22:59:12 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 12 Jul 2007 22:59:12 +0300 (EEST) Subject: [Oi-commits] r441 - trunk Message-ID: <20070712195912.265827C0043@liste.uludag.org.tr> Author: erenturkay Date: Thu Jul 12 22:59:11 2007 New Revision: 441 Modified: trunk/README Log: PIL ve database de gerekli :) Modified: trunk/README ================================================================= --- trunk/README (original) +++ trunk/README Thu Jul 12 22:59:11 2007 @@ -3,7 +3,11 @@ Apache Web Server mod_python Django + Python Imaging Library (PIL) +Optional (For databases, we recommend MySQL) + MySQL + Sqlite Setup: 1. edit settings.py @@ -12,4 +16,4 @@ 4. run 'chmod 777 -R media/upload' 5. copy htaccess file into the web directory as .htaccess and edit it. - 6. restart apache and go to WEB_URL/admin \ No newline at end of file + 6. restart apache and go to WEB_URL/admin From oi-commits at pardus.org.tr Thu Jul 12 23:14:07 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 12 Jul 2007 23:14:07 +0300 (EEST) Subject: [Oi-commits] r442 - trunk Message-ID: <20070712201407.78B527C0042@liste.uludag.org.tr> Author: erenturkay Date: Thu Jul 12 23:14:07 2007 New Revision: 442 Modified: trunk/TODO Log: bunu da ekleyelim, yar?n ofiste hallederiz. Bu arada svn'den kald?rd??m?z image resize patchi upstream'dan kabul edildi :P http://groups.google.com/group/feedjack/t/d8246dfd4b0d2e37 Modified: trunk/TODO ================================================================= --- trunk/TODO (original) +++ trunk/TODO Thu Jul 12 23:14:07 2007 @@ -22,6 +22,8 @@ - avatar support / lost password support +- Add original image link support for feedjack, when user clicks resized image, original image should be showed + - Find a better way of pagination stuff - FreeComment support for news (also maybe packages, games etc.) - CSS optimizations From oi-commits at pardus.org.tr Fri Jul 13 14:45:06 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 13 Jul 2007 14:45:06 +0300 (EEST) Subject: [Oi-commits] r443 - in trunk: . st templates/feeds Message-ID: <20070713114506.7BB667C004B@liste.uludag.org.tr> Author: erenturkay Date: Fri Jul 13 14:45:06 2007 New Revision: 443 Added: trunk/st/feeds.py Modified: trunk/templates/feeds/rss_description.html trunk/urls.py Log: rss deste?imiz gelsin :) Modified: trunk/templates/feeds/rss_description.html ================================================================= --- trunk/templates/feeds/rss_description.html (original) +++ trunk/templates/feeds/rss_description.html Fri Jul 13 14:45:06 2007 @@ -1 +1 @@ -{{ obj.content }} +{{ obj.sum }} Modified: trunk/urls.py ================================================================= --- trunk/urls.py (original) +++ trunk/urls.py Fri Jul 13 14:45:06 2007 @@ -11,6 +11,7 @@ from oi.settings import WEB_URL, DOCUMENT_ROOT, USER_PER_PAGE, PACKAGE_PER_PAGE, GAME_PER_PAGE, FS_PER_PAGE, NEWS_PER_PAGE, TAG_PER_PAGE from oi.st.models import Package, Game, FS, News, Tag from oi.seminar.models import Seminar +from oi.st.feeds import RssMainFeed user_dict = { 'queryset': User.objects.all().order_by('name'), @@ -55,6 +56,10 @@ 'template_object_name': 'tag' } +feed_dict = { + 'rss': RssMainFeed, + } + urlpatterns = patterns('', #News (r'^haber/$', 'django.views.generic.simple.redirect_to', {'url': "sayfa/1/"}), @@ -116,6 +121,9 @@ #Gezegen (r'^gezegen/', include('oi.feedjack.urls')), + #Feeds + (r'^feeds/(?P.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feed_dict}), + #FIXME: Delete this when development ends (r'^test/$', 'oi.st.views.test'), @@ -124,4 +132,4 @@ (r'^admin/upload/image/add/$', 'oi.upload.views.image_upload'), (r'^admin/', include('django.contrib.admin.urls')), (r'^media/(.*)$', 'django.views.static.serve', {'document_root': '%s/media' % DOCUMENT_ROOT, 'show_indexes': True}), -) \ No newline at end of file +) From oi-commits at pardus.org.tr Fri Jul 13 14:52:15 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 13 Jul 2007 14:52:15 +0300 (EEST) Subject: [Oi-commits] r444 - trunk/templates/feeds Message-ID: <20070713115215.8DB8B864003@liste.uludag.org.tr> Author: erenturkay Date: Fri Jul 13 14:52:15 2007 New Revision: 444 Modified: trunk/templates/feeds/rss_title.html Log: d?zeltmeler, model standart olmad??? i?in oyunlar?n ve paketlerin name ethodu mevcut, di?erlerinin sadece title Modified: trunk/templates/feeds/rss_title.html ================================================================= --- trunk/templates/feeds/rss_title.html (original) +++ trunk/templates/feeds/rss_title.html Fri Jul 13 14:52:15 2007 @@ -1 +1,7 @@ +{% if obj.title %} {{ obj.title }} +{% endif %} + +{% if obj.name %} +{{ obj.name }} +{% endif %} From oi-commits at pardus.org.tr Fri Jul 13 15:03:16 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 13 Jul 2007 15:03:16 +0300 (EEST) Subject: [Oi-commits] r445 - in trunk: st templates Message-ID: <20070713120317.0AB0E7C004C@liste.uludag.org.tr> Author: erenturkay Date: Fri Jul 13 15:03:16 2007 New Revision: 445 Modified: trunk/st/feeds.py trunk/templates/base.html Log: anasayfada rss oldu?u belli olsun Modified: trunk/st/feeds.py ================================================================= --- trunk/st/feeds.py (original) +++ trunk/st/feeds.py Fri Jul 13 15:03:16 2007 @@ -11,7 +11,7 @@ class RssMainFeed(Feed): title = '?zg?rl?k??

Kullan?c? ad?:	{{ form.username }}
Parola:	{{ form.password }}