{% else %}-{% endif %} {{ petitioner.signed|timedelta }}{% else %}-{% endif %} {{ petitioner.signed|timedelta }}{% else %}-{% endif %} {{ petitioner.signed|timedelta }}{% else %}-{% endif %} {{ petitioner.signed|timedelta }}{% else %}-{% endif %} {{ petitioner.signed|timedelta }}{% else %}-{% endif %} {{ petitioner.signed|timedelta }}
@@ -137,6 +132,9 @@
{% if perms.forum.can_lock_topic and not topic.locked %}
{% else %}Hen?z ileti yok{% endif %}
From oi-commits at pardus.org.tr Sun Mar 9 10:06:12 2008
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Sun, 9 Mar 2008 10:06:12 +0200 (EET)
Subject: [Oi-commits] r1119 - in trunk: forum templates/forum
Message-ID: <20080309080613.0D2EE864001@liste.uludag.org.tr>
Author: jnmbk
Date: Sun Mar 9 10:06:12 2008
New Revision: 1119
Modified:
trunk/forum/views.py
trunk/templates/forum/forum_detail.html
trunk/templates/forum/forum_list.html
Log:
Still doesn't work but let's put read messages somewhere... (I think paginator does something there and doesn't return our modified objects to template)
Modified: trunk/forum/views.py
=================================================================
--- trunk/forum/views.py (original)
+++ trunk/forum/views.py Sun Mar 9 10:06:12 2008
@@ -32,10 +32,12 @@
forums += 1
topics += forum.topics
posts += forum.posts
- if forum.forum_latest_post and forum.forum_latest_post.edited > request.session['last_visit']:
- forum.is_unread = True
+ if forum.forum_latest_post and \
+ forum.forum_latest_post.edited > request.session['last_visit']\
+ and not forum_latest_post.topic.id in request.session['read_topics_set']:
+ forum.is_read = False
else:
- forum.is_unread = False
+ forum.is_read = True
usercount = User.objects.count()
currentdate = datetime.now()
@@ -50,10 +52,11 @@
topics = forum.topic_set.all().order_by('-sticky', '-topic_latest_post')
for topic in topics:
- if topic.topic_latest_post.edited > request.session['last_visit']:
- topic.is_unread = True
+ if topic.topic_latest_post.edited > request.session['last_visit'] and \
+ not topic.id in request.session["read_topics_set"]:
+ topic.is_read = False
else:
- topic.is_unread = False
+ topic.is_read = True
return object_list(request, topics,
template_name = 'forum/forum_detail.html',
@@ -70,10 +73,11 @@
posts = topic.post_set.all().order_by('created')
news_list = News.objects.filter(status=1).order_by('-update')[:3]
- session_key = 'visited_'+topic_id
-
- if request.user.is_authenticated() and not session_key in request.session:
- request.session[session_key] = True
+ try:
+ request.session["read_topics_set"].add(topic.id)
+ except:
+ request.session["read_topics_set"] = set()
+ request.session["read_topics_set"].add(topic.id)
topic.views += 1
topic.save()
@@ -344,8 +348,9 @@
return flood,timeout
def lastvisit_control(request):
- if not 'last_visit' in request.session:
- request.session['last_visit'] = datetime.now()
+ if not "last_visit" in request.session:
+ request.session["last_visit"] = datetime.now()
+ request.session["read_topics_set"] = set()
def delete_post(request,forum_slug,topic_id, post_id):
""" The delete part should be controlled better !"""
Modified: trunk/templates/forum/forum_detail.html
=================================================================
--- trunk/templates/forum/forum_detail.html (original)
+++ trunk/templates/forum/forum_detail.html Sun Mar 9 10:06:12 2008
@@ -27,7 +27,7 @@
{% else %}Hen?z ileti yok{% endif %}
From oi-commits at pardus.org.tr Mon Mar 10 05:07:37 2008
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Mon, 10 Mar 2008 05:07:37 +0200 (EET)
Subject: [Oi-commits] r1120 - trunk/forum
Message-ID: <20080310030737.D8DD6864001@liste.uludag.org.tr>
Author: jnmbk
Date: Mon Mar 10 05:07:37 2008
New Revision: 1120
Modified:
trunk/forum/feeds.py
Log:
post feeds work properly now
Modified: trunk/forum/feeds.py
=================================================================
--- trunk/forum/feeds.py (original)
+++ trunk/forum/feeds.py Mon Mar 10 05:07:37 2008
@@ -25,7 +25,10 @@
description_template = 'forum/feed_description.html'
def items(self):
- return Post.objects.filter(hidden=0).order_by('-edited')[:10]
+ objects = Post.objects.filter(hidden=0).order_by('-edited')[:10]
+ for post in objects:
+ post.title = post.topic.title
+ return objects
class Atom(RSS):
feed_type = Atom1Feed
@@ -46,7 +49,6 @@
return Topic.objects.get(id=bits[0].strip()) # get the topic thing
-
def title(self,obj):
""" Istenilen forumun baslik kismi """
return SITE_NAME + " Forum Konusu : "+obj.title
@@ -71,12 +73,10 @@
raise FeedDoesNotExist
return WEB_URL+item.get_absolute_url()
-
class Topic_Atom(Topic_Rss):
feed_type = Atom1Feed
subtitle = Topic_Rss.description
-
class Tag_Rss(Topic_Rss):
""" Acilan Taglara g?re Rss"""
@@ -89,12 +89,10 @@
return Tag.objects.get(id=bits[0]) # get the topic thing
-
def title(self,obj):
""" Istenilen tag baslik kismi """
return SITE_NAME + " Forum Tag s?ralamas? : "+obj.name
-
def items(self,obj):
""" Istenilen Konular burada olacak"""
return Topic.objects.filter(tags=obj,hidden=0).order_by('title')[:10]
@@ -103,7 +101,3 @@
""" Bir de atom aya?? """
feed_type = Atom1Feed
subtitle = Tag_Rss.description
-
-
-
-
From oi-commits at pardus.org.tr Mon Mar 10 05:19:05 2008
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Mon, 10 Mar 2008 05:19:05 +0200 (EET)
Subject: [Oi-commits] r1121 - trunk/forum
Message-ID: <20080310031905.7AA94864001@liste.uludag.org.tr>
Author: jnmbk
Date: Mon Mar 10 05:19:05 2008
New Revision: 1121
Modified:
trunk/forum/feeds.py
Log:
let's take latest 40 posts in feed
Modified: trunk/forum/feeds.py
=================================================================
--- trunk/forum/feeds.py (original)
+++ trunk/forum/feeds.py Mon Mar 10 05:19:05 2008
@@ -25,7 +25,7 @@
description_template = 'forum/feed_description.html'
def items(self):
- objects = Post.objects.filter(hidden=0).order_by('-edited')[:10]
+ objects = Post.objects.filter(hidden=0).order_by('-edited')[:40]
for post in objects:
post.title = post.topic.title
return objects
From oi-commits at pardus.org.tr Mon Mar 10 05:23:50 2008
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Mon, 10 Mar 2008 05:23:50 +0200 (EET)
Subject: [Oi-commits] r1122 - trunk/forum
Message-ID: <20080310032350.57BFA864001@liste.uludag.org.tr>
Author: jnmbk
Date: Mon Mar 10 05:23:50 2008
New Revision: 1122
Modified:
trunk/forum/views.py
Log:
typo
Modified: trunk/forum/views.py
=================================================================
--- trunk/forum/views.py (original)
+++ trunk/forum/views.py Mon Mar 10 05:23:50 2008
@@ -34,7 +34,7 @@
posts += forum.posts
if forum.forum_latest_post and \
forum.forum_latest_post.edited > request.session['last_visit']\
- and not forum_latest_post.topic.id in request.session['read_topics_set']:
+ and not forum.forum_latest_post.topic.id in request.session['read_topics_set']:
forum.is_read = False
else:
forum.is_read = True
From oi-commits at pardus.org.tr Mon Mar 10 05:57:56 2008
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Mon, 10 Mar 2008 05:57:56 +0200 (EET)
Subject: [Oi-commits] r1123 - trunk/forum
Message-ID: <20080310035756.B0BA07C00CE@liste.uludag.org.tr>
Author: jnmbk
Date: Mon Mar 10 05:57:56 2008
New Revision: 1123
Modified:
trunk/forum/feeds.py
Log:
also return author
Modified: trunk/forum/feeds.py
=================================================================
--- trunk/forum/feeds.py (original)
+++ trunk/forum/feeds.py Mon Mar 10 05:57:56 2008
@@ -30,6 +30,9 @@
post.title = post.topic.title
return objects
+ def item_author_name(self, item):
+ return item.author
+
class Atom(RSS):
feed_type = Atom1Feed
subtitle = RSS.description
From turkay.eren at gmail.com Mon Mar 10 06:44:54 2008
From: turkay.eren at gmail.com (Eren =?utf-8?q?T=C3=BCrkay?=)
Date: Mon, 10 Mar 2008 06:44:54 +0200
Subject: [Oi-commits] r1120 - trunk/forum
In-Reply-To: <20080310030737.D8DD6864001@liste.uludag.org.tr>
References: <20080310030737.D8DD6864001@liste.uludag.org.tr>
Message-ID: <200803100644.54704.turkay.eren@gmail.com>
On 10 Mar 2008 Mon 05:07:37 oi-commits at pardus.org.tr wrote:
> Modified:
> ? ?trunk/forum/feeds.py
> Log:
> post feeds work properly now
Yaay! ?ok g?zel oldu bu :-)
From oi-commits at pardus.org.tr Wed Mar 12 15:19:17 2008
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Wed, 12 Mar 2008 15:19:17 +0200 (EET)
Subject: [Oi-commits] r1124 - in trunk: forum templates/forum
Message-ID: <20080312131917.B8FF57C0096@liste.uludag.org.tr>
Author: jnmbk
Date: Wed Mar 12 15:19:17 2008
New Revision: 1124
Modified:
trunk/forum/views.py
trunk/templates/forum/forum_list.html
Log:
it works perfect in main forum page and works in forum detail with a little touch on paginator code which I'll commit soon
Modified: trunk/forum/views.py
=================================================================
--- trunk/forum/views.py (original)
+++ trunk/forum/views.py Wed Mar 12 15:19:17 2008
@@ -26,18 +26,28 @@
lastvisit_control(request)
categories = Category.objects.order_by('order')
+ categories = [(category, category.forum_set.all()) for category in categories]
forums = topics = posts = 0
for category in categories:
- for forum in category.forum_set.all():
+ for forum in category[1]:
forums += 1
topics += forum.topics
posts += forum.posts
- if forum.forum_latest_post and \
- forum.forum_latest_post.edited > request.session['last_visit']\
- and not forum.forum_latest_post.topic.id in request.session['read_topics_set']:
- forum.is_read = False
- else:
- forum.is_read = True
+
+ # read/unread stuff
+ if request.user.is_authenticated():
+ readTopics = 0
+ counter = 0
+ for topic in forum.topic_set.all():
+ counter += 1
+ if topic.topic_latest_post.edited > request.session['last_visit'] or\
+ "read_topic_%s" % topic.id in request.session:
+ readTopics += 1
+ print counter, readTopics
+ if counter == readTopics:
+ forum.is_read = True
+ else:
+ forum.is_read = False
usercount = User.objects.count()
currentdate = datetime.now()
@@ -51,12 +61,13 @@
forum = get_object_or_404(Forum, slug=forum_slug)
topics = forum.topic_set.all().order_by('-sticky', '-topic_latest_post')
- for topic in topics:
- if topic.topic_latest_post.edited > request.session['last_visit'] and \
- not topic.id in request.session["read_topics_set"]:
- topic.is_read = False
- else:
- topic.is_read = True
+ if request.user.is_authenticated():
+ for topic in topics:
+ if topic.topic_latest_post.edited > request.session['last_visit'] or\
+ "read_topic_%s" % topic.id in request.session:
+ topic.is_read = True
+ else:
+ topic.is_read = False
return object_list(request, topics,
template_name = 'forum/forum_detail.html',
@@ -73,11 +84,8 @@
posts = topic.post_set.all().order_by('created')
news_list = News.objects.filter(status=1).order_by('-update')[:3]
- try:
- request.session["read_topics_set"].add(topic.id)
- except:
- request.session["read_topics_set"] = set()
- request.session["read_topics_set"].add(topic.id)
+ if request.user.is_authenticated():
+ request.session["read_topic_%s" % topic.id] = True
topic.views += 1
topic.save()
@@ -350,7 +358,6 @@
def lastvisit_control(request):
if not "last_visit" in request.session:
request.session["last_visit"] = datetime.now()
- request.session["read_topics_set"] = set()
def delete_post(request,forum_slug,topic_id, post_id):
""" The delete part should be controlled better !"""
Modified: trunk/templates/forum/forum_list.html
=================================================================
--- trunk/templates/forum/forum_list.html (original)
+++ trunk/templates/forum/forum_list.html Wed Mar 12 15:19:17 2008
@@ -14,7 +14,7 @@
{% else %}
{% endif %}{% else %}Hen?z ileti yok{% endif %}
From oi-commits at pardus.org.tr Wed Mar 12 18:00:56 2008
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Wed, 12 Mar 2008 18:00:56 +0200 (EET)
Subject: [Oi-commits] r1130 - in trunk: media/dijital/img/forum
templates/forum
Message-ID: <20080312160056.900297C00A2@liste.uludag.org.tr>
Author: jnmbk
Date: Wed Mar 12 18:00:56 2008
New Revision: 1130
Added:
trunk/media/dijital/img/forum/topic_unread_locked.png
- copied, changed from r1129, trunk/media/dijital/img/forum/topic_unread.png
Modified:
trunk/templates/forum/forum_detail.html
Log:
image for unread and locked topics
Copied: trunk/media/dijital/img/forum/topic_unread_locked.png (from r1129, trunk/media/dijital/img/forum/topic_unread.png)
=================================================================
Binary files. No diff available.
Modified: trunk/templates/forum/forum_detail.html
=================================================================
--- trunk/templates/forum/forum_detail.html (original)
+++ trunk/templates/forum/forum_detail.html Wed Mar 12 18:00:56 2008
@@ -26,7 +26,7 @@
{% else %}
{% else %}{% endif %}
- "?zg?rl?k??in OOXML'e Hay?r!" diyoruz. Banner ve d??melerimizi kullanarak kampanyam?za katk?da bulunabilir ve manifestomuzu destekleyerek siz de OOXML'e hay?r diyebilirsiniz.
-Destekleyenler: {{ numberofpetitioners }} / 3000
-
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.
+Nas?l b?l?m?ne katk?da bulunmak istiyorsan?z buraya t?klayarak size k?lavuzluk edecek + sayfaya gidebilirsiniz.
- "?zg?rl?k??in OOXML'e Hay?r!" diyoruz. Banner ve d??melerimizi kullanarak kampanyam?za katk?da bulunabilir ve manifestomuzu destekleyerek siz de OOXML'e hay?r diyebilirsiniz.
-Destekleyenler: {{ numberofpetitioners }} / 3000
-
- 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.
-
+ 
Okunmu? forum ya da konu Yeni ileti var
Yeni iletilere kapal?
Sabit konu (her zaman ?stte kal?r)
Okunmu? forum ya da konu Yeni ileti var Yeni iletilere kapal? Sabit konu (her zaman ?stte kal?r) Sabit (her zaman ?stte kal?r)
Yeni iletilere kapal? ve sabit Okunmu? forum ya da konu Yeni ileti var Okunmu? forum ya da konu Yeni ileti var Yeni iletilere kapal? Sabit (her zaman ?stte kal?r) Kilitli (yeni iletilere kapal?)
Kilitli ve yeni ileti var Yeni iletilere kapal? ve sabit Sabit (her zaman ?stte kal?r) Kilitli ve sabit
{% endif %}{% if topic.sticky and not topic.locked %}
{% endif %}{% if topic.locked and topic.sticky %}
{% for tag in fs.tags.all %}