From oi-commits at pardus.org.tr Sat Sep 1 17:38:49 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 17:38:49 +0300 (EEST) Subject: [Oi-commits] r533 - in trunk: . forum templates/forum Message-ID: <20070901143849.681827C002B@liste.uludag.org.tr> Author: ahmet Date: Sat Sep 1 17:38:49 2007 New Revision: 533 Modified: trunk/TODO trunk/forum/models.py trunk/forum/settings.py trunk/forum/views.py trunk/settings.py trunk/templates/forum/forum_detail.html trunk/templates/forum/forum_list.html Log: hidden,locked,sticky g?sterimleri. baz? iyile?tirmeler. Modified: trunk/TODO ================================================================= --- trunk/TODO (original) +++ trunk/TODO Sat Sep 1 17:38:49 2007 @@ -25,23 +25,24 @@ - Search support - Forum - - Tags - - Thread - - Category - - Sorting - - Forum - - Category - - Public/Private + + Category + + Hidden + ? Sorting + / Forum + + Category + + Hidden - Lock - - Thread + - Pagination + / Topic + + Tags - Hot or Not (Reddit style) - - Ghost + + Hidden - Lock ? Split ? Merge - - Post + / Post - Hot or Not (Reddit style) - - Ghost + + Hidden - Delete - Markup language (BBCode??) - Maximum characters in post, maximum images in post, maximum posts in X minute Modified: trunk/forum/models.py ================================================================= --- trunk/forum/models.py (original) +++ trunk/forum/models.py Sat Sep 1 17:38:49 2007 @@ -44,6 +44,10 @@ ordering = ('-update',) verbose_name = '?leti' verbose_name_plural = '?letiler' + permissions = ( + ("can_hide", "Can hide"), + ("can_see_hidden_posts", "Can see hidden posts"), + ) def save(self): if not self.id: @@ -106,6 +110,13 @@ ordering = ('-sticky', '-topic_latest_post') verbose_name = 'Konu' verbose_name_plural = 'Konular' + permissions = ( + ("can_hide", "Can hide"), + ("can_stick", "Can stick"), + ("can_lock", "Can lock"), + ("can_tag", "Can tag"), + ("can_see_hidden_topics", "Can see hidden topics"), + ) def save(self): if not self.id: @@ -118,6 +129,7 @@ if self.id: f = Forum.objects.get(id=self.forum.id) f.topics -= 1 + f.posts -= self.posts f.save() super(Topic, self).delete() @@ -144,6 +156,11 @@ class Meta: verbose_name = 'Forum' verbose_name_plural = 'Forumlar' + permissions = ( + ("can_hide", "Can hide"), + ("can_lock", "Can lock"), + ("can_see_hidden_forums", "Can see hidden forums"), + ) class Category(models.Model): name = models.CharField(maxlength=255, verbose_name='Kategori ismi') @@ -152,14 +169,6 @@ def __str__(self): return self.name - def get_moderators(self): - mods = Moderator.objects.filter(category=self.id) - - if mods.count() > 0: - return ', '.join([m.user.username for m in mods]) - else: - return None - class Admin: list_display = ('id', 'name') ordering = ['-name'] @@ -169,17 +178,10 @@ ordering = ['name'] verbose_name = 'Kategori' verbose_name_plural = 'Kategoriler' - -class Moderator(models.Model): - forum = models.ForeignKey(Forum, verbose_name='Forum') - user = models.ForeignKey(User, verbose_name='Kullan?c?') - - class Admin: - pass - - class Meta: - verbose_name = 'Y?netici' - verbose_name_plural = 'Y?neticiler' + permissions = ( + ("can_hide", "Can hide"), + ("can_see_hidden_categories", "Can see hidden categories"), + ) class AbuseReport(models.Model): post = models.ForeignKey(Post, verbose_name='?leti') @@ -201,16 +203,4 @@ class Meta: verbose_name = '?zleme listesi' - verbose_name_plural = '?zleme listeleri' - -#class Profile(models.Model): -# user = models.ForeignKey(User, unique=True, editable=False, core=True, edit_inline=models.STACKED, max_num_in_admin=1) -# profile = models.TextField(blank=True) -# avatar = models.ImageField(blank=True, upload_to='upload/avatars/') -# ppp = models.IntegerField(choices = ((5, '5'), (10, '10'), (20, '20'), (50, '50')), default = 20, help_text = "Posts per page") -# tpp = models.IntegerField(choices = ((5, '5'), (10, '10'), (20, '20'), (50, '50')), default = 20, help_text = "Threads per page") -# notify_email = models.BooleanField(default=False, blank=True, help_text = "Email notifications for watched discussions.") -# reverse_posts = models.BooleanField(default=False, help_text = "Display newest posts first.") - -# class Admin: -# pass \ No newline at end of file + verbose_name_plural = '?zleme listeleri' \ No newline at end of file Modified: trunk/forum/settings.py ================================================================= --- trunk/forum/settings.py (original) +++ trunk/forum/settings.py Sat Sep 1 17:38:49 2007 @@ -5,4 +5,4 @@ # Licensed under the GNU General Public License, version 3. # See the file http://www.gnu.org/copyleft/gpl.txt. -TOPICS_PER_PAGE = 30 \ No newline at end of file +TOPICS_PER_PAGE = 2 \ No newline at end of file Modified: trunk/forum/views.py ================================================================= --- trunk/forum/views.py (original) +++ trunk/forum/views.py Sat Sep 1 17:38:49 2007 @@ -18,17 +18,17 @@ from oi.forum.forms import TopicForm, PostForm from oi.st.wrappers import render_response -from oi.forum.models import Category, Forum, Topic, Post, Moderator, AbuseReport, WatchList +from oi.forum.models import Category, Forum, Topic, Post, AbuseReport, WatchList def main(request): - forums = Forum.objects.filter(hidden=0).order_by('name') + forums = Forum.objects.order_by('name') return render_response(request, 'forum/forum_list.html', locals()) def forum(request, forum_slug): forum = get_object_or_404(Forum, slug=forum_slug) topics = forum.topic_set.all() - paginator = ObjectPaginator(topics, TOPICS_PER_PAGE) + #paginator = ObjectPaginator(topics, TOPICS_PER_PAGE) return render_response(request, 'forum/forum_detail.html', locals()) @@ -37,11 +37,13 @@ topic = get_object_or_404(Topic, pk=topic_id) posts = topic.post_set.all().order_by('update') - topic.views += 1 - topic.save() + if request.user.is_authenticated(): + topic.views += 1 + topic.save() return render_response(request, 'forum/topic.html', locals()) + at login_required def reply(request, forum_slug, topic_id): if not request.user.is_authenticated: raise HttpResponseServerError #FIXME: Give an error message @@ -67,6 +69,7 @@ return render_response(request, 'forum/new_topic.html', {'form': form}) + at login_required def quote(request, forum_slug, topic_id, post_id): if not request.user.is_authenticated: raise HttpResponseServerError #FIXME: Give an error message @@ -97,6 +100,7 @@ return render_response(request, 'forum/new_topic.html', {'form': form}) + at login_required def new_topic(request, forum_slug): if not request.user.is_authenticated: raise HttpResponseServerError #FIXME: Give an error message Modified: trunk/settings.py ================================================================= --- trunk/settings.py (original) +++ trunk/settings.py Sat Sep 1 17:38:49 2007 @@ -118,12 +118,12 @@ 'django.contrib.admin', 'django.contrib.sites', 'django.contrib.humanize', - #'oi.flatpages', - #'oi.st', - #'oi.upload', - #'oi.bug', - #'oi.feedjack', - #'oi.seminar', + 'oi.flatpages', + 'oi.st', + 'oi.upload', + 'oi.bug', + 'oi.feedjack', + 'oi.seminar', 'oi.profile', 'oi.forum', ) Modified: trunk/templates/forum/forum_detail.html ================================================================= --- trunk/templates/forum/forum_detail.html (original) +++ trunk/templates/forum/forum_detail.html Sat Sep 1 17:38:49 2007 @@ -8,14 +8,20 @@ {% block section_logo %}{% endblock %} {% block content %} -{{ forum.name }}
+{{ forum.name }} - new topic
{% for topic in topics %} +{% 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 }}
+sticky: {{ topic.sticky }} | locked: {{ topic.locked }} | hidden: {{ topic.hidden }} | posts: {{ topic.posts }} | views: {{ topic.views }}
+
+{% endif %} +{% if not topic.hidden %} +{{ topic.title }}
+sticky: {{ topic.sticky }} | locked: {{ topic.locked }} | hidden: {{ topic.hidden }} | posts: {{ topic.posts }} | views: {{ topic.views }}
+{% endif %} {% endfor %} {% endblock %} Modified: trunk/templates/forum/forum_list.html ================================================================= --- trunk/templates/forum/forum_list.html (original) +++ trunk/templates/forum/forum_list.html Sat Sep 1 17:38:49 2007 @@ -11,9 +11,25 @@ {% regroup forums by category as forums %} {% for category in forums %} -{{ category.grouper }} -{% for item in category.list %}{{ item.name }}
{% endfor %} -
+ {% if category.grouper.hidden and perms.forum.can_see_hidden_categories %} +
+

{{ category.grouper }}

+ +
+ {% endif %} + {% if not category.grouper.hidden %} +

{{ category.grouper }}

+ + {% endif %} {% endfor %} {% endblock %} From oi-commits at pardus.org.tr Sat Sep 8 18:39:28 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 8 Sep 2007 18:39:28 +0300 (EEST) Subject: [Oi-commits] r534 - in trunk: . forum templates/forum Message-ID: <20070908153928.43BFB7C0026@liste.uludag.org.tr> Author: ahmet Date: Sat Sep 8 18:39:27 2007 New Revision: 534 Modified: trunk/TODO trunk/forum/models.py trunk/forum/settings.py trunk/forum/urls.py trunk/forum/views.py trunk/templates/forum/forum_list.html trunk/templates/forum/reply.html trunk/templates/forum/topic.html Log: Yenilikler, tamir edilenler, g?sterimler, modeller, lerler. Modified: trunk/TODO ================================================================= --- trunk/TODO (original) +++ trunk/TODO Sat Sep 8 18:39:27 2007 @@ -37,15 +37,16 @@ + Tags - Hot or Not (Reddit style) + Hidden + - Hide - Lock ? Split ? Merge / Post - - Hot or Not (Reddit style) + + Flood control + Hidden + - Hide - Delete - Markup language (BBCode??) - - Maximum characters in post, maximum images in post, maximum posts in X minute - Smiley - Quotations - Feeds @@ -53,4 +54,4 @@ - Log & monitor all IP's - User/IP Ban - Migration - - Multi language + - Multi language \ No newline at end of file Modified: trunk/forum/models.py ================================================================= --- trunk/forum/models.py (original) +++ trunk/forum/models.py Sat Sep 8 18:39:27 2007 @@ -30,13 +30,27 @@ update_count = models.IntegerField(default=0, verbose_name='G?ncellenme say?s?') ip = models.IPAddressField(blank=True, verbose_name='IP adresi') - def __str__(self): return "%s" % self.id def get_absolute_url(self): return '/forum/%s/%s/#post%s' % (self.topic.forum.slug, self.topic.id, self.id) + def get_reply_url(self): + return '/forum/%s/%s/reply/' % (self.topic.forum.slug, self.topic.id) + + def get_quote_url(self): + return '/forum/%s/%s/quote/%s/' % (self.topic.forum.slug, self.topic.id, self.id) + + def get_edit_url(self): + return '/forum/%s/%s/edit/%s/' % (self.topic.forum.slug, self.topic.id, self.id) + + def get_hide_url(self): + return '/forum/%s/%s/hide/%s/' % (self.topic.forum.slug, self.topic.id, self.id) + + def get_delete_url(self): + return '/forum/%s/%s/delete/%s/' % (self.topic.forum.slug, self.topic.id, self.id) + class Admin: list_display = ('id', 'topic', 'author', 'created', 'ip') @@ -51,22 +65,24 @@ def save(self): if not self.id: - t = Topic.objects.get(id=self.topic.id) + new_post = True + else: + self.update_count += 1 + + self.ip = threadlocals.get_current_ip() + super(Post, self).save() + + if new_post: + t = Topic.objects.get(pk=self.topic.id) t.topic_latest_post_id = self.id t.posts += 1 t.save() - f = Forum.objects.get(id=self.topic.forum.id) + f = Forum.objects.get(pk=self.topic.forum.id) f.forum_latest_post_id = self.id f.posts += 1 f.save() - else: - self.update_count += 1 - - self.ip = threadlocals.get_current_ip() - super(Post, self).save() - def delete(self): if self.id: t = Topic.objects.get(id=self.topic.id) Modified: trunk/forum/settings.py ================================================================= --- trunk/forum/settings.py (original) +++ trunk/forum/settings.py Sat Sep 8 18:39:27 2007 @@ -5,4 +5,5 @@ # Licensed under the GNU General Public License, version 3. # See the file http://www.gnu.org/copyleft/gpl.txt. -TOPICS_PER_PAGE = 2 \ No newline at end of file +TOPICS_PER_PAGE = 2 #FIXME: it's 2 for pagination testing, default is 20 +FLOOD_TIMEOUT = 30 \ No newline at end of file Modified: trunk/forum/urls.py ================================================================= --- trunk/forum/urls.py (original) +++ trunk/forum/urls.py Sat Sep 8 18:39:27 2007 @@ -17,7 +17,7 @@ (r'^$', 'oi.forum.views.main'), (r'^(?P.*)/new/$', 'oi.forum.views.new_topic'), - (r'^(?P.*)/(?P\d+)/quote/(?P\d+)/$', 'oi.forum.views.quote'), + (r'^(?P.*)/(?P\d+)/quote/(?P\d+)/$', 'oi.forum.views.reply'), (r'^(?P.*)/(?P\d+)/reply/$', 'oi.forum.views.reply'), (r'^(?P.*)/(?P\d+)/$', 'oi.forum.views.topic'), (r'^(?P.*)/$', 'oi.forum.views.forum'), Modified: trunk/forum/views.py ================================================================= --- trunk/forum/views.py (original) +++ trunk/forum/views.py Sat Sep 8 18:39:27 2007 @@ -37,14 +37,17 @@ topic = get_object_or_404(Topic, pk=topic_id) posts = topic.post_set.all().order_by('update') - if request.user.is_authenticated(): + session_key = 'visited_'+topic_id + + if request.user.is_authenticated() and not session_key in request.session: topic.views += 1 + request.session[session_key] = True topic.save() return render_response(request, 'forum/topic.html', locals()) @login_required -def reply(request, forum_slug, topic_id): +def reply(request, forum_slug, topic_id, post_id=False): if not request.user.is_authenticated: raise HttpResponseServerError #FIXME: Give an error message @@ -56,33 +59,15 @@ if request.user.is_authenticated and request.method == 'POST': form = PostForm(request.POST.copy()) - if form.is_valid(): - post = Post(topic=topic, - author=request.user, - text=form.clean_data['text'] - ) - post.save() - - return HttpResponseRedirect(post.get_absolute_url()) - else: - form = PostForm(auto_id=True).as_p() - return render_response(request, 'forum/new_topic.html', {'form': form}) + if 'flood_control' in request.session and ((datetime.now() - request.session['flood_control']).seconds < FLOOD_TIMEOUT): + 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 + request.session['flood_control'] = datetime.now() - at login_required -def quote(request, forum_slug, topic_id, post_id): - if not request.user.is_authenticated: - raise HttpResponseServerError #FIXME: Give an error message - - 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.user.is_authenticated and request.method == 'POST': - form = PostForm(request.POST.copy()) - if form.is_valid(): + if form.is_valid() and not flood: post = Post(topic=topic, author=request.user, text=form.clean_data['text'] @@ -91,14 +76,15 @@ return HttpResponseRedirect(post.get_absolute_url()) else: - post = get_object_or_404(Post, pk=post_id) + if post_id: + post = get_object_or_404(Post, pk=post_id) - if post in topic.post_set.all(): - form = PostForm(auto_id=True, initial={'text': '[quote|'+post_id+']'+post.text+'[/quote]'}).as_p() + if post in topic.post_set.all(): + form = PostForm(auto_id=True, initial={'text': '[quote|'+post_id+']'+post.text+'[/quote]'}) else: - pass #Give an exception + form = PostForm(auto_id=True) - return render_response(request, 'forum/new_topic.html', {'form': form}) + return render_response(request, 'forum/reply.html', locals()) @login_required def new_topic(request, forum_slug): Modified: trunk/templates/forum/forum_list.html ================================================================= --- trunk/templates/forum/forum_list.html (original) +++ trunk/templates/forum/forum_list.html Sat Sep 8 18:39:27 2007 @@ -15,7 +15,7 @@

{{ category.grouper }}

    - {% for item in category.list %}
  • {{ item.name }}
    • {% endfor %} + {% for item in category.list %}
  • {{ item.name }} ({{ item.topics }} konu, {{ item.posts }} ileti)
    • {% endfor %}
{% endif %} @@ -23,10 +23,8 @@

{{ category.grouper }}

    {% for item in category.list %} - {% if item.hidden and perms.forum.can_see_hidden_forums %}{% endif %} - {% if not item.hidden %} -
  • {{ item.name }}
    • - {% endif %} + {% if item.hidden and perms.forum.can_see_hidden_forums %}
  • {{ item.name }} ({{ item.topics }} konu, {{ item.posts }} ileti)
    • {% endif %} + {% if not item.hidden %}
  • {{ item.name }} ({{ item.topics }} konu, {{ item.posts }} ileti)
    • {% endif %} {% endfor %}
{% endif %} Modified: trunk/templates/forum/reply.html ================================================================= --- trunk/templates/forum/reply.html (original) +++ trunk/templates/forum/reply.html Sat Sep 8 18:39:27 2007 @@ -9,8 +9,16 @@ {% block content %} {% if user.is_authenticated %} +{% if flood %}Flood yapma lan, {{ timeout }}sn var.{% endif %}
-{{ form }} +
+{% for field in form %} +
{{ field.label_tag }}
+
{{ field }}
+ {% if field.help_text %}
{{ field.help_text }}
{% endif %} + {% if field.errors %}
{{ field.errors }}
{% endif %} +{% endfor %} +
{% else %} Modified: trunk/templates/forum/topic.html ================================================================= --- trunk/templates/forum/topic.html (original) +++ trunk/templates/forum/topic.html Sat Sep 8 18:39:27 2007 @@ -12,11 +12,24 @@ {% for post in posts %} {{ post.id }} - {{ post.author }} - {{ post.hidden }} - {{ post.created }}
-{{ post.text }}
+{{ post.text|linebreaksbr }}
{% ifnotequal post.update_count 0 %}Bu ileti {{ post.update_count }} kez de?i?tirilmi?tir, son kez {{ post.update }} tarihinde de?i?tirilmi?tir.
{% endifnotequal %} {{ post.ip }} +
quote + +{% ifequal post.author.id request.user.id %}{% ifequal post topic.topic_latest_post %}edit{% endifequal %}{% endifequal %} + +{% if perms.post.can_hide %}hide{% endif %} + +{% if perms.post.can_delete %} +delete +{% else %} +{% ifequal post.author.id request.user.id %}{% ifequal post topic.topic_latest_post %}delete{% endifequal %}{% endifequal %} +{% endif %} +
{% endfor %} +reply {% endblock %} {% block sidebartop %}{% endblock %} \ No newline at end of file From oi-commits at pardus.org.tr Mon Sep 10 12:42:48 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 10 Sep 2007 12:42:48 +0300 (EEST) Subject: [Oi-commits] r535 - trunk/media/hackergotchi Message-ID: <20070910094248.B55FF7C0039@liste.uludag.org.tr> Author: havan Date: Mon Sep 10 12:42:48 2007 New Revision: 535 Added: trunk/media/hackergotchi/recepkirmizi.png (contents, props changed) Log: Recep KIRMIZI'n?n kellesi From oi-commits at pardus.org.tr Tue Sep 11 19:20:09 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 11 Sep 2007 19:20:09 +0300 (EEST) Subject: [Oi-commits] r536 - trunk/media/hackergotchi Message-ID: <20070911162009.749ED7C0040@liste.uludag.org.tr> Author: havan Date: Tue Sep 11 19:20:09 2007 New Revision: 536 Modified: trunk/media/hackergotchi/recepkirmizi.png Log: Recep KIRMIZI'n?n yeni kellesi Modified: trunk/media/hackergotchi/recepkirmizi.png ================================================================= Binary files. No diff available. From oi-commits at pardus.org.tr Wed Sep 12 17:55:21 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 12 Sep 2007 17:55:21 +0300 (EEST) Subject: [Oi-commits] r537 - in trunk: . forum forum/templatetags profile templates/forum Message-ID: <20070912145521.B87EE7C0066@liste.uludag.org.tr> Author: ahmet Date: Wed Sep 12 17:55:21 2007 New Revision: 537 Added: trunk/forum/templatetags/ trunk/forum/templatetags/__init__.py trunk/forum/templatetags/library.py trunk/templates/forum/paginator.html Modified: trunk/TODO trunk/forum/models.py trunk/forum/settings.py trunk/forum/views.py trunk/profile/urls.py trunk/templates/forum/forum_detail.html trunk/templates/forum/new_topic.html trunk/templates/forum/topic.html Log: Hamak istiyorum, al?? Modified: trunk/TODO ================================================================= --- trunk/TODO (original) +++ trunk/TODO Wed Sep 12 17:55:21 2007 @@ -27,18 +27,21 @@ - Forum + Category + Hidden - ? Sorting + + Sorting / Forum + Category + Hidden - - Lock - - Pagination + + Sorting + + Lock + / Pagination / Topic + + Flood Control + Tags - Hot or Not (Reddit style) + Hidden - Hide - Lock + - Edit ? Split ? Merge / Post @@ -46,6 +49,7 @@ + Hidden - Hide - Delete + - Edit - Markup language (BBCode??) - Smiley - Quotations Modified: trunk/forum/models.py ================================================================= --- trunk/forum/models.py (original) +++ trunk/forum/models.py Wed Sep 12 17:55:21 2007 @@ -24,7 +24,7 @@ topic = models.ForeignKey('Topic', verbose_name='Konu') author = models.ForeignKey(User, verbose_name='Yazar') text = models.TextField(verbose_name='?leti') - hidden = models.BooleanField(blank=True, null=True, verbose_name='Gizli') + hidden = models.BooleanField(blank=True, null=True, default=0, verbose_name='Gizli') created = models.DateTimeField(blank=True, null=True, auto_now_add=True, verbose_name='Olu?turulma tarihi') update = models.DateTimeField(blank=True, null=True, auto_now=True, verbose_name='G?ncellenme tarihi') update_count = models.IntegerField(default=0, verbose_name='G?ncellenme say?s?') @@ -36,9 +36,6 @@ def get_absolute_url(self): return '/forum/%s/%s/#post%s' % (self.topic.forum.slug, self.topic.id, self.id) - def get_reply_url(self): - return '/forum/%s/%s/reply/' % (self.topic.forum.slug, self.topic.id) - def get_quote_url(self): return '/forum/%s/%s/quote/%s/' % (self.topic.forum.slug, self.topic.id, self.id) @@ -105,9 +102,9 @@ """ forum = models.ForeignKey('Forum', verbose_name='Forum') title = models.CharField(maxlength=100, verbose_name='Ba?l?k') - sticky = models.BooleanField(blank=True, null=True, verbose_name='Sabit') - locked = models.BooleanField(blank=True, null=True, verbose_name='Kilitli') - hidden = models.BooleanField(blank=True, null=True, verbose_name='Gizli') + sticky = models.BooleanField(blank=True, null=True, default=0, verbose_name='Sabit') + locked = models.BooleanField(blank=True, null=True, default=0, verbose_name='Kilitli') + hidden = models.BooleanField(blank=True, null=True, default=0, verbose_name='Gizli') posts = models.IntegerField(default=0, verbose_name='?leti say?s?') views = models.IntegerField(default=0, verbose_name='G?r?nt?lenme say?s?') topic_latest_post = models.ForeignKey(Post, blank=True, null=True, related_name='topic_latest_post', verbose_name='Son ileti') @@ -119,6 +116,9 @@ def get_absolute_url(self): return '/forum/%s/%s/' % (self.forum.slug, self.id) + def get_reply_url(self): + return '/forum/%s/%s/reply/' % (self.topic.forum.slug, self.topic.id) + class Admin: list_display = ('forum', 'title', 'sticky', 'locked', 'hidden') @@ -154,11 +154,12 @@ name = models.CharField(maxlength=100, verbose_name='?sim') slug = models.SlugField(prepopulate_from=('name',), verbose_name='SEF isim') description = models.TextField(verbose_name='A??klama') - hidden = models.BooleanField(blank=True, null=True, verbose_name='Gizli') - locked = models.BooleanField(blank=True, null=True, verbose_name='Kapal?') + hidden = models.BooleanField(blank=True, null=True, default=0, verbose_name='Gizli') + locked = models.BooleanField(blank=True, null=True, default=0, verbose_name='Kapal?') topics = models.IntegerField(default=0, verbose_name='Konu say?s?') posts = models.IntegerField(default=0, verbose_name='?leti say?s?') forum_latest_post = models.ForeignKey(Post, blank=True, null=True, related_name='forum_latest_post', verbose_name='Son ileti') + order = models.PositiveIntegerField(verbose_name='S?ralama') def get_absolute_url(self): return '/forum/%s/' % self.slug @@ -170,6 +171,8 @@ list_display = ('category', 'name') class Meta: + ordering = ('order',) + unique_together = (('category', 'order'),) verbose_name = 'Forum' verbose_name_plural = 'Forumlar' permissions = ( @@ -181,6 +184,7 @@ class Category(models.Model): name = models.CharField(maxlength=255, verbose_name='Kategori ismi') hidden = models.BooleanField(blank=True, null=True, verbose_name='Gizli') + order = models.PositiveIntegerField(verbose_name='S?ralama') def __str__(self): return self.name Modified: trunk/forum/settings.py ================================================================= --- trunk/forum/settings.py (original) +++ trunk/forum/settings.py Wed Sep 12 17:55:21 2007 @@ -5,5 +5,5 @@ # Licensed under the GNU General Public License, version 3. # See the file http://www.gnu.org/copyleft/gpl.txt. -TOPICS_PER_PAGE = 2 #FIXME: it's 2 for pagination testing, default is 20 +TOPICS_PER_PAGE = 5 #FIXME: it's 2 for pagination testing, default is 20 FLOOD_TIMEOUT = 30 \ No newline at end of file Modified: trunk/forum/views.py ================================================================= --- trunk/forum/views.py (original) +++ trunk/forum/views.py Wed Sep 12 17:55:21 2007 @@ -12,6 +12,7 @@ from django.contrib.auth.models import User from django.shortcuts import get_object_or_404 from django.core.paginator import ObjectPaginator +from django.views.generic.list_detail import object_list from oi.forum.settings import * @@ -27,10 +28,9 @@ def forum(request, forum_slug): forum = get_object_or_404(Forum, slug=forum_slug) - topics = forum.topic_set.all() - #paginator = ObjectPaginator(topics, TOPICS_PER_PAGE) + topics = forum.topic_set.all().order_by('-sticky', '-topic_latest_post') - return render_response(request, 'forum/forum_detail.html', locals()) + return object_list(request, topics, template_name='forum/forum_detail.html', template_object_name='topic', extra_context={'forum': forum}, paginate_by=5, allow_empty=True) def topic(request, forum_slug, topic_id): forum = get_object_or_404(Forum, slug=forum_slug) @@ -60,12 +60,7 @@ if request.user.is_authenticated and request.method == 'POST': form = PostForm(request.POST.copy()) - if 'flood_control' in request.session and ((datetime.now() - request.session['flood_control']).seconds < FLOOD_TIMEOUT): - 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 - request.session['flood_control'] = datetime.now() + flood,timeout = flood_control(request) if form.is_valid() and not flood: post = Post(topic=topic, @@ -91,14 +86,16 @@ if not request.user.is_authenticated: raise HttpResponseServerError #FIXME: Give an error message - if request.user.is_authenticated and request.method == 'POST': - forum = get_object_or_404(Forum, slug=forum_slug) + forum = get_object_or_404(Forum, slug=forum_slug) - if forum.locked: - raise HttpResponseServerError #FIXME: Give an error message + if forum.locked: + raise HttpResponseServerError #FIXME: Give an error message + if request.user.is_authenticated and request.method == 'POST': form = TopicForm(request.POST.copy()) - if form.is_valid(): + flood,timeout = flood_control(request) + + if form.is_valid() and not flood: topic = Topic(forum=forum, title=form.clean_data['title'] ) @@ -112,6 +109,17 @@ return HttpResponseRedirect(post.get_absolute_url()) else: - form = TopicForm(auto_id=True).as_p() + form = TopicForm(auto_id=True) + + return render_response(request, 'forum/new_topic.html', {'form': form}) + +def flood_control(request): + if 'flood_control' in request.session and ((datetime.now() - request.session['flood_control']).seconds < FLOOD_TIMEOUT): + 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 + request.session['flood_control'] = datetime.now() - return render_response(request, 'forum/new_topic.html', {'form': form}) \ No newline at end of file + return flood,timeout \ No newline at end of file Modified: trunk/profile/urls.py ================================================================= --- trunk/profile/urls.py (original) +++ trunk/profile/urls.py Wed Sep 12 17:55:21 2007 @@ -30,4 +30,4 @@ (r'^kayip/change/(?P[\w-]+)/$', 'oi.profile.views.change_password'), #(r'^kullanici/(?P[\w-]+)/yorumlar/$', 'oi.profile.views.user_comments'), (r'^(?P[\w-]+)/$', 'oi.profile.views.user_profile'), -) +) \ No newline at end of file Modified: trunk/templates/forum/forum_detail.html ================================================================= --- trunk/templates/forum/forum_detail.html (original) +++ trunk/templates/forum/forum_detail.html Wed Sep 12 17:55:21 2007 @@ -1,3 +1,4 @@ +{% load library %} {% extends "base.html" %} {% block title %}Forum - {% endblock %} @@ -9,20 +10,22 @@ {% block content %} {{ forum.name }} - new topic
-{% for topic in topics %} +{% 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 }}
+sticky: {{ topic.sticky }} | locked: {{ topic.locked }} | hidden: {{ topic.hidden }} | posts: {{ topic.posts }} | views: {{ topic.views }} |?latest post: {{ topic.topic_latest_post.update|timedelta }}
{% endif %} {% if not topic.hidden %} {{ topic.title }}
-sticky: {{ topic.sticky }} | locked: {{ topic.locked }} | hidden: {{ topic.hidden }} | posts: {{ topic.posts }} | views: {{ topic.views }}
+sticky: {{ topic.sticky }} | locked: {{ topic.locked }} | hidden: {{ topic.hidden }} | posts: {{ topic.posts }} | views: {{ topic.views }} |?latest post: {{ topic.topic_latest_post.update|timedelta }}
{% endif %} {% endfor %} + +{% if is_paginated %}{% paginator %}{% endif %} {% endblock %} {% block sidebartop %}{% endblock %} \ No newline at end of file Modified: trunk/templates/forum/new_topic.html ================================================================= --- trunk/templates/forum/new_topic.html (original) +++ trunk/templates/forum/new_topic.html Wed Sep 12 17:55:21 2007 @@ -9,13 +9,19 @@ {% block content %} {% if user.is_authenticated %} +{% if flood %}Flood yapma lan, {{ timeout }}sn var.{% endif %}
-{{ form }} +
+{% for field in form %} +
{{ field.label_tag }}
+
{{ field }}
+ {% if field.help_text %}
{{ field.help_text }}
{% endif %} + {% if field.errors %}
{{ field.errors }}
{% endif %} +{% endfor %} +
{% else %} -

You must be signed in to start a new discussion.

+

You must be signed in to send a reply.

{% endif %} -{% endblock %} - -{% block sidebartop %}{% endblock %} \ No newline at end of file +{% endblock %} \ No newline at end of file Modified: trunk/templates/forum/topic.html ================================================================= --- trunk/templates/forum/topic.html (original) +++ trunk/templates/forum/topic.html Wed Sep 12 17:55:21 2007 @@ -29,7 +29,7 @@
{% endfor %} -reply +reply {% endblock %} {% block sidebartop %}{% endblock %} \ No newline at end of file From oi-commits at pardus.org.tr Sat Sep 15 14:55:21 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 15 Sep 2007 14:55:21 +0300 (EEST) Subject: [Oi-commits] r538 - trunk/templates/package Message-ID: <20070915115521.A1C197C002F@liste.uludag.org.tr> Author: ahmet Date: Sat Sep 15 14:55:21 2007 New Revision: 538 Modified: trunk/templates/package/package_detail.html Log: heta olmu?i Modified: trunk/templates/package/package_detail.html ================================================================= --- trunk/templates/package/package_detail.html (original) +++ trunk/templates/package/package_detail.html Sat Sep 15 14:55:21 2007 @@ -27,7 +27,7 @@ {% block sidebar %}
Ayr?nt?lar
- Lisans: {% for license in licenses %}{{ license.title }} {% endfor %}
+ Lisans: {% for license in licenses %}{{ license.name }} {% endfor %}
Paket boyutu: {{ package.download_size|filesizeformat }}
Kurulu boyutu: {{ package.installed_size|filesizeformat }}
Web sitesi: {{ package.url }}
From oi-commits at pardus.org.tr Sat Sep 15 18:13:20 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 15 Sep 2007 18:13:20 +0300 (EEST) Subject: [Oi-commits] r539 - in trunk: forum templates/forum Message-ID: <20070915151320.7961C7C002B@liste.uludag.org.tr> Author: ahmet Date: Sat Sep 15 18:13:20 2007 New Revision: 539 Modified: trunk/forum/models.py trunk/forum/urls.py trunk/forum/views.py trunk/templates/forum/topic.html Log: bir s?r? g?zel ?ey Modified: trunk/forum/models.py ================================================================= --- trunk/forum/models.py (original) +++ trunk/forum/models.py Sat Sep 15 18:13:20 2007 @@ -26,7 +26,7 @@ text = models.TextField(verbose_name='?leti') hidden = models.BooleanField(blank=True, null=True, default=0, verbose_name='Gizli') created = models.DateTimeField(blank=True, null=True, auto_now_add=True, verbose_name='Olu?turulma tarihi') - update = models.DateTimeField(blank=True, null=True, auto_now=True, verbose_name='G?ncellenme tarihi') + update = models.DateTimeField(blank=True, null=True, auto_now_add=True, verbose_name='G?ncellenme tarihi') update_count = models.IntegerField(default=0, verbose_name='G?ncellenme say?s?') ip = models.IPAddressField(blank=True, verbose_name='IP adresi') @@ -45,6 +45,9 @@ def get_hide_url(self): return '/forum/%s/%s/hide/%s/' % (self.topic.forum.slug, self.topic.id, self.id) + def get_unhide_url(self): + return '/forum/%s/%s/unhide/%s/' % (self.topic.forum.slug, self.topic.id, self.id) + def get_delete_url(self): return '/forum/%s/%s/delete/%s/' % (self.topic.forum.slug, self.topic.id, self.id) @@ -63,8 +66,8 @@ def save(self): if not self.id: new_post = True - else: - self.update_count += 1 + #else: + #self.update_count += 1 self.ip = threadlocals.get_current_ip() super(Post, self).save() @@ -117,7 +120,28 @@ return '/forum/%s/%s/' % (self.forum.slug, self.id) def get_reply_url(self): - return '/forum/%s/%s/reply/' % (self.topic.forum.slug, self.topic.id) + return '/forum/%s/%s/reply/' % (self.forum.slug, self.id) + + def get_stick_url(self): + return '/forum/%s/%s/stick/' % (self.forum.slug, self.id) + + def get_unstick_url(self): + return '/forum/%s/%s/unstick/' % (self.forum.slug, self.id) + + def get_lock_url(self): + return '/forum/%s/%s/lock/' % (self.forum.slug, self.id) + + def get_unlock_url(self): + return '/forum/%s/%s/unlock/' % (self.forum.slug, self.id) + + def get_hide_url(self): + return '/forum/%s/%s/hide/' % (self.forum.slug, self.id) + + def get_unhide_url(self): + return '/forum/%s/%s/unhide/' % (self.forum.slug, self.id) + + def get_delete_url(self): + return '/forum/%s/%s/delete/' % (self.forum.slug, self.id) class Admin: list_display = ('forum', 'title', 'sticky', 'locked', 'hidden') @@ -189,6 +213,9 @@ def __str__(self): return self.name + def get_absolute_url(self): + return '/forum/' + class Admin: list_display = ('id', 'name') ordering = ['-name'] Modified: trunk/forum/urls.py ================================================================= --- trunk/forum/urls.py (original) +++ trunk/forum/urls.py Sat Sep 15 18:13:20 2007 @@ -19,6 +19,13 @@ (r'^(?P.*)/new/$', 'oi.forum.views.new_topic'), (r'^(?P.*)/(?P\d+)/quote/(?P\d+)/$', 'oi.forum.views.reply'), (r'^(?P.*)/(?P\d+)/reply/$', 'oi.forum.views.reply'), + (r'^(?P.*)/(?P\d+)/hide/(?P\d+)/$', 'oi.forum.views.hide'), + (r'^(?P.*)/(?P\d+)/unhide/(?P\d+)/$', 'oi.forum.views.hide'), + (r'^(?P.*)/(?P\d+)/delete/(?P\d+)/$', 'oi.forum.views.delete'), + (r'^(?P.*)/(?P\d+)/lock/$', 'oi.forum.views.lock'), + (r'^(?P.*)/(?P\d+)/unlock/$', 'oi.forum.views.lock'), + (r'^(?P.*)/(?P\d+)/stick/$', 'oi.forum.views.stick'), + (r'^(?P.*)/(?P\d+)/unstick/$', 'oi.forum.views.stick'), (r'^(?P.*)/(?P\d+)/$', 'oi.forum.views.topic'), (r'^(?P.*)/$', 'oi.forum.views.forum'), ) \ No newline at end of file Modified: trunk/forum/views.py ================================================================= --- trunk/forum/views.py (original) +++ trunk/forum/views.py Sat Sep 15 18:13:20 2007 @@ -7,7 +7,7 @@ from datetime import datetime -from django.http import HttpResponseRedirect, HttpResponseServerError +from django.http import HttpResponseRedirect, HttpResponseServerError, HttpResponseForbidden from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User from django.shortcuts import get_object_or_404 @@ -113,6 +113,58 @@ return render_response(request, 'forum/new_topic.html', {'form': form}) + at login_required +def hide(request, forum_slug, topic_id, post_id=False): + forum = get_object_or_404(Forum, slug=forum_slug) + topic = get_object_or_404(Topic, pk=topic_id) + + if request.user.has_perm('post.can_hide') and post_id: + post = get_object_or_404(Post, pk=post_id) + post.hidden = 1 + post.save() + + return HttpResponseRedirect(topic.get_absolute_url()) + + if request.user.has_perm('topic.can_hide') and not post_id: + topic.hidden = 1 + topic.save() + + return HttpResponseRedirect(forum.get_absolute_url()) + + at login_required +def stick(request, forum_slug, topic_id): + forum = get_object_or_404(Forum, slug=forum_slug) + topic = get_object_or_404(Topic, pk=topic_id) + + if request.user.has_perm('topic.can_stick') and not topic.sticky: + topic.sticky = 1 + topic.save() + + return HttpResponseRedirect(forum.get_absolute_url()) + + if request.user.has_perm('topic.can_stick') and topic.sticky: + topic.sticky = 0 + topic.save() + + return HttpResponseRedirect(forum.get_absolute_url()) + + at login_required +def lock(request, forum_slug, topic_id): + forum = get_object_or_404(Forum, slug=forum_slug) + topic = get_object_or_404(Topic, pk=topic_id) + + if request.user.has_perm('topic.can_lock') and not topic.locked: + topic.locked = 1 + topic.save() + + return HttpResponseRedirect(forum.get_absolute_url()) + + if request.user.has_perm('topic.can_lock') and topic.locked: + topic.locked = 0 + topic.save() + + return HttpResponseRedirect(forum.get_absolute_url()) + def flood_control(request): if 'flood_control' in request.session and ((datetime.now() - request.session['flood_control']).seconds < FLOOD_TIMEOUT): flood = True Modified: trunk/templates/forum/topic.html ================================================================= --- trunk/templates/forum/topic.html (original) +++ trunk/templates/forum/topic.html Sat Sep 15 18:13:20 2007 @@ -8,7 +8,7 @@ {% block section_logo %}{% endblock %} {% block content %} -{{ forum.name }} > {{ topic.title }}
+{{ forum.category.name }} > {{ forum.name }} > {{ topic.title }}
{% for post in posts %} {{ post.id }} - {{ post.author }} - {{ post.hidden }} - {{ post.created }}
@@ -19,17 +19,21 @@ {% ifequal post.author.id request.user.id %}{% ifequal post topic.topic_latest_post %}edit{% endifequal %}{% endifequal %} -{% if perms.post.can_hide %}hide{% endif %} +{% if perms.post.can_hide and not forloop.first %}hide{% endif %} -{% if perms.post.can_delete %} -delete -{% else %} -{% ifequal post.author.id request.user.id %}{% ifequal post topic.topic_latest_post %}delete{% endifequal %}{% endifequal %} +{% if perms.post.can_delete and not forloop.first %}delete{% else %} +{% ifequal post.author.id request.user.id %}{% ifequal post topic.topic_latest_post %}{% if not forloop.first %}delete{% endif %}{% endifequal %}{% endifequal %} {% endif %}
{% endfor %} -reply +{% if perms.topic.can_hide and not topic.hidden %}hide - {% endif %} +{% if perms.topic.can_hide and topic.hidden %}unhide - {% endif %} +{% if perms.topic.can_stick and not topic.sticky %}stick - {% endif %} +{% if perms.topic.can_stick and topic.sticky %}unstick - {% endif %} +{% if perms.topic.can_lock and not topic.locked %}lock{% endif %} +{% if perms.topic.can_lock and topic.locked %}unlock{% endif %} - reply +{% if perms.topic.can_delete %} - delete{% endif %} {% endblock %} {% block sidebartop %}{% endblock %} \ No newline at end of file From oi-commits at pardus.org.tr Mon Sep 17 18:05:35 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 17 Sep 2007 18:05:35 +0300 (EEST) Subject: [Oi-commits] r540 - trunk/media/hackergotchi Message-ID: <20070917150535.315FC7C003A@liste.uludag.org.tr> Author: havan Date: Mon Sep 17 18:05:34 2007 New Revision: 540 Added: trunk/media/hackergotchi/mustafagunay.png (contents, props changed) Log: Mustafa G?NAY'?n kellesini de koleksiyonumuza ekledik... From oi-commits at pardus.org.tr Tue Sep 18 15:17:31 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 18 Sep 2007 15:17:31 +0300 (EEST) Subject: [Oi-commits] r541 - in trunk: . forum templates/forum Message-ID: <20070918121731.8BCAA7C0043@liste.uludag.org.tr> Author: ahmet Date: Tue Sep 18 15:17:31 2007 New Revision: 541 Modified: trunk/AUTHORS trunk/README trunk/TODO trunk/forum/models.py trunk/forum/urls.py trunk/forum/views.py trunk/templates/forum/paginator.html trunk/templates/forum/topic.html Log: ET'de rakip ar?yorum :p Modified: trunk/AUTHORS ================================================================= --- trunk/AUTHORS (original) +++ trunk/AUTHORS Tue Sep 18 15:17:31 2007 @@ -5,7 +5,7 @@ Eren T?RKAY Special Thanks - Artistanbul PR, Miss Pizza for their delicious pizzas, - Duran Sandwiches for their delicious sandwiches, - Pardus for subversion service. \ No newline at end of file + Duran Sandwiches for their delicious sandwiches and tortillas, + Pardus for subversion service, + Evim Nargile for hookah. \ No newline at end of file Modified: trunk/README ================================================================= --- trunk/README (original) +++ trunk/README Tue Sep 18 15:17:31 2007 @@ -1,13 +1,7 @@ Requires: - Python - Apache Web Server - mod_python - Django + Django environment (Python, Web Server (Apache recommended), mod_python (if Apache preferred), Django) Python Imaging Library (PIL) - -Optional (For databases, we recommend MySQL) - MySQL - Sqlite + DBMS (MySQL recommended) Setup: 1. edit settings.py @@ -16,4 +10,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 + 6. restart apache and go to WEB_URL/admin \ No newline at end of file Modified: trunk/TODO ================================================================= --- trunk/TODO (original) +++ trunk/TODO Tue Sep 18 15:17:31 2007 @@ -40,7 +40,8 @@ - Hot or Not (Reddit style) + Hidden - Hide - - Lock + + Lock + + Stick - Edit ? Split ? Merge Modified: trunk/forum/models.py ================================================================= --- trunk/forum/models.py (original) +++ trunk/forum/models.py Tue Sep 18 15:17:31 2007 @@ -45,9 +45,6 @@ def get_hide_url(self): return '/forum/%s/%s/hide/%s/' % (self.topic.forum.slug, self.topic.id, self.id) - def get_unhide_url(self): - return '/forum/%s/%s/unhide/%s/' % (self.topic.forum.slug, self.topic.id, self.id) - def get_delete_url(self): return '/forum/%s/%s/delete/%s/' % (self.topic.forum.slug, self.topic.id, self.id) @@ -66,8 +63,9 @@ def save(self): if not self.id: new_post = True - #else: + else: #self.update_count += 1 + new_post = False self.ip = threadlocals.get_current_ip() super(Post, self).save() @@ -125,21 +123,12 @@ def get_stick_url(self): return '/forum/%s/%s/stick/' % (self.forum.slug, self.id) - def get_unstick_url(self): - return '/forum/%s/%s/unstick/' % (self.forum.slug, self.id) - def get_lock_url(self): return '/forum/%s/%s/lock/' % (self.forum.slug, self.id) - def get_unlock_url(self): - return '/forum/%s/%s/unlock/' % (self.forum.slug, self.id) - def get_hide_url(self): return '/forum/%s/%s/hide/' % (self.forum.slug, self.id) - def get_unhide_url(self): - return '/forum/%s/%s/unhide/' % (self.forum.slug, self.id) - def get_delete_url(self): return '/forum/%s/%s/delete/' % (self.forum.slug, self.id) Modified: trunk/forum/urls.py ================================================================= --- trunk/forum/urls.py (original) +++ trunk/forum/urls.py Tue Sep 18 15:17:31 2007 @@ -20,12 +20,11 @@ (r'^(?P.*)/(?P\d+)/quote/(?P\d+)/$', 'oi.forum.views.reply'), (r'^(?P.*)/(?P\d+)/reply/$', 'oi.forum.views.reply'), (r'^(?P.*)/(?P\d+)/hide/(?P\d+)/$', 'oi.forum.views.hide'), - (r'^(?P.*)/(?P\d+)/unhide/(?P\d+)/$', 'oi.forum.views.hide'), + (r'^(?P.*)/(?P\d+)/hide/$', 'oi.forum.views.hide'), (r'^(?P.*)/(?P\d+)/delete/(?P\d+)/$', 'oi.forum.views.delete'), + (r'^(?P.*)/(?P\d+)/delete/$', 'oi.forum.views.delete'), (r'^(?P.*)/(?P\d+)/lock/$', 'oi.forum.views.lock'), - (r'^(?P.*)/(?P\d+)/unlock/$', 'oi.forum.views.lock'), (r'^(?P.*)/(?P\d+)/stick/$', 'oi.forum.views.stick'), - (r'^(?P.*)/(?P\d+)/unstick/$', 'oi.forum.views.stick'), (r'^(?P.*)/(?P\d+)/$', 'oi.forum.views.topic'), (r'^(?P.*)/$', 'oi.forum.views.forum'), ) \ No newline at end of file Modified: trunk/forum/views.py ================================================================= --- trunk/forum/views.py (original) +++ trunk/forum/views.py Tue Sep 18 15:17:31 2007 @@ -120,13 +120,22 @@ if request.user.has_perm('post.can_hide') and post_id: post = get_object_or_404(Post, pk=post_id) - post.hidden = 1 + + if post.hidden: + post.hidden = 0 + else: + post.hidden = 1 + post.save() return HttpResponseRedirect(topic.get_absolute_url()) if request.user.has_perm('topic.can_hide') and not post_id: - topic.hidden = 1 + if topic.hidden: + topic.hidden = 0 + else: + topic.hidden = 1 + topic.save() return HttpResponseRedirect(forum.get_absolute_url()) Modified: trunk/templates/forum/paginator.html ================================================================= --- trunk/templates/forum/paginator.html (original) +++ trunk/templates/forum/paginator.html Tue Sep 18 15:17:31 2007 @@ -1,16 +1,16 @@ \ No newline at end of file +
Modified: trunk/templates/forum/topic.html ================================================================= --- trunk/templates/forum/topic.html (original) +++ trunk/templates/forum/topic.html Tue Sep 18 15:17:31 2007 @@ -28,11 +28,11 @@
{% endfor %} {% if perms.topic.can_hide and not topic.hidden %}hide - {% endif %} -{% if perms.topic.can_hide and topic.hidden %}unhide - {% endif %} +{% if perms.topic.can_hide and topic.hidden %}unhide - {% endif %} {% if perms.topic.can_stick and not topic.sticky %}stick - {% endif %} -{% if perms.topic.can_stick and topic.sticky %}unstick - {% endif %} +{% if perms.topic.can_stick and topic.sticky %}unstick - {% endif %} {% if perms.topic.can_lock and not topic.locked %}lock{% endif %} -{% if perms.topic.can_lock and topic.locked %}unlock{% endif %} - reply +{% if perms.topic.can_lock and topic.locked %}unlock{% endif %} - reply {% if perms.topic.can_delete %} - delete{% endif %} {% endblock %} From oi-commits at pardus.org.tr Tue Sep 18 15:30:15 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 18 Sep 2007 15:30:15 +0300 (EEST) Subject: [Oi-commits] r542 - trunk/forum Message-ID: <20070918123015.AEAA07C0043@liste.uludag.org.tr> Author: ahmet Date: Tue Sep 18 15:30:15 2007 New Revision: 542 Modified: trunk/forum/views.py Log: temizlik Modified: trunk/forum/views.py ================================================================= --- trunk/forum/views.py (original) +++ trunk/forum/views.py Tue Sep 18 15:30:15 2007 @@ -48,16 +48,13 @@ @login_required def reply(request, forum_slug, topic_id, post_id=False): - if not request.user.is_authenticated: - raise HttpResponseServerError #FIXME: Give an error message - 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.user.is_authenticated and request.method == 'POST': + if request.method == 'POST': form = PostForm(request.POST.copy()) flood,timeout = flood_control(request) @@ -83,15 +80,12 @@ @login_required def new_topic(request, forum_slug): - if not request.user.is_authenticated: - raise HttpResponseServerError #FIXME: Give an error message - forum = get_object_or_404(Forum, slug=forum_slug) if forum.locked: raise HttpResponseServerError #FIXME: Give an error message - if request.user.is_authenticated and request.method == 'POST': + if request.method == 'POST': form = TopicForm(request.POST.copy()) flood,timeout = flood_control(request) From oi-commits at pardus.org.tr Wed Sep 19 01:39:21 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 19 Sep 2007 01:39:21 +0300 (EEST) Subject: [Oi-commits] r543 - trunk/forum Message-ID: <20070918223921.2C59A7C0023@liste.uludag.org.tr> Author: ahmet Date: Wed Sep 19 01:39:20 2007 New Revision: 543 Modified: trunk/forum/views.py Log: locals() d?nd?r, yorma bizi Modified: trunk/forum/views.py ================================================================= --- trunk/forum/views.py (original) +++ trunk/forum/views.py Wed Sep 19 01:39:20 2007 @@ -105,7 +105,7 @@ else: form = TopicForm(auto_id=True) - return render_response(request, 'forum/new_topic.html', {'form': form}) + return render_response(request, 'forum/new_topic.html', locals()) @login_required def hide(request, forum_slug, topic_id, post_id=False): @@ -177,4 +177,4 @@ timeout = False request.session['flood_control'] = datetime.now() - return flood,timeout \ No newline at end of file + return flood,timeout From oi-commits at pardus.org.tr Wed Sep 19 14:47:04 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 19 Sep 2007 14:47:04 +0300 (EEST) Subject: [Oi-commits] r544 - in branches: forum stable Message-ID: <20070919114704.997737C002E@liste.uludag.org.tr> Author: ahmet Date: Wed Sep 19 14:47:04 2007 New Revision: 544 Added: branches/forum/ branches/stable/ Log: holoo From oi-commits at pardus.org.tr Wed Sep 19 15:01:42 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 19 Sep 2007 15:01:42 +0300 (EEST) Subject: [Oi-commits] r545 - trunk Message-ID: <20070919120142.38FD37C002E@liste.uludag.org.tr> Author: ahmet Date: Wed Sep 19 15:01:41 2007 New Revision: 545 Removed: trunk/ Log: n From oi-commits at pardus.org.tr Wed Sep 19 15:25:06 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 19 Sep 2007 15:25:06 +0300 (EEST) Subject: [Oi-commits] r546 - in trunk: . bug feedjack feedjack/bin flatpages forum forum/templatetags media media/css media/hackergotchi media/img media/img/admin media/img/banner media/img/niceforms media/js media/js/admin media/js/tinymce media/js/tinymce/langs media/js/tinymce/plugins media/js/tinymce/plugins/_template media/js/tinymce/plugins/_template/images media/js/tinymce/plugins/_template/langs media/js/tinymce/plugins/advimage media/js/tinymce/plugins/advimage/css media/js/tinymce/plugins/advimage/images media/js/tinymce/plugins/advimage/jscripts media/js/tinymce/plugins/advimage/langs media/js/tinymce/plugins/advlink media/js/tinymce/plugins/advlink/css media/js/tinymce/plugins/advlink/jscripts media/js/tinymce/plugins/advlink/langs media/js/tinymce/plugins/autosave media/js/tinymce/plugins/autosave/langs media/js/tinymce/plugins/emotions media/js/tinymce/plugins/emotions/images media/js/tinymce/plugins/emotions/jscripts media/js/tinymce/plugins/emotions/langs media/js/tinymce/ plugins/fullscreen media/js/tinymce/plugins/fullscreen/images media/js/tinymce/plugins/fullscreen/langs media/js/tinymce/plugins/inlinepopups media/js/tinymce/plugins/inlinepopups/css media/js/tinymce/plugins/inlinepopups/images media/js/tinymce/plugins/inlinepopups/jscripts media/js/tinymce/plugins/insertdatetime media/js/tinymce/plugins/insertdatetime/images media/js/tinymce/plugins/insertdatetime/langs media/js/tinymce/plugins/searchreplace media/js/tinymce/plugins/searchreplace/images media/js/tinymce/plugins/searchreplace/jscripts media/js/tinymce/plugins/searchreplace/langs media/js/tinymce/plugins/style media/js/tinymce/plugins/style/css media/js/tinymce/plugins/style/images media/js/tinymce/plugins/style/jscripts media/js/tinymce/plugins/style/langs media/js/tinymce/plugins/table media/js/tinymce/plugins/table/css media/js/tinymce/plugins/table/images media/js/tinymce/plugins/table/jscripts media/js/tinymce/plugins/table/langs media/js/tinymce/themes media/js/tinymce /themes/advanced media/js/tinymce/themes/advanced/css media/js/tinymce/themes/advanced/docs media/js/tinymce/themes/advanced/docs/en media/js/tinymce/themes/advanced/docs/en/images media/js/tinymce/themes/advanced/images media/js/tinymce/themes/advanced/images/xp media/js/tinymce/themes/advanced/jscripts media/js/tinymce/themes/advanced/langs media/js/tinymce/themes/simple media/js/tinymce/themes/simple/css media/js/tinymce/themes/simple/images media/js/tinymce/utils media/swf middleware profile seminar st st/templatetags templates templates/admin templates/bug templates/download templates/feedjack templates/feedjack/default templates/feedjack/oi templates/feeds templates/file_upload templates/flatpages templates/forum templates/fs templates/game templates/news templates/package templates/seminar templates/tag templates/user upload Message-ID: <20070919122506.4C7E67C002E@liste.uludag.org.tr> Author: ahmet Date: Wed Sep 19 15:25:05 2007 New Revision: 546 Added: trunk/ - copied from r544, trunk/ trunk/AUTHORS - copied unchanged from r544, trunk/AUTHORS trunk/COPYING - copied unchanged from r544, trunk/COPYING trunk/README - copied unchanged from r544, trunk/README trunk/TODO - copied unchanged from r544, trunk/TODO trunk/__init__.py - copied unchanged from r544, trunk/__init__.py trunk/bug/ - copied from r544, trunk/bug/ trunk/bug/__init__.py - copied unchanged from r544, trunk/bug/__init__.py trunk/bug/models.py - copied unchanged from r544, trunk/bug/models.py trunk/bug/urls.py - copied unchanged from r544, trunk/bug/urls.py trunk/bug/views.py - copied unchanged from r544, trunk/bug/views.py trunk/feedjack/ - copied from r544, trunk/feedjack/ trunk/feedjack/__init__.py - copied unchanged from r544, trunk/feedjack/__init__.py trunk/feedjack/bin/ - copied from r544, trunk/feedjack/bin/ trunk/feedjack/bin/feedjack_update.py - copied unchanged from r544, trunk/feedjack/bin/feedjack_update.py trunk/feedjack/fjcache.py - copied unchanged from r544, trunk/feedjack/fjcache.py trunk/feedjack/fjcloud.py - copied unchanged from r544, trunk/feedjack/fjcloud.py trunk/feedjack/fjlib.py - copied unchanged from r544, trunk/feedjack/fjlib.py trunk/feedjack/models.py - copied unchanged from r544, trunk/feedjack/models.py trunk/feedjack/urls.py - copied unchanged from r544, trunk/feedjack/urls.py trunk/feedjack/views.py - copied unchanged from r544, trunk/feedjack/views.py trunk/flatpages/ (props changed) - copied from r544, trunk/flatpages/ trunk/flatpages/__init__.py - copied unchanged from r544, trunk/flatpages/__init__.py trunk/flatpages/middleware.py - copied unchanged from r544, trunk/flatpages/middleware.py trunk/flatpages/models.py - copied unchanged from r544, trunk/flatpages/models.py trunk/flatpages/urls.py - copied unchanged from r544, trunk/flatpages/urls.py trunk/flatpages/views.py - copied unchanged from r544, trunk/flatpages/views.py trunk/forum/ - copied from r544, trunk/forum/ trunk/forum/__init__.py - copied unchanged from r544, trunk/forum/__init__.py trunk/forum/forms.py - copied unchanged from r544, trunk/forum/forms.py trunk/forum/models.py - copied unchanged from r544, trunk/forum/models.py trunk/forum/settings.py - copied unchanged from r544, trunk/forum/settings.py trunk/forum/templatetags/ - copied from r544, trunk/forum/templatetags/ trunk/forum/templatetags/__init__.py - copied unchanged from r544, trunk/forum/templatetags/__init__.py trunk/forum/templatetags/library.py - copied unchanged from r544, trunk/forum/templatetags/library.py trunk/forum/urls.py - copied unchanged from r544, trunk/forum/urls.py trunk/forum/views.py - copied unchanged from r544, trunk/forum/views.py trunk/htaccess - copied unchanged from r544, trunk/htaccess trunk/manage.py - copied unchanged from r544, trunk/manage.py trunk/media/ - copied from r544, trunk/media/ trunk/media/css/ - copied from r544, trunk/media/css/ trunk/media/css/base.css - copied unchanged from r544, trunk/media/css/base.css trunk/media/css/changelists.css - copied unchanged from r544, trunk/media/css/changelists.css trunk/media/css/dashboard.css - copied unchanged from r544, trunk/media/css/dashboard.css trunk/media/css/forms.css - copied unchanged from r544, trunk/media/css/forms.css trunk/media/css/global.css - copied unchanged from r544, trunk/media/css/global.css trunk/media/css/layout.css - copied unchanged from r544, trunk/media/css/layout.css trunk/media/css/login.css - copied unchanged from r544, trunk/media/css/login.css trunk/media/css/niceforms.css - copied unchanged from r544, trunk/media/css/niceforms.css trunk/media/css/patch-iewin.css - copied unchanged from r544, trunk/media/css/patch-iewin.css trunk/media/css/rtl.css - copied unchanged from r544, trunk/media/css/rtl.css trunk/media/css/slimbox_ex.css - copied unchanged from r544, trunk/media/css/slimbox_ex.css trunk/media/css/style.css - copied unchanged from r544, trunk/media/css/style.css trunk/media/css/widgets.css - copied unchanged from r544, trunk/media/css/widgets.css trunk/media/hackergotchi/ - copied from r544, trunk/media/hackergotchi/ trunk/media/hackergotchi/ahmetaygun.png - copied unchanged from r544, trunk/media/hackergotchi/ahmetaygun.png trunk/media/hackergotchi/akinomeroglu.png - copied unchanged from r544, trunk/media/hackergotchi/akinomeroglu.png trunk/media/hackergotchi/aliisingor.png - copied unchanged from r544, trunk/media/hackergotchi/aliisingor.png trunk/media/hackergotchi/alpersomuncu.png - copied unchanged from r544, trunk/media/hackergotchi/alpersomuncu.png trunk/media/hackergotchi/amuratmeren.png - copied unchanged from r544, trunk/media/hackergotchi/amuratmeren.png trunk/media/hackergotchi/bahadirkandemir.png - copied unchanged from r544, trunk/media/hackergotchi/bahadirkandemir.png trunk/media/hackergotchi/caglaronur.png - copied unchanged from r544, trunk/media/hackergotchi/caglaronur.png trunk/media/hackergotchi/faikuygur.png - copied unchanged from r544, trunk/media/hackergotchi/faikuygur.png trunk/media/hackergotchi/gokmengoksel.png - copied unchanged from r544, trunk/media/hackergotchi/gokmengoksel.png trunk/media/hackergotchi/gokmengorgen.png - copied unchanged from r544, trunk/media/hackergotchi/gokmengorgen.png trunk/media/hackergotchi/korayloker.png - copied unchanged from r544, trunk/media/hackergotchi/korayloker.png trunk/media/hackergotchi/mustafagunay.png - copied unchanged from r544, trunk/media/hackergotchi/mustafagunay.png trunk/media/hackergotchi/none.png - copied unchanged from r544, trunk/media/hackergotchi/none.png trunk/media/hackergotchi/oguztacyildiz.png - copied unchanged from r544, trunk/media/hackergotchi/oguztacyildiz.png trunk/media/hackergotchi/recepkirmizi.png - copied unchanged from r544, trunk/media/hackergotchi/recepkirmizi.png trunk/media/hackergotchi/serveracim.png - copied unchanged from r544, trunk/media/hackergotchi/serveracim.png trunk/media/img/ - copied from r544, trunk/media/img/ trunk/media/img/admin/ - copied from r544, trunk/media/img/admin/ trunk/media/img/admin/arrow-down.gif - copied unchanged from r544, trunk/media/img/admin/arrow-down.gif trunk/media/img/admin/arrow-up.gif - copied unchanged from r544, trunk/media/img/admin/arrow-up.gif trunk/media/img/admin/changelist-bg.gif - copied unchanged from r544, trunk/media/img/admin/changelist-bg.gif trunk/media/img/admin/chooser-bg.gif - copied unchanged from r544, trunk/media/img/admin/chooser-bg.gif trunk/media/img/admin/chooser_stacked-bg.gif - copied unchanged from r544, trunk/media/img/admin/chooser_stacked-bg.gif trunk/media/img/admin/default-bg-reverse.gif - copied unchanged from r544, trunk/media/img/admin/default-bg-reverse.gif trunk/media/img/admin/default-bg.gif - copied unchanged from r544, trunk/media/img/admin/default-bg.gif trunk/media/img/admin/deleted-overlay.gif - copied unchanged from r544, trunk/media/img/admin/deleted-overlay.gif trunk/media/img/admin/icon-no.gif - copied unchanged from r544, trunk/media/img/admin/icon-no.gif trunk/media/img/admin/icon-unknown.gif - copied unchanged from r544, trunk/media/img/admin/icon-unknown.gif trunk/media/img/admin/icon-yes.gif - copied unchanged from r544, trunk/media/img/admin/icon-yes.gif trunk/media/img/admin/icon_addlink.gif - copied unchanged from r544, trunk/media/img/admin/icon_addlink.gif trunk/media/img/admin/icon_alert.gif - copied unchanged from r544, trunk/media/img/admin/icon_alert.gif trunk/media/img/admin/icon_calendar.gif - copied unchanged from r544, trunk/media/img/admin/icon_calendar.gif trunk/media/img/admin/icon_changelink.gif - copied unchanged from r544, trunk/media/img/admin/icon_changelink.gif trunk/media/img/admin/icon_clock.gif - copied unchanged from r544, trunk/media/img/admin/icon_clock.gif trunk/media/img/admin/icon_deletelink.gif - copied unchanged from r544, trunk/media/img/admin/icon_deletelink.gif trunk/media/img/admin/icon_error.gif - copied unchanged from r544, trunk/media/img/admin/icon_error.gif trunk/media/img/admin/icon_searchbox.png - copied unchanged from r544, trunk/media/img/admin/icon_searchbox.png trunk/media/img/admin/icon_success.gif - copied unchanged from r544, trunk/media/img/admin/icon_success.gif trunk/media/img/admin/inline-delete-8bit.png - copied unchanged from r544, trunk/media/img/admin/inline-delete-8bit.png trunk/media/img/admin/inline-delete.png - copied unchanged from r544, trunk/media/img/admin/inline-delete.png trunk/media/img/admin/inline-restore-8bit.png - copied unchanged from r544, trunk/media/img/admin/inline-restore-8bit.png trunk/media/img/admin/inline-restore.png - copied unchanged from r544, trunk/media/img/admin/inline-restore.png trunk/media/img/admin/inline-splitter-bg.gif - copied unchanged from r544, trunk/media/img/admin/inline-splitter-bg.gif trunk/media/img/admin/nav-bg-grabber.gif - copied unchanged from r544, trunk/media/img/admin/nav-bg-grabber.gif trunk/media/img/admin/nav-bg-reverse.gif - copied unchanged from r544, trunk/media/img/admin/nav-bg-reverse.gif trunk/media/img/admin/nav-bg.gif - copied unchanged from r544, trunk/media/img/admin/nav-bg.gif trunk/media/img/admin/selector-add.gif - copied unchanged from r544, trunk/media/img/admin/selector-add.gif trunk/media/img/admin/selector-addall.gif - copied unchanged from r544, trunk/media/img/admin/selector-addall.gif trunk/media/img/admin/selector-remove.gif - copied unchanged from r544, trunk/media/img/admin/selector-remove.gif trunk/media/img/admin/selector-removeall.gif - copied unchanged from r544, trunk/media/img/admin/selector-removeall.gif trunk/media/img/admin/selector-search.gif - copied unchanged from r544, trunk/media/img/admin/selector-search.gif trunk/media/img/admin/selector_stacked-add.gif - copied unchanged from r544, trunk/media/img/admin/selector_stacked-add.gif trunk/media/img/admin/selector_stacked-remove.gif - copied unchanged from r544, trunk/media/img/admin/selector_stacked-remove.gif trunk/media/img/admin/tool-left.gif - copied unchanged from r544, trunk/media/img/admin/tool-left.gif trunk/media/img/admin/tool-left_over.gif - copied unchanged from r544, trunk/media/img/admin/tool-left_over.gif trunk/media/img/admin/tool-right.gif - copied unchanged from r544, trunk/media/img/admin/tool-right.gif trunk/media/img/admin/tool-right_over.gif - copied unchanged from r544, trunk/media/img/admin/tool-right_over.gif trunk/media/img/admin/tooltag-add.gif - copied unchanged from r544, trunk/media/img/admin/tooltag-add.gif trunk/media/img/admin/tooltag-add_over.gif - copied unchanged from r544, trunk/media/img/admin/tooltag-add_over.gif trunk/media/img/admin/tooltag-arrowright.gif - copied unchanged from r544, trunk/media/img/admin/tooltag-arrowright.gif trunk/media/img/admin/tooltag-arrowright_over.gif - copied unchanged from r544, trunk/media/img/admin/tooltag-arrowright_over.gif trunk/media/img/atom.png - copied unchanged from r544, trunk/media/img/atom.png trunk/media/img/banner/ - copied from r544, trunk/media/img/banner/ trunk/media/img/banner/banner01.png - copied unchanged from r544, trunk/media/img/banner/banner01.png trunk/media/img/banner/banner02.png - copied unchanged from r544, trunk/media/img/banner/banner02.png trunk/media/img/banner/banner03.png - copied unchanged from r544, trunk/media/img/banner/banner03.png trunk/media/img/bg.png - copied unchanged from r544, trunk/media/img/bg.png trunk/media/img/cok_yakinda.png - copied unchanged from r544, trunk/media/img/cok_yakinda.png trunk/media/img/content_bg.png - copied unchanged from r544, trunk/media/img/content_bg.png trunk/media/img/content_bg_single.png - copied unchanged from r544, trunk/media/img/content_bg_single.png trunk/media/img/cross.png - copied unchanged from r544, trunk/media/img/cross.png trunk/media/img/djangomade.png - copied unchanged from r544, trunk/media/img/djangomade.png trunk/media/img/download_package.png - copied unchanged from r544, trunk/media/img/download_package.png trunk/media/img/error.png - copied unchanged from r544, trunk/media/img/error.png trunk/media/img/favicon.png - copied unchanged from r544, trunk/media/img/favicon.png trunk/media/img/feed_icon.png - copied unchanged from r544, trunk/media/img/feed_icon.png trunk/media/img/footer_about.png - copied unchanged from r544, trunk/media/img/footer_about.png trunk/media/img/footer_bg.png - copied unchanged from r544, trunk/media/img/footer_bg.png trunk/media/img/footer_bug.png - copied unchanged from r544, trunk/media/img/footer_bug.png trunk/media/img/footer_right_bg.png - copied unchanged from r544, trunk/media/img/footer_right_bg.png trunk/media/img/footer_rss.png - copied unchanged from r544, trunk/media/img/footer_rss.png trunk/media/img/forum_header_bg.png - copied unchanged from r544, trunk/media/img/forum_header_bg.png trunk/media/img/forum_header_logo.png - copied unchanged from r544, trunk/media/img/forum_header_logo.png trunk/media/img/fs_header_bg.png - copied unchanged from r544, trunk/media/img/fs_header_bg.png trunk/media/img/fs_header_logo.png - copied unchanged from r544, trunk/media/img/fs_header_logo.png trunk/media/img/fs_title.png - copied unchanged from r544, trunk/media/img/fs_title.png trunk/media/img/fs_title_mini.png - copied unchanged from r544, trunk/media/img/fs_title_mini.png trunk/media/img/game_average_point.png - copied unchanged from r544, trunk/media/img/game_average_point.png trunk/media/img/game_header_bg.png - copied unchanged from r544, trunk/media/img/game_header_bg.png trunk/media/img/game_header_logo.png - copied unchanged from r544, trunk/media/img/game_header_logo.png trunk/media/img/games_title.png - copied unchanged from r544, trunk/media/img/games_title.png trunk/media/img/games_title_mini.png - copied unchanged from r544, trunk/media/img/games_title_mini.png trunk/media/img/home_header_bg.png - copied unchanged from r544, trunk/media/img/home_header_bg.png trunk/media/img/input_password.png - copied unchanged from r544, trunk/media/img/input_password.png trunk/media/img/input_username.png - copied unchanged from r544, trunk/media/img/input_username.png trunk/media/img/loading.gif - copied unchanged from r544, trunk/media/img/loading.gif trunk/media/img/loading.png - copied unchanged from r544, trunk/media/img/loading.png trunk/media/img/logo.png - copied unchanged from r544, trunk/media/img/logo.png trunk/media/img/news_header_bg.png - copied unchanged from r544, trunk/media/img/news_header_bg.png trunk/media/img/news_header_logo.png - copied unchanged from r544, trunk/media/img/news_header_logo.png trunk/media/img/news_title.png - copied unchanged from r544, trunk/media/img/news_title.png trunk/media/img/news_title_mini.png - copied unchanged from r544, trunk/media/img/news_title_mini.png trunk/media/img/niceforms/ - copied from r544, trunk/media/img/niceforms/ trunk/media/img/niceforms/button_bg.png - copied unchanged from r544, trunk/media/img/niceforms/button_bg.png trunk/media/img/niceforms/button_left.png - copied unchanged from r544, trunk/media/img/niceforms/button_left.png trunk/media/img/niceforms/button_left_xon.png - copied unchanged from r544, trunk/media/img/niceforms/button_left_xon.png trunk/media/img/niceforms/button_right.png - copied unchanged from r544, trunk/media/img/niceforms/button_right.png trunk/media/img/niceforms/button_right_xon.png - copied unchanged from r544, trunk/media/img/niceforms/button_right_xon.png trunk/media/img/niceforms/checkbox.png - copied unchanged from r544, trunk/media/img/niceforms/checkbox.png trunk/media/img/niceforms/input_bg.png - copied unchanged from r544, trunk/media/img/niceforms/input_bg.png trunk/media/img/niceforms/input_left.png - copied unchanged from r544, trunk/media/img/niceforms/input_left.png trunk/media/img/niceforms/input_left_xon.png - copied unchanged from r544, trunk/media/img/niceforms/input_left_xon.png trunk/media/img/niceforms/input_right.png - copied unchanged from r544, trunk/media/img/niceforms/input_right.png trunk/media/img/niceforms/input_right_xon.png - copied unchanged from r544, trunk/media/img/niceforms/input_right_xon.png trunk/media/img/niceforms/radio.png - copied unchanged from r544, trunk/media/img/niceforms/radio.png trunk/media/img/niceforms/select_bg.png - copied unchanged from r544, trunk/media/img/niceforms/select_bg.png trunk/media/img/niceforms/select_left.png - copied unchanged from r544, trunk/media/img/niceforms/select_left.png trunk/media/img/niceforms/select_right.png - copied unchanged from r544, trunk/media/img/niceforms/select_right.png trunk/media/img/niceforms/txtarea_bl.png - copied unchanged from r544, trunk/media/img/niceforms/txtarea_bl.png trunk/media/img/niceforms/txtarea_bl_xon.png - copied unchanged from r544, trunk/media/img/niceforms/txtarea_bl_xon.png trunk/media/img/niceforms/txtarea_br.png - copied unchanged from r544, trunk/media/img/niceforms/txtarea_br.png trunk/media/img/niceforms/txtarea_br_xon.png - copied unchanged from r544, trunk/media/img/niceforms/txtarea_br_xon.png trunk/media/img/niceforms/txtarea_cntr.png - copied unchanged from r544, trunk/media/img/niceforms/txtarea_cntr.png trunk/media/img/niceforms/txtarea_cntr_xon.png - copied unchanged from r544, trunk/media/img/niceforms/txtarea_cntr_xon.png trunk/media/img/niceforms/txtarea_l.png - copied unchanged from r544, trunk/media/img/niceforms/txtarea_l.png trunk/media/img/niceforms/txtarea_l_xon.png - copied unchanged from r544, trunk/media/img/niceforms/txtarea_l_xon.png trunk/media/img/niceforms/txtarea_tl.png - copied unchanged from r544, trunk/media/img/niceforms/txtarea_tl.png trunk/media/img/niceforms/txtarea_tl_xon.png - copied unchanged from r544, trunk/media/img/niceforms/txtarea_tl_xon.png trunk/media/img/niceforms/txtarea_tr.png - copied unchanged from r544, trunk/media/img/niceforms/txtarea_tr.png trunk/media/img/niceforms/txtarea_tr_xon.png - copied unchanged from r544, trunk/media/img/niceforms/txtarea_tr_xon.png trunk/media/img/other_planets.png - copied unchanged from r544, trunk/media/img/other_planets.png trunk/media/img/package_header_bg.png - copied unchanged from r544, trunk/media/img/package_header_bg.png trunk/media/img/package_header_logo.png - copied unchanged from r544, trunk/media/img/package_header_logo.png trunk/media/img/packages_title.png - copied unchanged from r544, trunk/media/img/packages_title.png trunk/media/img/packages_title_mini.png - copied unchanged from r544, trunk/media/img/packages_title_mini.png trunk/media/img/planet_date_bg.png - copied unchanged from r544, trunk/media/img/planet_date_bg.png trunk/media/img/planet_header_bg.png - copied unchanged from r544, trunk/media/img/planet_header_bg.png trunk/media/img/planet_header_logo.png - copied unchanged from r544, trunk/media/img/planet_header_logo.png trunk/media/img/planet_title.png - copied unchanged from r544, trunk/media/img/planet_title.png trunk/media/img/print.png - copied unchanged from r544, trunk/media/img/print.png trunk/media/img/question.png - copied unchanged from r544, trunk/media/img/question.png trunk/media/img/rating_1.png - copied unchanged from r544, trunk/media/img/rating_1.png trunk/media/img/rating_10.png - copied unchanged from r544, trunk/media/img/rating_10.png trunk/media/img/rating_2.png - copied unchanged from r544, trunk/media/img/rating_2.png trunk/media/img/rating_3.png - copied unchanged from r544, trunk/media/img/rating_3.png trunk/media/img/rating_4.png - copied unchanged from r544, trunk/media/img/rating_4.png trunk/media/img/rating_5.png - copied unchanged from r544, trunk/media/img/rating_5.png trunk/media/img/rating_6.png - copied unchanged from r544, trunk/media/img/rating_6.png trunk/media/img/rating_7.png - copied unchanged from r544, trunk/media/img/rating_7.png trunk/media/img/rating_8.png - copied unchanged from r544, trunk/media/img/rating_8.png trunk/media/img/rating_9.png - copied unchanged from r544, trunk/media/img/rating_9.png trunk/media/img/rating_off.png - copied unchanged from r544, trunk/media/img/rating_off.png trunk/media/img/rating_on.png - copied unchanged from r544, trunk/media/img/rating_on.png trunk/media/img/rating_small_1.png - copied unchanged from r544, trunk/media/img/rating_small_1.png trunk/media/img/rating_small_2.png - copied unchanged from r544, trunk/media/img/rating_small_2.png trunk/media/img/rating_small_3.png - copied unchanged from r544, trunk/media/img/rating_small_3.png trunk/media/img/rating_small_4.png - copied unchanged from r544, trunk/media/img/rating_small_4.png trunk/media/img/rating_small_5.png - copied unchanged from r544, trunk/media/img/rating_small_5.png trunk/media/img/rss2.png - copied unchanged from r544, trunk/media/img/rss2.png trunk/media/img/sb_anchor_spacer.gif - copied unchanged from r544, trunk/media/img/sb_anchor_spacer.gif trunk/media/img/sb_closelabel.gif - copied unchanged from r544, trunk/media/img/sb_closelabel.gif trunk/media/img/sb_loading.gif - copied unchanged from r544, trunk/media/img/sb_loading.gif trunk/media/img/sb_nextlabel.gif - copied unchanged from r544, trunk/media/img/sb_nextlabel.gif trunk/media/img/sb_prevlabel.gif - copied unchanged from r544, trunk/media/img/sb_prevlabel.gif trunk/media/img/sidebar_blue.png - copied unchanged from r544, trunk/media/img/sidebar_blue.png trunk/media/img/sidebar_darkblue.png - copied unchanged from r544, trunk/media/img/sidebar_darkblue.png trunk/media/img/sidebar_download.png - copied unchanged from r544, trunk/media/img/sidebar_download.png trunk/media/img/sidebar_green.png - copied unchanged from r544, trunk/media/img/sidebar_green.png trunk/media/img/sidebar_orange.png - copied unchanged from r544, trunk/media/img/sidebar_orange.png trunk/media/img/sidebar_purple.png - copied unchanged from r544, trunk/media/img/sidebar_purple.png trunk/media/img/sidebar_yellow.png - copied unchanged from r544, trunk/media/img/sidebar_yellow.png trunk/media/img/tab_forum.png - copied unchanged from r544, trunk/media/img/tab_forum.png trunk/media/img/tab_fs.png - copied unchanged from r544, trunk/media/img/tab_fs.png trunk/media/img/tab_games.png - copied unchanged from r544, trunk/media/img/tab_games.png trunk/media/img/tab_news.png - copied unchanged from r544, trunk/media/img/tab_news.png trunk/media/img/tab_packages.png - copied unchanged from r544, trunk/media/img/tab_packages.png trunk/media/img/tab_planet.png - copied unchanged from r544, trunk/media/img/tab_planet.png trunk/media/img/tag.png - copied unchanged from r544, trunk/media/img/tag.png trunk/media/img/tag_darkblue.png - copied unchanged from r544, trunk/media/img/tag_darkblue.png trunk/media/img/tag_green.png - copied unchanged from r544, trunk/media/img/tag_green.png trunk/media/img/topbar_bg.png - copied unchanged from r544, trunk/media/img/topbar_bg.png trunk/media/img/video_play.png - copied unchanged from r544, trunk/media/img/video_play.png trunk/media/js/ - copied from r544, trunk/media/js/ trunk/media/js/SelectBox.js - copied unchanged from r544, trunk/media/js/SelectBox.js trunk/media/js/SelectFilter.js - copied unchanged from r544, trunk/media/js/SelectFilter.js trunk/media/js/SelectFilter2.js - copied unchanged from r544, trunk/media/js/SelectFilter2.js trunk/media/js/admin/ - copied from r544, trunk/media/js/admin/ trunk/media/js/admin/CollapsedFieldsets.js - copied unchanged from r544, trunk/media/js/admin/CollapsedFieldsets.js trunk/media/js/admin/DateTimeShortcuts.js - copied unchanged from r544, trunk/media/js/admin/DateTimeShortcuts.js trunk/media/js/admin/RelatedObjectLookups.js - copied unchanged from r544, trunk/media/js/admin/RelatedObjectLookups.js trunk/media/js/admin/ordering.js - copied unchanged from r544, trunk/media/js/admin/ordering.js trunk/media/js/calendar.js - copied unchanged from r544, trunk/media/js/calendar.js trunk/media/js/core.js - copied unchanged from r544, trunk/media/js/core.js trunk/media/js/custom.js - copied unchanged from r544, trunk/media/js/custom.js trunk/media/js/dateparse.js - copied unchanged from r544, trunk/media/js/dateparse.js trunk/media/js/element.cnet.js - copied unchanged from r544, trunk/media/js/element.cnet.js trunk/media/js/getElementsBySelector.js - copied unchanged from r544, trunk/media/js/getElementsBySelector.js trunk/media/js/mootools.js - copied unchanged from r544, trunk/media/js/mootools.js trunk/media/js/niceforms.js - copied unchanged from r544, trunk/media/js/niceforms.js trunk/media/js/pngfix.js - copied unchanged from r544, trunk/media/js/pngfix.js trunk/media/js/slimbox_ex.js - copied unchanged from r544, trunk/media/js/slimbox_ex.js trunk/media/js/tabswapper.js - copied unchanged from r544, trunk/media/js/tabswapper.js trunk/media/js/timeparse.js - copied unchanged from r544, trunk/media/js/timeparse.js trunk/media/js/tinymce/ - copied from r544, trunk/media/js/tinymce/ trunk/media/js/tinymce/blank.htm - copied unchanged from r544, trunk/media/js/tinymce/blank.htm trunk/media/js/tinymce/langs/ - copied from r544, trunk/media/js/tinymce/langs/ trunk/media/js/tinymce/langs/en.js - copied unchanged from r544, trunk/media/js/tinymce/langs/en.js trunk/media/js/tinymce/langs/readme.txt - copied unchanged from r544, trunk/media/js/tinymce/langs/readme.txt trunk/media/js/tinymce/langs/tr.js - copied unchanged from r544, trunk/media/js/tinymce/langs/tr.js trunk/media/js/tinymce/plugins/ - copied from r544, trunk/media/js/tinymce/plugins/ trunk/media/js/tinymce/plugins/_template/ - copied from r544, trunk/media/js/tinymce/plugins/_template/ trunk/media/js/tinymce/plugins/_template/editor_plugin.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/_template/editor_plugin.js trunk/media/js/tinymce/plugins/_template/editor_plugin_src.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/_template/editor_plugin_src.js trunk/media/js/tinymce/plugins/_template/images/ - copied from r544, trunk/media/js/tinymce/plugins/_template/images/ trunk/media/js/tinymce/plugins/_template/images/template.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/_template/images/template.gif trunk/media/js/tinymce/plugins/_template/langs/ - copied from r544, trunk/media/js/tinymce/plugins/_template/langs/ trunk/media/js/tinymce/plugins/_template/langs/en.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/_template/langs/en.js trunk/media/js/tinymce/plugins/_template/langs/tr.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/_template/langs/tr.js trunk/media/js/tinymce/plugins/_template/popup.htm - copied unchanged from r544, trunk/media/js/tinymce/plugins/_template/popup.htm trunk/media/js/tinymce/plugins/_template/readme.txt - copied unchanged from r544, trunk/media/js/tinymce/plugins/_template/readme.txt trunk/media/js/tinymce/plugins/advimage/ - copied from r544, trunk/media/js/tinymce/plugins/advimage/ trunk/media/js/tinymce/plugins/advimage/css/ - copied from r544, trunk/media/js/tinymce/plugins/advimage/css/ trunk/media/js/tinymce/plugins/advimage/css/advimage.css - copied unchanged from r544, trunk/media/js/tinymce/plugins/advimage/css/advimage.css trunk/media/js/tinymce/plugins/advimage/editor_plugin.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/advimage/editor_plugin.js trunk/media/js/tinymce/plugins/advimage/editor_plugin_src.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/advimage/editor_plugin_src.js trunk/media/js/tinymce/plugins/advimage/image.htm - copied unchanged from r544, trunk/media/js/tinymce/plugins/advimage/image.htm trunk/media/js/tinymce/plugins/advimage/images/ - copied from r544, trunk/media/js/tinymce/plugins/advimage/images/ trunk/media/js/tinymce/plugins/advimage/images/sample.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/advimage/images/sample.gif trunk/media/js/tinymce/plugins/advimage/jscripts/ - copied from r544, trunk/media/js/tinymce/plugins/advimage/jscripts/ trunk/media/js/tinymce/plugins/advimage/jscripts/functions.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/advimage/jscripts/functions.js trunk/media/js/tinymce/plugins/advimage/langs/ - copied from r544, trunk/media/js/tinymce/plugins/advimage/langs/ trunk/media/js/tinymce/plugins/advimage/langs/en.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/advimage/langs/en.js trunk/media/js/tinymce/plugins/advimage/langs/tr.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/advimage/langs/tr.js trunk/media/js/tinymce/plugins/advimage/readme.txt - copied unchanged from r544, trunk/media/js/tinymce/plugins/advimage/readme.txt trunk/media/js/tinymce/plugins/advlink/ - copied from r544, trunk/media/js/tinymce/plugins/advlink/ trunk/media/js/tinymce/plugins/advlink/css/ - copied from r544, trunk/media/js/tinymce/plugins/advlink/css/ trunk/media/js/tinymce/plugins/advlink/css/advlink.css - copied unchanged from r544, trunk/media/js/tinymce/plugins/advlink/css/advlink.css trunk/media/js/tinymce/plugins/advlink/editor_plugin.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/advlink/editor_plugin.js trunk/media/js/tinymce/plugins/advlink/editor_plugin_src.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/advlink/editor_plugin_src.js trunk/media/js/tinymce/plugins/advlink/jscripts/ - copied from r544, trunk/media/js/tinymce/plugins/advlink/jscripts/ trunk/media/js/tinymce/plugins/advlink/jscripts/functions.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/advlink/jscripts/functions.js trunk/media/js/tinymce/plugins/advlink/langs/ - copied from r544, trunk/media/js/tinymce/plugins/advlink/langs/ trunk/media/js/tinymce/plugins/advlink/langs/en.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/advlink/langs/en.js trunk/media/js/tinymce/plugins/advlink/langs/tr.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/advlink/langs/tr.js trunk/media/js/tinymce/plugins/advlink/link.htm - copied unchanged from r544, trunk/media/js/tinymce/plugins/advlink/link.htm trunk/media/js/tinymce/plugins/advlink/readme.txt - copied unchanged from r544, trunk/media/js/tinymce/plugins/advlink/readme.txt trunk/media/js/tinymce/plugins/autosave/ - copied from r544, trunk/media/js/tinymce/plugins/autosave/ trunk/media/js/tinymce/plugins/autosave/editor_plugin.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/autosave/editor_plugin.js trunk/media/js/tinymce/plugins/autosave/editor_plugin_src.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/autosave/editor_plugin_src.js trunk/media/js/tinymce/plugins/autosave/langs/ - copied from r544, trunk/media/js/tinymce/plugins/autosave/langs/ trunk/media/js/tinymce/plugins/autosave/langs/en.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/autosave/langs/en.js trunk/media/js/tinymce/plugins/autosave/langs/tr.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/autosave/langs/tr.js trunk/media/js/tinymce/plugins/autosave/readme.txt - copied unchanged from r544, trunk/media/js/tinymce/plugins/autosave/readme.txt trunk/media/js/tinymce/plugins/emotions/ - copied from r544, trunk/media/js/tinymce/plugins/emotions/ trunk/media/js/tinymce/plugins/emotions/editor_plugin.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/editor_plugin.js trunk/media/js/tinymce/plugins/emotions/editor_plugin_src.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/editor_plugin_src.js trunk/media/js/tinymce/plugins/emotions/emotions.htm - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/emotions.htm trunk/media/js/tinymce/plugins/emotions/images/ - copied from r544, trunk/media/js/tinymce/plugins/emotions/images/ trunk/media/js/tinymce/plugins/emotions/images/emotions.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/emotions.gif trunk/media/js/tinymce/plugins/emotions/images/readme.txt - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/readme.txt trunk/media/js/tinymce/plugins/emotions/images/smiley-cool.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/smiley-cool.gif trunk/media/js/tinymce/plugins/emotions/images/smiley-cry.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/smiley-cry.gif trunk/media/js/tinymce/plugins/emotions/images/smiley-embarassed.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/smiley-embarassed.gif trunk/media/js/tinymce/plugins/emotions/images/smiley-foot-in-mouth.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/smiley-foot-in-mouth.gif trunk/media/js/tinymce/plugins/emotions/images/smiley-frown.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/smiley-frown.gif trunk/media/js/tinymce/plugins/emotions/images/smiley-innocent.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/smiley-innocent.gif trunk/media/js/tinymce/plugins/emotions/images/smiley-kiss.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/smiley-kiss.gif trunk/media/js/tinymce/plugins/emotions/images/smiley-laughing.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/smiley-laughing.gif trunk/media/js/tinymce/plugins/emotions/images/smiley-money-mouth.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/smiley-money-mouth.gif trunk/media/js/tinymce/plugins/emotions/images/smiley-sealed.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/smiley-sealed.gif trunk/media/js/tinymce/plugins/emotions/images/smiley-smile.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/smiley-smile.gif trunk/media/js/tinymce/plugins/emotions/images/smiley-surprised.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/smiley-surprised.gif trunk/media/js/tinymce/plugins/emotions/images/smiley-tongue-out.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/smiley-tongue-out.gif trunk/media/js/tinymce/plugins/emotions/images/smiley-undecided.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/smiley-undecided.gif trunk/media/js/tinymce/plugins/emotions/images/smiley-wink.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/smiley-wink.gif trunk/media/js/tinymce/plugins/emotions/images/smiley-yell.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/images/smiley-yell.gif trunk/media/js/tinymce/plugins/emotions/jscripts/ - copied from r544, trunk/media/js/tinymce/plugins/emotions/jscripts/ trunk/media/js/tinymce/plugins/emotions/jscripts/functions.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/jscripts/functions.js trunk/media/js/tinymce/plugins/emotions/langs/ - copied from r544, trunk/media/js/tinymce/plugins/emotions/langs/ trunk/media/js/tinymce/plugins/emotions/langs/en.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/langs/en.js trunk/media/js/tinymce/plugins/emotions/langs/tr.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/langs/tr.js trunk/media/js/tinymce/plugins/emotions/readme.txt - copied unchanged from r544, trunk/media/js/tinymce/plugins/emotions/readme.txt trunk/media/js/tinymce/plugins/fullscreen/ - copied from r544, trunk/media/js/tinymce/plugins/fullscreen/ trunk/media/js/tinymce/plugins/fullscreen/editor_plugin.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/fullscreen/editor_plugin.js trunk/media/js/tinymce/plugins/fullscreen/editor_plugin_src.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/fullscreen/editor_plugin_src.js trunk/media/js/tinymce/plugins/fullscreen/fullscreen.htm - copied unchanged from r544, trunk/media/js/tinymce/plugins/fullscreen/fullscreen.htm trunk/media/js/tinymce/plugins/fullscreen/images/ - copied from r544, trunk/media/js/tinymce/plugins/fullscreen/images/ trunk/media/js/tinymce/plugins/fullscreen/images/fullscreen.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/fullscreen/images/fullscreen.gif trunk/media/js/tinymce/plugins/fullscreen/langs/ - copied from r544, trunk/media/js/tinymce/plugins/fullscreen/langs/ trunk/media/js/tinymce/plugins/fullscreen/langs/en.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/fullscreen/langs/en.js trunk/media/js/tinymce/plugins/fullscreen/langs/tr.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/fullscreen/langs/tr.js trunk/media/js/tinymce/plugins/fullscreen/readme.txt - copied unchanged from r544, trunk/media/js/tinymce/plugins/fullscreen/readme.txt trunk/media/js/tinymce/plugins/inlinepopups/ - copied from r544, trunk/media/js/tinymce/plugins/inlinepopups/ trunk/media/js/tinymce/plugins/inlinepopups/css/ - copied from r544, trunk/media/js/tinymce/plugins/inlinepopups/css/ trunk/media/js/tinymce/plugins/inlinepopups/css/inlinepopup.css - copied unchanged from r544, trunk/media/js/tinymce/plugins/inlinepopups/css/inlinepopup.css trunk/media/js/tinymce/plugins/inlinepopups/editor_plugin.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/inlinepopups/editor_plugin.js trunk/media/js/tinymce/plugins/inlinepopups/editor_plugin_src.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/inlinepopups/editor_plugin_src.js trunk/media/js/tinymce/plugins/inlinepopups/images/ - copied from r544, trunk/media/js/tinymce/plugins/inlinepopups/images/ trunk/media/js/tinymce/plugins/inlinepopups/images/spacer.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/inlinepopups/images/spacer.gif trunk/media/js/tinymce/plugins/inlinepopups/images/window_close.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/inlinepopups/images/window_close.gif trunk/media/js/tinymce/plugins/inlinepopups/images/window_maximize.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/inlinepopups/images/window_maximize.gif trunk/media/js/tinymce/plugins/inlinepopups/images/window_minimize.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/inlinepopups/images/window_minimize.gif trunk/media/js/tinymce/plugins/inlinepopups/images/window_resize.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/inlinepopups/images/window_resize.gif trunk/media/js/tinymce/plugins/inlinepopups/jscripts/ - copied from r544, trunk/media/js/tinymce/plugins/inlinepopups/jscripts/ trunk/media/js/tinymce/plugins/inlinepopups/jscripts/mcwindows.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/inlinepopups/jscripts/mcwindows.js trunk/media/js/tinymce/plugins/inlinepopups/readme.txt - copied unchanged from r544, trunk/media/js/tinymce/plugins/inlinepopups/readme.txt trunk/media/js/tinymce/plugins/insertdatetime/ - copied from r544, trunk/media/js/tinymce/plugins/insertdatetime/ trunk/media/js/tinymce/plugins/insertdatetime/editor_plugin.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/insertdatetime/editor_plugin.js trunk/media/js/tinymce/plugins/insertdatetime/editor_plugin_src.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/insertdatetime/editor_plugin_src.js trunk/media/js/tinymce/plugins/insertdatetime/images/ - copied from r544, trunk/media/js/tinymce/plugins/insertdatetime/images/ trunk/media/js/tinymce/plugins/insertdatetime/images/insertdate.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/insertdatetime/images/insertdate.gif trunk/media/js/tinymce/plugins/insertdatetime/images/inserttime.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/insertdatetime/images/inserttime.gif trunk/media/js/tinymce/plugins/insertdatetime/langs/ - copied from r544, trunk/media/js/tinymce/plugins/insertdatetime/langs/ trunk/media/js/tinymce/plugins/insertdatetime/langs/en.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/insertdatetime/langs/en.js trunk/media/js/tinymce/plugins/insertdatetime/langs/tr.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/insertdatetime/langs/tr.js trunk/media/js/tinymce/plugins/insertdatetime/readme.txt - copied unchanged from r544, trunk/media/js/tinymce/plugins/insertdatetime/readme.txt trunk/media/js/tinymce/plugins/readme.txt - copied unchanged from r544, trunk/media/js/tinymce/plugins/readme.txt trunk/media/js/tinymce/plugins/searchreplace/ - copied from r544, trunk/media/js/tinymce/plugins/searchreplace/ trunk/media/js/tinymce/plugins/searchreplace/editor_plugin.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/searchreplace/editor_plugin.js trunk/media/js/tinymce/plugins/searchreplace/editor_plugin_src.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/searchreplace/editor_plugin_src.js trunk/media/js/tinymce/plugins/searchreplace/images/ - copied from r544, trunk/media/js/tinymce/plugins/searchreplace/images/ trunk/media/js/tinymce/plugins/searchreplace/images/replace.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/searchreplace/images/replace.gif trunk/media/js/tinymce/plugins/searchreplace/images/search.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/searchreplace/images/search.gif trunk/media/js/tinymce/plugins/searchreplace/jscripts/ - copied from r544, trunk/media/js/tinymce/plugins/searchreplace/jscripts/ trunk/media/js/tinymce/plugins/searchreplace/jscripts/replace.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/searchreplace/jscripts/replace.js trunk/media/js/tinymce/plugins/searchreplace/jscripts/search.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/searchreplace/jscripts/search.js trunk/media/js/tinymce/plugins/searchreplace/langs/ - copied from r544, trunk/media/js/tinymce/plugins/searchreplace/langs/ trunk/media/js/tinymce/plugins/searchreplace/langs/en.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/searchreplace/langs/en.js trunk/media/js/tinymce/plugins/searchreplace/langs/tr.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/searchreplace/langs/tr.js trunk/media/js/tinymce/plugins/searchreplace/readme.txt - copied unchanged from r544, trunk/media/js/tinymce/plugins/searchreplace/readme.txt trunk/media/js/tinymce/plugins/searchreplace/replace.htm - copied unchanged from r544, trunk/media/js/tinymce/plugins/searchreplace/replace.htm trunk/media/js/tinymce/plugins/searchreplace/search.htm - copied unchanged from r544, trunk/media/js/tinymce/plugins/searchreplace/search.htm trunk/media/js/tinymce/plugins/style/ - copied from r544, trunk/media/js/tinymce/plugins/style/ trunk/media/js/tinymce/plugins/style/css/ - copied from r544, trunk/media/js/tinymce/plugins/style/css/ trunk/media/js/tinymce/plugins/style/css/props.css - copied unchanged from r544, trunk/media/js/tinymce/plugins/style/css/props.css trunk/media/js/tinymce/plugins/style/editor_plugin.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/style/editor_plugin.js trunk/media/js/tinymce/plugins/style/editor_plugin_src.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/style/editor_plugin_src.js trunk/media/js/tinymce/plugins/style/images/ - copied from r544, trunk/media/js/tinymce/plugins/style/images/ trunk/media/js/tinymce/plugins/style/images/apply_button_bg.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/style/images/apply_button_bg.gif trunk/media/js/tinymce/plugins/style/images/style_info.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/style/images/style_info.gif trunk/media/js/tinymce/plugins/style/jscripts/ - copied from r544, trunk/media/js/tinymce/plugins/style/jscripts/ trunk/media/js/tinymce/plugins/style/jscripts/props.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/style/jscripts/props.js trunk/media/js/tinymce/plugins/style/langs/ - copied from r544, trunk/media/js/tinymce/plugins/style/langs/ trunk/media/js/tinymce/plugins/style/langs/en.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/style/langs/en.js trunk/media/js/tinymce/plugins/style/langs/tr.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/style/langs/tr.js trunk/media/js/tinymce/plugins/style/props.htm - copied unchanged from r544, trunk/media/js/tinymce/plugins/style/props.htm trunk/media/js/tinymce/plugins/style/readme.txt - copied unchanged from r544, trunk/media/js/tinymce/plugins/style/readme.txt trunk/media/js/tinymce/plugins/table/ - copied from r544, trunk/media/js/tinymce/plugins/table/ trunk/media/js/tinymce/plugins/table/cell.htm - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/cell.htm trunk/media/js/tinymce/plugins/table/css/ - copied from r544, trunk/media/js/tinymce/plugins/table/css/ trunk/media/js/tinymce/plugins/table/css/cell.css - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/css/cell.css trunk/media/js/tinymce/plugins/table/css/row.css - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/css/row.css trunk/media/js/tinymce/plugins/table/css/table.css - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/css/table.css trunk/media/js/tinymce/plugins/table/editor_plugin.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/editor_plugin.js trunk/media/js/tinymce/plugins/table/editor_plugin_src.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/editor_plugin_src.js trunk/media/js/tinymce/plugins/table/images/ - copied from r544, trunk/media/js/tinymce/plugins/table/images/ trunk/media/js/tinymce/plugins/table/images/buttons.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/images/buttons.gif trunk/media/js/tinymce/plugins/table/images/table.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/images/table.gif trunk/media/js/tinymce/plugins/table/images/table_cell_props.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/images/table_cell_props.gif trunk/media/js/tinymce/plugins/table/images/table_delete.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/images/table_delete.gif trunk/media/js/tinymce/plugins/table/images/table_delete_col.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/images/table_delete_col.gif trunk/media/js/tinymce/plugins/table/images/table_delete_row.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/images/table_delete_row.gif trunk/media/js/tinymce/plugins/table/images/table_insert_col_after.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/images/table_insert_col_after.gif trunk/media/js/tinymce/plugins/table/images/table_insert_col_before.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/images/table_insert_col_before.gif trunk/media/js/tinymce/plugins/table/images/table_insert_row_after.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/images/table_insert_row_after.gif trunk/media/js/tinymce/plugins/table/images/table_insert_row_before.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/images/table_insert_row_before.gif trunk/media/js/tinymce/plugins/table/images/table_merge_cells.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/images/table_merge_cells.gif trunk/media/js/tinymce/plugins/table/images/table_row_props.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/images/table_row_props.gif trunk/media/js/tinymce/plugins/table/images/table_split_cells.gif - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/images/table_split_cells.gif trunk/media/js/tinymce/plugins/table/jscripts/ - copied from r544, trunk/media/js/tinymce/plugins/table/jscripts/ trunk/media/js/tinymce/plugins/table/jscripts/cell.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/jscripts/cell.js trunk/media/js/tinymce/plugins/table/jscripts/merge_cells.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/jscripts/merge_cells.js trunk/media/js/tinymce/plugins/table/jscripts/row.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/jscripts/row.js trunk/media/js/tinymce/plugins/table/jscripts/table.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/jscripts/table.js trunk/media/js/tinymce/plugins/table/langs/ - copied from r544, trunk/media/js/tinymce/plugins/table/langs/ trunk/media/js/tinymce/plugins/table/langs/en.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/langs/en.js trunk/media/js/tinymce/plugins/table/langs/tr.js - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/langs/tr.js trunk/media/js/tinymce/plugins/table/merge_cells.htm - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/merge_cells.htm trunk/media/js/tinymce/plugins/table/readme.txt - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/readme.txt trunk/media/js/tinymce/plugins/table/row.htm - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/row.htm trunk/media/js/tinymce/plugins/table/table.htm - copied unchanged from r544, trunk/media/js/tinymce/plugins/table/table.htm trunk/media/js/tinymce/textareas.js - copied unchanged from r544, trunk/media/js/tinymce/textareas.js trunk/media/js/tinymce/themes/ - copied from r544, trunk/media/js/tinymce/themes/ trunk/media/js/tinymce/themes/advanced/ - copied from r544, trunk/media/js/tinymce/themes/advanced/ trunk/media/js/tinymce/themes/advanced/about.htm - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/about.htm trunk/media/js/tinymce/themes/advanced/anchor.htm - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/anchor.htm trunk/media/js/tinymce/themes/advanced/charmap.htm - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/charmap.htm trunk/media/js/tinymce/themes/advanced/color_picker.htm - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/color_picker.htm trunk/media/js/tinymce/themes/advanced/css/ - copied from r544, trunk/media/js/tinymce/themes/advanced/css/ trunk/media/js/tinymce/themes/advanced/css/editor_content.css - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/css/editor_content.css trunk/media/js/tinymce/themes/advanced/css/editor_popup.css - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/css/editor_popup.css trunk/media/js/tinymce/themes/advanced/css/editor_ui.css - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/css/editor_ui.css trunk/media/js/tinymce/themes/advanced/docs/ - copied from r544, trunk/media/js/tinymce/themes/advanced/docs/ trunk/media/js/tinymce/themes/advanced/docs/en/ - copied from r544, trunk/media/js/tinymce/themes/advanced/docs/en/ trunk/media/js/tinymce/themes/advanced/docs/en/about.htm - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/docs/en/about.htm trunk/media/js/tinymce/themes/advanced/docs/en/common_buttons.htm - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/docs/en/common_buttons.htm trunk/media/js/tinymce/themes/advanced/docs/en/create_accessible_content.htm - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/docs/en/create_accessible_content.htm trunk/media/js/tinymce/themes/advanced/docs/en/images/ - copied from r544, trunk/media/js/tinymce/themes/advanced/docs/en/images/ trunk/media/js/tinymce/themes/advanced/docs/en/images/insert_anchor_window.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/docs/en/images/insert_anchor_window.gif trunk/media/js/tinymce/themes/advanced/docs/en/images/insert_image_window.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/docs/en/images/insert_image_window.gif trunk/media/js/tinymce/themes/advanced/docs/en/images/insert_link_window.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/docs/en/images/insert_link_window.gif trunk/media/js/tinymce/themes/advanced/docs/en/images/insert_table_window.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/docs/en/images/insert_table_window.gif trunk/media/js/tinymce/themes/advanced/docs/en/index.htm - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/docs/en/index.htm trunk/media/js/tinymce/themes/advanced/docs/en/insert_anchor_button.htm - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/docs/en/insert_anchor_button.htm trunk/media/js/tinymce/themes/advanced/docs/en/insert_image_button.htm - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/docs/en/insert_image_button.htm trunk/media/js/tinymce/themes/advanced/docs/en/insert_link_button.htm - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/docs/en/insert_link_button.htm trunk/media/js/tinymce/themes/advanced/docs/en/insert_table_button.htm - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/docs/en/insert_table_button.htm trunk/media/js/tinymce/themes/advanced/docs/en/style.css - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/docs/en/style.css trunk/media/js/tinymce/themes/advanced/editor_template.js - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/editor_template.js trunk/media/js/tinymce/themes/advanced/editor_template_src.js - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/editor_template_src.js trunk/media/js/tinymce/themes/advanced/image.htm - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/image.htm trunk/media/js/tinymce/themes/advanced/images/ - copied from r544, trunk/media/js/tinymce/themes/advanced/images/ trunk/media/js/tinymce/themes/advanced/images/anchor.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/anchor.gif trunk/media/js/tinymce/themes/advanced/images/anchor_symbol.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/anchor_symbol.gif trunk/media/js/tinymce/themes/advanced/images/backcolor.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/backcolor.gif trunk/media/js/tinymce/themes/advanced/images/bold.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/bold.gif trunk/media/js/tinymce/themes/advanced/images/bold_de_se.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/bold_de_se.gif trunk/media/js/tinymce/themes/advanced/images/bold_es.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/bold_es.gif trunk/media/js/tinymce/themes/advanced/images/bold_fr.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/bold_fr.gif trunk/media/js/tinymce/themes/advanced/images/bold_ru.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/bold_ru.gif trunk/media/js/tinymce/themes/advanced/images/bold_tw.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/bold_tw.gif trunk/media/js/tinymce/themes/advanced/images/browse.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/browse.gif trunk/media/js/tinymce/themes/advanced/images/bullist.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/bullist.gif trunk/media/js/tinymce/themes/advanced/images/button_menu.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/button_menu.gif trunk/media/js/tinymce/themes/advanced/images/buttons.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/buttons.gif trunk/media/js/tinymce/themes/advanced/images/cancel_button_bg.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/cancel_button_bg.gif trunk/media/js/tinymce/themes/advanced/images/charmap.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/charmap.gif trunk/media/js/tinymce/themes/advanced/images/cleanup.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/cleanup.gif trunk/media/js/tinymce/themes/advanced/images/close.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/close.gif trunk/media/js/tinymce/themes/advanced/images/code.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/code.gif trunk/media/js/tinymce/themes/advanced/images/color.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/color.gif trunk/media/js/tinymce/themes/advanced/images/copy.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/copy.gif trunk/media/js/tinymce/themes/advanced/images/custom_1.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/custom_1.gif trunk/media/js/tinymce/themes/advanced/images/cut.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/cut.gif trunk/media/js/tinymce/themes/advanced/images/forecolor.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/forecolor.gif trunk/media/js/tinymce/themes/advanced/images/help.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/help.gif trunk/media/js/tinymce/themes/advanced/images/hr.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/hr.gif trunk/media/js/tinymce/themes/advanced/images/image.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/image.gif trunk/media/js/tinymce/themes/advanced/images/indent.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/indent.gif trunk/media/js/tinymce/themes/advanced/images/insert_button_bg.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/insert_button_bg.gif trunk/media/js/tinymce/themes/advanced/images/italic.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/italic.gif trunk/media/js/tinymce/themes/advanced/images/italic_de_se.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/italic_de_se.gif trunk/media/js/tinymce/themes/advanced/images/italic_es.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/italic_es.gif trunk/media/js/tinymce/themes/advanced/images/italic_ru.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/italic_ru.gif trunk/media/js/tinymce/themes/advanced/images/italic_tw.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/italic_tw.gif trunk/media/js/tinymce/themes/advanced/images/justifycenter.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/justifycenter.gif trunk/media/js/tinymce/themes/advanced/images/justifyfull.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/justifyfull.gif trunk/media/js/tinymce/themes/advanced/images/justifyleft.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/justifyleft.gif trunk/media/js/tinymce/themes/advanced/images/justifyright.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/justifyright.gif trunk/media/js/tinymce/themes/advanced/images/link.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/link.gif trunk/media/js/tinymce/themes/advanced/images/menu_check.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/menu_check.gif trunk/media/js/tinymce/themes/advanced/images/newdocument.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/newdocument.gif trunk/media/js/tinymce/themes/advanced/images/numlist.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/numlist.gif trunk/media/js/tinymce/themes/advanced/images/opacity.png - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/opacity.png trunk/media/js/tinymce/themes/advanced/images/outdent.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/outdent.gif trunk/media/js/tinymce/themes/advanced/images/paste.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/paste.gif trunk/media/js/tinymce/themes/advanced/images/redo.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/redo.gif trunk/media/js/tinymce/themes/advanced/images/removeformat.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/removeformat.gif trunk/media/js/tinymce/themes/advanced/images/separator.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/separator.gif trunk/media/js/tinymce/themes/advanced/images/spacer.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/spacer.gif trunk/media/js/tinymce/themes/advanced/images/statusbar_resize.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/statusbar_resize.gif trunk/media/js/tinymce/themes/advanced/images/strikethrough.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/strikethrough.gif trunk/media/js/tinymce/themes/advanced/images/sub.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/sub.gif trunk/media/js/tinymce/themes/advanced/images/sup.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/sup.gif trunk/media/js/tinymce/themes/advanced/images/underline.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/underline.gif trunk/media/js/tinymce/themes/advanced/images/underline_es.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/underline_es.gif trunk/media/js/tinymce/themes/advanced/images/underline_fr.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/underline_fr.gif trunk/media/js/tinymce/themes/advanced/images/underline_ru.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/underline_ru.gif trunk/media/js/tinymce/themes/advanced/images/underline_tw.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/underline_tw.gif trunk/media/js/tinymce/themes/advanced/images/undo.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/undo.gif trunk/media/js/tinymce/themes/advanced/images/unlink.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/unlink.gif trunk/media/js/tinymce/themes/advanced/images/visualaid.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/visualaid.gif trunk/media/js/tinymce/themes/advanced/images/xp/ - copied from r544, trunk/media/js/tinymce/themes/advanced/images/xp/ trunk/media/js/tinymce/themes/advanced/images/xp/tab_bg.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/xp/tab_bg.gif trunk/media/js/tinymce/themes/advanced/images/xp/tab_end.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/xp/tab_end.gif trunk/media/js/tinymce/themes/advanced/images/xp/tab_sel_bg.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/xp/tab_sel_bg.gif trunk/media/js/tinymce/themes/advanced/images/xp/tab_sel_end.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/xp/tab_sel_end.gif trunk/media/js/tinymce/themes/advanced/images/xp/tabs_bg.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/images/xp/tabs_bg.gif trunk/media/js/tinymce/themes/advanced/jscripts/ - copied from r544, trunk/media/js/tinymce/themes/advanced/jscripts/ trunk/media/js/tinymce/themes/advanced/jscripts/about.js - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/jscripts/about.js trunk/media/js/tinymce/themes/advanced/jscripts/anchor.js - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/jscripts/anchor.js trunk/media/js/tinymce/themes/advanced/jscripts/charmap.js - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/jscripts/charmap.js trunk/media/js/tinymce/themes/advanced/jscripts/color_picker.js - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/jscripts/color_picker.js trunk/media/js/tinymce/themes/advanced/jscripts/image.js - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/jscripts/image.js trunk/media/js/tinymce/themes/advanced/jscripts/link.js - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/jscripts/link.js trunk/media/js/tinymce/themes/advanced/jscripts/source_editor.js - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/jscripts/source_editor.js trunk/media/js/tinymce/themes/advanced/langs/ - copied from r544, trunk/media/js/tinymce/themes/advanced/langs/ trunk/media/js/tinymce/themes/advanced/langs/en.js - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/langs/en.js trunk/media/js/tinymce/themes/advanced/langs/tr.js - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/langs/tr.js trunk/media/js/tinymce/themes/advanced/link.htm - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/link.htm trunk/media/js/tinymce/themes/advanced/source_editor.htm - copied unchanged from r544, trunk/media/js/tinymce/themes/advanced/source_editor.htm trunk/media/js/tinymce/themes/simple/ - copied from r544, trunk/media/js/tinymce/themes/simple/ trunk/media/js/tinymce/themes/simple/css/ - copied from r544, trunk/media/js/tinymce/themes/simple/css/ trunk/media/js/tinymce/themes/simple/css/editor_content.css - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/css/editor_content.css trunk/media/js/tinymce/themes/simple/css/editor_popup.css - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/css/editor_popup.css trunk/media/js/tinymce/themes/simple/css/editor_ui.css - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/css/editor_ui.css trunk/media/js/tinymce/themes/simple/editor_template.js - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/editor_template.js trunk/media/js/tinymce/themes/simple/editor_template_src.js - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/editor_template_src.js trunk/media/js/tinymce/themes/simple/images/ - copied from r544, trunk/media/js/tinymce/themes/simple/images/ trunk/media/js/tinymce/themes/simple/images/bold.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/bold.gif trunk/media/js/tinymce/themes/simple/images/bold_de_se.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/bold_de_se.gif trunk/media/js/tinymce/themes/simple/images/bold_fr.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/bold_fr.gif trunk/media/js/tinymce/themes/simple/images/bold_ru.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/bold_ru.gif trunk/media/js/tinymce/themes/simple/images/bold_tw.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/bold_tw.gif trunk/media/js/tinymce/themes/simple/images/bullist.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/bullist.gif trunk/media/js/tinymce/themes/simple/images/buttons.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/buttons.gif trunk/media/js/tinymce/themes/simple/images/cleanup.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/cleanup.gif trunk/media/js/tinymce/themes/simple/images/italic.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/italic.gif trunk/media/js/tinymce/themes/simple/images/italic_de_se.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/italic_de_se.gif trunk/media/js/tinymce/themes/simple/images/italic_ru.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/italic_ru.gif trunk/media/js/tinymce/themes/simple/images/italic_tw.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/italic_tw.gif trunk/media/js/tinymce/themes/simple/images/numlist.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/numlist.gif trunk/media/js/tinymce/themes/simple/images/redo.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/redo.gif trunk/media/js/tinymce/themes/simple/images/separator.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/separator.gif trunk/media/js/tinymce/themes/simple/images/spacer.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/spacer.gif trunk/media/js/tinymce/themes/simple/images/strikethrough.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/strikethrough.gif trunk/media/js/tinymce/themes/simple/images/underline.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/underline.gif trunk/media/js/tinymce/themes/simple/images/underline_fr.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/underline_fr.gif trunk/media/js/tinymce/themes/simple/images/underline_ru.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/underline_ru.gif trunk/media/js/tinymce/themes/simple/images/underline_tw.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/underline_tw.gif trunk/media/js/tinymce/themes/simple/images/undo.gif - copied unchanged from r544, trunk/media/js/tinymce/themes/simple/images/undo.gif trunk/media/js/tinymce/tiny_mce.js - copied unchanged from r544, trunk/media/js/tinymce/tiny_mce.js trunk/media/js/tinymce/tiny_mce_popup.js - copied unchanged from r544, trunk/media/js/tinymce/tiny_mce_popup.js trunk/media/js/tinymce/tiny_mce_src.js - copied unchanged from r544, trunk/media/js/tinymce/tiny_mce_src.js trunk/media/js/tinymce/utils/ - copied from r544, trunk/media/js/tinymce/utils/ trunk/media/js/tinymce/utils/editable_selects.js - copied unchanged from r544, trunk/media/js/tinymce/utils/editable_selects.js trunk/media/js/tinymce/utils/form_utils.js - copied unchanged from r544, trunk/media/js/tinymce/utils/form_utils.js trunk/media/js/tinymce/utils/mclayer.js - copied unchanged from r544, trunk/media/js/tinymce/utils/mclayer.js trunk/media/js/tinymce/utils/mctabs.js - copied unchanged from r544, trunk/media/js/tinymce/utils/mctabs.js trunk/media/js/tinymce/utils/validate.js - copied unchanged from r544, trunk/media/js/tinymce/utils/validate.js trunk/media/js/urlify.js - copied unchanged from r544, trunk/media/js/urlify.js trunk/media/swf/ - copied from r544, trunk/media/swf/ trunk/media/swf/FlowPlayerBlack.swf - copied unchanged from r544, trunk/media/swf/FlowPlayerBlack.swf trunk/middleware/ (props changed) - copied from r544, trunk/middleware/ trunk/middleware/__init__.py - copied unchanged from r544, trunk/middleware/__init__.py trunk/middleware/threadlocals.py - copied unchanged from r544, trunk/middleware/threadlocals.py trunk/profile/ - copied from r544, trunk/profile/ trunk/profile/__init__.py - copied unchanged from r544, trunk/profile/__init__.py trunk/profile/models.py - copied unchanged from r544, trunk/profile/models.py trunk/profile/urls.py - copied unchanged from r544, trunk/profile/urls.py trunk/profile/views.py - copied unchanged from r544, trunk/profile/views.py trunk/seminar/ - copied from r544, trunk/seminar/ trunk/seminar/__init__.py - copied unchanged from r544, trunk/seminar/__init__.py trunk/seminar/models.py - copied unchanged from r544, trunk/seminar/models.py trunk/seminar/urls.py - copied unchanged from r544, trunk/seminar/urls.py trunk/seminar/views.py - copied unchanged from r544, trunk/seminar/views.py trunk/settings.py - copied unchanged from r544, trunk/settings.py trunk/st/ - copied from r544, trunk/st/ trunk/st/__init__.py - copied unchanged from r544, trunk/st/__init__.py trunk/st/feeds.py - copied unchanged from r544, trunk/st/feeds.py trunk/st/models.py - copied unchanged from r544, trunk/st/models.py trunk/st/templatetags/ - copied from r544, trunk/st/templatetags/ trunk/st/templatetags/__init__.py - copied unchanged from r544, trunk/st/templatetags/__init__.py trunk/st/templatetags/library.py - copied unchanged from r544, trunk/st/templatetags/library.py trunk/st/views.py - copied unchanged from r544, trunk/st/views.py trunk/st/wrappers.py - copied unchanged from r544, trunk/st/wrappers.py trunk/templates/ - copied from r544, trunk/templates/ trunk/templates/404.html - copied unchanged from r544, trunk/templates/404.html trunk/templates/500.html - copied unchanged from r544, trunk/templates/500.html trunk/templates/admin/ - copied from r544, trunk/templates/admin/ trunk/templates/admin/404.html - copied unchanged from r544, trunk/templates/admin/404.html trunk/templates/admin/500.html - copied unchanged from r544, trunk/templates/admin/500.html trunk/templates/admin/base.html - copied unchanged from r544, trunk/templates/admin/base.html trunk/templates/admin/base_site.html - copied unchanged from r544, trunk/templates/admin/base_site.html trunk/templates/admin/change_form.html - copied unchanged from r544, trunk/templates/admin/change_form.html trunk/templates/admin/change_list.html - copied unchanged from r544, trunk/templates/admin/change_list.html trunk/templates/admin/change_list_results.html - copied unchanged from r544, trunk/templates/admin/change_list_results.html trunk/templates/admin/date_hierarchy.html - copied unchanged from r544, trunk/templates/admin/date_hierarchy.html trunk/templates/admin/delete_confirmation.html - copied unchanged from r544, trunk/templates/admin/delete_confirmation.html trunk/templates/admin/edit_inline_stacked.html - copied unchanged from r544, trunk/templates/admin/edit_inline_stacked.html trunk/templates/admin/edit_inline_tabular.html - copied unchanged from r544, trunk/templates/admin/edit_inline_tabular.html trunk/templates/admin/field_line.html - copied unchanged from r544, trunk/templates/admin/field_line.html trunk/templates/admin/filter.html - copied unchanged from r544, trunk/templates/admin/filter.html trunk/templates/admin/filters.html - copied unchanged from r544, trunk/templates/admin/filters.html trunk/templates/admin/index.html - copied unchanged from r544, trunk/templates/admin/index.html trunk/templates/admin/invalid_setup.html - copied unchanged from r544, trunk/templates/admin/invalid_setup.html trunk/templates/admin/login.html - copied unchanged from r544, trunk/templates/admin/login.html trunk/templates/admin/object_history.html - copied unchanged from r544, trunk/templates/admin/object_history.html trunk/templates/admin/pagination.html - copied unchanged from r544, trunk/templates/admin/pagination.html trunk/templates/admin/search_form.html - copied unchanged from r544, trunk/templates/admin/search_form.html trunk/templates/admin/submit_line.html - copied unchanged from r544, trunk/templates/admin/submit_line.html trunk/templates/admin/template_validator.html - copied unchanged from r544, trunk/templates/admin/template_validator.html trunk/templates/base.html - copied unchanged from r544, trunk/templates/base.html trunk/templates/bug/ - copied from r544, trunk/templates/bug/ trunk/templates/bug/bug_detail.html - copied unchanged from r544, trunk/templates/bug/bug_detail.html trunk/templates/bug/bug_main.html - copied unchanged from r544, trunk/templates/bug/bug_main.html trunk/templates/download/ - copied from r544, trunk/templates/download/ trunk/templates/download/download.html - copied unchanged from r544, trunk/templates/download/download.html trunk/templates/download/download_relnotes.html - copied unchanged from r544, trunk/templates/download/download_relnotes.html trunk/templates/feedjack/ - copied from r544, trunk/templates/feedjack/ trunk/templates/feedjack/default/ - copied from r544, trunk/templates/feedjack/default/ trunk/templates/feedjack/default/post_list.html - copied unchanged from r544, trunk/templates/feedjack/default/post_list.html trunk/templates/feedjack/foaf.xml - copied unchanged from r544, trunk/templates/feedjack/foaf.xml trunk/templates/feedjack/oi/ - copied from r544, trunk/templates/feedjack/oi/ trunk/templates/feedjack/oi/post_list.html - copied unchanged from r544, trunk/templates/feedjack/oi/post_list.html trunk/templates/feedjack/opml.xml - copied unchanged from r544, trunk/templates/feedjack/opml.xml trunk/templates/feeds/ - copied from r544, trunk/templates/feeds/ trunk/templates/feeds/feed_description.html - copied unchanged from r544, trunk/templates/feeds/feed_description.html trunk/templates/feeds/feed_title.html - copied unchanged from r544, trunk/templates/feeds/feed_title.html trunk/templates/file_upload/ - copied from r544, trunk/templates/file_upload/ trunk/templates/file_upload/file_upload.html - copied unchanged from r544, trunk/templates/file_upload/file_upload.html trunk/templates/file_upload/file_upload_success.html - copied unchanged from r544, trunk/templates/file_upload/file_upload_success.html trunk/templates/flatpages/ - copied from r544, trunk/templates/flatpages/ trunk/templates/flatpages/about.html - copied unchanged from r544, trunk/templates/flatpages/about.html trunk/templates/flatpages/default.html - copied unchanged from r544, trunk/templates/flatpages/default.html trunk/templates/forum/ - copied from r544, trunk/templates/forum/ trunk/templates/forum/forum_detail.html - copied unchanged from r544, trunk/templates/forum/forum_detail.html trunk/templates/forum/forum_list.html - copied unchanged from r544, trunk/templates/forum/forum_list.html trunk/templates/forum/new_topic.html - copied unchanged from r544, trunk/templates/forum/new_topic.html trunk/templates/forum/paginator.html - copied unchanged from r544, trunk/templates/forum/paginator.html trunk/templates/forum/reply.html - copied unchanged from r544, trunk/templates/forum/reply.html trunk/templates/forum/topic.html - copied unchanged from r544, trunk/templates/forum/topic.html trunk/templates/fs/ - copied from r544, trunk/templates/fs/ trunk/templates/fs/fs_detail.html - copied unchanged from r544, trunk/templates/fs/fs_detail.html trunk/templates/fs/fs_main.html - copied unchanged from r544, trunk/templates/fs/fs_main.html trunk/templates/fs/fs_printable.html - copied unchanged from r544, trunk/templates/fs/fs_printable.html trunk/templates/game/ - copied from r544, trunk/templates/game/ trunk/templates/game/game_detail.html - copied unchanged from r544, trunk/templates/game/game_detail.html trunk/templates/game/game_main.html - copied unchanged from r544, trunk/templates/game/game_main.html trunk/templates/game/game_printable.html - copied unchanged from r544, trunk/templates/game/game_printable.html trunk/templates/home.html - copied unchanged from r544, trunk/templates/home.html trunk/templates/news/ - copied from r544, trunk/templates/news/ trunk/templates/news/news_detail.html - copied unchanged from r544, trunk/templates/news/news_detail.html trunk/templates/news/news_main.html - copied unchanged from r544, trunk/templates/news/news_main.html trunk/templates/news/news_printable.html - copied unchanged from r544, trunk/templates/news/news_printable.html trunk/templates/package/ - copied from r544, trunk/templates/package/ trunk/templates/package/package_detail.html - copied unchanged from r544, trunk/templates/package/package_detail.html trunk/templates/package/package_main.html - copied unchanged from r544, trunk/templates/package/package_main.html trunk/templates/package/package_printable.html - copied unchanged from r544, trunk/templates/package/package_printable.html trunk/templates/paginator.html - copied unchanged from r544, trunk/templates/paginator.html trunk/templates/printable.html - copied unchanged from r544, trunk/templates/printable.html trunk/templates/seminar/ - copied from r544, trunk/templates/seminar/ trunk/templates/seminar/attender.html - copied unchanged from r544, trunk/templates/seminar/attender.html trunk/templates/seminar/place.html - copied unchanged from r544, trunk/templates/seminar/place.html trunk/templates/seminar/seminar.html - copied unchanged from r544, trunk/templates/seminar/seminar.html trunk/templates/tag/ - copied from r544, trunk/templates/tag/ trunk/templates/tag/tag_detail.html - copied unchanged from r544, trunk/templates/tag/tag_detail.html trunk/templates/test.html - copied unchanged from r544, trunk/templates/test.html trunk/templates/user/ - copied from r544, trunk/templates/user/ trunk/templates/user/change_password.html - copied unchanged from r544, trunk/templates/user/change_password.html trunk/templates/user/change_password_done.html - copied unchanged from r544, trunk/templates/user/change_password_done.html trunk/templates/user/confirm.html - copied unchanged from r544, trunk/templates/user/confirm.html trunk/templates/user/dashboard.html - copied unchanged from r544, trunk/templates/user/dashboard.html trunk/templates/user/login.html - copied unchanged from r544, trunk/templates/user/login.html trunk/templates/user/logout.html - copied unchanged from r544, trunk/templates/user/logout.html trunk/templates/user/lostpassword.html - copied unchanged from r544, trunk/templates/user/lostpassword.html trunk/templates/user/lostpassword_done.html - copied unchanged from r544, trunk/templates/user/lostpassword_done.html trunk/templates/user/profile.html - copied unchanged from r544, trunk/templates/user/profile.html trunk/templates/user/profile_edit.html - copied unchanged from r544, trunk/templates/user/profile_edit.html trunk/templates/user/register.html - copied unchanged from r544, trunk/templates/user/register.html trunk/templates/user/register_done.html - copied unchanged from r544, trunk/templates/user/register_done.html trunk/templates/user/user_list.html - copied unchanged from r544, trunk/templates/user/user_list.html trunk/templates/videobox.html - copied unchanged from r544, trunk/templates/videobox.html trunk/upload/ - copied from r544, trunk/upload/ trunk/upload/__init__.py - copied unchanged from r544, trunk/upload/__init__.py trunk/upload/models.py - copied unchanged from r544, trunk/upload/models.py trunk/upload/views.py - copied unchanged from r544, trunk/upload/views.py trunk/urls.py - copied unchanged from r544, trunk/urls.py Log: upsi From oi-commits at pardus.org.tr Wed Sep 19 15:31:26 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 19 Sep 2007 15:31:26 +0300 (EEST) Subject: [Oi-commits] r547 - branches/forum Message-ID: <20070919123126.BE43E7C002E@liste.uludag.org.tr> Author: ahmet Date: Wed Sep 19 15:31:26 2007 New Revision: 547 Removed: branches/forum/ Log: asd From oi-commits at pardus.org.tr Wed Sep 19 15:32:27 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 19 Sep 2007 15:32:27 +0300 (EEST) Subject: [Oi-commits] r548 - branches/forum Message-ID: <20070919123227.641927C002E@liste.uludag.org.tr> Author: ahmet Date: Wed Sep 19 15:32:27 2007 New Revision: 548 Added: branches/forum/ - copied from r546, trunk/ Log: forum branch From oi-commits at pardus.org.tr Wed Sep 19 15:39:54 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 19 Sep 2007 15:39:54 +0300 (EEST) Subject: [Oi-commits] r549 - branches/stable Message-ID: <20070919123954.889447C002E@liste.uludag.org.tr> Author: ahmet Date: Wed Sep 19 15:39:54 2007 New Revision: 549 Removed: branches/stable/ Log: git From oi-commits at pardus.org.tr Wed Sep 19 15:42:53 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 19 Sep 2007 15:42:53 +0300 (EEST) Subject: [Oi-commits] r550 - branches/stable Message-ID: <20070919124253.722FF7C0021@liste.uludag.org.tr> Author: ahmet Date: Wed Sep 19 15:42:53 2007 New Revision: 550 Added: branches/stable/ - copied from r546, trunk/ Log: stable From oi-commits at pardus.org.tr Wed Sep 19 15:55:17 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 19 Sep 2007 15:55:17 +0300 (EEST) Subject: [Oi-commits] r551 - in branches/stable: . forum templates templates/forum Message-ID: <20070919125517.0F3EE7C0021@liste.uludag.org.tr> Author: ahmet Date: Wed Sep 19 15:55:16 2007 New Revision: 551 Removed: branches/stable/TODO branches/stable/forum/ branches/stable/templates/forum/ Modified: branches/stable/settings.py branches/stable/templates/base.html Log: hehe Modified: branches/stable/settings.py ================================================================= --- branches/stable/settings.py (original) +++ branches/stable/settings.py Wed Sep 19 15:55:16 2007 @@ -125,7 +125,6 @@ 'oi.feedjack', 'oi.seminar', 'oi.profile', - 'oi.forum', ) CITY_LIST = ( @@ -211,4 +210,4 @@ ('yozgat','Yozgat'), ('yalova', 'Yalova'), ('zonguldak','Zonguldak') -) +) \ No newline at end of file Modified: branches/stable/templates/base.html ================================================================= --- branches/stable/templates/base.html (original) +++ branches/stable/templates/base.html Wed Sep 19 15:55:16 2007 @@ -18,18 +18,6 @@ {% block extrahead %}{% endblock %} -
+ + - + \ No newline at end of file From oi-commits at pardus.org.tr Thu Sep 20 14:24:33 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 20 Sep 2007 14:24:33 +0300 (EEST) Subject: [Oi-commits] r552 - in branches/stable: st templates/news Message-ID: <20070920112433.54BB77C006C@liste.uludag.org.tr> Author: ahmet Date: Thu Sep 20 14:24:33 2007 New Revision: 552 Modified: branches/stable/st/models.py branches/stable/templates/news/news_detail.html Log: d?zeltmeler Modified: branches/stable/st/models.py ================================================================= --- branches/stable/st/models.py (original) +++ branches/stable/st/models.py Thu Sep 20 14:24:33 2007 @@ -170,7 +170,7 @@ ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'status', 'update') + list_display = ('title', 'author', 'status', 'update') list_filter = ['update'] ordering = ['-update'] search_fields = ['title', 'text', 'tags'] @@ -220,7 +220,7 @@ ('De?erlendirme', {'fields': ('gameplay', 'graphics', 'sound', 'scenario', 'atmosphere')}), ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'status', 'update') + list_display = ('title', 'author', 'status', 'update') list_filter = ['update'] ordering = ['-id'] search_fields = ['title', 'sum', 'text', 'tags'] @@ -300,7 +300,7 @@ ('Genel', {'fields': ('author', 'title','sum','text', 'license','installed_size','download_size','url','point','path','ss','tags','videos','update','status')}), ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'status', 'update') + list_display = ('title', 'author', 'status', 'update') list_filter = ['license'] ordering = ['-id'] search_fields = ['title', 'sum', 'text'] Modified: branches/stable/templates/news/news_detail.html ================================================================= --- branches/stable/templates/news/news_detail.html (original) +++ branches/stable/templates/news/news_detail.html Thu Sep 20 14:24:33 2007 @@ -14,7 +14,7 @@ {{ news.text }}
-
Son g?ncelleme: {{ news.date|timedelta }}
+
Son g?ncelleme: {{ news.update|timedelta }}
{% endblock %} {% block sidebar %} From oi-commits at pardus.org.tr Thu Sep 20 14:26:00 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 20 Sep 2007 14:26:00 +0300 (EEST) Subject: [Oi-commits] r553 - in trunk: st templates/news Message-ID: <20070920112600.BBB827C006C@liste.uludag.org.tr> Author: ahmet Date: Thu Sep 20 14:26:00 2007 New Revision: 553 Modified: trunk/st/models.py trunk/templates/news/news_detail.html Log: merge Modified: trunk/st/models.py ================================================================= --- trunk/st/models.py (original) +++ trunk/st/models.py Thu Sep 20 14:26:00 2007 @@ -170,7 +170,7 @@ ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'status', 'update') + list_display = ('title', 'author', 'status', 'update') list_filter = ['update'] ordering = ['-update'] search_fields = ['title', 'text', 'tags'] @@ -220,7 +220,7 @@ ('De?erlendirme', {'fields': ('gameplay', 'graphics', 'sound', 'scenario', 'atmosphere')}), ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'status', 'update') + list_display = ('title', 'author', 'status', 'update') list_filter = ['update'] ordering = ['-id'] search_fields = ['title', 'sum', 'text', 'tags'] @@ -300,7 +300,7 @@ ('Genel', {'fields': ('author', 'title','sum','text', 'license','installed_size','download_size','url','point','path','ss','tags','videos','update','status')}), ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'status', 'update') + list_display = ('title', 'author', 'status', 'update') list_filter = ['license'] ordering = ['-id'] search_fields = ['title', 'sum', 'text'] Modified: trunk/templates/news/news_detail.html ================================================================= --- trunk/templates/news/news_detail.html (original) +++ trunk/templates/news/news_detail.html Thu Sep 20 14:26:00 2007 @@ -14,7 +14,7 @@ {{ news.text }}
-
Son g?ncelleme: {{ news.date|timedelta }}
+
Son g?ncelleme: {{ news.update|timedelta }}
{% endblock %} {% block sidebar %} From ahmet at pardusman.org Thu Sep 20 14:37:10 2007 From: ahmet at pardusman.org (Ahmet =?utf-8?q?AYG=C3=9CN?=) Date: Thu, 20 Sep 2007 14:37:10 +0300 Subject: [Oi-commits] =?utf-8?q?Yeni_yap=C4=B1?= Message-ID: <200709201437.14822.ahmet@pardusman.org> Merhaba Benden ba?ka commit yapan kimse yok ama yine de tarihe not d??eyim. Svn depomuzda yeni bir yap?ya ge?tik, a?a??da krokisi var. - trunk Her t?rl? geli?tirme ve denemelerimizi burada yap?yoruz. - branches/stable Sunucuda kullan?lan branch, her 20 dakikada bir g?ncelleniyor. - branches/forum Forum ?al??malar?n? y?r?tt???m branch. Sevgiler -- 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/20070920/dc63167f/attachment.pgp From turkay.eren at gmail.com Thu Sep 20 15:22:19 2007 From: turkay.eren at gmail.com (Eren =?utf-8?q?T=C3=BCrkay?=) Date: Thu, 20 Sep 2007 15:22:19 +0300 Subject: [Oi-commits] =?utf-8?q?Yeni_yap=C4=B1?= In-Reply-To: <200709201437.14822.ahmet@pardusman.org> References: <200709201437.14822.ahmet@pardusman.org> Message-ID: <200709201522.19634.turkay.eren@gmail.com> On Thursday 20 September 2007 14:37:10 Ahmet AYG?N wrote: > Merhaba > > Benden ba?ka commit yapan kimse yok ama yine de tarihe not d??eyim. Huh >.< > Svn depomuzda yeni bir yap?ya ge?tik, a?a??da krokisi var. > - trunk > ? Her t?rl? geli?tirme ve denemelerimizi burada yap?yoruz. > - branches/stable > ? Sunucuda kullan?lan branch, her 20 dakikada bir g?ncelleniyor. > - branches/forum > ? Forum ?al??malar?n? y?r?tt???m branch. Eline sa?l?k, ?imdi svn reposuna benzemi? :P From oi-commits at pardus.org.tr Thu Sep 20 17:21:57 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 20 Sep 2007 17:21:57 +0300 (EEST) Subject: [Oi-commits] r554 - in branches/stable: . forum templates/forum Message-ID: <20070920142157.B0CAD864011@liste.uludag.org.tr> Author: ahmet Date: Thu Sep 20 17:21:57 2007 New Revision: 554 Added: branches/stable/forum/ branches/stable/forum/__init__.py branches/stable/forum/models.py branches/stable/forum/urls.py branches/stable/forum/views.py branches/stable/templates/forum/ branches/stable/templates/forum/main.html Modified: branches/stable/settings.py Log: gone Modified: branches/stable/settings.py ================================================================= --- branches/stable/settings.py (original) +++ branches/stable/settings.py Thu Sep 20 17:21:57 2007 @@ -125,6 +125,7 @@ 'oi.feedjack', 'oi.seminar', 'oi.profile', + 'oi.forum', ) CITY_LIST = ( From oi-commits at pardus.org.tr Thu Sep 20 17:39:44 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 20 Sep 2007 17:39:44 +0300 (EEST) Subject: [Oi-commits] r555 - branches/stable/forum Message-ID: <20070920143944.E9A8E864011@liste.uludag.org.tr> Author: ahmet Date: Thu Sep 20 17:39:44 2007 New Revision: 555 Modified: branches/stable/forum/views.py Log: hhl Modified: branches/stable/forum/views.py ================================================================= --- branches/stable/forum/views.py (original) +++ branches/stable/forum/views.py Thu Sep 20 17:39:44 2007 @@ -7,5 +7,5 @@ from oi.st.wrappers import render_response -def home(request): - return render_response(request, 'forum/main.html') \ No newline at end of file +def main(request): + return render_response(request, 'forum/main.html') From oi-commits at pardus.org.tr Sat Sep 22 15:54:19 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 22 Sep 2007 15:54:19 +0300 (EEST) Subject: [Oi-commits] r556 - branches/stable/media/hackergotchi Message-ID: <20070922125419.96FCA7C0072@liste.uludag.org.tr> Author: havan Date: Sat Sep 22 15:54:19 2007 New Revision: 556 Added: branches/stable/media/hackergotchi/erenturkay.png (contents, props changed) branches/stable/media/hackergotchi/erkantekman.png (contents, props changed) branches/stable/media/hackergotchi/gurerozen.png (contents, props changed) Log: Erkan TEKMAN, Eren T?RKAY, G?rer ?ZEN kelleleri :) From oi-commits at pardus.org.tr Sun Sep 23 03:21:45 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sun, 23 Sep 2007 03:21:45 +0300 (EEST) Subject: [Oi-commits] r557 - branches/stable/media/hackergotchi Message-ID: <20070923002145.C238E86419E@liste.uludag.org.tr> Author: havan Date: Sun Sep 23 03:21:45 2007 New Revision: 557 Added: branches/stable/media/hackergotchi/erenkovanci.png (contents, props changed) Log: Eren KOVANCI'n?n kellesi From ahmet at pardusman.org Sun Sep 23 03:44:13 2007 From: ahmet at pardusman.org (Ahmet =?utf-8?q?AYG=C3=9CN?=) Date: Sun, 23 Sep 2007 03:44:13 +0300 Subject: [Oi-commits] r557 - branches/stable/media/hackergotchi In-Reply-To: <20070923002145.C238E86419E@liste.uludag.org.tr> References: <20070923002145.C238E86419E@liste.uludag.org.tr> Message-ID: <200709230344.20872.ahmet@pardusman.org> On Sunday 23 September 2007 03:21:45 oi-commits at pardus.org.tr wrote: > branches/stable/media/hackergotchi/erenkovanci.png (contents, props Bunlar? trunk'a commit etmen gerekiyor. -- 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/20070923/cb2dd78f/attachment.pgp From ekrem.seren at gmail.com Sun Sep 23 15:43:48 2007 From: ekrem.seren at gmail.com (Ekrem SEREN) Date: Sun, 23 Sep 2007 15:43:48 +0300 Subject: [Oi-commits] r557 - branches/stable/media/hackergotchi In-Reply-To: <200709230344.20872.ahmet@pardusman.org> References: <20070923002145.C238E86419E@liste.uludag.org.tr> <200709230344.20872.ahmet@pardusman.org> Message-ID: <200709231543.48245.ekrem.seren@gmail.com> On Sunday 23 September 2007 03:44:13 Ahmet AYG?N wrote: > On Sunday 23 September 2007 03:21:45 oi-commits at pardus.org.tr wrote: > > branches/stable/media/hackergotchi/erenkovanci.png (contents, props > > Bunlar? trunk'a commit etmen gerekiyor. P?ff... On Thursday 20 September 2007 14:37:10 Ahmet AYG?N wrote: > - trunk > Her t?rl? geli?tirme ve denemelerimizi burada yap?yoruz. > - branches/stable > Sunucuda kullan?lan branch, her 20 dakikada bir g?ncelleniyor. Peki trunk'a commit edince, 20dk'da bir sunucu oradan m? g?ncelliyor? Yoksa senin sync etmeni mi bekleyece?iz trunk'?? -- Ekrem SEREN www.ozgurlukicin.com From oi-commits at pardus.org.tr Sun Sep 23 15:56:39 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sun, 23 Sep 2007 15:56:39 +0300 (EEST) Subject: [Oi-commits] r558 - branches/stable/media/hackergotchi trunk/media/hackergotchi Message-ID: <20070923125639.21EF47C0065@liste.uludag.org.tr> Author: havan Date: Sun Sep 23 15:56:38 2007 New Revision: 558 Added: trunk/media/hackergotchi/abdulkerimaydin.png (contents, props changed) trunk/media/hackergotchi/erenkovanci.png - copied unchanged from r557, branches/stable/media/hackergotchi/erenkovanci.png trunk/media/hackergotchi/erenturkay.png - copied unchanged from r557, branches/stable/media/hackergotchi/erenturkay.png trunk/media/hackergotchi/erkantekman.png - copied unchanged from r557, branches/stable/media/hackergotchi/erkantekman.png trunk/media/hackergotchi/gurerozen.png - copied unchanged from r557, branches/stable/media/hackergotchi/gurerozen.png Removed: branches/stable/media/hackergotchi/erenkovanci.png branches/stable/media/hackergotchi/erenturkay.png branches/stable/media/hackergotchi/erkantekman.png branches/stable/media/hackergotchi/gurerozen.png Log: Braches/Stable'dan Trunk'a bir seyahat... From ahmet at pardusman.org Mon Sep 24 00:04:01 2007 From: ahmet at pardusman.org (Ahmet =?iso-8859-1?q?AYG=DCN?=) Date: Mon, 24 Sep 2007 00:04:01 +0300 Subject: [Oi-commits] r558 - branches/stable/media/hackergotchi trunk/media/hackergotchi In-Reply-To: <20070923125639.21EF47C0065@liste.uludag.org.tr> References: <20070923125639.21EF47C0065@liste.uludag.org.tr> Message-ID: <200709240004.04875.ahmet@pardusman.org> On Sunday 23 September 2007 15:56:39 oi-commits at pardus.org.tr wrote: > Braches/Stable'dan Trunk'a bir seyahat... Eklediklerini silmeseydin bari :( -- 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/20070924/f632748c/attachment.pgp From ekrem.seren at gmail.com Mon Sep 24 02:01:25 2007 From: ekrem.seren at gmail.com (Ekrem SEREN) Date: Mon, 24 Sep 2007 02:01:25 +0300 Subject: [Oi-commits] r558 - branches/stable/media/hackergotchi trunk/media/hackergotchi In-Reply-To: <200709240004.04875.ahmet@pardusman.org> References: <20070923125639.21EF47C0065@liste.uludag.org.tr> <200709240004.04875.ahmet@pardusman.org> Message-ID: <200709240201.25077.ekrem.seren@gmail.com> On Monday 24 September 2007 00:04:01 Ahmet AYG?N wrote: > On Sunday 23 September 2007 15:56:39 oi-commits at pardus.org.tr wrote: > > Braches/Stable'dan Trunk'a bir seyahat... > > Eklediklerini silmeseydin bari :( ?al??m?yorlard? ki... Shortname'i de?i?tirmeme ra?men hi? birinde hackergothci ??kmad?. :/ -- Ekrem SEREN www.ozgurlukicin.com From oi-commits at pardus.org.tr Mon Sep 24 02:19:31 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 24 Sep 2007 02:19:31 +0300 (EEST) Subject: [Oi-commits] r559 - trunk/media/hackergotchi Message-ID: <20070923231931.8A0707C00A0@liste.uludag.org.tr> Author: havan Date: Mon Sep 24 02:19:31 2007 New Revision: 559 Added: trunk/media/hackergotchi/ismaildonmez.png (contents, props changed) Log: ?smailci?imin kellesi :P From oi-commits at pardus.org.tr Mon Sep 24 03:56:42 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 24 Sep 2007 03:56:42 +0300 (EEST) Subject: [Oi-commits] r560 - in branches/forum: . templates/forum Message-ID: <20070924005642.2E1FD7C00A1@liste.uludag.org.tr> Author: ahmet Date: Mon Sep 24 03:56:41 2007 New Revision: 560 Modified: branches/forum/TODO branches/forum/templates/forum/topic.html Log: gece gece Modified: branches/forum/TODO ================================================================= --- branches/forum/TODO (original) +++ branches/forum/TODO Mon Sep 24 03:56:41 2007 @@ -39,7 +39,7 @@ + Tags - Hot or Not (Reddit style) + Hidden - - Hide + + Hide + Lock + Stick - Edit @@ -48,7 +48,7 @@ / Post + Flood control + Hidden - - Hide + + Hide - Delete - Edit - Markup language (BBCode??) Modified: branches/forum/templates/forum/topic.html ================================================================= --- branches/forum/templates/forum/topic.html (original) +++ branches/forum/templates/forum/topic.html Mon Sep 24 03:56:41 2007 @@ -10,6 +10,7 @@ {% block content %} {{ forum.category.name }} > {{ forum.name }} > {{ topic.title }}
{% for post in posts %} +{% if post.hidden %}
{% endif %} {{ post.id }} - {{ post.author }} - {{ post.hidden }} - {{ post.created }}
{{ post.text|linebreaksbr }}
@@ -19,13 +20,15 @@ {% ifequal post.author.id request.user.id %}{% ifequal post topic.topic_latest_post %}edit{% endifequal %}{% endifequal %} -{% if perms.post.can_hide and not forloop.first %}hide{% endif %} +{% if perms.post.can_hide and not forloop.first and not post.hidden %}hide{% endif %} +{% if perms.post.can_hide and not forloop.first and post.hidden %}unhide{% endif %} {% if perms.post.can_delete and not forloop.first %}delete{% else %} {% ifequal post.author.id request.user.id %}{% ifequal post topic.topic_latest_post %}{% if not forloop.first %}delete{% endif %}{% endifequal %}{% endifequal %} {% endif %}
+{% if post.hidden %}
{% endif %} {% endfor %} {% if perms.topic.can_hide and not topic.hidden %}hide - {% endif %} {% if perms.topic.can_hide and topic.hidden %}unhide - {% endif %} From oi-commits at pardus.org.tr Mon Sep 24 04:26:28 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 24 Sep 2007 04:26:28 +0300 (EEST) Subject: [Oi-commits] r561 - in branches/forum: . media/css st/templatetags templates templates/forum Message-ID: <20070924012628.1F5DB7C00A5@liste.uludag.org.tr> Author: ahmet Date: Mon Sep 24 04:26:27 2007 New Revision: 561 Removed: branches/forum/templates/forum/paginator.html Modified: branches/forum/TODO branches/forum/media/css/style.css branches/forum/st/templatetags/library.py branches/forum/templates/paginator.html branches/forum/urls.py Log: Better pagination and update 'to do' list. Modified: branches/forum/TODO ================================================================= --- branches/forum/TODO (original) +++ branches/forum/TODO Mon Sep 24 04:26:27 2007 @@ -33,7 +33,7 @@ + Hidden + Sorting + Lock - / Pagination + + Pagination / Topic + Flood Control + Tags @@ -59,4 +59,6 @@ - Log & monitor all IP's - User/IP Ban - Migration - - Multi language \ No newline at end of file + - Multi language + +- Move common functions to utils \ No newline at end of file Modified: branches/forum/media/css/style.css ================================================================= --- branches/forum/media/css/style.css (original) +++ branches/forum/media/css/style.css Mon Sep 24 04:26:27 2007 @@ -741,3 +741,58 @@ h6 { font-size: 10px; } + +/** PAGINATOR **/ +.paginator { padding:.5em .75em; float:left; font:normal .8em arial; } + +.paginator a { + text-decoration: none; +} + +.paginator .prev-na, +.paginator .next-na { + padding:.3em; + font:bold .875em arial; +} + +.paginator .prev-na, +.paginator .next-na { + border:1px solid #ccc; + background-color:#f9f9f9; + color:#aaa; + font-weight:normal; +} + +.paginator .prev a, .paginator .prev a:visited, +.paginator .next a, .paginator .next a:visited { + border:1px solid #c2ee62; + background-color:#edfdd0; + color:#234f32; + padding:.3em; + font:bold .875em arial; +} + +.paginator .page a, .paginator .page a:visited, .paginator .curr { + padding:.25em; + font:normal .875em verdana; + border:1px solid #C2EE62; + background-color:#EDFDD0; + color:#006000; +} + +.paginator .curr { + background-color:#234f32; + color:#fff; + border:1px solid #234f32; + font-weight:bold; + font-size:1.2em; +} + +.paginator .page a:hover, +.paginator .curr a:hover, +.paginator .prev a:hover, +.paginator .next a:hover { + color:#fff; + background-color:#234f32; + border:1px solid #234f32; +} \ No newline at end of file Modified: branches/forum/st/templatetags/library.py ================================================================= --- branches/forum/st/templatetags/library.py (original) +++ branches/forum/st/templatetags/library.py Mon Sep 24 04:26:27 2007 @@ -6,6 +6,7 @@ register = Library() + at register.filter def thumbnail(file, size='200x200'): # defining the size x, y = [int(x) for x in size.split('x')] @@ -23,8 +24,7 @@ image.save(miniature_filename, image.format) return miniature_url -register.filter(thumbnail) - + at register.inclusion_tag('paginator.html', takes_context=True) def paginator(context, adjacent_pages=2): """ To be used in conjunction with the object_list generic view. @@ -51,8 +51,7 @@ 'show_last': context['pages'] not in page_numbers, } -register.inclusion_tag('paginator.html', takes_context=True)(paginator) - + at register.filter def timedelta(value, arg=None): if not value: return '' @@ -63,6 +62,4 @@ if value > cmp: return "%s sonra" % timesince(cmp,value) else: - return "%s ?nce" % timesince(value,cmp) - -register.filter(timedelta) \ No newline at end of file + return "%s ?nce" % timesince(value,cmp) \ No newline at end of file Modified: branches/forum/templates/paginator.html ================================================================= --- branches/forum/templates/paginator.html (original) +++ branches/forum/templates/paginator.html Mon Sep 24 04:26:27 2007 @@ -1,16 +1,17 @@ - Modified: branches/forum/urls.py ================================================================= --- branches/forum/urls.py (original) +++ branches/forum/urls.py Mon Sep 24 04:26:27 2007 @@ -66,14 +66,12 @@ urlpatterns = patterns('', #News - (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/$', '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.simple.redirect_to', {'url': "sayfa/1/"}), - (r'^paket/sayfa/(?P[0-9]+)/$', 'django.views.generic.list_detail.object_list', dict(package_dict)), + (r'^paket/$', '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'), @@ -81,20 +79,17 @@ (r'^kullanici/', include('oi.profile.urls')), #First Steps - (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/$', '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.simple.redirect_to', {'url': "sayfa/1/"}), - (r'^oyun/sayfa/(?P[0-9]+)/$', 'django.views.generic.list_detail.object_list', dict(game_dict)), + (r'^oyun/$', '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.simple.redirect_to', {'url': "sayfa/1/"}), - (r'^etiket/sayfa/(?P[0-9]+)/$', 'django.views.generic.list_detail.object_list', dict(tag_dict)), + (r'^etiket/$', 'django.views.generic.list_detail.object_list', dict(tag_dict)), (r'^etiket/(?P.*)/$', 'oi.st.views.tag_detail'), #Download @@ -137,4 +132,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 Mon Sep 24 06:39:57 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 24 Sep 2007 06:39:57 +0300 (EEST) Subject: [Oi-commits] r562 - trunk/media/hackergotchi Message-ID: <20070924033957.169577C009F@liste.uludag.org.tr> Author: havan Date: Mon Sep 24 06:39:56 2007 New Revision: 562 Added: trunk/media/hackergotchi/denizegetuncay.png (contents, props changed) Log: bu da sabah sabah Deniz Ege TUNCAY kellesi From oi-commits at pardus.org.tr Tue Sep 25 14:30:25 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 25 Sep 2007 14:30:25 +0300 (EEST) Subject: [Oi-commits] r563 - branches/stable/media/hackergotchi Message-ID: <20070925113025.4A3197C007C@liste.uludag.org.tr> Author: ahmet Date: Tue Sep 25 14:30:25 2007 New Revision: 563 Added: branches/stable/media/hackergotchi/abdulkerimaydin.png (contents, props changed) branches/stable/media/hackergotchi/denizegetuncay.png (contents, props changed) branches/stable/media/hackergotchi/erenkovanci.png (contents, props changed) branches/stable/media/hackergotchi/erenturkay.png (contents, props changed) branches/stable/media/hackergotchi/erkantekman.png (contents, props changed) branches/stable/media/hackergotchi/gurerozen.png (contents, props changed) branches/stable/media/hackergotchi/ismaildonmez.png (contents, props changed) Log: eksikler gelsin From oi-commits at pardus.org.tr Tue Sep 25 16:08:09 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 25 Sep 2007 16:08:09 +0300 (EEST) Subject: [Oi-commits] r564 - trunk/media/hackergotchi Message-ID: <20070925130809.965817C006A@liste.uludag.org.tr> Author: ahmet Date: Tue Sep 25 16:08:09 2007 New Revision: 564 Added: trunk/media/hackergotchi/miratcanbayrak.png (contents, props changed) Log: mirat From oi-commits at pardus.org.tr Tue Sep 25 16:08:57 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 25 Sep 2007 16:08:57 +0300 (EEST) Subject: [Oi-commits] r565 - branches/stable/media/hackergotchi Message-ID: <20070925130857.3F2F27C0021@liste.uludag.org.tr> Author: ahmet Date: Tue Sep 25 16:08:56 2007 New Revision: 565 Added: branches/stable/media/hackergotchi/miratcanbayrak.png (contents, props changed) Log: mirat From oi-commits at pardus.org.tr Tue Sep 25 16:30:29 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 25 Sep 2007 16:30:29 +0300 (EEST) Subject: [Oi-commits] r566 - in branches/forum: . forum templates/forum Message-ID: <20070925133029.621697C0073@liste.uludag.org.tr> Author: ahmet Date: Tue Sep 25 16:30:29 2007 New Revision: 566 Modified: branches/forum/TODO branches/forum/forum/models.py branches/forum/forum/urls.py branches/forum/forum/views.py branches/forum/templates/forum/topic.html Log: Edit Post/Topic Modified: branches/forum/TODO ================================================================= --- branches/forum/TODO (original) +++ branches/forum/TODO Tue Sep 25 16:30:29 2007 @@ -28,7 +28,7 @@ + Category + Hidden + Sorting - / Forum + + Forum + Category + Hidden + Sorting @@ -42,15 +42,14 @@ + Hide + Lock + Stick - - Edit + + Edit ? Split ? Merge / Post + Flood control + Hidden + Hide - - Delete - - Edit + + Edit - Markup language (BBCode??) - Smiley - Quotations @@ -61,4 +60,4 @@ - Migration - Multi language -- Move common functions to utils \ No newline at end of file +- Move common functions to utils Modified: branches/forum/forum/models.py ================================================================= --- branches/forum/forum/models.py (original) +++ branches/forum/forum/models.py Tue Sep 25 16:30:29 2007 @@ -48,6 +48,9 @@ def get_delete_url(self): return '/forum/%s/%s/delete/%s/' % (self.topic.forum.slug, self.topic.id, self.id) + def get_delete_confirm_url(self): + return '/forum/%s/%s/delete/%s/yes/' % (self.topic.forum.slug, self.topic.id, self.id) + class Admin: list_display = ('id', 'topic', 'author', 'created', 'ip') @@ -120,6 +123,9 @@ def get_reply_url(self): return '/forum/%s/%s/reply/' % (self.forum.slug, self.id) + def get_edit_url(self): + return '/forum/%s/%s/edit/' % (self.forum.slug, self.id) + def get_stick_url(self): return '/forum/%s/%s/stick/' % (self.forum.slug, self.id) @@ -132,6 +138,9 @@ def get_delete_url(self): return '/forum/%s/%s/delete/' % (self.forum.slug, self.id) + def get_delete_url(self): + return '/forum/%s/%s/delete/yes/' % (self.forum.slug, self.id) + class Admin: list_display = ('forum', 'title', 'sticky', 'locked', 'hidden') Modified: branches/forum/forum/urls.py ================================================================= --- branches/forum/forum/urls.py (original) +++ branches/forum/forum/urls.py Tue Sep 25 16:30:29 2007 @@ -20,11 +20,11 @@ (r'^(?P.*)/(?P\d+)/quote/(?P\d+)/$', 'oi.forum.views.reply'), (r'^(?P.*)/(?P\d+)/reply/$', 'oi.forum.views.reply'), (r'^(?P.*)/(?P\d+)/hide/(?P\d+)/$', 'oi.forum.views.hide'), + (r'^(?P.*)/(?P\d+)/edit/(?P\d+)/$', 'oi.forum.views.edit_post'), (r'^(?P.*)/(?P\d+)/hide/$', 'oi.forum.views.hide'), - (r'^(?P.*)/(?P\d+)/delete/(?P\d+)/$', 'oi.forum.views.delete'), - (r'^(?P.*)/(?P\d+)/delete/$', 'oi.forum.views.delete'), (r'^(?P.*)/(?P\d+)/lock/$', 'oi.forum.views.lock'), (r'^(?P.*)/(?P\d+)/stick/$', 'oi.forum.views.stick'), + (r'^(?P.*)/(?P\d+)/edit/$', 'oi.forum.views.edit_topic'), (r'^(?P.*)/(?P\d+)/$', 'oi.forum.views.topic'), (r'^(?P.*)/$', 'oi.forum.views.forum'), ) \ No newline at end of file Modified: branches/forum/forum/views.py ================================================================= --- branches/forum/forum/views.py (original) +++ branches/forum/forum/views.py Tue Sep 25 16:30:29 2007 @@ -35,7 +35,7 @@ def topic(request, forum_slug, topic_id): forum = get_object_or_404(Forum, slug=forum_slug) topic = get_object_or_404(Topic, pk=topic_id) - posts = topic.post_set.all().order_by('update') + posts = topic.post_set.all().order_by('created') session_key = 'visited_'+topic_id @@ -79,6 +79,33 @@ return render_response(request, 'forum/reply.html', locals()) @login_required +def edit_post(request, forum_slug, topic_id, post_id): + forum = get_object_or_404(Forum, slug=forum_slug) + topic = get_object_or_404(Topic, pk=topic_id) + post = get_object_or_404(Post, pk=post_id) + + if forum.locked or topic.locked: + raise HttpResponseServerError #FIXME: Give an error message + + if request.method == 'POST': + form = PostForm(request.POST.copy()) + + flood,timeout = flood_control(request) + + if form.is_valid() and not flood: + post.text = form.clean_data['text'] + post.update_count += 1 + post.update = datetime.now() + post.save() + + return HttpResponseRedirect(post.get_absolute_url()) + else: + if post in topic.post_set.all(): + form = PostForm(auto_id=True, initial={'text': post.text}) + + return render_response(request, 'forum/reply.html', locals()) + + at login_required def new_topic(request, forum_slug): forum = get_object_or_404(Forum, slug=forum_slug) @@ -108,6 +135,34 @@ return render_response(request, 'forum/new_topic.html', locals()) @login_required +def edit_topic(request, forum_slug, topic_id): + forum = get_object_or_404(Forum, slug=forum_slug) + topic = get_object_or_404(Topic, pk=topic_id) + first_post = topic.post_set.order_by('created')[0] + + 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: + topic.title = form.clean_data['title'] + topic.topic_latest_post = first_post + topic.save() + + first_post.update_count += 1 + first_post.update = datetime.now() + first_post.save() + + return HttpResponseRedirect(topic.get_absolute_url()) + else: + form = TopicForm(auto_id=True, initial={'title': topic.title, 'text': first_post.text}) + + return render_response(request, 'forum/new_topic.html', locals()) + + at login_required def hide(request, forum_slug, topic_id, post_id=False): forum = get_object_or_404(Forum, slug=forum_slug) topic = get_object_or_404(Topic, pk=topic_id) Modified: branches/forum/templates/forum/topic.html ================================================================= --- branches/forum/templates/forum/topic.html (original) +++ branches/forum/templates/forum/topic.html Tue Sep 25 16:30:29 2007 @@ -12,11 +12,11 @@ {% for post in posts %} {% if post.hidden %}
{% endif %} -{{ post.id }} - {{ post.author }} - {{ post.hidden }} - {{ post.created }}
+{{ post.id }} - {{ post.author }} - {{ post.created }}
{{ post.text|linebreaksbr }}
{% ifnotequal post.update_count 0 %}Bu ileti {{ post.update_count }} kez de?i?tirilmi?tir, son kez {{ post.update }} tarihinde de?i?tirilmi?tir.
{% endifnotequal %} {{ post.ip }} -
quote +
{% 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 {% ifequal post.author.id request.user.id %}{% ifequal post topic.topic_latest_post %}edit{% endifequal %}{% endifequal %} @@ -36,7 +36,6 @@ {% if perms.topic.can_stick and topic.sticky %}unstick - {% endif %} {% if perms.topic.can_lock and not topic.locked %}lock{% endif %} {% if perms.topic.can_lock and topic.locked %}unlock{% endif %} - reply -{% if perms.topic.can_delete %} - delete{% endif %} {% endblock %} {% block sidebartop %}{% endblock %} \ No newline at end of file From oi-commits at pardus.org.tr Wed Sep 26 02:07:41 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 26 Sep 2007 02:07:41 +0300 (EEST) Subject: [Oi-commits] r567 - in branches/forum: . forum templates/forum Message-ID: <20070925230741.8A0377C0090@liste.uludag.org.tr> Author: ahmet Date: Wed Sep 26 02:07:41 2007 New Revision: 567 Modified: branches/forum/TODO branches/forum/forum/models.py branches/forum/forum/settings.py branches/forum/forum/views.py branches/forum/templates/forum/topic.html Log: gecce :) Modified: branches/forum/TODO ================================================================= --- branches/forum/TODO (original) +++ branches/forum/TODO Wed Sep 26 02:07:41 2007 @@ -8,7 +8,6 @@ / In progress + Completed -/ General 404 error pages / User management system (basic login/logout/register and user profiles) + ignored user names + login @@ -20,9 +19,9 @@ - avatar support + lost password support -- FreeComment support for news (also maybe packages, games etc.) -- Download documents as PDF support (packages, first steps) -- Search support +? FreeComment support for news (also maybe packages, games etc.) +? Download documents as PDF (packages, first steps) +- Search - Forum + Category @@ -61,3 +60,6 @@ - Multi language - Move common functions to utils +- ErrorHandler + - General error pages +- Logging \ No newline at end of file Modified: branches/forum/forum/models.py ================================================================= --- branches/forum/forum/models.py (original) +++ branches/forum/forum/models.py Wed Sep 26 02:07:41 2007 @@ -26,8 +26,9 @@ text = models.TextField(verbose_name='?leti') hidden = models.BooleanField(blank=True, null=True, default=0, verbose_name='Gizli') created = models.DateTimeField(blank=True, null=True, auto_now_add=True, verbose_name='Olu?turulma tarihi') - update = models.DateTimeField(blank=True, null=True, auto_now_add=True, verbose_name='G?ncellenme tarihi') - update_count = models.IntegerField(default=0, verbose_name='G?ncellenme say?s?') + edited = models.DateTimeField(blank=True, null=True, auto_now_add=True, verbose_name='G?ncellenme tarihi') + edit_count = models.IntegerField(default=0, verbose_name='G?ncellenme say?s?') + last_edited_by = models.ForeignKey(User, blank=True, related_name='last edited by', verbose_name='Yazar') ip = models.IPAddressField(blank=True, verbose_name='IP adresi') def __str__(self): @@ -55,7 +56,7 @@ list_display = ('id', 'topic', 'author', 'created', 'ip') class Meta: - ordering = ('-update',) + ordering = ('-edited',) verbose_name = '?leti' verbose_name_plural = '?letiler' permissions = ( @@ -64,11 +65,10 @@ ) def save(self): + new_post = False + if not self.id: new_post = True - else: - #self.update_count += 1 - new_post = False self.ip = threadlocals.get_current_ip() super(Post, self).save() @@ -86,15 +86,16 @@ def delete(self): if self.id: + f = Forum.objects.get(id=self.topic.forum.id) t = Topic.objects.get(id=self.topic.id) - #FIXME: set the latest post after deletion - #t.topic_latest_post_id = self.id + + latest_post = t.post_set.all().order_by('-created')[0].id + + t.topic_latest_post_id = latest_post t.posts -= 1 t.save() - f = Forum.objects.get(id=self.topic.forum.id) - #FIXME: set the latest post after deletion - #f.forum_latest_post_id = self.id + f.forum_latest_post_id = latest_post f.posts -= 1 f.save() @@ -206,7 +207,7 @@ class Category(models.Model): name = models.CharField(maxlength=255, verbose_name='Kategori ismi') hidden = models.BooleanField(blank=True, null=True, verbose_name='Gizli') - order = models.PositiveIntegerField(verbose_name='S?ralama') + order = models.PositiveIntegerField(unique=True, verbose_name='S?ralama') def __str__(self): return self.name Modified: branches/forum/forum/settings.py ================================================================= --- branches/forum/forum/settings.py (original) +++ branches/forum/forum/settings.py Wed Sep 26 02:07:41 2007 @@ -5,5 +5,5 @@ # Licensed under the GNU General Public License, version 3. # See the file http://www.gnu.org/copyleft/gpl.txt. -TOPICS_PER_PAGE = 5 #FIXME: it's 2 for pagination testing, default is 20 +TOPICS_PER_PAGE = 20 FLOOD_TIMEOUT = 30 \ No newline at end of file Modified: branches/forum/forum/views.py ================================================================= --- branches/forum/forum/views.py (original) +++ branches/forum/forum/views.py Wed Sep 26 02:07:41 2007 @@ -94,8 +94,9 @@ if form.is_valid() and not flood: post.text = form.clean_data['text'] - post.update_count += 1 - post.update = datetime.now() + post.edit_count += 1 + post.edited = datetime.now() + post.last_edited_by = request.user post.save() return HttpResponseRedirect(post.get_absolute_url()) @@ -152,8 +153,9 @@ topic.topic_latest_post = first_post topic.save() - first_post.update_count += 1 - first_post.update = datetime.now() + first_post.edit_count += 1 + first_post.edited = datetime.now() + first_post.last_edited_by = request.user first_post.save() return HttpResponseRedirect(topic.get_absolute_url()) Modified: branches/forum/templates/forum/topic.html ================================================================= --- branches/forum/templates/forum/topic.html (original) +++ branches/forum/templates/forum/topic.html Wed Sep 26 02:07:41 2007 @@ -14,7 +14,7 @@ {{ post.id }} - {{ post.author }} - {{ post.created }}
{{ post.text|linebreaksbr }}
-{% ifnotequal post.update_count 0 %}Bu ileti {{ post.update_count }} kez de?i?tirilmi?tir, son kez {{ post.update }} tarihinde de?i?tirilmi?tir.
{% endifnotequal %} +{% 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 }}
{% 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 From oi-commits at pardus.org.tr Wed Sep 26 02:34:01 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 26 Sep 2007 02:34:01 +0300 (EEST) Subject: [Oi-commits] r568 - in branches/forum: forum templates/forum Message-ID: <20070925233401.266977C003C@liste.uludag.org.tr> Author: ahmet Date: Wed Sep 26 02:34:00 2007 New Revision: 568 Modified: branches/forum/forum/models.py branches/forum/forum/views.py branches/forum/templates/forum/forum_detail.html branches/forum/templates/forum/topic.html Log: corrections Modified: branches/forum/forum/models.py ================================================================= --- branches/forum/forum/models.py (original) +++ branches/forum/forum/models.py Wed Sep 26 02:34:00 2007 @@ -28,7 +28,7 @@ created = models.DateTimeField(blank=True, null=True, auto_now_add=True, verbose_name='Olu?turulma tarihi') edited = models.DateTimeField(blank=True, null=True, auto_now_add=True, verbose_name='G?ncellenme tarihi') edit_count = models.IntegerField(default=0, verbose_name='G?ncellenme say?s?') - last_edited_by = models.ForeignKey(User, blank=True, related_name='last edited by', verbose_name='Yazar') + last_edited_by = models.ForeignKey(User, blank=True, null=True, related_name='last edited by', verbose_name='Yazar') ip = models.IPAddressField(blank=True, verbose_name='IP adresi') def __str__(self): Modified: branches/forum/forum/views.py ================================================================= --- branches/forum/forum/views.py (original) +++ branches/forum/forum/views.py Wed Sep 26 02:34:00 2007 @@ -30,7 +30,7 @@ forum = get_object_or_404(Forum, slug=forum_slug) topics = forum.topic_set.all().order_by('-sticky', '-topic_latest_post') - return object_list(request, topics, template_name='forum/forum_detail.html', template_object_name='topic', extra_context={'forum': forum}, paginate_by=5, allow_empty=True) + return object_list(request, topics, template_name='forum/forum_detail.html', template_object_name='topic', extra_context={'forum': forum}, paginate_by=TOPICS_PER_PAGE, allow_empty=True) def topic(request, forum_slug, topic_id): forum = get_object_or_404(Forum, slug=forum_slug) Modified: branches/forum/templates/forum/forum_detail.html ================================================================= --- branches/forum/templates/forum/forum_detail.html (original) +++ branches/forum/templates/forum/forum_detail.html Wed Sep 26 02:34:00 2007 @@ -16,12 +16,12 @@ {% 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.update|timedelta }}
+sticky: {{ topic.sticky }} | locked: {{ topic.locked }} | hidden: {{ topic.hidden }} | posts: {{ topic.posts }} | views: {{ topic.views }} |?latest post: {{ topic.topic_latest_post.edited|timedelta }}
{% 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.update|timedelta }}
+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 %} Modified: branches/forum/templates/forum/topic.html ================================================================= --- branches/forum/templates/forum/topic.html (original) +++ branches/forum/templates/forum/topic.html Wed Sep 26 02:34:00 2007 @@ -18,8 +18,6 @@ {{ post.ip }}
{% 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 -{% ifequal post.author.id request.user.id %}{% ifequal post topic.topic_latest_post %}edit{% endifequal %}{% endifequal %} - {% if perms.post.can_hide and not forloop.first and not post.hidden %}hide{% endif %} {% if perms.post.can_hide and not forloop.first and post.hidden %}unhide{% endif %} @@ -35,7 +33,7 @@ {% if perms.topic.can_stick and not topic.sticky %}stick - {% endif %} {% if perms.topic.can_stick and topic.sticky %}unstick - {% endif %} {% if perms.topic.can_lock and not topic.locked %}lock{% endif %} -{% if perms.topic.can_lock and topic.locked %}unlock{% endif %} - reply +{% if perms.topic.can_lock and topic.locked %}unlock{% endif %} - {% if not topic.locked %}reply{% endif %} {% endblock %} {% block sidebartop %}{% endblock %} \ No newline at end of file From oi-commits at pardus.org.tr Wed Sep 26 17:43:11 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 26 Sep 2007 17:43:11 +0300 (EEST) Subject: [Oi-commits] r569 - in branches/forum: . forum templates/forum Message-ID: <20070926144311.818877C00C3@liste.uludag.org.tr> Author: ahmet Date: Wed Sep 26 17:43:11 2007 New Revision: 569 Modified: branches/forum/TODO branches/forum/forum/models.py branches/forum/forum/urls.py branches/forum/templates/forum/topic.html Log: pff Modified: branches/forum/TODO ================================================================= --- branches/forum/TODO (original) +++ branches/forum/TODO Wed Sep 26 17:43:11 2007 @@ -62,4 +62,5 @@ - Move common functions to utils - ErrorHandler - General error pages -- Logging \ No newline at end of file +- Logging (django-logging) +- Tests \ No newline at end of file Modified: branches/forum/forum/models.py ================================================================= --- branches/forum/forum/models.py (original) +++ branches/forum/forum/models.py Wed Sep 26 17:43:11 2007 @@ -124,6 +124,9 @@ def get_reply_url(self): return '/forum/%s/%s/reply/' % (self.forum.slug, self.id) + def get_merge_url(self): + return '/forum/%s/%s/merge/' % (self.forum.slug, self.id) + def get_edit_url(self): return '/forum/%s/%s/edit/' % (self.forum.slug, self.id) @@ -136,12 +139,6 @@ def get_hide_url(self): return '/forum/%s/%s/hide/' % (self.forum.slug, self.id) - def get_delete_url(self): - return '/forum/%s/%s/delete/' % (self.forum.slug, self.id) - - def get_delete_url(self): - return '/forum/%s/%s/delete/yes/' % (self.forum.slug, self.id) - class Admin: list_display = ('forum', 'title', 'sticky', 'locked', 'hidden') Modified: branches/forum/forum/urls.py ================================================================= --- branches/forum/forum/urls.py (original) +++ branches/forum/forum/urls.py Wed Sep 26 17:43:11 2007 @@ -25,6 +25,7 @@ (r'^(?P.*)/(?P\d+)/lock/$', 'oi.forum.views.lock'), (r'^(?P.*)/(?P\d+)/stick/$', 'oi.forum.views.stick'), (r'^(?P.*)/(?P\d+)/edit/$', 'oi.forum.views.edit_topic'), + (r'^(?P.*)/(?P\d+)/merge/$', 'oi.forum.views.merge'), (r'^(?P.*)/(?P\d+)/$', 'oi.forum.views.topic'), (r'^(?P.*)/$', 'oi.forum.views.forum'), ) \ No newline at end of file Modified: branches/forum/templates/forum/topic.html ================================================================= --- branches/forum/templates/forum/topic.html (original) +++ branches/forum/templates/forum/topic.html Wed Sep 26 17:43:11 2007 @@ -28,6 +28,7 @@
{% if post.hidden %}
{% endif %} {% endfor %} +{% if perms.topic.can_merge %}merge - {% endif %} {% if perms.topic.can_hide and not topic.hidden %}hide - {% endif %} {% if perms.topic.can_hide and topic.hidden %}unhide - {% endif %} {% if perms.topic.can_stick and not topic.sticky %}stick - {% endif %} From oi-commits at pardus.org.tr Thu Sep 27 14:18:25 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 27 Sep 2007 14:18:25 +0300 (EEST) Subject: [Oi-commits] r570 - in branches/forum: st templates/howto Message-ID: <20070927111825.A110E7C00C3@liste.uludag.org.tr> Author: ahmet Date: Thu Sep 27 14:18:25 2007 New Revision: 570 Added: branches/forum/templates/howto/ - copied from r551, branches/forum/templates/fs/ Modified: branches/forum/st/models.py branches/forum/st/views.py Log: eheh Modified: branches/forum/st/models.py ================================================================= --- branches/forum/st/models.py (original) +++ branches/forum/st/models.py Thu Sep 27 14:18:25 2007 @@ -180,6 +180,42 @@ verbose_name = "?lk Ad?m" verbose_name_plural = "?lk Ad?mlar" +class HowTo(models.Model): + title = models.CharField('Ba?l?k', maxlength=32, blank=False) + slug = models.SlugField('SEF Ba?l?k', prepopulate_from=("title",)) + sum = models.TextField('?zet', blank=False) + text = models.TextField('Metin', blank=False) + tags = models.ManyToManyField(Tag, blank=False) + videos = models.ManyToManyField(Video, blank=True) + update = models.DateTimeField('Son G?ncelleme', blank=False) + author = models.CharField('Yazar', maxlength=32) + status = models.BooleanField('Aktif') + + def __str__(self): + return self.title + + def get_absolute_url(self): + return "/nasil/%s/" % self.slug + + def get_printable_url(self): + return "/nasil/%s/yazdir/" % self.slug + + class Admin: + fields = ( + ('Genel', {'fields': ('author', 'title','sum','text','videos','tags','update','status',)}), + ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), + ) + + list_display = ('title', 'status', 'update') + list_filter = ['update'] + ordering = ['-update'] + search_fields = ['title', 'text', 'tags'] + js = ("js/admin/sef.js", "js/tinymce/tiny_mce.js", "js/tinymce/textareas.js",) + + class Meta: + verbose_name = "Nas?l" + verbose_name_plural = "Nas?l Belgeleri" + class Game(models.Model): ratings = (('1','1'),('2','2'),('3','3'),('4','4'),('5','5'),('6','6'),('7','7'),('8','8'),('9','9'),('10','10')) Modified: branches/forum/st/views.py ================================================================= --- branches/forum/st/views.py (original) +++ branches/forum/st/views.py Thu Sep 27 14:18:25 2007 @@ -34,6 +34,16 @@ fs = get_object_or_404(FS, slug=slug) return render_response(request, 'fs/fs_printable.html', locals()) +def howto_detail(request, slug): + howto = get_object_or_404(HowTo, slug=slug) + tags = howto.tags.all() + videos = howto.videos.all() + return render_response(request, 'howto/howto_detail.html', locals()) + +def howto_printable(request, slug): + howto = get_object_or_404(HowTo, slug=slug) + return render_response(request, 'howto/howto_detail.html', locals()) + def game_detail(request, slug): game = get_object_or_404(Game, slug=slug) tags = game.tags.all() From oi-commits at pardus.org.tr Thu Sep 27 14:20:03 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 27 Sep 2007 14:20:03 +0300 (EEST) Subject: [Oi-commits] r571 - branches/forum/templates/howto Message-ID: <20070927112003.0C8397C00C3@liste.uludag.org.tr> Author: ahmet Date: Thu Sep 27 14:20:02 2007 New Revision: 571 Added: branches/forum/templates/howto/howto_detail.html - copied unchanged from r570, branches/forum/templates/howto/fs_detail.html branches/forum/templates/howto/howto_main.html - copied unchanged from r570, branches/forum/templates/howto/fs_main.html branches/forum/templates/howto/howto_printable.html - copied unchanged from r570, branches/forum/templates/howto/fs_printable.html Removed: branches/forum/templates/howto/fs_detail.html branches/forum/templates/howto/fs_main.html branches/forum/templates/howto/fs_printable.html Log: move From oi-commits at pardus.org.tr Thu Sep 27 17:25:55 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 27 Sep 2007 17:25:55 +0300 (EEST) Subject: [Oi-commits] r572 - in trunk: . media/css media/img st st/templatetags templates templates/howto Message-ID: <20070927142555.7BC1B7C00BD@liste.uludag.org.tr> Author: ahmet Date: Thu Sep 27 17:25:55 2007 New Revision: 572 Added: trunk/media/img/howto_header_bg.png (contents, props changed) trunk/media/img/howto_header_logo.png (contents, props changed) trunk/media/img/howto_title.png (contents, props changed) trunk/media/img/howto_title_mini.png (contents, props changed) trunk/media/img/tab_howtos.png (contents, props changed) trunk/media/img/tag_red.png (contents, props changed) trunk/templates/howto/ trunk/templates/howto/howto_detail.html trunk/templates/howto/howto_main.html trunk/templates/howto/howto_printable.html Modified: trunk/media/css/style.css trunk/settings.py trunk/st/feeds.py trunk/st/models.py trunk/st/templatetags/library.py trunk/st/views.py trunk/templates/base.html trunk/templates/home.html trunk/urls.py Log: geRENKS?Z i?ler :) Modified: trunk/media/css/style.css ================================================================= --- trunk/media/css/style.css (original) +++ trunk/media/css/style.css Thu Sep 27 17:25:55 2007 @@ -77,6 +77,10 @@ background: url('/media/img/fs_header_bg.png') repeat-x; } +.howto_header { + background: url('/media/img/howto_header_bg.png') repeat-x; +} + .package_header { background: url('/media/img/package_header_bg.png') repeat-x; } @@ -616,6 +620,40 @@ overflow: auto; } +.howtos_title_mini { + background: url('/media/img/howto_title_mini.png') no-repeat; + font-size: 14px; + font-weight: bold; + padding-top: 5px; + padding-left: 12px; + height: 25px; + margin-top: 10px; + width: 280px; +} + +.howtos_title { + background: url('/media/img/howto_title.png') no-repeat; + font-size: 14px; + font-weight: bold; + padding-top: 5px; + padding-left: 12px; + height: 25px; + margin-top: 10px; +} + +.howtos_content_mini { + width: 280px; + padding-left: 10px; + padding-right: 16px; + overflow: auto; +} + +.howtos_content { + padding-left: 10px; + padding-right: 16px; + overflow: auto; +} + /* sidebar */ #sidebar { float: right; @@ -741,3 +779,58 @@ h6 { font-size: 10px; } + +/** PAGINATOR **/ +.paginator { padding:.5em .75em; float:left; font:normal .8em arial; } + +.paginator a { + text-decoration: none; +} + +.paginator .prev-na, +.paginator .next-na { + padding:.3em; + font:bold .875em arial; +} + +.paginator .prev-na, +.paginator .next-na { + border:1px solid #ccc; + background-color:#f9f9f9; + color:#aaa; + font-weight:normal; +} + +.paginator .prev a, .paginator .prev a:visited, +.paginator .next a, .paginator .next a:visited { + border:1px solid #c2ee62; + background-color:#edfdd0; + color:#234f32; + padding:.3em; + font:bold .875em arial; +} + +.paginator .page a, .paginator .page a:visited, .paginator .curr { + padding:.25em; + font:normal .875em verdana; + border:1px solid #C2EE62; + background-color:#EDFDD0; + color:#006000; +} + +.paginator .curr { + background-color:#234f32; + color:#fff; + border:1px solid #234f32; + font-weight:bold; + font-size:1.2em; +} + +.paginator .page a:hover, +.paginator .curr a:hover, +.paginator .prev a:hover, +.paginator .next a:hover { + color:#fff; + background-color:#234f32; + border:1px solid #234f32; +} \ No newline at end of file Modified: trunk/settings.py ================================================================= --- trunk/settings.py (original) +++ trunk/settings.py Thu Sep 27 17:25:55 2007 @@ -47,6 +47,7 @@ USER_PER_PAGE = 10 PACKAGE_PER_PAGE = 10 FS_PER_PAGE = 10 +HOWTO_PER_PAGE = 10 GAME_PER_PAGE = 10 NEWS_PER_PAGE = 10 TAG_PER_PAGE = 10 @@ -57,6 +58,7 @@ PACKAGES_IN_HOMEPAGE = 2 GAMES_IN_HOMEPAGE = 2 FS_IN_HOMEPAGE = 2 +HOWTOS_IN_HOMEPAGE = 2 # For extending User class AUTH_PROFILE_MODULE = 'profile.Profile' Modified: trunk/st/feeds.py ================================================================= --- trunk/st/feeds.py (original) +++ trunk/st/feeds.py Thu Sep 27 17:25:55 2007 @@ -9,7 +9,7 @@ from django.utils.feedgenerator import Atom1Feed from oi.st.models import Game, FS, News, Package -from oi.settings import WEB_URL, SITE_NAME, SITE_DESC, NEWS_IN_HOMEPAGE, PACKAGES_IN_HOMEPAGE, GAMES_IN_HOMEPAGE, FS_IN_HOMEPAGE, NEWS_PER_PAGE, PACKAGE_PER_PAGE, GAME_PER_PAGE, FS_PER_PAGE +from oi.settings import WEB_URL, SITE_NAME, SITE_DESC, NEWS_IN_HOMEPAGE, PACKAGES_IN_HOMEPAGE, GAMES_IN_HOMEPAGE, FS_IN_HOMEPAGE, HOWTOS_IN_HOMEPAGE, NEWS_PER_PAGE, PACKAGE_PER_PAGE, GAME_PER_PAGE, FS_PER_PAGE, HOWTO_PER_PAGE class Main_RSS(Feed): title = SITE_NAME + " - Anasayfa" @@ -36,6 +36,10 @@ fs.title = '?lk Ad?m: %s' % fs.title output.append(fs) + for howto in HowTo.objects.filter(status=1).order_by('-update')[:HOWTOS_IN_HOMEPAGE]: + howto.title = '?lk Ad?m: %s' % howto.title + output.append(howto) + return output class Main_Atom(Main_RSS): @@ -70,6 +74,20 @@ feed_type = Atom1Feed subtitle = FS_RSS.description +class HowTo_RSS(Feed): + title = SITE_NAME + " - Nas?l" + link = WEB_URL + description = SITE_DESC + title_template = 'feeds/feed_title.html' + description_template = 'feeds/feed_description.html' + + def items(self): + return HowTo.objects.filter(status=1).order_by('-update')[:HOWTOS_PER_PAGE] + +class HowTo_Atom(FS_RSS): + feed_type = Atom1Feed + subtitle = FS_RSS.description + class Game_RSS(Feed): title = SITE_NAME + " - Oyunlar" link = WEB_URL Modified: trunk/st/models.py ================================================================= --- trunk/st/models.py (original) +++ trunk/st/models.py Thu Sep 27 17:25:55 2007 @@ -170,7 +170,7 @@ ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'author', 'status', 'update') + list_display = ('title', 'status', 'update') list_filter = ['update'] ordering = ['-update'] search_fields = ['title', 'text', 'tags'] @@ -180,6 +180,42 @@ verbose_name = "?lk Ad?m" verbose_name_plural = "?lk Ad?mlar" +class HowTo(models.Model): + title = models.CharField('Ba?l?k', maxlength=32, blank=False) + slug = models.SlugField('SEF Ba?l?k', prepopulate_from=("title",)) + sum = models.TextField('?zet', blank=False) + text = models.TextField('Metin', blank=False) + tags = models.ManyToManyField(Tag, blank=False) + videos = models.ManyToManyField(Video, blank=True) + update = models.DateTimeField('Son G?ncelleme', blank=False) + author = models.CharField('Yazar', maxlength=32) + status = models.BooleanField('Aktif') + + def __str__(self): + return self.title + + def get_absolute_url(self): + return "/nasil/%s/" % self.slug + + def get_printable_url(self): + return "/nasil/%s/yazdir/" % self.slug + + class Admin: + fields = ( + ('Genel', {'fields': ('author', 'title','sum','text','videos','tags','update','status',)}), + ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), + ) + + list_display = ('title', 'status', 'update') + list_filter = ['update'] + ordering = ['-update'] + search_fields = ['title', 'text', 'tags'] + js = ("js/admin/sef.js", "js/tinymce/tiny_mce.js", "js/tinymce/textareas.js",) + + class Meta: + verbose_name = "Nas?l" + verbose_name_plural = "Nas?l Belgeleri" + class Game(models.Model): ratings = (('1','1'),('2','2'),('3','3'),('4','4'),('5','5'),('6','6'),('7','7'),('8','8'),('9','9'),('10','10')) @@ -220,7 +256,7 @@ ('De?erlendirme', {'fields': ('gameplay', 'graphics', 'sound', 'scenario', 'atmosphere')}), ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'author', 'status', 'update') + list_display = ('title', 'status', 'update') list_filter = ['update'] ordering = ['-id'] search_fields = ['title', 'sum', 'text', 'tags'] @@ -300,7 +336,7 @@ ('Genel', {'fields': ('author', 'title','sum','text', 'license','installed_size','download_size','url','point','path','ss','tags','videos','update','status')}), ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'author', 'status', 'update') + list_display = ('title', 'status', 'update') list_filter = ['license'] ordering = ['-id'] search_fields = ['title', 'sum', 'text'] Modified: trunk/st/templatetags/library.py ================================================================= --- trunk/st/templatetags/library.py (original) +++ trunk/st/templatetags/library.py Thu Sep 27 17:25:55 2007 @@ -6,6 +6,7 @@ register = Library() + at register.filter def thumbnail(file, size='200x200'): # defining the size x, y = [int(x) for x in size.split('x')] @@ -23,8 +24,7 @@ image.save(miniature_filename, image.format) return miniature_url -register.filter(thumbnail) - + at register.inclusion_tag('paginator.html', takes_context=True) def paginator(context, adjacent_pages=2): """ To be used in conjunction with the object_list generic view. @@ -51,8 +51,7 @@ 'show_last': context['pages'] not in page_numbers, } -register.inclusion_tag('paginator.html', takes_context=True)(paginator) - + at register.filter def timedelta(value, arg=None): if not value: return '' @@ -63,6 +62,4 @@ if value > cmp: return "%s sonra" % timesince(cmp,value) else: - return "%s ?nce" % timesince(value,cmp) - -register.filter(timedelta) \ No newline at end of file + return "%s ?nce" % timesince(value,cmp) \ No newline at end of file Modified: trunk/st/views.py ================================================================= --- trunk/st/views.py (original) +++ trunk/st/views.py Thu Sep 27 17:25:55 2007 @@ -11,9 +11,9 @@ from django.contrib.auth.models import User from django.shortcuts import get_object_or_404 -from oi.settings import WEB_URL, NEWS_IN_HOMEPAGE, PACKAGES_IN_HOMEPAGE, GAMES_IN_HOMEPAGE, FS_IN_HOMEPAGE +from oi.settings import WEB_URL, NEWS_IN_HOMEPAGE, PACKAGES_IN_HOMEPAGE, GAMES_IN_HOMEPAGE, FS_IN_HOMEPAGE, HOWTOS_IN_HOMEPAGE -from oi.st.models import FS, Game, News, Package, ScreenShot, Tag, PardusVersion, PardusMirror, Video +from oi.st.models import * from oi.st.wrappers import render_response from oi.flatpages.models import FlatPage @@ -22,6 +22,7 @@ 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] + howtos = HowTo.objects.filter(status=1).order_by('-update')[:HOWTOS_IN_HOMEPAGE] return render_response(request, 'home.html', locals()) def fs_detail(request, slug): @@ -34,6 +35,16 @@ fs = get_object_or_404(FS, slug=slug) return render_response(request, 'fs/fs_printable.html', locals()) +def howto_detail(request, slug): + howto = get_object_or_404(HowTo, slug=slug) + tags = howto.tags.all() + videos = howto.videos.all() + return render_response(request, 'howto/howto_detail.html', locals()) + +def howto_printable(request, slug): + howto = get_object_or_404(HowTo, slug=slug) + return render_response(request, 'howto/howto_printable.html', locals()) + def game_detail(request, slug): game = get_object_or_404(Game, slug=slug) tags = game.tags.all() Modified: trunk/templates/base.html ================================================================= --- trunk/templates/base.html (original) +++ trunk/templates/base.html Thu Sep 27 17:25:55 2007 @@ -36,10 +36,11 @@ Modified: trunk/templates/home.html ================================================================= --- trunk/templates/home.html (original) +++ trunk/templates/home.html Thu Sep 27 17:25:55 2007 @@ -10,6 +10,15 @@ {% endfor %}
+
+ {% for howto in howtos %} +
+
Nas?l: {{ howto.title }}
+
{{ howto.sum }}
+
+ {% endfor %} +
+
{% for package in packages %}
Modified: trunk/urls.py ================================================================= --- trunk/urls.py (original) +++ trunk/urls.py Thu Sep 27 17:25:55 2007 @@ -7,10 +7,10 @@ from django.conf.urls.defaults import * -from oi.settings import WEB_URL, DOCUMENT_ROOT, 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.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 from oi.seminar.models import Seminar -from oi.st.feeds import Main_RSS, Main_Atom, News_RSS, News_Atom, FS_RSS, FS_Atom, Game_RSS, Game_Atom, Package_RSS, Package_Atom +from oi.st.feeds import * rss_dict = { '': Main_RSS, @@ -18,6 +18,7 @@ 'ia': FS_RSS, 'oyun': Game_RSS, 'paket': Package_RSS, + 'nasil': HowTo_RSS, } atom_dict = { @@ -26,6 +27,7 @@ 'ia': FS_Atom, 'oyun': Game_Atom, 'paket': Package_Atom, + 'nasil': HowTo_Atom, } package_dict = { @@ -49,6 +51,13 @@ 'template_object_name': 'fs' } +howto_dict = { + 'queryset': HowTo.objects.filter(status=1).order_by('title'), + 'template_name': 'howto/howto_main.html', + 'paginate_by': HOWTO_PER_PAGE, + 'template_object_name': 'howto' + } + news_dict = { 'queryset': News.objects.filter(status=1).order_by('-update'), 'template_name': 'news/news_main.html', @@ -66,14 +75,12 @@ urlpatterns = patterns('', #News - (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/$', '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.simple.redirect_to', {'url': "sayfa/1/"}), - (r'^paket/sayfa/(?P[0-9]+)/$', 'django.views.generic.list_detail.object_list', dict(package_dict)), + (r'^paket/$', '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'), @@ -81,20 +88,22 @@ (r'^kullanici/', include('oi.profile.urls')), #First Steps - (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/$', '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'), + #How to + (r'^nasil/$', 'django.views.generic.list_detail.object_list', dict(howto_dict)), + (r'^nasil/(?P.*)/yazdir/$', 'oi.st.views.howto_printable'), + (r'^nasil/(?P.*)/$', 'oi.st.views.howto_detail'), + #Games - (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/$', '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.simple.redirect_to', {'url': "sayfa/1/"}), - (r'^etiket/sayfa/(?P[0-9]+)/$', 'django.views.generic.list_detail.object_list', dict(tag_dict)), + (r'^etiket/$', 'django.views.generic.list_detail.object_list', dict(tag_dict)), (r'^etiket/(?P.*)/$', 'oi.st.views.tag_detail'), #Download @@ -137,4 +146,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 Thu Sep 27 17:28:41 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 27 Sep 2007 17:28:41 +0300 (EEST) Subject: [Oi-commits] r573 - in branches/stable/media: css img Message-ID: <20070927142841.ADE7D7C00BD@liste.uludag.org.tr> Author: ahmet Date: Thu Sep 27 17:28:41 2007 New Revision: 573 Added: branches/stable/media/img/howto_header_bg.png (contents, props changed) branches/stable/media/img/howto_header_logo.png (contents, props changed) branches/stable/media/img/howto_title.png (contents, props changed) branches/stable/media/img/howto_title_mini.png (contents, props changed) branches/stable/media/img/tab_howtos.png (contents, props changed) branches/stable/media/img/tag_red.png (contents, props changed) Modified: branches/stable/media/css/style.css Log: yava?tan port Modified: branches/stable/media/css/style.css ================================================================= --- branches/stable/media/css/style.css (original) +++ branches/stable/media/css/style.css Thu Sep 27 17:28:41 2007 @@ -77,6 +77,10 @@ background: url('/media/img/fs_header_bg.png') repeat-x; } +.howto_header { + background: url('/media/img/howto_header_bg.png') repeat-x; +} + .package_header { background: url('/media/img/package_header_bg.png') repeat-x; } @@ -616,6 +620,40 @@ overflow: auto; } +.howtos_title_mini { + background: url('/media/img/howto_title_mini.png') no-repeat; + font-size: 14px; + font-weight: bold; + padding-top: 5px; + padding-left: 12px; + height: 25px; + margin-top: 10px; + width: 280px; +} + +.howtos_title { + background: url('/media/img/howto_title.png') no-repeat; + font-size: 14px; + font-weight: bold; + padding-top: 5px; + padding-left: 12px; + height: 25px; + margin-top: 10px; +} + +.howtos_content_mini { + width: 280px; + padding-left: 10px; + padding-right: 16px; + overflow: auto; +} + +.howtos_content { + padding-left: 10px; + padding-right: 16px; + overflow: auto; +} + /* sidebar */ #sidebar { float: right; @@ -741,3 +779,58 @@ h6 { font-size: 10px; } + +/** PAGINATOR **/ +.paginator { padding:.5em .75em; float:left; font:normal .8em arial; } + +.paginator a { + text-decoration: none; +} + +.paginator .prev-na, +.paginator .next-na { + padding:.3em; + font:bold .875em arial; +} + +.paginator .prev-na, +.paginator .next-na { + border:1px solid #ccc; + background-color:#f9f9f9; + color:#aaa; + font-weight:normal; +} + +.paginator .prev a, .paginator .prev a:visited, +.paginator .next a, .paginator .next a:visited { + border:1px solid #c2ee62; + background-color:#edfdd0; + color:#234f32; + padding:.3em; + font:bold .875em arial; +} + +.paginator .page a, .paginator .page a:visited, .paginator .curr { + padding:.25em; + font:normal .875em verdana; + border:1px solid #C2EE62; + background-color:#EDFDD0; + color:#006000; +} + +.paginator .curr { + background-color:#234f32; + color:#fff; + border:1px solid #234f32; + font-weight:bold; + font-size:1.2em; +} + +.paginator .page a:hover, +.paginator .curr a:hover, +.paginator .prev a:hover, +.paginator .next a:hover { + color:#fff; + background-color:#234f32; + border:1px solid #234f32; +} \ No newline at end of file From oi-commits at pardus.org.tr Thu Sep 27 17:29:02 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 27 Sep 2007 17:29:02 +0300 (EEST) Subject: [Oi-commits] r574 - branches/stable Message-ID: <20070927142902.DA8D07C00BD@liste.uludag.org.tr> Author: ahmet Date: Thu Sep 27 17:29:02 2007 New Revision: 574 Modified: branches/stable/settings.py Log: settings Modified: branches/stable/settings.py ================================================================= --- branches/stable/settings.py (original) +++ branches/stable/settings.py Thu Sep 27 17:29:02 2007 @@ -47,6 +47,7 @@ USER_PER_PAGE = 10 PACKAGE_PER_PAGE = 10 FS_PER_PAGE = 10 +HOWTO_PER_PAGE = 10 GAME_PER_PAGE = 10 NEWS_PER_PAGE = 10 TAG_PER_PAGE = 10 @@ -57,6 +58,7 @@ PACKAGES_IN_HOMEPAGE = 2 GAMES_IN_HOMEPAGE = 2 FS_IN_HOMEPAGE = 2 +HOWTOS_IN_HOMEPAGE = 2 # For extending User class AUTH_PROFILE_MODULE = 'profile.Profile' @@ -211,4 +213,4 @@ ('yozgat','Yozgat'), ('yalova', 'Yalova'), ('zonguldak','Zonguldak') -) \ No newline at end of file +) From oi-commits at pardus.org.tr Thu Sep 27 17:30:15 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 27 Sep 2007 17:30:15 +0300 (EEST) Subject: [Oi-commits] r575 - in branches/stable: . st st/templatetags templates templates/howto Message-ID: <20070927143015.E90D47C00BD@liste.uludag.org.tr> Author: ahmet Date: Thu Sep 27 17:30:15 2007 New Revision: 575 Added: branches/stable/templates/howto/ branches/stable/templates/howto/howto_detail.html branches/stable/templates/howto/howto_main.html branches/stable/templates/howto/howto_printable.html Modified: branches/stable/st/feeds.py branches/stable/st/models.py branches/stable/st/templatetags/library.py branches/stable/st/views.py branches/stable/templates/base.html branches/stable/templates/home.html branches/stable/templates/paginator.html branches/stable/urls.py Log: g?nderiver Modified: branches/stable/st/feeds.py ================================================================= --- branches/stable/st/feeds.py (original) +++ branches/stable/st/feeds.py Thu Sep 27 17:30:15 2007 @@ -9,7 +9,7 @@ from django.utils.feedgenerator import Atom1Feed from oi.st.models import Game, FS, News, Package -from oi.settings import WEB_URL, SITE_NAME, SITE_DESC, NEWS_IN_HOMEPAGE, PACKAGES_IN_HOMEPAGE, GAMES_IN_HOMEPAGE, FS_IN_HOMEPAGE, NEWS_PER_PAGE, PACKAGE_PER_PAGE, GAME_PER_PAGE, FS_PER_PAGE +from oi.settings import WEB_URL, SITE_NAME, SITE_DESC, NEWS_IN_HOMEPAGE, PACKAGES_IN_HOMEPAGE, GAMES_IN_HOMEPAGE, FS_IN_HOMEPAGE, HOWTOS_IN_HOMEPAGE, NEWS_PER_PAGE, PACKAGE_PER_PAGE, GAME_PER_PAGE, FS_PER_PAGE, HOWTO_PER_PAGE class Main_RSS(Feed): title = SITE_NAME + " - Anasayfa" @@ -36,6 +36,10 @@ fs.title = '?lk Ad?m: %s' % fs.title output.append(fs) + for howto in HowTo.objects.filter(status=1).order_by('-update')[:HOWTOS_IN_HOMEPAGE]: + howto.title = '?lk Ad?m: %s' % howto.title + output.append(howto) + return output class Main_Atom(Main_RSS): @@ -70,6 +74,20 @@ feed_type = Atom1Feed subtitle = FS_RSS.description +class HowTo_RSS(Feed): + title = SITE_NAME + " - Nas?l" + link = WEB_URL + description = SITE_DESC + title_template = 'feeds/feed_title.html' + description_template = 'feeds/feed_description.html' + + def items(self): + return HowTo.objects.filter(status=1).order_by('-update')[:HOWTOS_PER_PAGE] + +class HowTo_Atom(FS_RSS): + feed_type = Atom1Feed + subtitle = FS_RSS.description + class Game_RSS(Feed): title = SITE_NAME + " - Oyunlar" link = WEB_URL Modified: branches/stable/st/models.py ================================================================= --- branches/stable/st/models.py (original) +++ branches/stable/st/models.py Thu Sep 27 17:30:15 2007 @@ -170,7 +170,7 @@ ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'author', 'status', 'update') + list_display = ('title', 'status', 'update') list_filter = ['update'] ordering = ['-update'] search_fields = ['title', 'text', 'tags'] @@ -180,6 +180,42 @@ verbose_name = "?lk Ad?m" verbose_name_plural = "?lk Ad?mlar" +class HowTo(models.Model): + title = models.CharField('Ba?l?k', maxlength=32, blank=False) + slug = models.SlugField('SEF Ba?l?k', prepopulate_from=("title",)) + sum = models.TextField('?zet', blank=False) + text = models.TextField('Metin', blank=False) + tags = models.ManyToManyField(Tag, blank=False) + videos = models.ManyToManyField(Video, blank=True) + update = models.DateTimeField('Son G?ncelleme', blank=False) + author = models.CharField('Yazar', maxlength=32) + status = models.BooleanField('Aktif') + + def __str__(self): + return self.title + + def get_absolute_url(self): + return "/nasil/%s/" % self.slug + + def get_printable_url(self): + return "/nasil/%s/yazdir/" % self.slug + + class Admin: + fields = ( + ('Genel', {'fields': ('author', 'title','sum','text','videos','tags','update','status',)}), + ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), + ) + + list_display = ('title', 'status', 'update') + list_filter = ['update'] + ordering = ['-update'] + search_fields = ['title', 'text', 'tags'] + js = ("js/admin/sef.js", "js/tinymce/tiny_mce.js", "js/tinymce/textareas.js",) + + class Meta: + verbose_name = "Nas?l" + verbose_name_plural = "Nas?l Belgeleri" + class Game(models.Model): ratings = (('1','1'),('2','2'),('3','3'),('4','4'),('5','5'),('6','6'),('7','7'),('8','8'),('9','9'),('10','10')) @@ -220,7 +256,7 @@ ('De?erlendirme', {'fields': ('gameplay', 'graphics', 'sound', 'scenario', 'atmosphere')}), ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'author', 'status', 'update') + list_display = ('title', 'status', 'update') list_filter = ['update'] ordering = ['-id'] search_fields = ['title', 'sum', 'text', 'tags'] @@ -300,7 +336,7 @@ ('Genel', {'fields': ('author', 'title','sum','text', 'license','installed_size','download_size','url','point','path','ss','tags','videos','update','status')}), ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'author', 'status', 'update') + list_display = ('title', 'status', 'update') list_filter = ['license'] ordering = ['-id'] search_fields = ['title', 'sum', 'text'] Modified: branches/stable/st/templatetags/library.py ================================================================= --- branches/stable/st/templatetags/library.py (original) +++ branches/stable/st/templatetags/library.py Thu Sep 27 17:30:15 2007 @@ -6,6 +6,7 @@ register = Library() + at register.filter def thumbnail(file, size='200x200'): # defining the size x, y = [int(x) for x in size.split('x')] @@ -23,8 +24,7 @@ image.save(miniature_filename, image.format) return miniature_url -register.filter(thumbnail) - + at register.inclusion_tag('paginator.html', takes_context=True) def paginator(context, adjacent_pages=2): """ To be used in conjunction with the object_list generic view. @@ -51,8 +51,7 @@ 'show_last': context['pages'] not in page_numbers, } -register.inclusion_tag('paginator.html', takes_context=True)(paginator) - + at register.filter def timedelta(value, arg=None): if not value: return '' @@ -63,6 +62,4 @@ if value > cmp: return "%s sonra" % timesince(cmp,value) else: - return "%s ?nce" % timesince(value,cmp) - -register.filter(timedelta) \ No newline at end of file + return "%s ?nce" % timesince(value,cmp) \ No newline at end of file Modified: branches/stable/st/views.py ================================================================= --- branches/stable/st/views.py (original) +++ branches/stable/st/views.py Thu Sep 27 17:30:15 2007 @@ -11,9 +11,9 @@ from django.contrib.auth.models import User from django.shortcuts import get_object_or_404 -from oi.settings import WEB_URL, NEWS_IN_HOMEPAGE, PACKAGES_IN_HOMEPAGE, GAMES_IN_HOMEPAGE, FS_IN_HOMEPAGE +from oi.settings import WEB_URL, NEWS_IN_HOMEPAGE, PACKAGES_IN_HOMEPAGE, GAMES_IN_HOMEPAGE, FS_IN_HOMEPAGE, HOWTOS_IN_HOMEPAGE -from oi.st.models import FS, Game, News, Package, ScreenShot, Tag, PardusVersion, PardusMirror, Video +from oi.st.models import * from oi.st.wrappers import render_response from oi.flatpages.models import FlatPage @@ -22,6 +22,7 @@ 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] + howtos = HowTo.objects.filter(status=1).order_by('-update')[:HOWTOS_IN_HOMEPAGE] return render_response(request, 'home.html', locals()) def fs_detail(request, slug): @@ -34,6 +35,16 @@ fs = get_object_or_404(FS, slug=slug) return render_response(request, 'fs/fs_printable.html', locals()) +def howto_detail(request, slug): + howto = get_object_or_404(HowTo, slug=slug) + tags = howto.tags.all() + videos = howto.videos.all() + return render_response(request, 'howto/howto_detail.html', locals()) + +def howto_printable(request, slug): + howto = get_object_or_404(HowTo, slug=slug) + return render_response(request, 'howto/howto_printable.html', locals()) + def game_detail(request, slug): game = get_object_or_404(Game, slug=slug) tags = game.tags.all() Modified: branches/stable/templates/base.html ================================================================= --- branches/stable/templates/base.html (original) +++ branches/stable/templates/base.html Thu Sep 27 17:30:15 2007 @@ -18,16 +18,29 @@ {% block extrahead %}{% endblock %} +
- - - \ No newline at end of file + Modified: branches/stable/templates/home.html ================================================================= --- branches/stable/templates/home.html (original) +++ branches/stable/templates/home.html Thu Sep 27 17:30:15 2007 @@ -10,6 +10,15 @@ {% endfor %}

+
+ {% for howto in howtos %} +
+
Nas?l: {{ howto.title }}
+
{{ howto.sum }}
+
+ {% endfor %} +
+
{% for package in packages %}
Modified: branches/stable/templates/paginator.html ================================================================= --- branches/stable/templates/paginator.html (original) +++ branches/stable/templates/paginator.html Thu Sep 27 17:30:15 2007 @@ -1,16 +1,17 @@ - Modified: branches/stable/urls.py ================================================================= --- branches/stable/urls.py (original) +++ branches/stable/urls.py Thu Sep 27 17:30:15 2007 @@ -7,10 +7,10 @@ from django.conf.urls.defaults import * -from oi.settings import WEB_URL, DOCUMENT_ROOT, 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.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 from oi.seminar.models import Seminar -from oi.st.feeds import Main_RSS, Main_Atom, News_RSS, News_Atom, FS_RSS, FS_Atom, Game_RSS, Game_Atom, Package_RSS, Package_Atom +from oi.st.feeds import * rss_dict = { '': Main_RSS, @@ -18,6 +18,7 @@ 'ia': FS_RSS, 'oyun': Game_RSS, 'paket': Package_RSS, + 'nasil': HowTo_RSS, } atom_dict = { @@ -26,6 +27,7 @@ 'ia': FS_Atom, 'oyun': Game_Atom, 'paket': Package_Atom, + 'nasil': HowTo_Atom, } package_dict = { @@ -49,6 +51,13 @@ 'template_object_name': 'fs' } +howto_dict = { + 'queryset': HowTo.objects.filter(status=1).order_by('title'), + 'template_name': 'howto/howto_main.html', + 'paginate_by': HOWTO_PER_PAGE, + 'template_object_name': 'howto' + } + news_dict = { 'queryset': News.objects.filter(status=1).order_by('-update'), 'template_name': 'news/news_main.html', @@ -66,14 +75,12 @@ urlpatterns = patterns('', #News - (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/$', '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.simple.redirect_to', {'url': "sayfa/1/"}), - (r'^paket/sayfa/(?P[0-9]+)/$', 'django.views.generic.list_detail.object_list', dict(package_dict)), + (r'^paket/$', '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'), @@ -81,20 +88,22 @@ (r'^kullanici/', include('oi.profile.urls')), #First Steps - (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/$', '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'), + #How to + (r'^nasil/$', 'django.views.generic.list_detail.object_list', dict(howto_dict)), + (r'^nasil/(?P.*)/yazdir/$', 'oi.st.views.howto_printable'), + (r'^nasil/(?P.*)/$', 'oi.st.views.howto_detail'), + #Games - (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/$', '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.simple.redirect_to', {'url': "sayfa/1/"}), - (r'^etiket/sayfa/(?P[0-9]+)/$', 'django.views.generic.list_detail.object_list', dict(tag_dict)), + (r'^etiket/$', 'django.views.generic.list_detail.object_list', dict(tag_dict)), (r'^etiket/(?P.*)/$', 'oi.st.views.tag_detail'), #Download @@ -137,4 +146,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 Thu Sep 27 17:35:08 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 27 Sep 2007 17:35:08 +0300 (EEST) Subject: [Oi-commits] r576 - in branches/stable: st templates Message-ID: <20070927143508.363637C0022@liste.uludag.org.tr> Author: ahmet Date: Thu Sep 27 17:35:07 2007 New Revision: 576 Modified: branches/stable/st/models.py branches/stable/templates/base.html Log: aradan ka?anlar Modified: branches/stable/st/models.py ================================================================= --- branches/stable/st/models.py (original) +++ branches/stable/st/models.py Thu Sep 27 17:35:07 2007 @@ -170,7 +170,7 @@ ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'status', 'update') + list_display = ('title', 'author', 'status', 'update') list_filter = ['update'] ordering = ['-update'] search_fields = ['title', 'text', 'tags'] @@ -206,7 +206,7 @@ ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'status', 'update') + list_display = ('title', 'author', 'status', 'update') list_filter = ['update'] ordering = ['-update'] search_fields = ['title', 'text', 'tags'] @@ -256,7 +256,7 @@ ('De?erlendirme', {'fields': ('gameplay', 'graphics', 'sound', 'scenario', 'atmosphere')}), ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'status', 'update') + list_display = ('title', 'author', 'status', 'update') list_filter = ['update'] ordering = ['-id'] search_fields = ['title', 'sum', 'text', 'tags'] @@ -336,7 +336,7 @@ ('Genel', {'fields': ('author', 'title','sum','text', 'license','installed_size','download_size','url','point','path','ss','tags','videos','update','status')}), ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'status', 'update') + list_display = ('title', 'author', 'status', 'update') list_filter = ['license'] ordering = ['-id'] search_fields = ['title', 'sum', 'text'] Modified: branches/stable/templates/base.html ================================================================= --- branches/stable/templates/base.html (original) +++ branches/stable/templates/base.html Thu Sep 27 17:35:07 2007 @@ -18,18 +18,6 @@ {% block extrahead %}{% endblock %} -
+ + From oi-commits at pardus.org.tr Thu Sep 27 17:36:51 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 27 Sep 2007 17:36:51 +0300 (EEST) Subject: [Oi-commits] r577 - trunk/st Message-ID: <20070927143651.6566D7C0079@liste.uludag.org.tr> Author: ahmet Date: Thu Sep 27 17:36:51 2007 New Revision: 577 Modified: trunk/st/models.py Log: commit it Modified: trunk/st/models.py ================================================================= --- trunk/st/models.py (original) +++ trunk/st/models.py Thu Sep 27 17:36:51 2007 @@ -170,7 +170,7 @@ ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'status', 'update') + list_display = ('title', 'author', 'status', 'update') list_filter = ['update'] ordering = ['-update'] search_fields = ['title', 'text', 'tags'] @@ -206,7 +206,7 @@ ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'status', 'update') + list_display = ('title', 'author', 'status', 'update') list_filter = ['update'] ordering = ['-update'] search_fields = ['title', 'text', 'tags'] @@ -256,7 +256,7 @@ ('De?erlendirme', {'fields': ('gameplay', 'graphics', 'sound', 'scenario', 'atmosphere')}), ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'status', 'update') + list_display = ('title', 'author', 'status', 'update') list_filter = ['update'] ordering = ['-id'] search_fields = ['title', 'sum', 'text', 'tags'] @@ -336,7 +336,7 @@ ('Genel', {'fields': ('author', 'title','sum','text', 'license','installed_size','download_size','url','point','path','ss','tags','videos','update','status')}), ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) - list_display = ('title', 'status', 'update') + list_display = ('title', 'author', 'status', 'update') list_filter = ['license'] ordering = ['-id'] search_fields = ['title', 'sum', 'text'] From oi-commits at pardus.org.tr Thu Sep 27 18:13:34 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 27 Sep 2007 18:13:34 +0300 (EEST) Subject: [Oi-commits] r578 - in branches/stable: media/css media/img templates/howto Message-ID: <20070927151334.A0ED27C0092@liste.uludag.org.tr> Author: ahmet Date: Thu Sep 27 18:13:34 2007 New Revision: 578 Added: branches/stable/media/img/sidebar_red.png (contents, props changed) Modified: branches/stable/media/css/style.css branches/stable/templates/howto/howto_detail.html branches/stable/templates/howto/howto_main.html Log: hehehe Modified: branches/stable/media/css/style.css ================================================================= --- branches/stable/media/css/style.css (original) +++ branches/stable/media/css/style.css Thu Sep 27 18:13:34 2007 @@ -738,6 +738,17 @@ background-image: url('/media/img/sidebar_yellow.png'); } +.sidebar_red_title { + margin-top: 10px; + padding-top: 4px; + height: 25px; + font-size: 14px; + font-weight: bold; + color: #ffffff; + background-repeat: no-repeat; + background-image: url('/media/img/sidebar_red.png'); +} + /* base */ body { font: 75%/150% "Trebuchet MS", Tahoma, Arial; Modified: branches/stable/templates/howto/howto_detail.html ================================================================= --- branches/stable/templates/howto/howto_detail.html (original) +++ branches/stable/templates/howto/howto_detail.html Thu Sep 27 18:13:34 2007 @@ -23,14 +23,14 @@ {% endblock %} {% block sidebar %} -
Etiketler
+
Etiketler
{% for tag in tags %}{{ tag.name }} {% endfor %}
{% if videos %} -
?lgili Videolar
+
?lgili Videolar
{% for video in videos %}{% endfor %}
{% endif %} -
Yazar
+
Yazar
{{ howto.author }}
{% endblock %} \ No newline at end of file Modified: branches/stable/templates/howto/howto_main.html ================================================================= --- branches/stable/templates/howto/howto_main.html (original) +++ branches/stable/templates/howto/howto_main.html Thu Sep 27 18:13:34 2007 @@ -12,7 +12,7 @@ {% for howto in howto_list %}
{{ howto.title }}
-
{{ fs.sum }} +
{{ howto.sum }}

{% for tag in howto.tags.all %}{{ tag.name }} {% endfor %}

@@ -24,6 +24,6 @@ {% block sidebartop %}{% endblock %} {% block sidebar %} -
Katk?da bulunun
-
?lk ad?mlar b?l?m?ne katk?da bulunmak istiyorsan?z buraya t?klayarak size k?lavuzluk edecek sayfaya gidebilirsiniz.
+
Katk?da bulunun
+
Nas?l b?l?m?ne katk?da bulunmak istiyorsan?z buraya t?klayarak size k?lavuzluk edecek sayfaya gidebilirsiniz.
{% endblock %} From oi-commits at pardus.org.tr Thu Sep 27 18:18:09 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 27 Sep 2007 18:18:09 +0300 (EEST) Subject: [Oi-commits] r579 - trunk/st/templatetags Message-ID: <20070927151809.5D9177C0092@liste.uludag.org.tr> Author: erenturkay Date: Thu Sep 27 18:18:09 2007 New Revision: 579 Modified: trunk/st/templatetags/library.py Log: T?rk?e karakter i?eriyor bu dosya, a?a??daki uyar?y? verip g?z esteti?imi bozmas?n :P /usr/lib/python2.4/site-packages/django/template/__init__.py:904: DeprecationWarning: Non-ASCII character '\xc3' in file /home/mini/pardus/oi/oi/st/templatetags/library.py on line 65, but no encoding declared; see http://www.python.org/peps/pep-0263.html for details Modified: trunk/st/templatetags/library.py ================================================================= --- trunk/st/templatetags/library.py (original) +++ trunk/st/templatetags/library.py Thu Sep 27 18:18:09 2007 @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + import os, Image from datetime import datetime from django.template import Library @@ -62,4 +64,4 @@ if value > cmp: return "%s sonra" % timesince(cmp,value) else: - return "%s ?nce" % timesince(value,cmp) \ No newline at end of file + return "%s ?nce" % timesince(value,cmp) From oi-commits at pardus.org.tr Thu Sep 27 18:21:06 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 27 Sep 2007 18:21:06 +0300 (EEST) Subject: [Oi-commits] r580 - trunk/templates Message-ID: <20070927152106.6CEDD7C0092@liste.uludag.org.tr> Author: erenturkay Date: Thu Sep 27 18:21:06 2007 New Revision: 580 Modified: trunk/templates/base.html Log: Sayfada da g?r?ns?n Modified: trunk/templates/base.html ================================================================= --- trunk/templates/base.html (original) +++ trunk/templates/base.html Thu Sep 27 18:21:06 2007 @@ -7,6 +7,7 @@ + From oi-commits at pardus.org.tr Thu Sep 27 18:45:53 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 27 Sep 2007 18:45:53 +0300 (EEST) Subject: [Oi-commits] r581 - trunk/st Message-ID: <20070927154553.A37BB7C0092@liste.uludag.org.tr> Author: erenturkay Date: Thu Sep 27 18:45:53 2007 New Revision: 581 Modified: trunk/st/feeds.py Log: * Fix copy-paste programming error :P Modified: trunk/st/feeds.py ================================================================= --- trunk/st/feeds.py (original) +++ trunk/st/feeds.py Thu Sep 27 18:45:53 2007 @@ -8,7 +8,7 @@ from django.contrib.syndication.feeds import Feed from django.utils.feedgenerator import Atom1Feed -from oi.st.models import Game, FS, News, Package +from oi.st.models import Game, FS, News, Package, HowTo from oi.settings import WEB_URL, SITE_NAME, SITE_DESC, NEWS_IN_HOMEPAGE, PACKAGES_IN_HOMEPAGE, GAMES_IN_HOMEPAGE, FS_IN_HOMEPAGE, HOWTOS_IN_HOMEPAGE, NEWS_PER_PAGE, PACKAGE_PER_PAGE, GAME_PER_PAGE, FS_PER_PAGE, HOWTO_PER_PAGE class Main_RSS(Feed): @@ -82,11 +82,11 @@ description_template = 'feeds/feed_description.html' def items(self): - return HowTo.objects.filter(status=1).order_by('-update')[:HOWTOS_PER_PAGE] + return HowTo.objects.filter(status=1).order_by('-update')[:HOWTO_PER_PAGE] -class HowTo_Atom(FS_RSS): +class HowTo_Atom(HowTo_RSS): feed_type = Atom1Feed - subtitle = FS_RSS.description + subtitle = HowTo_RSS.description class Game_RSS(Feed): title = SITE_NAME + " - Oyunlar" From oi-commits at pardus.org.tr Thu Sep 27 18:50:19 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 27 Sep 2007 18:50:19 +0300 (EEST) Subject: [Oi-commits] r582 - in branches/stable: st st/templatetags templates Message-ID: <20070927155020.0854E7C0092@liste.uludag.org.tr> Author: erenturkay Date: Thu Sep 27 18:50:19 2007 New Revision: 582 Modified: branches/stable/st/feeds.py branches/stable/st/templatetags/library.py branches/stable/templates/base.html Log: * mergelim Modified: branches/stable/st/feeds.py ================================================================= --- branches/stable/st/feeds.py (original) +++ branches/stable/st/feeds.py Thu Sep 27 18:50:19 2007 @@ -8,7 +8,7 @@ from django.contrib.syndication.feeds import Feed from django.utils.feedgenerator import Atom1Feed -from oi.st.models import Game, FS, News, Package +from oi.st.models import Game, FS, News, Package, HowTo from oi.settings import WEB_URL, SITE_NAME, SITE_DESC, NEWS_IN_HOMEPAGE, PACKAGES_IN_HOMEPAGE, GAMES_IN_HOMEPAGE, FS_IN_HOMEPAGE, HOWTOS_IN_HOMEPAGE, NEWS_PER_PAGE, PACKAGE_PER_PAGE, GAME_PER_PAGE, FS_PER_PAGE, HOWTO_PER_PAGE class Main_RSS(Feed): @@ -82,11 +82,11 @@ description_template = 'feeds/feed_description.html' def items(self): - return HowTo.objects.filter(status=1).order_by('-update')[:HOWTOS_PER_PAGE] + return HowTo.objects.filter(status=1).order_by('-update')[:HOWTO_PER_PAGE] -class HowTo_Atom(FS_RSS): +class HowTo_Atom(HowTo_RSS): feed_type = Atom1Feed - subtitle = FS_RSS.description + subtitle = HowTo_RSS.description class Game_RSS(Feed): title = SITE_NAME + " - Oyunlar" Modified: branches/stable/st/templatetags/library.py ================================================================= --- branches/stable/st/templatetags/library.py (original) +++ branches/stable/st/templatetags/library.py Thu Sep 27 18:50:19 2007 @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + import os, Image from datetime import datetime from django.template import Library @@ -62,4 +64,4 @@ if value > cmp: return "%s sonra" % timesince(cmp,value) else: - return "%s ?nce" % timesince(value,cmp) \ No newline at end of file + return "%s ?nce" % timesince(value,cmp) Modified: branches/stable/templates/base.html ================================================================= --- branches/stable/templates/base.html (original) +++ branches/stable/templates/base.html Thu Sep 27 18:50:19 2007 @@ -7,6 +7,7 @@ + From oi-commits at pardus.org.tr Fri Sep 28 15:20:57 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 28 Sep 2007 15:20:57 +0300 (EEST) Subject: [Oi-commits] r583 - in branches/forum: . forum media/css media/img st templates templates/forum templates/howto Message-ID: <20070928122058.0EA81864011@liste.uludag.org.tr> Author: ahmet Date: Fri Sep 28 15:20:57 2007 New Revision: 583 Added: branches/forum/media/img/howto_header_bg.png (contents, props changed) branches/forum/media/img/howto_header_logo.png (contents, props changed) branches/forum/media/img/howto_title.png (contents, props changed) branches/forum/media/img/howto_title_mini.png (contents, props changed) branches/forum/media/img/sidebar_red.png (contents, props changed) branches/forum/media/img/tab_howtos.png (contents, props changed) branches/forum/media/img/tag_red.png (contents, props changed) Modified: branches/forum/TODO branches/forum/forum/forms.py branches/forum/forum/urls.py branches/forum/forum/views.py branches/forum/media/css/style.css branches/forum/settings.py branches/forum/st/feeds.py branches/forum/st/views.py branches/forum/templates/base.html branches/forum/templates/forum/topic.html branches/forum/templates/home.html branches/forum/templates/howto/howto_detail.html branches/forum/templates/howto/howto_main.html branches/forum/templates/howto/howto_printable.html branches/forum/urls.py Log: Bir tak?m de?i?iklikler :( Modified: branches/forum/TODO ================================================================= --- branches/forum/TODO (original) +++ branches/forum/TODO Fri Sep 28 15:20:57 2007 @@ -52,6 +52,7 @@ - Markup language (BBCode??) - Smiley - Quotations + - Quick reply - Feeds - Search - Log & monitor all IP's Modified: branches/forum/forum/forms.py ================================================================= --- branches/forum/forum/forms.py (original) +++ branches/forum/forum/forms.py Fri Sep 28 15:20:57 2007 @@ -1,8 +1,5 @@ from django import newforms as forms -from django.contrib.auth import authenticate -from django.contrib.auth.models import User - class TopicForm(forms.Form): title = forms.CharField(label='Ba?l?k', required=True, max_length=100, widget=forms.TextInput(attrs={'size': '40',})) text = forms.CharField(label='?leti', required=True, widget=forms.Textarea(attrs={'rows': '20', 'cols': '60',})) Modified: branches/forum/forum/urls.py ================================================================= --- branches/forum/forum/urls.py (original) +++ branches/forum/forum/urls.py Fri Sep 28 15:20:57 2007 @@ -25,7 +25,6 @@ (r'^(?P.*)/(?P\d+)/lock/$', 'oi.forum.views.lock'), (r'^(?P.*)/(?P\d+)/stick/$', 'oi.forum.views.stick'), (r'^(?P.*)/(?P\d+)/edit/$', 'oi.forum.views.edit_topic'), - (r'^(?P.*)/(?P\d+)/merge/$', 'oi.forum.views.merge'), (r'^(?P.*)/(?P\d+)/$', 'oi.forum.views.topic'), (r'^(?P.*)/$', 'oi.forum.views.forum'), ) \ No newline at end of file Modified: branches/forum/forum/views.py ================================================================= --- branches/forum/forum/views.py (original) +++ branches/forum/forum/views.py Fri Sep 28 15:20:57 2007 @@ -11,12 +11,10 @@ from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User from django.shortcuts import get_object_or_404 -from django.core.paginator import ObjectPaginator from django.views.generic.list_detail import object_list from oi.forum.settings import * - -from oi.forum.forms import TopicForm, PostForm +from oi.forum.forms import * from oi.st.wrappers import render_response from oi.forum.models import Category, Forum, Topic, Post, AbuseReport, WatchList Modified: branches/forum/media/css/style.css ================================================================= --- branches/forum/media/css/style.css (original) +++ branches/forum/media/css/style.css Fri Sep 28 15:20:57 2007 @@ -77,6 +77,10 @@ background: url('/media/img/fs_header_bg.png') repeat-x; } +.howto_header { + background: url('/media/img/howto_header_bg.png') repeat-x; +} + .package_header { background: url('/media/img/package_header_bg.png') repeat-x; } @@ -616,6 +620,40 @@ overflow: auto; } +.howtos_title_mini { + background: url('/media/img/howto_title_mini.png') no-repeat; + font-size: 14px; + font-weight: bold; + padding-top: 5px; + padding-left: 12px; + height: 25px; + margin-top: 10px; + width: 280px; +} + +.howtos_title { + background: url('/media/img/howto_title.png') no-repeat; + font-size: 14px; + font-weight: bold; + padding-top: 5px; + padding-left: 12px; + height: 25px; + margin-top: 10px; +} + +.howtos_content_mini { + width: 280px; + padding-left: 10px; + padding-right: 16px; + overflow: auto; +} + +.howtos_content { + padding-left: 10px; + padding-right: 16px; + overflow: auto; +} + /* sidebar */ #sidebar { float: right; @@ -700,6 +738,17 @@ background-image: url('/media/img/sidebar_yellow.png'); } +.sidebar_red_title { + margin-top: 10px; + padding-top: 4px; + height: 25px; + font-size: 14px; + font-weight: bold; + color: #ffffff; + background-repeat: no-repeat; + background-image: url('/media/img/sidebar_red.png'); +} + /* base */ body { font: 75%/150% "Trebuchet MS", Tahoma, Arial; Modified: branches/forum/settings.py ================================================================= --- branches/forum/settings.py (original) +++ branches/forum/settings.py Fri Sep 28 15:20:57 2007 @@ -47,6 +47,7 @@ USER_PER_PAGE = 10 PACKAGE_PER_PAGE = 10 FS_PER_PAGE = 10 +HOWTO_PER_PAGE = 10 GAME_PER_PAGE = 10 NEWS_PER_PAGE = 10 TAG_PER_PAGE = 10 @@ -57,6 +58,7 @@ PACKAGES_IN_HOMEPAGE = 2 GAMES_IN_HOMEPAGE = 2 FS_IN_HOMEPAGE = 2 +HOWTOS_IN_HOMEPAGE = 2 # For extending User class AUTH_PROFILE_MODULE = 'profile.Profile' Modified: branches/forum/st/feeds.py ================================================================= --- branches/forum/st/feeds.py (original) +++ branches/forum/st/feeds.py Fri Sep 28 15:20:57 2007 @@ -9,7 +9,7 @@ from django.utils.feedgenerator import Atom1Feed from oi.st.models import Game, FS, News, Package -from oi.settings import WEB_URL, SITE_NAME, SITE_DESC, NEWS_IN_HOMEPAGE, PACKAGES_IN_HOMEPAGE, GAMES_IN_HOMEPAGE, FS_IN_HOMEPAGE, NEWS_PER_PAGE, PACKAGE_PER_PAGE, GAME_PER_PAGE, FS_PER_PAGE +from oi.settings import WEB_URL, SITE_NAME, SITE_DESC, NEWS_IN_HOMEPAGE, PACKAGES_IN_HOMEPAGE, GAMES_IN_HOMEPAGE, FS_IN_HOMEPAGE, HOWTOS_IN_HOMEPAGE, NEWS_PER_PAGE, PACKAGE_PER_PAGE, GAME_PER_PAGE, FS_PER_PAGE, HOWTO_PER_PAGE class Main_RSS(Feed): title = SITE_NAME + " - Anasayfa" @@ -36,6 +36,10 @@ fs.title = '?lk Ad?m: %s' % fs.title output.append(fs) + for howto in HowTo.objects.filter(status=1).order_by('-update')[:HOWTOS_IN_HOMEPAGE]: + howto.title = '?lk Ad?m: %s' % howto.title + output.append(howto) + return output class Main_Atom(Main_RSS): @@ -70,6 +74,20 @@ feed_type = Atom1Feed subtitle = FS_RSS.description +class HowTo_RSS(Feed): + title = SITE_NAME + " - Nas?l" + link = WEB_URL + description = SITE_DESC + title_template = 'feeds/feed_title.html' + description_template = 'feeds/feed_description.html' + + def items(self): + return HowTo.objects.filter(status=1).order_by('-update')[:HOWTOS_PER_PAGE] + +class HowTo_Atom(FS_RSS): + feed_type = Atom1Feed + subtitle = FS_RSS.description + class Game_RSS(Feed): title = SITE_NAME + " - Oyunlar" link = WEB_URL Modified: branches/forum/st/views.py ================================================================= --- branches/forum/st/views.py (original) +++ branches/forum/st/views.py Fri Sep 28 15:20:57 2007 @@ -11,9 +11,9 @@ from django.contrib.auth.models import User from django.shortcuts import get_object_or_404 -from oi.settings import WEB_URL, NEWS_IN_HOMEPAGE, PACKAGES_IN_HOMEPAGE, GAMES_IN_HOMEPAGE, FS_IN_HOMEPAGE +from oi.settings import WEB_URL, NEWS_IN_HOMEPAGE, PACKAGES_IN_HOMEPAGE, GAMES_IN_HOMEPAGE, FS_IN_HOMEPAGE, HOWTOS_IN_HOMEPAGE -from oi.st.models import FS, Game, News, Package, ScreenShot, Tag, PardusVersion, PardusMirror, Video +from oi.st.models import * from oi.st.wrappers import render_response from oi.flatpages.models import FlatPage @@ -22,6 +22,7 @@ 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] + howtos = HowTo.objects.filter(status=1).order_by('-update')[:HOWTOS_IN_HOMEPAGE] return render_response(request, 'home.html', locals()) def fs_detail(request, slug): @@ -42,7 +43,7 @@ def howto_printable(request, slug): howto = get_object_or_404(HowTo, slug=slug) - return render_response(request, 'howto/howto_detail.html', locals()) + return render_response(request, 'howto/howto_printable.html', locals()) def game_detail(request, slug): game = get_object_or_404(Game, slug=slug) Modified: branches/forum/templates/base.html ================================================================= --- branches/forum/templates/base.html (original) +++ branches/forum/templates/base.html Fri Sep 28 15:20:57 2007 @@ -36,10 +36,11 @@ Modified: branches/forum/templates/forum/topic.html ================================================================= --- branches/forum/templates/forum/topic.html (original) +++ branches/forum/templates/forum/topic.html Fri Sep 28 15:20:57 2007 @@ -12,7 +12,7 @@ {% for post in posts %} {% if post.hidden %}
{% endif %} -{{ post.id }} - {{ post.author }} - {{ post.created }}
+#{{ 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 }} Modified: branches/forum/templates/home.html ================================================================= --- branches/forum/templates/home.html (original) +++ branches/forum/templates/home.html Fri Sep 28 15:20:57 2007 @@ -10,6 +10,15 @@ {% endfor %}

+
+ {% for howto in howtos %} +
+
Nas?l: {{ howto.title }}
+
{{ howto.sum }}
+
+ {% endfor %} +
+
{% for package in packages %}
Modified: branches/forum/templates/howto/howto_detail.html ================================================================= --- branches/forum/templates/howto/howto_detail.html (original) +++ branches/forum/templates/howto/howto_detail.html Fri Sep 28 15:20:57 2007 @@ -1,7 +1,7 @@ {% load library %} {% extends "base.html" %} -{% block title %}{{ fs.title }} - ?lk Ad?mlar - {% endblock %} +{% block title %}{{ howto.title }} - Nas?l - {% endblock %} {% block extrahead %} @@ -10,27 +10,27 @@ {% block pagetype %}page{% endblock %} -{% block section %}fs{% endblock %} -{% block section_logo %}{% endblock %} +{% block section %}howto{% endblock %} +{% block section_logo %}{% endblock %} {% block content %} -
{{ fs.title }}
+
{{ howto.title }}
-{{ fs.text }} +{{ howto.text }}
-
-
Son g?ncelleme: {{ fs.update|timedelta }}
+
+
Son g?ncelleme: {{ howto.update|timedelta }}
{% endblock %} {% block sidebar %} -
Etiketler
+
Etiketler
{% for tag in tags %}{{ tag.name }} {% endfor %}
{% if videos %} -
?lgili Videolar
+
?lgili Videolar
{% for video in videos %}{% endfor %}
{% endif %} -
Yazar
-
{{ fs.author }}
-{% endblock %} +
Yazar
+
{{ howto.author }}
+{% endblock %} \ No newline at end of file Modified: branches/forum/templates/howto/howto_main.html ================================================================= --- branches/forum/templates/howto/howto_main.html (original) +++ branches/forum/templates/howto/howto_main.html Fri Sep 28 15:20:57 2007 @@ -1,19 +1,19 @@ {% load library %} {% extends "base.html" %} -{% block title %}?lk Ad?mlar - {% endblock %} +{% block title %}Nas?l - {% endblock %} {% block pagetype %}page{% endblock %} -{% block section %}fs{% endblock %} -{% block section_logo %}{% endblock %} +{% block section %}howto{% endblock %} +{% block section_logo %}{% endblock %} {% block content %} -{% for fs in fs_list %} -
-
{{ fs.title }}
-
{{ fs.sum }} -

{% for tag in fs.tags.all %}{{ tag.name }} {% endfor %}

+{% for howto in howto_list %} +
+
{{ howto.title }}
+
{{ howto.sum }} +

{% for tag in howto.tags.all %}{{ tag.name }} {% endfor %}

{% endfor %} @@ -24,22 +24,6 @@ {% block sidebartop %}{% endblock %} {% block sidebar %} -
En ?nemli '?lk Ad?mlar'
-
- -
- -
Katk?da bulunun
-
?lk ad?mlar b?l?m?ne katk?da bulunmak istiyorsan?z buraya t?klayarak size k?lavuzluk edecek sayfaya gidebilirsiniz.
+
Katk?da bulunun
+
Nas?l b?l?m?ne katk?da bulunmak istiyorsan?z buraya t?klayarak size k?lavuzluk edecek sayfaya gidebilirsiniz.
{% endblock %} Modified: branches/forum/templates/howto/howto_printable.html ================================================================= --- branches/forum/templates/howto/howto_printable.html (original) +++ branches/forum/templates/howto/howto_printable.html Fri Sep 28 15:20:57 2007 @@ -1,11 +1,11 @@ {% extends "printable.html" %} -{% block title %}{{ fs.title }} - ?lk Ad?mlar - {% endblock %} +{% block title %}{{ howto.title }} - Nas?l - {% endblock %} {% block content %} -

{{ fs.title }}

+

{{ howto.title }}

-{{ fs.text }} +{{ howto.text }}
-
{{ fs.update|date:"d" }} {{ fs.update|date:"F" }} {{ fs.update|date:"Y" }} - {{ fs.update|date:"H" }}:{{ fs.update|date:"i" }}
+
{{ howto.update|date:"d" }} {{ howto.update|date:"F" }} {{ howto.update|date:"Y" }} - {{ howto.update|date:"H" }}:{{ howto.update|date:"i" }}
{% endblock %} \ No newline at end of file Modified: branches/forum/urls.py ================================================================= --- branches/forum/urls.py (original) +++ branches/forum/urls.py Fri Sep 28 15:20:57 2007 @@ -7,10 +7,10 @@ from django.conf.urls.defaults import * -from oi.settings import WEB_URL, DOCUMENT_ROOT, 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.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 from oi.seminar.models import Seminar -from oi.st.feeds import Main_RSS, Main_Atom, News_RSS, News_Atom, FS_RSS, FS_Atom, Game_RSS, Game_Atom, Package_RSS, Package_Atom +from oi.st.feeds import * rss_dict = { '': Main_RSS, @@ -18,6 +18,7 @@ 'ia': FS_RSS, 'oyun': Game_RSS, 'paket': Package_RSS, + 'nasil': HowTo_RSS, } atom_dict = { @@ -26,6 +27,7 @@ 'ia': FS_Atom, 'oyun': Game_Atom, 'paket': Package_Atom, + 'nasil': HowTo_Atom, } package_dict = { @@ -49,6 +51,13 @@ 'template_object_name': 'fs' } +howto_dict = { + 'queryset': HowTo.objects.filter(status=1).order_by('title'), + 'template_name': 'howto/howto_main.html', + 'paginate_by': HOWTO_PER_PAGE, + 'template_object_name': 'howto' + } + news_dict = { 'queryset': News.objects.filter(status=1).order_by('-update'), 'template_name': 'news/news_main.html', @@ -83,6 +92,11 @@ (r'^ia/(?P.*)/yazdir/$', 'oi.st.views.fs_printable'), (r'^ia/(?P.*)/$', 'oi.st.views.fs_detail'), + #How to + (r'^nasil/$', 'django.views.generic.list_detail.object_list', dict(howto_dict)), + (r'^nasil/(?P.*)/yazdir/$', 'oi.st.views.howto_printable'), + (r'^nasil/(?P.*)/$', 'oi.st.views.howto_detail'), + #Games (r'^oyun/$', 'django.views.generic.list_detail.object_list', dict(game_dict)), (r'^oyun/(?P.*)/yazdir/$', 'oi.st.views.game_printable'), From oi-commits at pardus.org.tr Sun Sep 30 00:43:21 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sun, 30 Sep 2007 00:43:21 +0300 (EEST) Subject: [Oi-commits] r584 - trunk/feedjack/bin Message-ID: <20070929214321.39A6E7C00B0@liste.uludag.org.tr> Author: erenturkay Date: Sun Sep 30 00:43:20 2007 New Revision: 584 Modified: trunk/feedjack/bin/feedjack_update.py Log: * yeah, fix it Even if image has been resized, it is shown as it is. it's because width and height attribute of img tag can not be changed. Modified: trunk/feedjack/bin/feedjack_update.py ================================================================= --- trunk/feedjack/bin/feedjack_update.py (original) +++ trunk/feedjack/bin/feedjack_update.py Sun Sep 30 00:43:20 2007 @@ -121,7 +121,7 @@ #?create a request and get the image data if options.verbose: - print 'Getting %s to resize' % url + print ' RESIZE: Getting %s to resize' % url req = urllib2.Request(url) req.add_header('User-Agent', USER_AGENT) image_data = urllib2.urlopen(req).read() @@ -151,12 +151,22 @@ # generate a site url that will be showed in feedjack index and replace it with original resized_image_url = "%s/%s" % (settings.FEEDJACK_UPLOAD_URL, image_name) - content = content.replace(url, resized_image_url) + img['src'] = resized_image_url + + # if it has width + if img.has_key("width"): + img['width'] = resize_x + + # if it has height + if img.has_key("height"): + img['height'] = resize_y + + content = soup if options.verbose: - print 'Image resized %s, %s' % (url, resized_image_url) + print ' RESIZE: Image resized %s, %s' % (url, resized_image_url) else: if options.verbose: - print 'Skipped, there is no change\n' + print ' RESIZE: Skipped, there is no change\n' # endpatch From oi-commits at pardus.org.tr Sun Sep 30 00:43:55 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sun, 30 Sep 2007 00:43:55 +0300 (EEST) Subject: [Oi-commits] r585 - branches/stable/feedjack/bin Message-ID: <20070929214355.DC62D7C00B0@liste.uludag.org.tr> Author: erenturkay Date: Sun Sep 30 00:43:55 2007 New Revision: 585 Modified: branches/stable/feedjack/bin/feedjack_update.py Log: * merge Modified: branches/stable/feedjack/bin/feedjack_update.py ================================================================= --- branches/stable/feedjack/bin/feedjack_update.py (original) +++ branches/stable/feedjack/bin/feedjack_update.py Sun Sep 30 00:43:55 2007 @@ -121,7 +121,7 @@ #?create a request and get the image data if options.verbose: - print 'Getting %s to resize' % url + print ' RESIZE: Getting %s to resize' % url req = urllib2.Request(url) req.add_header('User-Agent', USER_AGENT) image_data = urllib2.urlopen(req).read() @@ -151,12 +151,22 @@ # generate a site url that will be showed in feedjack index and replace it with original resized_image_url = "%s/%s" % (settings.FEEDJACK_UPLOAD_URL, image_name) - content = content.replace(url, resized_image_url) + img['src'] = resized_image_url + + # if it has width + if img.has_key("width"): + img['width'] = resize_x + + # if it has height + if img.has_key("height"): + img['height'] = resize_y + + content = soup if options.verbose: - print 'Image resized %s, %s' % (url, resized_image_url) + print ' RESIZE: Image resized %s, %s' % (url, resized_image_url) else: if options.verbose: - print 'Skipped, there is no change\n' + print ' RESIZE: Skipped, there is no change\n' # endpatch