+
+
+
+
+
+
{% endfor %}
{% endblock %}
From oi-commits at pardus.org.tr Sat Dec 8 20:43:37 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Sat, 8 Dec 2007 20:43:37 +0200 (EET)
Subject: [Oi-commits] r623 - in trunk: . media/upload/sanat
media/upload/sanat/dosya media/upload/sanat/images sanat
sanat/templatetags
Message-ID: <20071208184337.99E0E86436D@liste.uludag.org.tr>
Author: dkurov
Date: Sat Dec 8 20:43:37 2007
New Revision: 623
Added:
trunk/media/upload/sanat/
trunk/media/upload/sanat/dosya/
trunk/media/upload/sanat/dosya/xss_helpphp.zip (contents, props changed)
trunk/media/upload/sanat/images/
trunk/media/upload/sanat/images/Wallpaper.jpg (contents, props changed)
trunk/media/upload/sanat/images/Wallpaper_t_w100_h100.jpg (contents, props changed)
trunk/media/upload/sanat/images/original.jpg (contents, props changed)
trunk/media/upload/sanat/images/original_t_w100_h100.jpg (contents, props changed)
trunk/sanat/signals.py
trunk/sanat/templatetags/
trunk/sanat/templatetags/__init__.py
trunk/sanat/templatetags/thumbman.py
trunk/sanat/urls.py
trunk/sanat/utils.py
trunk/silici.sh
Modified:
trunk/sanat/models.py
trunk/settings.py
Log:
Pardus tema has admin part, handles the thumb thing of the screenshots,ready to be displayed
Modified: trunk/sanat/models.py
=================================================================
--- trunk/sanat/models.py (original)
+++ trunk/sanat/models.py Sat Dec 8 20:43:37 2007
@@ -5,9 +5,14 @@
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/copyleft/gpl.txt.
+#Requires..
from django.db import models
from django.contrib.auth.models import User
-from oi.st.models import ScreenShot
+from oi.st.models import License
+from django.db.models import signals
+from django.dispatch import dispatcher
+from oi.sanat.signals import rm_thumb,crt_thumb
+
# Create your models here.
@@ -19,7 +24,7 @@
cat_name=models.CharField(max_length=100,verbose_name="Kategori ad?",unique=True)
#if they are nested it is needed
slug=models.SlugField(verbose_name="SEF Ba?l?k",prepopulate_from=("cat_name",))
- parent_id=models.IntegerField(verbose_name="Ebeveyn Kategori",default=0,choices=self.get_possible_parents())
+ parent_id=models.IntegerField(verbose_name="Ebeveyn Kategori",default=0)
update=models.DateField(auto_now=True,verbose_name="Yay?n Tarihi")
def __str__(self):
@@ -31,22 +36,22 @@
def get_parent_choice(self):
"""Get the current parent category of the model"""
return self.parent_id
-
- def get_possible_parents(self):
+
+ def get_possible_parents(self,cls):
""" To have the choices in admin.."""
temp=[(0,"Kendisi")]
- choices=Category.objects.exclude(cat_name=self.cat_name)
+ choices=cls.objects.all()
if choices:
- for i in choces:
+ for i in choices:
temp.append((i.id,i.cat_name))
#getting the final value
return tuple(choices)
-
-
+ #get_possible_parents=staticmethod(get_possible_parents)
+
class Admin:
list_display = ('cat_name','parent_id','update')
@@ -58,17 +63,30 @@
verbose_name="Kategori"
verbose_name_plural="Kategoriler"
-class SanatScreen(ScreenShot):
+
+
+
+
+class SanatScreen(models.Model):
"It is modified version because we should change the upload directory ???"
- file=models.FileField(upload_to="upload/sanat/images/",default="default.jpg")
+ file=models.FileField(upload_to="upload/sanat/images/",blank=True)
class Meta:
verbose_name="Sanat G?r?nt?"
verbose_name_plural="Sanat G?r?nt?"
+ def __str__(self):
+ return self.file
+
class Admin:
+
pass
+
+# when we add or delete a thumb it is needed
+dispatcher.connect(crt_thumb,signal=signals.post_save, sender=SanatScreen)
+dispatcher.connect(rm_thumb,signal=signals.post_delete, sender=SanatScreen)
+
class ArsivDosya(models.Model):
""" The data file that includes the archives for templates and etc"""
@@ -82,21 +100,13 @@
class Dosya(models.Model):
""" The catual file that will be downloaded and shown"""
- RATE_CHOICES=(
- ('0','Yok'),
- ('1','K?t?'),
- ('2','Orta'),
- ('3','?yi'),
- ('4','?ok iyi'),
- ('5','S?per'),
- )
parent_cat=models.ForeignKey(Category,verbose_name="Kategori")
- licence=models.ForeignKey(Lisans,verbose_name="Lisans")
+ licence=models.ForeignKey(License,verbose_name="Lisans")
user=models.ForeignKey(User,verbose_name="G?nderen")
- screens=models.ManyToManyField(SanatScreen,verbose_name="G?r?nt?ler")
- file_data=models.ManyToManyField(ArsivDosya,verbose_name="??erik Dosyas?")
+ screens=models.ManyToManyField(SanatScreen,verbose_name="G?r?nt?ler",blank=True)
+ file_data=models.ManyToManyField(ArsivDosya,verbose_name="??erik Dosyas?",blank=True)
name=models.CharField(max_length=100,unique=True,verbose_name="Dosya ismi")
description=models.TextField(verbose_name="A??klama")
@@ -116,11 +126,11 @@
list_display=('name','rate','state','counter','update','parent_cat')
search_fields=['name','parent_cat']
list_filter=['update']
- ordering
+ ordering=['-update']
class Meta:
- ordering=('-update')
+
verbose_name="Sanat Dosya"
verbose_name_plural="Sanat Dosyalar?"
Modified: trunk/settings.py
=================================================================
--- trunk/settings.py (original)
+++ trunk/settings.py Sat Dec 8 20:43:37 2007
@@ -129,6 +129,7 @@
'oi.seminar',
'oi.profile',
'oi.forum',
+ 'oi.sanat',
)
CITY_LIST = (
From oi-commits at pardus.org.tr Sat Dec 8 20:50:20 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Sat, 8 Dec 2007 20:50:20 +0200 (EET)
Subject: [Oi-commits] r624 - in trunk/media/upload/sanat: dosya images
Message-ID: <20071208185020.CF9F086436D@liste.uludag.org.tr>
Author: dkurov
Date: Sat Dec 8 20:50:20 2007
New Revision: 624
Removed:
trunk/media/upload/sanat/dosya/xss_helpphp.zip
trunk/media/upload/sanat/images/Wallpaper.jpg
trunk/media/upload/sanat/images/Wallpaper_t_w100_h100.jpg
trunk/media/upload/sanat/images/original.jpg
trunk/media/upload/sanat/images/original_t_w100_h100.jpg
Log:
Remove the files we dont need
From oi-commits at pardus.org.tr Wed Dec 12 16:55:38 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Wed, 12 Dec 2007 16:55:38 +0200 (EET)
Subject: [Oi-commits] r625 - in trunk: . sanat sanat/templatetags
templates/sanat
Message-ID: <20071212145538.5BE0A864D60@liste.uludag.org.tr>
Author: dkurov
Date: Wed Dec 12 16:55:38 2007
New Revision: 625
Added:
trunk/sanat/sanat_settings.py
trunk/templates/sanat/
trunk/templates/sanat/file_detail.html
trunk/templates/sanat/kategori.html
trunk/templates/sanat/main.html
Modified:
trunk/sanat/models.py
trunk/sanat/templatetags/thumbman.py
trunk/sanat/urls.py
trunk/sanat/views.py
trunk/urls.py
Log:
Tema pardus main page listing, user listing, detail listing finished
Modified: trunk/sanat/models.py
=================================================================
--- trunk/sanat/models.py (original)
+++ trunk/sanat/models.py Wed Dec 12 16:55:38 2007
@@ -31,7 +31,7 @@
return self.cat_name
def get_absolute_url(self):
- return "/sanat/kategori/%s/"%(self.slug)
+ return "/tema/kategori/%s/"%(self.slug)
def get_parent_choice(self):
"""Get the current parent category of the model"""
@@ -120,7 +120,7 @@
return self.name
def get_absolute_url(self):
- return "/sanat/dosya/%s/"%(self.id)
+ return "/tema/dosya/%s/"%(self.id)
class Admin:
list_display=('name','rate','state','counter','update','parent_cat')
Modified: trunk/sanat/templatetags/thumbman.py
=================================================================
--- trunk/sanat/templatetags/thumbman.py (original)
+++ trunk/sanat/templatetags/thumbman.py Wed Dec 12 16:55:38 2007
@@ -12,7 +12,7 @@
from django import template
from django.template import TemplateSyntaxError
-from nesh.thumbnail.utils import make_thumbnail, get_image_size
+from oi.sanat.utils import make_thumbnail, get_image_size
register = template.Library()
##################################################
## FILTERS ##
@@ -73,9 +73,8 @@
#
if ('width' not in kwargs) and ('height' not in kwargs):
- kwargs['width']=DEFAULT_WIDTH
+ kwargs['width']=DEFAULT_WIDTH
kwargs['height']=DEFAULT_HEIGHT
-
#raise template.TemplateSyntaxError, "thumbnail filter requires arguments (width and/or height)"
ret = make_thumbnail(url, **kwargs)
Modified: trunk/sanat/urls.py
=================================================================
--- trunk/sanat/urls.py (original)
+++ trunk/sanat/urls.py Wed Dec 12 16:55:38 2007
@@ -0,0 +1,9 @@
+from django.conf.urls.defaults import *
+
+
+urlpatterns = patterns ('oi.sanat.views',
+ #the first page listing
+ (r'^goster/(?P[a-z]+)/$','list_material'),
+ (r'^kategori/(?P)[a-z]+/$','list_category'),
+ (r'^dosya/(?P)[0-9]+/$','file_detail'),
+)
Modified: trunk/sanat/views.py
=================================================================
--- trunk/sanat/views.py (original)
+++ trunk/sanat/views.py Wed Dec 12 16:55:38 2007
@@ -1 +1,94 @@
# Create your views here.
+from django.views.generic.list_detail import object_list
+from sanat_settings import HOME_ITEMS
+from oi.sanat.models import Dosya,Category
+from django.shortcuts import render_to_response,get_object_or_404
+
+
+def list_material(request,sort_by="son"):
+ """ That view vill show the ones that are submitted and approved by admin
+ sort_by parameter is the part that tells which one will be shown..."""
+
+ valid_sorts=["son","begenilen","indirilen"]
+
+ if request.method == 'GET':
+ if sort_by in valid_sorts:
+
+ if sort_by == "son":
+ sorgu=Dosya.objects.filter(state=True).order_by("update")
+
+ elif sort_by == "begenilen":
+ sorgu=Dosya.objects.filter(state=True).order_by("-rate")
+
+ elif sort_by == "indirilen":
+ sorgu=Dosya.objects.filter(state=True).order_by("-counter")
+
+ params={
+
+ 'queryset':sorgu,
+ 'paginate_by':HOME_ITEMS,
+ 'template_name':'sanat/main.html',
+
+ }
+
+
+ #en son burasi
+ return object_list(request,**params)
+
+
+ else:
+ #not valid option
+ return render_to_response('404.html')
+
+ else :
+ # no way
+ return render_to_response('404.html')
+
+
+def list_category(request,cat_name):
+ """ List the files according to their parent category"""
+ import re
+
+ #hav to thing a little bit about sec
+ x=re.compile(r"([a-z])[a-z\-\_]*([a-z])")
+ res=re.match(x,cat_name.strip())
+
+ #if doesnt pass the test ...
+ if not res:
+ return render_to_response('404.html')
+
+
+ res=Category.objects.filter(slug=cat_name)
+
+ if not res:
+ return render_to_response('404.html')
+
+ sorgu=res[0].dosya_set.all()
+
+ params={
+
+ 'queryset':sorgu,
+ 'paginate_by':HOME_ITEMS,
+ 'template_name':'sanat/main.html',
+
+ }
+
+ return object_list(request,**params)
+
+
+def file_detail(request,file_id):
+ """" Shows the details of the file"""
+
+ #we know it is a int
+ dosya = get_object_or_404(Dosya, pk=file_id)
+
+ return render_to_response('file_detail.html', {'dosya':dosya})
+
+
+def list_user(request,username):
+ """ Lists a users things that he/she uploaded to site"""
+ pass
+
+def add_file(request):
+ """ That one will add a file to the system"""
+ pass
Modified: trunk/urls.py
=================================================================
--- trunk/urls.py (original)
+++ trunk/urls.py Wed Dec 12 16:55:38 2007
@@ -128,6 +128,9 @@
#Planet
(r'^gezegen/', include('oi.feedjack.urls')),
+ #Tema
+ (r'^tema/', include('oi.sanat.urls')),
+
#Django
(r'^$', 'oi.st.views.home'),
(r'^admin/upload/image/add/$', 'oi.upload.views.image_upload'),
From oi-commits at pardus.org.tr Fri Dec 14 13:41:05 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Fri, 14 Dec 2007 13:41:05 +0200 (EET)
Subject: [Oi-commits] r626 - branches/stable/templates
Message-ID: <20071214114105.C20B9864B39@liste.uludag.org.tr>
Author: dkurov
Date: Fri Dec 14 13:41:05 2007
New Revision: 626
Modified:
branches/stable/templates/home.html
Log:
Haberler uste alindi
Modified: branches/stable/templates/home.html
=================================================================
--- branches/stable/templates/home.html (original)
+++ branches/stable/templates/home.html Fri Dec 14 13:41:05 2007
@@ -1,7 +1,16 @@
{% extends "base.html" %}
{% block content %}
-
+
+ {% for new in news %}
+
+ {% endfor %}
+
+
+
{% for fs in fss %}
{% endfor %}
-
-
- {% for new in news %}
-
- {% endfor %}
-
+
+
{% endblock %}
From oi-commits at pardus.org.tr Fri Dec 14 14:08:19 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Fri, 14 Dec 2007 14:08:19 +0200 (EET)
Subject: [Oi-commits] r627 - branches/stable/templates
Message-ID: <20071214120819.EFF9B864B39@liste.uludag.org.tr>
Author: dkurov
Date: Fri Dec 14 14:08:19 2007
New Revision: 627
Modified:
branches/stable/templates/home.html
Log:
Haberler uste alindi insallah
Modified: branches/stable/templates/home.html
=================================================================
--- branches/stable/templates/home.html (original)
+++ branches/stable/templates/home.html Fri Dec 14 14:08:19 2007
@@ -3,18 +3,18 @@
{% block content %}
{% for new in news %}
-
-
-
{{ new.sum }}
+
{% endfor %}
{% for fs in fss %}
-
-
-
{{ fs.sum }}
+
{% endfor %}
From oi-commits at pardus.org.tr Fri Dec 14 14:22:22 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Fri, 14 Dec 2007 14:22:22 +0200 (EET)
Subject: [Oi-commits] r628 - trunk
Message-ID: <20071214122223.08557864B39@liste.uludag.org.tr>
Author: ahmet
Date: Fri Dec 14 14:22:22 2007
New Revision: 628
Modified:
trunk/silici.sh
Log:
silelim
Modified: trunk/silici.sh
=================================================================
--- trunk/silici.sh (original)
+++ trunk/silici.sh Fri Dec 14 14:22:22 2007
@@ -1,14 +1 @@
-rm -f *.pyc
-rm -rf sanat/*.pyc
-rm -rf flatpages/*.pyc
-rm -rf st/*.pyc
-rm -rf sanat/*.pyc
-rm -rf profile/*.pyc
-rm -rf media/*.pyc
-rm -rf feedjack/*.pyc
-rm -rf bug/*.pyc
-rm -rf upload/*.pyc
-rm -rf seminar/*.pyc
-rm -rf middleware/*.pyc
-rm -rf forum/*.pyc
-
+find ./ -iname *.pyc |xargs rm -rfv
From oi-commits at pardus.org.tr Fri Dec 14 15:43:39 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Fri, 14 Dec 2007 15:43:39 +0200 (EET)
Subject: [Oi-commits] r629 - branches/stable/templates
Message-ID: <20071214134339.403FC7C00F8@liste.uludag.org.tr>
Author: dkurov
Date: Fri Dec 14 15:43:38 2007
New Revision: 629
Modified:
branches/stable/templates/base.html
Log:
Fsfs sheyisi
Modified: branches/stable/templates/base.html
=================================================================
--- branches/stable/templates/base.html (original)
+++ branches/stable/templates/base.html Fri Dec 14 15:43:38 2007
@@ -52,6 +52,17 @@
+
+
{% endblock %}
{% block sidebar %}
{% endblock %}
From oi-commits at pardus.org.tr Fri Dec 14 16:10:10 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Fri, 14 Dec 2007 16:10:10 +0200 (EET)
Subject: [Oi-commits] r630 - branches/stable/templates/news
Message-ID: <20071214141010.90D137C00FD@liste.uludag.org.tr>
Author: dkurov
Date: Fri Dec 14 16:10:10 2007
New Revision: 630
Modified:
branches/stable/templates/news/news_main.html
Log:
haberlere fsf sidebar sheyisi
Modified: branches/stable/templates/news/news_main.html
=================================================================
--- branches/stable/templates/news/news_main.html (original)
+++ branches/stable/templates/news/news_main.html Fri Dec 14 16:10:10 2007
@@ -39,4 +39,15 @@
{% endfor %}
{% endif %}
-{% endblock %}
\ No newline at end of file
+
+
+{% endblock %}
From oi-commits at pardus.org.tr Fri Dec 14 19:06:29 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Fri, 14 Dec 2007 19:06:29 +0200 (EET)
Subject: [Oi-commits] r631 - in trunk: . forum templates/forum
Message-ID: <20071214170629.A2C307C00F9@liste.uludag.org.tr>
Author: ahmet
Date: Fri Dec 14 19:06:29 2007
New Revision: 631
Modified:
trunk/forum/models.py
trunk/forum/settings.py
trunk/forum/views.py
trunk/silici.sh
trunk/templates/forum/forum_detail.html
trunk/templates/forum/forum_list.html
trunk/templates/forum/merge.html
trunk/templates/forum/new_topic.html
trunk/templates/forum/reply.html
trunk/templates/forum/topic.html
trunk/urls.py
Log:
Forum giydirme :)
Modified: trunk/forum/models.py
=================================================================
--- trunk/forum/models.py (original)
+++ trunk/forum/models.py Fri Dec 14 19:06:29 2007
@@ -60,6 +60,7 @@
verbose_name = '?leti'
verbose_name_plural = '?letiler'
permissions = (
+ ("can_see_ip", "Can see author ip"),
("can_hide", "Can hide"),
("can_see_hidden_posts", "Can see hidden posts"),
)
Modified: trunk/forum/settings.py
=================================================================
--- trunk/forum/settings.py (original)
+++ trunk/forum/settings.py Fri Dec 14 19:06:29 2007
@@ -6,4 +6,4 @@
# See the file http://www.gnu.org/copyleft/gpl.txt.
TOPICS_PER_PAGE = 20
-FLOOD_TIMEOUT = 30
\ No newline at end of file
+FLOOD_TIMEOUT = 6
\ No newline at end of file
Modified: trunk/forum/views.py
=================================================================
--- trunk/forum/views.py (original)
+++ trunk/forum/views.py Fri Dec 14 19:06:29 2007
@@ -60,7 +60,7 @@
if form.is_valid() and not flood:
post = Post(topic=topic,
author=request.user,
- text=form.cleaned_data['text']
+ text=form.clean_data['text']
)
post.save()
@@ -91,7 +91,7 @@
flood,timeout = flood_control(request)
if form.is_valid() and not flood:
- post.text = form.cleaned_data['text']
+ post.text = form.clean_data['text']
post.edit_count += 1
post.edited = datetime.now()
post.last_edited_by = request.user
@@ -117,13 +117,13 @@
if form.is_valid() and not flood:
topic = Topic(forum=forum,
- title=form.cleaned_data['title']
+ title=form.clean_data['title']
)
topic.save()
post = Post(topic=topic,
author=request.user,
- text=form.cleaned_data['text']
+ text=form.clean_data['text']
)
post.save()
@@ -147,7 +147,7 @@
flood,timeout = flood_control(request)
if form.is_valid() and not flood:
- topic.title = form.cleaned_data['title']
+ topic.title = form.clean_data['title']
topic.topic_latest_post = first_post
topic.save()
@@ -162,30 +162,30 @@
return render_response(request, 'forum/new_topic.html', locals())
- at login_required
-def merge(request, forum_slug, topic_id):
- forum = get_object_or_404(Forum, slug=forum_slug)
- topic = get_object_or_404(Topic, pk=topic_id)
-
- if forum.locked or topic.locked:
- raise HttpResponseServerError #FIXME: Give an error message
-
- if request.method == 'POST':
- form = TopicForm(request.POST.copy())
- flood,timeout = flood_control(request)
-
- if form.is_valid() and not flood:
- topic2 = form.cleaned_data['topic2']
- for post in Post.objects.filter(topic.id=topic.id):
- post.topic.id = topic2.id
-
- topic.delete()
-
- return HttpResponseRedirect(topic2.get_absolute_url())
- else:
- form = MergeForm(auto_id=True)
+#@login_required
+#def merge(request, forum_slug, topic_id):
+ #forum = get_object_or_404(Forum, slug=forum_slug)
+ #topic = get_object_or_404(Topic, pk=topic_id)
+
+ #if forum.locked or topic.locked:
+ #raise HttpResponseServerError #FIXME: Give an error message
+
+ #if request.method == 'POST':
+ #form = TopicForm(request.POST.copy())
+ #flood,timeout = flood_control(request)
+
+ #if form.is_valid() and not flood:
+ #topic2 = form.clean_data['topic2']
+ #for post in Post.objects.filter(topic.id=topic.id):
+ #post.topic.id = topic2.id
+
+ #topic.delete()
+
+ #return HttpResponseRedirect(topic2.get_absolute_url())
+ #else:
+ #form = MergeForm(auto_id=True)
- return render_response(request, 'forum/merge.html', locals())
+ #return render_response(request, 'forum/merge.html', locals())
@login_required
def hide(request, forum_slug, topic_id, post_id=False):
@@ -253,8 +253,7 @@
flood = True
timeout = (FLOOD_TIMEOUT - (datetime.now() - request.session['flood_control']).seconds)
if not 'flood_control' in request.session or ((datetime.now() - request.session['flood_control']).seconds > FLOOD_TIMEOUT):
- flood = False
- timeout = False
+ flood = timeout = False
request.session['flood_control'] = datetime.now()
return flood,timeout
\ No newline at end of file
Modified: trunk/silici.sh
=================================================================
--- trunk/silici.sh (original)
+++ trunk/silici.sh Fri Dec 14 19:06:29 2007
@@ -1 +1,2 @@
find ./ -iname *.pyc |xargs rm -rfv
+find ./ -iname *~ |xargs rm -rfv
Modified: trunk/templates/forum/forum_detail.html
=================================================================
--- trunk/templates/forum/forum_detail.html (original)
+++ trunk/templates/forum/forum_detail.html Fri Dec 14 19:06:29 2007
@@ -1,31 +1,44 @@
{% load library %}
-{% extends "base.html" %}
-
-{% block title %}Forum - {% endblock %}
-
-{% block pagetype %}page-single{% endblock %}
-
-{% block section %}forum{% endblock %}
-{% block section_logo %}
{% endblock %}
{% block content %}
-
{{ forum.name }} -
new topic
-{% for topic in topic_list %}
-{% if topic.locked %}LOCKED - {% endif %}
-{% if topic.sticky %}STICKY - {% endif %}
-{% if topic.hidden and perms.forum.can_see_hidden_topics %}
-
-
{{ topic.title }}
-sticky: {{ topic.sticky }} | locked: {{ topic.locked }} | hidden: {{ topic.hidden }} | posts: {{ topic.posts }} | views: {{ topic.views }} |?latest post: {{ topic.topic_latest_post.edited|timedelta }}
+
+
+
Forum > {{ forum.name }}
+
+
+
+
-{% endif %}
-{% if not topic.hidden %}
-
{{ topic.title }}
-sticky: {{ topic.sticky }} | locked: {{ topic.locked }} | hidden: {{ topic.hidden }} | posts: {{ topic.posts }} | views: {{ topic.views }} |?latest post: {{ topic.topic_latest_post.edited|timedelta }}
-{% endif %}
-{% endfor %}
+
+ {% for topic in topic_list %}
+
+
{% if topic.locked %}L{% endif %}{% if topic.sticky %}S{% endif %}
+
+
{{ topic.topic_latest_post.author }} taraf?ndan {{ topic.topic_latest_post.edited|timedelta }}
+
{{ topic.posts }}
+
{{ topic.views }}
+
+ {% endfor %}
+
+
{% if is_paginated %}{% paginator %}{% endif %}
-{% endblock %}
-
-{% block sidebartop %}{% endblock %}
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
Modified: trunk/templates/forum/forum_list.html
=================================================================
--- trunk/templates/forum/forum_list.html (original)
+++ trunk/templates/forum/forum_list.html Fri Dec 14 19:06:29 2007
@@ -1,33 +1,46 @@
-{% extends "base.html" %}
-
-{% block title %}Forum - {% endblock %}
-
-{% block pagetype %}page-single{% endblock %}
-
-{% block section %}forum{% endblock %}
-{% block section_logo %}
{% endblock %}
-
+{% load library %}
{% block content %}
{% regroup forums by category as forums %}
+
+
+
{% for category in forums %}
- {% if category.grouper.hidden and perms.forum.can_see_hidden_categories %}
-
-
{{ category.grouper }}
-
- {% for item in category.list %}{{ item.name }} ({{ item.topics }} konu, {{ item.posts }} ileti) {% endfor %}
-
-
- {% endif %}
- {% if not category.grouper.hidden %}
-
{{ category.grouper }}
-
- {% for item in category.list %}
- {% if item.hidden and perms.forum.can_see_hidden_forums %}{% endif %}
- {% if not item.hidden %}{{ item.name }} ({{ item.topics }} konu, {{ item.posts }} ileti) {% endif %}
- {% endfor %}
-
- {% endif %}
+
+
{{ category.grouper }}
+
+ {% for item in category.list %}
+
+ {% endfor %}
+
+
{% endfor %}
{% endblock %}
Modified: trunk/templates/forum/merge.html
=================================================================
--- trunk/templates/forum/merge.html (original)
+++ trunk/templates/forum/merge.html Fri Dec 14 19:06:29 2007
@@ -1,5 +1,3 @@
-{% extends "base.html" %}
-
{% block title %}Forum - {% endblock %}
{% block pagetype %}page-single{% endblock %}
Modified: trunk/templates/forum/new_topic.html
=================================================================
--- trunk/templates/forum/new_topic.html (original)
+++ trunk/templates/forum/new_topic.html Fri Dec 14 19:06:29 2007
@@ -1,5 +1,3 @@
-{% extends "base.html" %}
-
{% block title %}Forum - {% endblock %}
{% block pagetype %}page-single{% endblock %}
Modified: trunk/templates/forum/reply.html
=================================================================
--- trunk/templates/forum/reply.html (original)
+++ trunk/templates/forum/reply.html Fri Dec 14 19:06:29 2007
@@ -1,5 +1,3 @@
-{% extends "base.html" %}
-
{% block title %}Forum - {% endblock %}
{% block pagetype %}page-single{% endblock %}
Modified: trunk/templates/forum/topic.html
=================================================================
--- trunk/templates/forum/topic.html (original)
+++ trunk/templates/forum/topic.html Fri Dec 14 19:06:29 2007
@@ -1,21 +1,15 @@
-{% extends "base.html" %}
-
-{% block title %}Forum - {% endblock %}
-
-{% block pagetype %}page-single{% endblock %}
-
-{% block section %}forum{% endblock %}
-{% block section_logo %}
{% endblock %}
-
{% block content %}
-
{{ forum.category.name }} > {{ forum.name }} > {{ topic.title }}
+
{{ forum.category.name }} > {{ forum.name }} > {{ topic.title }}
+
{% for post in posts %}
-{% if post.hidden %}
{% endif %}
-
-
#{{ forloop.counter }} - {{ post.author }} - {{ post.created }}
-{{ post.text|linebreaksbr }}
-{% ifnotequal post.edit_count 0 %}Bu ileti {{ post.edit_count }} kez de?i?tirilmi?tir, son kez {{ post.edited }} tarihinde {{ post.last_edited_by }} taraf?ndan de?i?tirilmi?tir.
{% endifnotequal %}
-{{ post.ip }}
+
+
#{{ forloop.counter }}
+
{{ post.created|date:"d-m-Y H:i" }}
+
{{ post.author.avatar }} {{ post.author }}{% if perms.post.can_see_ip %} ({{ post.ip }}){% endif %}
+
{{ post.text|linebreaksbr }}
+{% ifnotequal post.edit_count 0 %} Bu ileti {{ post.edit_count }} kez de?i?tirilmi?tir, son kez {{ post.edited }} tarihinde {{ post.last_edited_by }} taraf?ndan de?i?tirilmi?tir. {% endifnotequal %}
+
+
{% if forloop.first %}{% if perms.topic.can_edit %}
edit {% else %}{% ifequal post.author.id request.user.id %}
edit {% endifequal %}{% endif %}{% else %}{% if perms.post.can_edit %}
edit {% else %}{% ifequal post.author.id request.user.id %}
edit {% endifequal %}{% endif %}{% endif %}
quote
{% if perms.post.can_hide and not forloop.first and not post.hidden %}
hide {% endif %}
Modified: trunk/urls.py
=================================================================
--- trunk/urls.py (original)
+++ trunk/urls.py Fri Dec 14 19:06:29 2007
@@ -128,8 +128,8 @@
#Planet
(r'^gezegen/', include('oi.feedjack.urls')),
- #Tema
- (r'^tema/', include('oi.sanat.urls')),
+ #Tema
+ (r'^tema/', include('oi.sanat.urls')),
#Django
(r'^$', 'oi.st.views.home'),
@@ -149,4 +149,4 @@
(r'^rss/(?P
.*)$', 'django.contrib.syndication.views.feed', {'feed_dict': rss_dict}),
(r'^atom/(?P.*)$', 'django.contrib.syndication.views.feed', {'feed_dict': atom_dict}),
-)
\ No newline at end of file
+)
From oi-commits at pardus.org.tr Wed Dec 19 17:05:22 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Wed, 19 Dec 2007 17:05:22 +0200 (EET)
Subject: [Oi-commits] r632 - in trunk: . sanat templates/sanat
Message-ID: <20071219150522.BA688864B3E@liste.uludag.org.tr>
Author: dkurov
Date: Wed Dec 19 17:05:22 2007
New Revision: 632
Added:
trunk/templates/sanat/detail.html
Removed:
trunk/templates/sanat/file_detail.html
Modified:
trunk/sanat/models.py
trunk/sanat/signals.py
trunk/sanat/urls.py
trunk/sanat/views.py
trunk/settings.py
trunk/silici.sh
trunk/templates/sanat/main.html
trunk/urls.py
Log:
Her turlu siralama ve commentin bir kismi eklendi
Modified: trunk/sanat/models.py
=================================================================
--- trunk/sanat/models.py (original)
+++ trunk/sanat/models.py Wed Dec 19 17:05:22 2007
@@ -11,7 +11,7 @@
from oi.st.models import License
from django.db.models import signals
from django.dispatch import dispatcher
-from oi.sanat.signals import rm_thumb,crt_thumb
+from oi.sanat.signals import rm_thumb,crt_thumb,rmv_files
# Create your models here.
@@ -121,9 +121,17 @@
def get_absolute_url(self):
return "/tema/dosya/%s/"%(self.id)
+
+ def get_screens(self):
+ """ Screen linklerini al"""
+ sc=self.screens.all()
+
+ for i in sc:
+ link="".join(["\n Link "%(i)])
+ return link
class Admin:
- list_display=('name','rate','state','counter','update','parent_cat')
+ list_display=('name','rate','state','counter','update','parent_cat','get_screens')
search_fields=['name','parent_cat']
list_filter=['update']
ordering=['-update']
@@ -134,3 +142,4 @@
verbose_name="Sanat Dosya"
verbose_name_plural="Sanat Dosyalar?"
+dispatcher.connect(rmv_files,signal=signals.pre_delete, sender=Dosya)
\ No newline at end of file
Modified: trunk/sanat/signals.py
=================================================================
--- trunk/sanat/signals.py (original)
+++ trunk/sanat/signals.py Wed Dec 19 17:05:22 2007
@@ -19,3 +19,18 @@
remove_model_thumbnails(instance)
+
+def rmv_files(sender, instance, signal, *args,**kwargs):
+ """ Delete the files associated with the tema file when it is deleted
+ we need that one because the relation is manytomany"""
+
+ #may add not to remove the default one ???
+
+ #remove the associated screens
+ for screen in instance.screens.all():
+ screen.delete()
+
+ #remove the assciated files
+ for file in instance.file_data.all():
+ file.delete()
+
\ No newline at end of file
Modified: trunk/sanat/urls.py
=================================================================
--- trunk/sanat/urls.py (original)
+++ trunk/sanat/urls.py Wed Dec 19 17:05:22 2007
@@ -4,6 +4,8 @@
urlpatterns = patterns ('oi.sanat.views',
#the first page listing
(r'^goster/(?P[a-z]+)/$','list_material'),
- (r'^kategori/(?P)[a-z]+/$','list_category'),
- (r'^dosya/(?P)[0-9]+/$','file_detail'),
+ (r'^kategori/(?P[a-z]+)/$','list_category'),
+ (r'^dosya/(?P[0-9]+)/$','file_detail'),
+ (r'^kullanici/(?P[a-z]+)/$','list_user'),
+
)
Modified: trunk/sanat/views.py
=================================================================
--- trunk/sanat/views.py (original)
+++ trunk/sanat/views.py Wed Dec 19 17:05:22 2007
@@ -3,7 +3,9 @@
from sanat_settings import HOME_ITEMS
from oi.sanat.models import Dosya,Category
from django.shortcuts import render_to_response,get_object_or_404
-
+from django.contrib.auth.models import User
+from django.contrib.comments.views.comments import post_free_comment
+from django.http import HttpResponseRedirect
def list_material(request,sort_by="son"):
""" That view vill show the ones that are submitted and approved by admin
@@ -63,7 +65,7 @@
if not res:
return render_to_response('404.html')
- sorgu=res[0].dosya_set.all()
+ sorgu=res[0].dosya_set.filter(state=True)
params={
@@ -82,13 +84,47 @@
#we know it is a int
dosya = get_object_or_404(Dosya, pk=file_id)
- return render_to_response('file_detail.html', {'dosya':dosya})
+ dosya.counter +=1
+ dosya.save()
+
+
+ return render_to_response('sanat/detail.html', {'dosya':dosya})
def list_user(request,username):
""" Lists a users things that he/she uploaded to site"""
- pass
+
+ u=User.objects.filter(username=username)
+
+ if not u:
+ return render_to_response('404.html')
+
+ sorgu=u[0].dosya_set.filter(state=True)
+
+ #sorgu=Dosya.objects.filter(user=username,state=True)
+
+ params={
+
+ 'queryset':sorgu,
+ 'paginate_by':HOME_ITEMS,
+ 'template_name':'sanat/main.html',
+
+ }
+
+ return object_list(request,**params)
+
def add_file(request):
- """ That one will add a file to the system"""
+ """ That one will add a file to the system the hardest one !"""
pass
+
+def my_post_free_comment(request):
+ """ Comment wrapper for free comments"""
+ if request.has_key('url') and not request.has_key('preview'):
+ response = post_free_comment(request)
+ # ensure there's a url to redirect to, and that post_free_comment worked
+ if len(request['url'].strip()) > 0 and isinstance(response, HttpResponseRedirect):
+ return redirect_to(request, request['url'])
+ # fallback on the default post_free_comment response
+ return response
+ return post_free_comment(request)
Modified: trunk/settings.py
=================================================================
--- trunk/settings.py (original)
+++ trunk/settings.py Wed Dec 19 17:05:22 2007
@@ -19,7 +19,7 @@
if DEVELOPMENT_MODE:
DEBUG = True
TEMPLATE_DEBUG = DEBUG
- WEB_URL = 'http://127.0.0.1:9999/'
+ WEB_URL = 'http://127.0.0.1:9999'
DOCUMENT_ROOT = '/home/makkalot/public_html/oi'
DATABASE_ENGINE = 'mysql'
DATABASE_NAME = 'oi'
@@ -121,6 +121,7 @@
'django.contrib.admin',
'django.contrib.sites',
'django.contrib.humanize',
+ 'django.contrib.comments',
'oi.flatpages',
'oi.st',
'oi.upload',
Modified: trunk/silici.sh
=================================================================
--- trunk/silici.sh (original)
+++ trunk/silici.sh Wed Dec 19 17:05:22 2007
@@ -1,2 +1,4 @@
-find ./ -iname *.pyc |xargs rm -rfv
-find ./ -iname *~ |xargs rm -rfv
+find ./ -iname "*.pyc" |xargs rm -rfv
+find ./ -iname "*~" |xargs rm -rfv
+
+#find -iname "*.pyc" |xargs rm -rfv
\ No newline at end of file
Modified: trunk/templates/sanat/main.html
=================================================================
--- trunk/templates/sanat/main.html (original)
+++ trunk/templates/sanat/main.html Wed Dec 19 17:05:22 2007
@@ -40,7 +40,7 @@
Link
{% endfor %}
- {{dosya.user}}
+ {{dosya.user}}
{{dosya.licence}}
{{dosya.counter}}
{{dosya.rate}}
Modified: trunk/urls.py
=================================================================
--- trunk/urls.py (original)
+++ trunk/urls.py Wed Dec 19 17:05:22 2007
@@ -6,6 +6,7 @@
# See the file http://www.gnu.org/copyleft/gpl.txt.
from django.conf.urls.defaults import *
+from django.contrib.comments.models import FreeComment
from oi.settings import WEB_URL, DOCUMENT_ROOT, PACKAGE_PER_PAGE, GAME_PER_PAGE, FS_PER_PAGE, NEWS_PER_PAGE, TAG_PER_PAGE, HOWTO_PER_PAGE
from oi.st.models import Package, Game, FS, News, Tag, HowTo
@@ -74,6 +75,11 @@
}
urlpatterns = patterns('',
+
+ #comments
+ (r'^comments/', include('django.contrib.comments.urls.comments')),
+ (r'^comments/postfree/', 'oi.sanat.views.my_post_free_comment'),
+
#News
(r'^haber/$', 'django.views.generic.list_detail.object_list', dict(news_dict)),
(r'^haber/(?P.*)/yazdir/$', 'oi.st.views.news_printable'),
From turkay.eren at gmail.com Wed Dec 19 18:17:39 2007
From: turkay.eren at gmail.com (Eren =?utf-8?q?T=C3=BCrkay?=)
Date: Wed, 19 Dec 2007 18:17:39 +0200
Subject: [Oi-commits] r632 - in trunk: . sanat templates/sanat
In-Reply-To: <20071219150522.BA688864B3E@liste.uludag.org.tr>
References: <20071219150522.BA688864B3E@liste.uludag.org.tr>
Message-ID: <200712191817.39329.turkay.eren@gmail.com>
On 19 Dec 2007 Wed 17:05:22 oi-commits at pardus.org.tr wrote:
> Modified:
> ? ?trunk/sanat/models.py
Finally, I'm able to test the changes =) I think, something is wrong with
sanat module.
[~/pardus/oi/oi]> python manage.py runserver
Validating models...
oi.sanat: __init__() got an unexpected keyword argument 'max_length'
1 error found.
Django version 0.96.1, using settings 'trunk.settings'
Development server is running at http://127.0.0.1:8000/
Quit the server with CONTROL-C.
In Django 0.96.1, which we use on the server, and previous releases, the
parameter of models is "maxlength". It won't work after uploading the code
onto ozgurlukicin.com and probably there will be some other errors if you use
another django version for developing stuff as django team doesn't promise
API stability. I suppose that you installed the latest django from its svn
repository. Could you install Django via PiSi?
Regards,
Eren
From ahmet at pardusman.org Wed Dec 19 23:18:48 2007
From: ahmet at pardusman.org (Ahmet =?utf-8?q?AYG=C3=9CN?=)
Date: Wed, 19 Dec 2007 23:18:48 +0200
Subject: [Oi-commits] r632 - in trunk: . sanat templates/sanat
In-Reply-To: <200712191817.39329.turkay.eren@gmail.com>
References: <20071219150522.BA688864B3E@liste.uludag.org.tr>
<200712191817.39329.turkay.eren@gmail.com>
Message-ID: <200712192318.50397.ahmet@pardusman.org>
Wednesday 19 December 2007 Tarihinde 18:17:39 yazm??t?:
> Finally, I'm able to test the changes =) I think, something is wrong with
> sanat module.
>
> [~/pardus/oi/oi]> python manage.py runserver
> Validating models...
> oi.sanat: __init__() got an unexpected keyword argument 'max_length'
> 1 error found.
>
> Django version 0.96.1, using settings 'trunk.settings'
> Development server is running at http://127.0.0.1:8000/
> Quit the server with CONTROL-C.
>
> In Django 0.96.1, which we use on the server, and previous releases, the
> parameter of models is "maxlength". It won't work after uploading the code
> onto ozgurlukicin.com and probably there will be some other errors if you
> use another django version for developing stuff as django team doesn't
> promise API stability. I suppose that you installed the latest django from
> its svn repository. Could you install Django via PiSi?
>
> Regards,
> Eren
Erenci?im kendini developers ve/veya ba?ka bir listede sand?n galiba?
oi'nin T?rk?e bilmeyen geli?tiricisi oldu?unu sanm?yorum :)
--
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/20071219/4d606ae3/attachment.pgp
From turkay.eren at gmail.com Wed Dec 19 23:15:25 2007
From: turkay.eren at gmail.com (Eren =?utf-8?q?T=C3=BCrkay?=)
Date: Wed, 19 Dec 2007 23:15:25 +0200
Subject: [Oi-commits] r632 - in trunk: . sanat templates/sanat
In-Reply-To: <200712192318.50397.ahmet@pardusman.org>
References: <20071219150522.BA688864B3E@liste.uludag.org.tr>
<200712191817.39329.turkay.eren@gmail.com>
<200712192318.50397.ahmet@pardusman.org>
Message-ID: <200712192315.25301.turkay.eren@gmail.com>
On 19 Dec 2007 Wed 23:18:48 Ahmet AYG?N wrote:
> Erenci?im kendini developers ve/veya ba?ka bir listede sand?n galiba?
> oi'nin T?rk?e bilmeyen geli?tiricisi oldu?unu sanm?yorum :)
Burada yazmayay?m hikayeyi, Ali abiye soruver :P ?kinci bir "ak?n da gelecek
mi" vakas? :\
From oi-commits at pardus.org.tr Wed Dec 19 23:21:15 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Wed, 19 Dec 2007 23:21:15 +0200 (EET)
Subject: [Oi-commits] r633 - in trunk: media/dijital templates
Message-ID: <20071219212115.3577E7C00DA@liste.uludag.org.tr>
Author: ahmet
Date: Wed Dec 19 23:21:14 2007
New Revision: 633
Removed:
trunk/media/dijital/
trunk/templates/base.html
trunk/templates/footer.html
trunk/templates/header.html
trunk/templates/home.html
trunk/templates/sidebar_main.html
Log:
coming soon
From oi-commits at pardus.org.tr Wed Dec 19 23:21:48 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Wed, 19 Dec 2007 23:21:48 +0200 (EET)
Subject: [Oi-commits] r634 - in trunk/templates: . yedekler
Message-ID: <20071219212148.3BEBE7C00DA@liste.uludag.org.tr>
Author: ahmet
Date: Wed Dec 19 23:21:47 2007
New Revision: 634
Added:
trunk/templates/base.html
- copied unchanged from r632, trunk/templates/yedekler/base.html
trunk/templates/home.html
- copied unchanged from r632, trunk/templates/yedekler/home.html
Removed:
trunk/templates/yedekler/
Log:
geri al
From oi-commits at pardus.org.tr Wed Dec 19 23:25:17 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Wed, 19 Dec 2007 23:25:17 +0200 (EET)
Subject: [Oi-commits] r635 - trunk
Message-ID: <20071219212517.C1F5B7C00F0@liste.uludag.org.tr>
Author: ahmet
Date: Wed Dec 19 23:25:17 2007
New Revision: 635
Modified:
trunk/settings.py
Log:
make it generic
Modified: trunk/settings.py
=================================================================
--- trunk/settings.py (original)
+++ trunk/settings.py Wed Dec 19 23:25:17 2007
@@ -5,10 +5,6 @@
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/copyleft/gpl.txt.
-import platform
-#not kaldirdik simdilik
-DEVELOPMENT_MODE = ("pardus" in platform.node())
-
ADMINS = ()
MANAGERS = ADMINS
@@ -19,12 +15,12 @@
if DEVELOPMENT_MODE:
DEBUG = True
TEMPLATE_DEBUG = DEBUG
- WEB_URL = 'http://127.0.0.1:9999'
- DOCUMENT_ROOT = '/home/makkalot/public_html/oi'
+ WEB_URL = 'http://127.0.0.1:8000'
+ DOCUMENT_ROOT = '/home/username/public_html/oi'
DATABASE_ENGINE = 'mysql'
DATABASE_NAME = 'oi'
DATABASE_USER = 'root'
- DATABASE_PASSWORD = '010684'
+ DATABASE_PASSWORD = ''
DATABASE_HOST = 'localhost'
DATABASE_PORT = ''
else:
@@ -216,4 +212,4 @@
('yozgat','Yozgat'),
('yalova', 'Yalova'),
('zonguldak','Zonguldak')
-)
\ No newline at end of file
+)
From oi-commits at pardus.org.tr Wed Dec 19 23:26:10 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Wed, 19 Dec 2007 23:26:10 +0200 (EET)
Subject: [Oi-commits] r636 - trunk
Message-ID: <20071219212610.A9BBD7C00F0@liste.uludag.org.tr>
Author: ahmet
Date: Wed Dec 19 23:26:10 2007
New Revision: 636
Modified:
trunk/silici.sh
Log:
corr.
Modified: trunk/silici.sh
=================================================================
--- trunk/silici.sh (original)
+++ trunk/silici.sh Wed Dec 19 23:26:10 2007
@@ -1,4 +1,2 @@
find ./ -iname "*.pyc" |xargs rm -rfv
find ./ -iname "*~" |xargs rm -rfv
-
-#find -iname "*.pyc" |xargs rm -rfv
\ No newline at end of file
From oi-commits at pardus.org.tr Wed Dec 19 23:27:46 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Wed, 19 Dec 2007 23:27:46 +0200 (EET)
Subject: [Oi-commits] r637 - trunk
Message-ID: <20071219212746.668F97C00F0@liste.uludag.org.tr>
Author: ahmet
Date: Wed Dec 19 23:27:46 2007
New Revision: 637
Modified:
trunk/settings.py
Log:
trunk'da geli?tiricilere gerekecek ayarlar dursun,
stable'da sunucuda kullan?lacak ayarlar (db parolas? hari?) dursun.
Modified: trunk/settings.py
=================================================================
--- trunk/settings.py (original)
+++ trunk/settings.py Wed Dec 19 23:27:46 2007
@@ -12,28 +12,16 @@
SITE_NAME = '?zg?rl?k i?in...'
SITE_DESC = 'Pardus i?in bir numaral? bilgi kayna??'
-if DEVELOPMENT_MODE:
- DEBUG = True
- TEMPLATE_DEBUG = DEBUG
- WEB_URL = 'http://127.0.0.1:8000'
- DOCUMENT_ROOT = '/home/username/public_html/oi'
- DATABASE_ENGINE = 'mysql'
- DATABASE_NAME = 'oi'
- DATABASE_USER = 'root'
- DATABASE_PASSWORD = ''
- DATABASE_HOST = 'localhost'
- DATABASE_PORT = ''
-else:
- DEBUG = False
- TEMPLATE_DEBUG = DEBUG
- WEB_URL = 'http://www.ozgurlukicin.com'
- DOCUMENT_ROOT = '/var/www/ozgurlukicin.com/oi'
- DATABASE_ENGINE = 'mysql'
- DATABASE_NAME = 'ozgur_oi'
- DATABASE_USER = 'ozgur'
- DATABASE_PASSWORD = ''
- DATABASE_HOST = 'localhost'
- DATABASE_PORT = ''
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+WEB_URL = 'http://127.0.0.1:8000'
+DOCUMENT_ROOT = '/home/username/public_html/oi'
+DATABASE_ENGINE = 'mysql'
+DATABASE_NAME = 'oi'
+DATABASE_USER = 'root'
+DATABASE_PASSWORD = ''
+DATABASE_HOST = 'localhost'
+DATABASE_PORT = ''
# Email
DEFAULT_FROM_EMAIL = 'accounts at ozgurlukicin.com'
From oi-commits at pardus.org.tr Thu Dec 20 00:11:06 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Thu, 20 Dec 2007 00:11:06 +0200 (EET)
Subject: [Oi-commits] r638 - trunk
Message-ID: <20071219221106.7D31A8643D1@liste.uludag.org.tr>
Author: ahmet
Date: Thu Dec 20 00:11:06 2007
New Revision: 638
Modified:
trunk/settings.py
Log:
s?pr?z :)
Modified: trunk/settings.py
=================================================================
--- trunk/settings.py (original)
+++ trunk/settings.py Thu Dec 20 00:11:06 2007
@@ -13,6 +13,7 @@
SITE_DESC = 'Pardus i?in bir numaral? bilgi kayna??'
DEBUG = True
+TESTING = False
TEMPLATE_DEBUG = DEBUG
WEB_URL = 'http://127.0.0.1:8000'
DOCUMENT_ROOT = '/home/username/public_html/oi'
From oi-commits at pardus.org.tr Fri Dec 21 11:26:43 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Fri, 21 Dec 2007 11:26:43 +0200 (EET)
Subject: [Oi-commits] r639 - trunk/st
Message-ID: <20071221092644.076E3864CD1@liste.uludag.org.tr>
Author: ahmet
Date: Fri Dec 21 11:26:43 2007
New Revision: 639
Modified:
trunk/st/views.py
trunk/st/wrappers.py
Log:
bo?luklar
Modified: trunk/st/views.py
=================================================================
--- trunk/st/views.py (original)
+++ trunk/st/views.py Fri Dec 21 11:26:43 2007
@@ -136,4 +136,4 @@
else:
pass
- return render_response(request, 'search.html', locals())
+ return render_response(request, 'search.html', locals())
\ No newline at end of file
Modified: trunk/st/wrappers.py
=================================================================
--- trunk/st/wrappers.py (original)
+++ trunk/st/wrappers.py Fri Dec 21 11:26:43 2007
@@ -10,4 +10,4 @@
def render_response(req, *args, **kwargs):
kwargs['context_instance'] = RequestContext(req)
- return render_to_response(*args, **kwargs)
+ return render_to_response(*args, **kwargs)
\ No newline at end of file
From oi-commits at pardus.org.tr Fri Dec 21 11:33:32 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Fri, 21 Dec 2007 11:33:32 +0200 (EET)
Subject: [Oi-commits] r640 - trunk
Message-ID: <20071221093332.749DE864CD1@liste.uludag.org.tr>
Author: ahmet
Date: Fri Dec 21 11:33:32 2007
New Revision: 640
Added:
trunk/context_processors.py
Modified:
trunk/settings.py
Log:
Denemeler i?in context processor
Modified: trunk/settings.py
=================================================================
--- trunk/settings.py (original)
+++ trunk/settings.py Fri Dec 21 11:33:32 2007
@@ -65,24 +65,19 @@
LANGUAGE_CODE = 'tr'
SITE_ID = 1
-# Example: "/home/media/media.lawrence.com/"
MEDIA_ROOT = '%s/media/' % DOCUMENT_ROOT
-
-# Example: "http://media.lawrence.com"
MEDIA_URL = '%s/media/' % WEB_URL
-
-# Examples: "http://foo.com/media/", "/media/".
ADMIN_MEDIA_PREFIX = '%s/media/' % WEB_URL
-# Make this unique, and don't share it with anybody.
SECRET_KEY = 'n9-*x3!&!(x*z_!13)cyxil4fh+ov_+3!y($&4t7iit=)d)=93'
-# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.load_template_source',
'django.template.loaders.app_directories.load_template_source',
)
+TEMPLATE_CONTEXT_PROCESSORS = ("oi.context_processors.testing",)
+
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
@@ -106,7 +101,7 @@
'django.contrib.admin',
'django.contrib.sites',
'django.contrib.humanize',
- 'django.contrib.comments',
+ 'django.contrib.comments',
'oi.flatpages',
'oi.st',
'oi.upload',
From denis at artistanbulpr.com Fri Dec 21 14:23:51 2007
From: denis at artistanbulpr.com (Denis)
Date: Fri, 21 Dec 2007 14:23:51 +0200
Subject: [Oi-commits] r632 - in trunk: . sanat templates/sanat
In-Reply-To: <200712192318.50397.ahmet@pardusman.org>
References: <20071219150522.BA688864B3E@liste.uludag.org.tr>
<200712191817.39329.turkay.eren@gmail.com>
<200712192318.50397.ahmet@pardusman.org>
Message-ID: <200712211423.51811.denis@artistanbulpr.com>
Wednesday 19 December 2007 Tarihinde 23:18:48 yazm??t?:
Selamlar , biraz ge? cevap veriyorum kusura bakmay?n :)
> > In Django 0.96.1, which we use on the server, and previous releases, the
> > parameter of models is "maxlength". It won't work after uploading the
> > code onto ozgurlukicin.com and probably there will be some other errors
> > if you use another django version for developing stuff as django team
> > doesn't promise API stability. I suppose that you installed the latest
> > django from its svn repository. Could you install Django via PiSi?
> >
Evet svn s?r?m?n? kullan?yorum, 0.96.1 'e ge?eyim o zaman. ger?i ?u anda
stable'da olan site feedjack d???nda bende sorunsuz ?al???yo. Herneyse
sonras? i?in b?lesi daha mant?kl?. Sanat ?u anda yorum k?sm? hari? (orada
biyerde tak?ld?m :) ) haz?r bir de siteye ekleme k?sm? kald?.
>
> Erenci?im kendini developers ve/veya ba?ka bir listede sand?n galiba?
> oi'nin T?rk?e bilmeyen geli?tiricisi oldu?unu sanm?yorum :)
:)
Bu arada Ahmet bayram iyi geldi, commitlerin artt? valla :)
From ekrem.seren at gmail.com Sun Dec 23 21:41:51 2007
From: ekrem.seren at gmail.com (Ekrem SEREN)
Date: Sun, 23 Dec 2007 21:41:51 +0200
Subject: [Oi-commits] r632 - in trunk: . sanat templates/sanat
In-Reply-To: <200712192315.25301.turkay.eren@gmail.com>
References: <20071219150522.BA688864B3E@liste.uludag.org.tr>
<200712192318.50397.ahmet@pardusman.org>
<200712192315.25301.turkay.eren@gmail.com>
Message-ID: <200712232141.51402.ekrem.seren@gmail.com>
Wednesday 19 December 2007 23:15:25 tarihinde Eren T?rkay ?unlar? yazm??t?:
> Burada yazmayay?m hikayeyi, Ali abiye soruver :P ?kinci bir "ak?n da
> gelecek mi" vakas? :\
Ahahaha.. :)
--
Ekrem SEREN
www.ozgurlukicin.com
From oi-commits at pardus.org.tr Mon Dec 24 16:56:28 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Mon, 24 Dec 2007 16:56:28 +0200 (EET)
Subject: [Oi-commits] r641 - in trunk: . media/dijital media/dijital/css
media/dijital/img media/dijital/js sanat templates templates/yedek
Message-ID: <20071224145628.C05A4864300@liste.uludag.org.tr>
Author: dkurov
Date: Mon Dec 24 16:56:28 2007
New Revision: 641
Added:
trunk/media/dijital/
trunk/media/dijital/css/
trunk/media/dijital/css/ozgurlukicin.css
trunk/media/dijital/img/
trunk/media/dijital/img/Thumbs.db (contents, props changed)
trunk/media/dijital/img/a2.jpg (contents, props changed)
trunk/media/dijital/img/a3.jpg (contents, props changed)
trunk/media/dijital/img/a4.jpg (contents, props changed)
trunk/media/dijital/img/a5.jpg (contents, props changed)
trunk/media/dijital/img/a6.jpg (contents, props changed)
trunk/media/dijital/img/a7.jpg (contents, props changed)
trunk/media/dijital/img/a_1.jpg (contents, props changed)
trunk/media/dijital/img/ara_bg.jpg (contents, props changed)
trunk/media/dijital/img/bg.jpg (contents, props changed)
trunk/media/dijital/img/bt_detay.gif (contents, props changed)
trunk/media/dijital/img/bt_detay_off.gif (contents, props changed)
trunk/media/dijital/img/d_tblalt.jpg (contents, props changed)
trunk/media/dijital/img/d_tblbg.jpg (contents, props changed)
trunk/media/dijital/img/d_tblust.jpg (contents, props changed)
trunk/media/dijital/img/i1.jpg (contents, props changed)
trunk/media/dijital/img/i2.jpg (contents, props changed)
trunk/media/dijital/img/i_link.jpg (contents, props changed)
trunk/media/dijital/img/i_pardus.jpg (contents, props changed)
trunk/media/dijital/img/l_daire.jpg (contents, props changed)
trunk/media/dijital/img/l_gezegen.gif (contents, props changed)
trunk/media/dijital/img/l_haber.gif (contents, props changed)
trunk/media/dijital/img/l_ilkadim.gif (contents, props changed)
trunk/media/dijital/img/l_nasil.gif (contents, props changed)
trunk/media/dijital/img/l_oyun.gif (contents, props changed)
trunk/media/dijital/img/l_paket.gif (contents, props changed)
trunk/media/dijital/img/l_pardon.gif (contents, props changed)
trunk/media/dijital/img/l_pozitif.jpg (contents, props changed)
trunk/media/dijital/img/l_tema.gif (contents, props changed)
trunk/media/dijital/img/l_topluluk.gif (contents, props changed)
trunk/media/dijital/img/line.jpg (contents, props changed)
trunk/media/dijital/img/line2.jpg (contents, props changed)
trunk/media/dijital/img/lo_pardus.jpg (contents, props changed)
trunk/media/dijital/img/logo.png (contents, props changed)
trunk/media/dijital/img/p_cdyazmak.gif (contents, props changed)
trunk/media/dijital/img/p_divxizlemek.gif (contents, props changed)
trunk/media/dijital/img/p_nasilkurulur.gif (contents, props changed)
trunk/media/dijital/img/pardus_ust.png (contents, props changed)
trunk/media/dijital/img/r_gezegen_off.jpg (contents, props changed)
trunk/media/dijital/img/r_gezegen_on.jpg (contents, props changed)
trunk/media/dijital/img/r_haber_off.jpg (contents, props changed)
trunk/media/dijital/img/r_haber_on.jpg (contents, props changed)
trunk/media/dijital/img/r_ilkadim_off.jpg (contents, props changed)
trunk/media/dijital/img/r_ilkadim_on.jpg (contents, props changed)
trunk/media/dijital/img/r_nasil_off.jpg (contents, props changed)
trunk/media/dijital/img/r_nasil_on.jpg (contents, props changed)
trunk/media/dijital/img/r_oyun_off.jpg (contents, props changed)
trunk/media/dijital/img/r_oyun_on.jpg (contents, props changed)
trunk/media/dijital/img/r_paketler_off.jpg (contents, props changed)
trunk/media/dijital/img/r_paketler_on.jpg (contents, props changed)
trunk/media/dijital/img/r_pardon_off.jpg (contents, props changed)
trunk/media/dijital/img/r_pardon_on.jpg (contents, props changed)
trunk/media/dijital/img/r_tema_off.jpg (contents, props changed)
trunk/media/dijital/img/r_tema_on.jpg (contents, props changed)
trunk/media/dijital/img/r_topluluk_off.jpg (contents, props changed)
trunk/media/dijital/img/r_topluluk_on.jpg (contents, props changed)
trunk/media/dijital/img/spacer.gif (contents, props changed)
trunk/media/dijital/img/tbl_alt.jpg (contents, props changed)
trunk/media/dijital/img/tbl_bg.jpg (contents, props changed)
trunk/media/dijital/img/tbl_ust.jpg (contents, props changed)
trunk/media/dijital/img/td_bg.jpg (contents, props changed)
trunk/media/dijital/js/
trunk/media/dijital/js/base.js
trunk/templates/footer.html
trunk/templates/header.html
trunk/templates/ust_menu.html
trunk/templates/yedek/
trunk/templates/yedek/base.html
trunk/templates/yedek/home.html
Modified:
trunk/sanat/models.py
trunk/settings.py
trunk/templates/base.html
trunk/templates/home.html
Log:
Yeni tema anasayfa vs. template giydirme divli
Modified: trunk/sanat/models.py
=================================================================
--- trunk/sanat/models.py (original)
+++ trunk/sanat/models.py Mon Dec 24 16:56:28 2007
@@ -21,7 +21,7 @@
neseted in each other a tree hieararchy.."""
#100 is enough for now
- cat_name=models.CharField(max_length=100,verbose_name="Kategori ad?",unique=True)
+ cat_name=models.CharField(maxlength=100,verbose_name="Kategori ad?",unique=True)
#if they are nested it is needed
slug=models.SlugField(verbose_name="SEF Ba?l?k",prepopulate_from=("cat_name",))
parent_id=models.IntegerField(verbose_name="Ebeveyn Kategori",default=0)
@@ -108,9 +108,9 @@
screens=models.ManyToManyField(SanatScreen,verbose_name="G?r?nt?ler",blank=True)
file_data=models.ManyToManyField(ArsivDosya,verbose_name="??erik Dosyas?",blank=True)
- name=models.CharField(max_length=100,unique=True,verbose_name="Dosya ismi")
+ name=models.CharField(maxlength=100,unique=True,verbose_name="Dosya ismi")
description=models.TextField(verbose_name="A??klama")
- rate=models.CharField(max_length=1,verbose_name="Oy",default="0")
+ rate=models.CharField(maxlength=1,verbose_name="Oy",default="0")
state=models.BooleanField(verbose_name="Yay?nla",default=False)
counter= models.IntegerField(verbose_name="Saya?",default=0)
update=models.DateField(auto_now=True,verbose_name="Yay?n Tarihi")
Modified: trunk/settings.py
=================================================================
--- trunk/settings.py (original)
+++ trunk/settings.py Mon Dec 24 16:56:28 2007
@@ -76,7 +76,7 @@
'django.template.loaders.app_directories.load_template_source',
)
-TEMPLATE_CONTEXT_PROCESSORS = ("oi.context_processors.testing",)
+TEMPLATE_CONTEXT_PROCESSORS = ("oi.context_processors.testing","django.core.context_processors.auth",)
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
Modified: trunk/templates/base.html
=================================================================
--- trunk/templates/base.html (original)
+++ trunk/templates/base.html Mon Dec 24 16:56:28 2007
@@ -12,86 +12,72 @@
-
-
-
-
+
+
+
+
+
{% block extrahead %}{% endblock %}
+
-
-
-
-
-
- {% block content %}
- {% endblock %}
-
-
-
-
-
+
+
+
+ {% include "header.html" %}
+
+
+ {% include "ust_menu.html" %}
+
+
+
+
+
+
+
+ {% block content %}
+
+
+
+
+
Pardus nas?l kurulur?
+
Pardus Geli?tiricilerinden Koray L?ker, temel bir Pardus kurulumun nas?l olaca??n? ad?m ad?m anlat?yor. Ekran g?r?nt?leri
+
+
+
+
+ {% endblock %}
+
+
+
+
+
+
+
Pardus'un tan?t?m?na katk?da bulunmak isteyenler i?in ?zg?rl?ki?in d??meleri yay?nland?. Sitenizde, blogunuzda yay?nlamak i?in siz de
haz?r kodlar?m?zdan yararlanabilirsiniz.
+
ozgurlukicin'i destekleyin
+
+
+ {% block sidebar %}
+ {% endblock %}
+ {% block sidebarbottom %}
+ {% endblock %}
+
+
+
+
+
+
+
+
+ {% include "footer.html" %}
+
+
+
Modified: trunk/templates/home.html
=================================================================
--- trunk/templates/home.html (original)
+++ trunk/templates/home.html Mon Dec 24 16:56:28 2007
@@ -1,48 +1,108 @@
{% extends "base.html" %}
+
+
{% block content %}
-
+
{% for fs in fss %}
-
+
+
+
+
{{ fs.title }}
+
{{ fs.sum }}
+
+
+
+
+
+
+
+
+
+
{% endfor %}
-
-
-
+
+
+
+
+
{% for howto in howtos %}
-
+
+
+
+
{{ howto.title }}
+
{{ howto.sum }}
+
+
+
+
+
+
+
+
+
+
{% endfor %}
-
-
-
+
+
+
+
{% for package in packages %}
-
+
+
+
+
{{ package.title }}
+
{{ package.sum }}
+
+
+
+
+
+
+
+
+
+
{% endfor %}
-
-
-
+
+
+
+
{% for game in games %}
-
- {% endfor %}
-
-
-
- {% for new in news %}
-
+
+
+
{{ game.title }}
+
{{ game.sum }}
+
+
+
+
+
+
+
+
+
+ {% endfor %}
+
+
+
+ {% for new in news %}
+
+
+
+
{{ new.title }}
+
{{ new.sum }}
+
+
+
+
+
+
+
+
+
+
{% endfor %}
-
+
+
{% endblock %}
From oi-commits at pardus.org.tr Wed Dec 26 17:15:24 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Wed, 26 Dec 2007 17:15:24 +0200 (EET)
Subject: [Oi-commits] r642 - in trunk: . comments comments/migrations
comments/templates comments/templatetags sanat
templates/comments templates/sanat util
Message-ID: <20071226151524.6CA017C0173@liste.uludag.org.tr>
Author: dkurov
Date: Wed Dec 26 17:15:24 2007
New Revision: 642
Added:
trunk/comments/
trunk/comments/__init__.py
trunk/comments/feeds.py
trunk/comments/managers.py
trunk/comments/migrations/
trunk/comments/models.py
trunk/comments/moderation.py
trunk/comments/templates/
trunk/comments/templatetags/
trunk/comments/templatetags/__init__.py
trunk/comments/templatetags/comment_honeypot.py
trunk/comments/templatetags/comment_utils.py
trunk/comments/views.py
trunk/templates/comments/
trunk/templates/comments/comment_display.html
trunk/templates/comments/comment_form.html
trunk/templates/comments/comment_form_fields.html
trunk/templates/comments/comment_preview.html
trunk/templates/comments/trackback_display.html
trunk/templates/sanat/eski_detail.html
trunk/util/
trunk/util/__init__.py
trunk/util/feedparser.py
trunk/util/fetch.py
Modified:
trunk/sanat/models.py
trunk/settings.py
trunk/urls.py
Log:
Yorum kismi tamam ve spam protection
Modified: trunk/sanat/models.py
=================================================================
--- trunk/sanat/models.py (original)
+++ trunk/sanat/models.py Wed Dec 26 17:15:24 2007
@@ -12,10 +12,10 @@
from django.db.models import signals
from django.dispatch import dispatcher
from oi.sanat.signals import rm_thumb,crt_thumb,rmv_files
-
-# Create your models here.
-
+from oi.comments.moderation import CommentModerator, moderator
+
+
class Category(models.Model):
""" The categories of thing that are published they maybe
neseted in each other a tree hieararchy.."""
@@ -115,6 +115,9 @@
counter= models.IntegerField(verbose_name="Saya?",default=0)
update=models.DateField(auto_now=True,verbose_name="Yay?n Tarihi")
+ #added later ...
+ enable_comments = models.BooleanField()
+
def __str__(self):
return self.name
@@ -142,4 +145,13 @@
verbose_name="Sanat Dosya"
verbose_name_plural="Sanat Dosyalar?"
-dispatcher.connect(rmv_files,signal=signals.pre_delete, sender=Dosya)
\ No newline at end of file
+dispatcher.connect(rmv_files,signal=signals.pre_delete, sender=Dosya)
+
+class DosyaCommentModerator(CommentModerator):
+ """ Dosya models class Comment moderation""",
+ akismet = False
+ email_notification = False
+ enable_field = 'enable_comments'
+
+#register it
+moderator.register(Dosya, DosyaCommentModerator)
\ No newline at end of file
Modified: trunk/settings.py
=================================================================
--- trunk/settings.py (original)
+++ trunk/settings.py Wed Dec 26 17:15:24 2007
@@ -15,12 +15,12 @@
DEBUG = True
TESTING = False
TEMPLATE_DEBUG = DEBUG
-WEB_URL = 'http://127.0.0.1:8000'
-DOCUMENT_ROOT = '/home/username/public_html/oi'
+WEB_URL = 'http://127.0.0.1:9999'
+DOCUMENT_ROOT = '/home/makkalot/public_html/oi'
DATABASE_ENGINE = 'mysql'
DATABASE_NAME = 'oi'
DATABASE_USER = 'root'
-DATABASE_PASSWORD = ''
+DATABASE_PASSWORD = '010684'
DATABASE_HOST = 'localhost'
DATABASE_PORT = ''
@@ -76,7 +76,7 @@
'django.template.loaders.app_directories.load_template_source',
)
-TEMPLATE_CONTEXT_PROCESSORS = ("oi.context_processors.testing","django.core.context_processors.auth",)
+TEMPLATE_CONTEXT_PROCESSORS = ("oi.context_processors.testing","django.core.context_processors.auth")
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
@@ -101,7 +101,7 @@
'django.contrib.admin',
'django.contrib.sites',
'django.contrib.humanize',
- 'django.contrib.comments',
+ #'django.contrib.comments',
'oi.flatpages',
'oi.st',
'oi.upload',
@@ -111,6 +111,8 @@
'oi.profile',
'oi.forum',
'oi.sanat',
+ 'oi.comments',
+
)
CITY_LIST = (
Modified: trunk/urls.py
=================================================================
--- trunk/urls.py (original)
+++ trunk/urls.py Wed Dec 26 17:15:24 2007
@@ -77,8 +77,12 @@
urlpatterns = patterns('',
#comments
- (r'^comments/', include('django.contrib.comments.urls.comments')),
- (r'^comments/postfree/', 'oi.sanat.views.my_post_free_comment'),
+
+ (r'^comments/post/$', 'oi.comments.views.post_comment'),
+ (r'^comments/posted/$', 'oi.comments.views.comment_was_posted'),
+
+ #(r'^comments/', include('django.contrib.comments.urls.comments')),
+ #(r'^comments/postfree/', 'oi.sanat.views.my_post_free_comment'),
#News
(r'^haber/$', 'django.views.generic.list_detail.object_list', dict(news_dict)),
From turkay.eren at gmail.com Wed Dec 26 17:16:38 2007
From: turkay.eren at gmail.com (Eren =?utf-8?q?T=C3=BCrkay?=)
Date: Wed, 26 Dec 2007 17:16:38 +0200
Subject: [Oi-commits] r642 - in trunk: . comments comments/migrations
comments/templates comments/templatetags sanat
templates/comments templates/sanat util
In-Reply-To: <20071226151524.6CA017C0173@liste.uludag.org.tr>
References: <20071226151524.6CA017C0173@liste.uludag.org.tr>
Message-ID: <200712261716.38339.turkay.eren@gmail.com>
On 26 Dec 2007 Wed 17:15:24 oi-commits at pardus.org.tr wrote:
> Log:
> Yorum kismi tamam ve spam protection
Harikas?n, eline sa?l?k :)
From oi-commits at pardus.org.tr Wed Dec 26 18:11:41 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Wed, 26 Dec 2007 18:11:41 +0200 (EET)
Subject: [Oi-commits] r643 - trunk/templates/sanat
Message-ID: <20071226161141.85DD67C00F2@liste.uludag.org.tr>
Author: dkurov
Date: Wed Dec 26 18:11:25 2007
New Revision: 643
Modified:
trunk/templates/sanat/detail.html
trunk/templates/sanat/main.html
Log:
Yenilenmis template sanatta yorum icin bu
Modified: trunk/templates/sanat/detail.html
=================================================================
--- trunk/templates/sanat/detail.html (original)
+++ trunk/templates/sanat/detail.html Wed Dec 26 18:11:25 2007
@@ -1,4 +1,6 @@
-{% load comments %}
+
+{% load comment_honeypot %}
+{% load comment_utils %}
{% block content %}
Tema Anasayfa
@@ -47,13 +49,22 @@
- {% free_comment_form for sanat.dosya dosya.id %}
+
+
+
+
+
+
+ {% comment_form for sanat.dosya dosya.id %}
+
- {% get_free_comment_list for sanat.dosya dosya.id as comment_list %}
- {% if comment_list %}
+ {% get_public_comment_list for sanat.dosya dosya.id as comments %}
+
+
+ {% if comments %}
Yorumlar
@@ -70,7 +81,7 @@
- {% for comment in comment_list%}
+ {% for comment in comments %}
Modified: trunk/templates/sanat/main.html
=================================================================
--- trunk/templates/sanat/main.html (original)
+++ trunk/templates/sanat/main.html Wed Dec 26 18:11:25 2007
@@ -1,5 +1,5 @@
{% load thumbman %}
-
+{% load comment_utils %}
{% block content %}
@@ -20,6 +20,7 @@
G?r?lm??
Oy
+ Yorum
@@ -44,6 +45,8 @@
{{dosya.licence}}
{{dosya.counter}}
{{dosya.rate}}
+ {% get_public_comment_count for sanat.dosya dosya.id as comment_count %}{{comment_count}}
+
{% endfor %}
{% endif %}
From oi-commits at pardus.org.tr Fri Dec 28 12:22:04 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Fri, 28 Dec 2007 12:22:04 +0200 (EET)
Subject: [Oi-commits] r644 - in trunk: sanat templates/comments
templates/sanat
Message-ID: <20071228102204.A8A0E864002@liste.uludag.org.tr>
Author: dkurov
Date: Fri Dec 28 12:22:04 2007
New Revision: 644
Modified:
trunk/sanat/views.py
trunk/templates/comments/comment_form_fields.html
trunk/templates/sanat/detail.html
Log:
sadece uyeler yorum biraksin (kucuk degisiklik)
Modified: trunk/sanat/views.py
=================================================================
--- trunk/sanat/views.py (original)
+++ trunk/sanat/views.py Fri Dec 28 12:22:04 2007
@@ -87,8 +87,12 @@
dosya.counter +=1
dosya.save()
+ auth=False
- return render_to_response('sanat/detail.html', {'dosya':dosya})
+ if request.user.is_authenticated():
+ auth=request.user.username
+
+ return render_to_response('sanat/detail.html', {'dosya':dosya,'auth':auth})
def list_user(request,username):
@@ -117,14 +121,3 @@
def add_file(request):
""" That one will add a file to the system the hardest one !"""
pass
-
-def my_post_free_comment(request):
- """ Comment wrapper for free comments"""
- if request.has_key('url') and not request.has_key('preview'):
- response = post_free_comment(request)
- # ensure there's a url to redirect to, and that post_free_comment worked
- if len(request['url'].strip()) > 0 and isinstance(response, HttpResponseRedirect):
- return redirect_to(request, request['url'])
- # fallback on the default post_free_comment response
- return response
- return post_free_comment(request)
Modified: trunk/templates/comments/comment_form_fields.html
=================================================================
--- trunk/templates/comments/comment_form_fields.html (original)
+++ trunk/templates/comments/comment_form_fields.html Fri Dec 28 12:22:04 2007
@@ -21,7 +21,7 @@
{% if comment_form.person_name.errors %}
{{ comment_form.person_name.html_error_list }}
{% endif %}
-
+
Modified: trunk/templates/sanat/detail.html
=================================================================
--- trunk/templates/sanat/detail.html (original)
+++ trunk/templates/sanat/detail.html Fri Dec 28 12:22:04 2007
@@ -53,52 +53,58 @@
-
+ {% if auth %}
{% comment_form for sanat.dosya dosya.id %}
-
+ {% endif %}
-
- {% get_public_comment_list for sanat.dosya dosya.id as comments %}
-
-
- {% if comments %}
-
- Yorumlar
-
-
- link#
- ?sim
- Yorum
- IP
+ {% if not auth %}
+ Yorum yapabilmek i?in giri? yapman?z gerekir!
+ {% endif %}
- Tarih
-
-
+
-
-
-
- {% for comment in comments %}
-
-
-
- {{comment.get_absolute_url}}
- {{comment.person_name}}
- {{comment.comment}}
- {{comment.ip_address}}
- {{comment.submit_date}}
-
- {% endfor %}
-
+ {% get_public_comment_list for sanat.dosya dosya.id as comments %}
+
+
+ {% if comments %}
+
+ Yorumlar
+
+
+ link#
+ ?sim
+ Yorum
+ IP
+
+ Tarih
+
+
+
+
+
+
+ {% for comment in comments %}
+
+
+
+ {{comment.get_absolute_url}}
+ {{comment.person_name}}
+ {{comment.comment}}
+ {{comment.ip_address}}
+ {{comment.submit_date}}
+
+ {% endfor %}
+
+
+
+
-
-
-
- {% endif %}
+ {% endif %}
+
{% endblock %}
\ No newline at end of file
From oi-commits at pardus.org.tr Fri Dec 28 17:33:44 2007
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Fri, 28 Dec 2007 17:33:44 +0200 (EET)
Subject: [Oi-commits] r645 - in trunk: comments sanat templates
templates/sanat
Message-ID: <20071228153344.EADD5864002@liste.uludag.org.tr>
Author: dkurov
Date: Fri Dec 28 17:33:44 2007
New Revision: 645
Added:
trunk/sanat/forms.py
trunk/templates/db_error.html
Modified:
trunk/comments/views.py
trunk/sanat/models.py
trunk/sanat/urls.py
trunk/sanat/views.py
trunk/templates/sanat/detail.html
Log:
oy kullancaz artik
Modified: trunk/comments/views.py
=================================================================
--- trunk/comments/views.py (original)
+++ trunk/comments/views.py Fri Dec 28 17:33:44 2007
@@ -18,12 +18,14 @@
from django.shortcuts import render_to_response
from django.template import RequestContext
from django.utils.datastructures import MultiValueDictKeyError
+from django.contrib.auth.decorators import login_required
from oi.util.fetch import read_html
from oi.comments.models import Comment
from oi.comments.templatetags.comment_honeypot import makeFieldNames, makeSpinner
+
COMMENTS_PER_PAGE = 20
# Minimum and maximum time allowed for comment posting, in seconds
@@ -73,6 +75,7 @@
class SpamComment(Exception): pass
+ at login_required
def post_comment(request):
''' This is a rewrite of django.contrib.comments.views.comments.post_free_comment
implementing the honeypot ideas from
@@ -201,6 +204,7 @@
raise Http404
+ at login_required
def comment_was_posted(request):
"""
Display "comment was posted" success page
@@ -226,6 +230,7 @@
'''I couldn't understand some parts of this article, but it sounds interesting'''
]
+ at login_required
def trackback(request, content_type_id, obj_id, entry_url):
''' Generic trackback handler
@param request: Django request
@@ -264,7 +269,7 @@
return trackbackOk()
-
+ at login_required
def validateTrackback(client_url, target_url):
''' Verify that the target URL actually appears in the page referenced by the client URL. '''
try:
Modified: trunk/sanat/models.py
=================================================================
--- trunk/sanat/models.py (original)
+++ trunk/sanat/models.py Fri Dec 28 17:33:44 2007
@@ -110,7 +110,7 @@
name=models.CharField(maxlength=100,unique=True,verbose_name="Dosya ismi")
description=models.TextField(verbose_name="A??klama")
- rate=models.CharField(maxlength=1,verbose_name="Oy",default="0")
+ rate=models.FloatField(verbose_name="Puan",default=0,max_digits=2, decimal_places=1)
state=models.BooleanField(verbose_name="Yay?nla",default=False)
counter= models.IntegerField(verbose_name="Saya?",default=0)
update=models.DateField(auto_now=True,verbose_name="Yay?n Tarihi")
@@ -147,6 +147,7 @@
dispatcher.connect(rmv_files,signal=signals.pre_delete, sender=Dosya)
+#dont forget to disable it before uploading pff
class DosyaCommentModerator(CommentModerator):
""" Dosya models class Comment moderation""",
akismet = False
Modified: trunk/sanat/urls.py
=================================================================
--- trunk/sanat/urls.py (original)
+++ trunk/sanat/urls.py Fri Dec 28 17:33:44 2007
@@ -7,5 +7,6 @@
(r'^kategori/(?P[a-z]+)/$','list_category'),
(r'^dosya/(?P[0-9]+)/$','file_detail'),
(r'^kullanici/(?P[a-z]+)/$','list_user'),
+ (r'^oy/$','vote_it'),
)
Modified: trunk/sanat/views.py
=================================================================
--- trunk/sanat/views.py (original)
+++ trunk/sanat/views.py Fri Dec 28 17:33:44 2007
@@ -4,8 +4,11 @@
from oi.sanat.models import Dosya,Category
from django.shortcuts import render_to_response,get_object_or_404
from django.contrib.auth.models import User
-from django.contrib.comments.views.comments import post_free_comment
from django.http import HttpResponseRedirect
+from django.contrib.auth.decorators import login_required
+
+from forms import VoteForm
+from django.core.urlresolvers import reverse
def list_material(request,sort_by="son"):
""" That view vill show the ones that are submitted and approved by admin
@@ -92,7 +95,7 @@
if request.user.is_authenticated():
auth=request.user.username
- return render_to_response('sanat/detail.html', {'dosya':dosya,'auth':auth})
+ return render_to_response('sanat/detail.html', {'dosya':dosya,'auth':auth,'form':VoteForm()})
def list_user(request,username):
@@ -118,6 +121,57 @@
return object_list(request,**params)
+ at login_required
def add_file(request):
- """ That one will add a file to the system the hardest one !"""
+ """ That one will add a file to the system the hardest one !
+ Offf svn s?r?m?nde varm?? file upload..."""
pass
+
+ at login_required
+def vote_it(request):
+ """ That one is for voting thing for uploaded files
+ Also pass the id of detail you are looking at to pass it to previous page!"""
+
+ # G?r?lm??
Oy
-
-
+ {% if auth %}
+ Oy kullan
+ {% endif %}
+
@@ -43,6 +45,21 @@
{{dosya.licence}}
{{dosya.counter}}
{{dosya.rate}}
+ {% if auth %}
+
+
+ {% if error %}
+ {{error}}
+ {% endif %}