{{ item.content|safe }}
--{% block ust_menu %} - {% include "ust_menu_ayrinti.html" %} -{% endblock %} -
- {% block content %} +
{% for tag in game.tags.all %}{{ tag.name }} {% endfor %}
+ {{ game.update|date:"d M Y" }}
From oi-commits at pardus.org.tr Mon Sep 1 04:10:06 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 1 Sep 2008 04:10:06 +0300 (EEST) Subject: [Oi-commits] r1754 - in branches/newdesign: ideas/templates media/css/new media/js Message-ID: <20080901011006.D2F13138411B@liste.pardus.org.tr> Author: huseyin.berberoglu Date: Mon Sep 1 04:10:06 2008 New Revision: 1754 Modified: branches/newdesign/ideas/templates/idea_list.html branches/newdesign/media/css/new/brainstorm.css branches/newdesign/media/js/brainstorm.js Log: vote button works true now. Modified: branches/newdesign/ideas/templates/idea_list.html ================================================================= --- branches/newdesign/ideas/templates/idea_list.html (original) +++ branches/newdesign/ideas/templates/idea_list.html Mon Sep 1 04:10:06 2008 @@ -17,28 +17,12 @@ {% for idea in ideas %}
- {% else %}
- {% ifequal idea.user_vote 0 %}
-
- {% else %}
-
- {% endifequal %}
- {% endifequal %}
+ 
- ?zg?rl?ki?in'in ?imdi bir de e-dergisi var! Okumak i?in buraya t?klay?n.
+ {{ last_modified }}
- {% for tag in item.qtags %}{{ tag.name }} {% endfor %}
- {% endif %}
- {{ item.content|safe }}
-
+ {% for tag in item.qtags %}{{ tag.name }} {% endfor %}
+ {% endif %}
+
{% for tag in game.tags.all %}{{ tag.name }} {% endfor %}
{% for tag in topic.tags.all %}{{tag.name}}{% endfor %}
+
{% for tag in topic.tags.all %}{{tag.name}}{% endfor %}
{% for tag in fs.tags.all %}{{ tag.name }} {% endfor %}
{% for tag in howto.tags.all %}{{ tag.name }} {% endfor %}
{% for tag in package.tags.all %}{{ tag.name }} {% endfor %}
{{ idea.description|safe|truncatewords:22 }}
-%s
%s
%s
%s
%s
tag. xhtml valid now Modified: branches/newdesign/ideas/templatetags/ideas.py ================================================================= --- branches/newdesign/ideas/templatetags/ideas.py (original) +++ branches/newdesign/ideas/templatetags/ideas.py Tue Sep 2 14:20:27 2008 @@ -19,5 +19,5 @@ html = '' for idea in ideas: description = truncatewords_html(idea.description, 22) - html += '
%s
+
-
+
From oi-commits at pardus.org.tr Tue Sep 2 15:39:56 2008
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Tue, 2 Sep 2008 15:39:56 +0300 (EEST)
Subject: [Oi-commits] r1784 - branches/newdesign/templates
Message-ID: <20080902123956.4CE1013840F9@liste.pardus.org.tr>
Author: erenturkay
Date: Tue Sep 2 15:39:55 2008
New Revision: 1784
Modified:
branches/newdesign/templates/menu.html
Log:
* please add other titles, that's enough for me as I can't find anything to write
Modified: branches/newdesign/templates/menu.html
=================================================================
--- branches/newdesign/templates/menu.html (original)
+++ branches/newdesign/templates/menu.html Tue Sep 2 15:39:55 2008
@@ -6,13 +6,13 @@
From oi-commits at pardus.org.tr Tue Sep 2 15:52:35 2008
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Tue, 2 Sep 2008 15:52:35 +0300 (EEST)
Subject: [Oi-commits] r1785 - branches/newdesign/templates
Message-ID: <20080902125235.2C6AF138413B@liste.pardus.org.tr>
Author: erenturkay
Date: Tue Sep 2 15:52:34 2008
New Revision: 1785
Modified:
branches/newdesign/templates/menu.html
Log:
* get rid of DOTs since they are not a complete sentence
Modified: branches/newdesign/templates/menu.html
=================================================================
--- branches/newdesign/templates/menu.html (original)
+++ branches/newdesign/templates/menu.html Tue Sep 2 15:52:34 2008
@@ -4,13 +4,13 @@
+
-
+
From oi-commits at pardus.org.tr Tue Sep 2 15:57:14 2008
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Tue, 2 Sep 2008 15:57:14 +0300 (EEST)
Subject: [Oi-commits] r1786 - branches/newdesign/media/css/new
Message-ID: <20080902125714.D00021384129@liste.pardus.org.tr>
Author: jnmbk
Date: Tue Sep 2 15:57:14 2008
New Revision: 1786
Modified:
branches/newdesign/media/css/new/forum_list.css
Log:
fix forum title
Modified: branches/newdesign/media/css/new/forum_list.css
=================================================================
--- branches/newdesign/media/css/new/forum_list.css (original)
+++ branches/newdesign/media/css/new/forum_list.css Tue Sep 2 15:57:14 2008
@@ -51,7 +51,7 @@
margin-left: 10px;
width: 35px;
}
-.forum_list .item .title, .forum_list .item .lastpost {
+.forum_list .item .title, .forum_list .item .lastpost, .forum_list .item .topic_title {
margin-top: 12px;
line-height: 15px;
}
From oi-commits at pardus.org.tr Tue Sep 2 15:58:07 2008
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Tue, 2 Sep 2008 15:58:07 +0300 (EEST)
Subject: [Oi-commits] r1787 - branches/newdesign/templates/forum
Message-ID: <20080902125808.0DC931384129@liste.pardus.org.tr>
Author: jnmbk
Date: Tue Sep 2 15:58:07 2008
New Revision: 1787
Modified:
branches/newdesign/templates/forum/topic.html
Log:
fix follow button
Modified: branches/newdesign/templates/forum/topic.html
=================================================================
--- branches/newdesign/templates/forum/topic.html (original)
+++ branches/newdesign/templates/forum/topic.html Tue Sep 2 15:58:07 2008
@@ -11,7 +11,7 @@

+ 1 / 5
+
"?zg?rl?k??in OOXML'e Hay?r!" diyoruz. Banner ve d??melerimizi kullanarak kampanyam?za katk?da bulunabilir ve manifestomuzu destekleyerek siz de OOXML'e hay?r diyebilirsiniz.
Destekleyenler: %(numberofpetitioners)s / 3000
+Destekleyenler: %(numberofpetitioners)s / 3000
?lk ad?mlar b?l?m?ne katk?da bulunmak istiyorsan?z buraya t?klayarak size k?lavuzluk edecek sayfaya gidebilirsiniz.
-?lk ad?mlar b?l?m?ne katk?da bulunmak istiyorsan?z buraya t?klayarak size k?lavuzluk edecek sayfaya gidebilirsiniz.
+
{% for tag in fs.tags.all %}{{ tag.name }} {% endfor %}
-
{% for video in fs.videos.all %} {% include "video.html" %} {% endfor %} -
{{ fs.author }}
-
{% for tag in fs.tags.all %}{{ tag.name }} {% endfor %}
+
{% for tag in fs.tags.all %}{{ tag.name }} {% endfor %}
{% if auth %} {% if form %}
{% endif %} {% endif %} - - - + +
{% for tag in howto.tags.all %}{{ tag.name }} {% endfor %}
+
+ {% for video in howto.videos.all %} {% include "video.html" %} - {% endfor %} -
Nas?l b?l?m?ne katk?da bulunmak istiyorsan?z buraya t?klayarak size k?lavuzluk edecek - sayfaya gidebilirsiniz.
-{{ howto.author }}
+Nas?l b?l?m?ne katk?da bulunmak istiyorsan?z buraya t?klayarak size k?lavuzluk edecek sayfaya gidebilirsiniz.
?lk ad?mlar b?l?m?ne katk?da bulunmak istiyorsan?z buraya t?klayarak size k?lavuzluk edecek sayfaya gidebilirsiniz.
Modified: branches/newdesign/templates/news/news_detail.html ================================================================= --- branches/newdesign/templates/news/news_detail.html (original) +++ branches/newdesign/templates/news/news_detail.html Wed Sep 3 16:29:56 2008 @@ -8,56 +8,39 @@ {% endblock %} -{% block pagetype %}page{% endblock %} - -{% block section %}news{% endblock %} - -{% block header_menu %} - {% include "header.html" %} -{% endblock %} -+ {% endif %} {% endif %} - - +
{% for tag in news.tags.all %}{{ tag.name }} {% endfor %}
+
{{ news.author }}
Okunmu? forum ya da konu
Yeni ileti var
Kilitli (yeni iletilere kapal?)
Kilitli ve okunmam?? ileti var
Sabit (her zaman ?stte kal?r)
Kilitli ve sabit
Okunmu? forum ya da konu
Yeni ileti var
Kilitli (yeni iletilere kapal?)
Kilitli ve okunmam?? ileti var
Sabit (her zaman ?stte kal?r)
Kilitli ve sabit+ {% endif %} {% endif %} - - +
Lisans: {% for license in game.license.all %}{{ license.name }} {% endfor %}
Paket boyutu: {{ game.download_size|filesizeformat }}
Kurulu boyutu: {{ game.installed_size|filesizeformat }}
- Web sitesi
-
??renme s?resi: {{ game.learning_time }}
Oynanabilirlik: {{ game.gameplay }}
Grafik: {{ game.graphics }}
@@ -75,68 +55,34 @@
Senaryo: {{ game.scenario }}
Atmosfer: {{ game.atmosphere }}
{{ game.path }}
- +
{% for tag in game.tags.all %}{{ tag.name }} {% endfor %}
{% for video in game.videos.all %} {% include "video.html" %} {% endfor %} -
{{ game.author }}
+Oyunlar b?l?m?ne katk?da bulunmak istiyorsan?z buraya t?klayarak size k?lavuzluk edecek sayfaya gidebilirsiniz.
-
Lisans: {% for license in package.license.all %}{{ license.name }} {% endfor %}
Paket boyutu: {{ package.download_size|filesizeformat }}
Kurulu boyutu: {{ package.installed_size|filesizeformat }}
Web sitesi
-

{{ package.path }}
+
+
{% for tag in package.tags.all %}{{ tag.name }} {% endfor %}
+
{% for wiki in package.wiki.all %}{{ wiki.name }}
{% endfor %}
-
Paketler b?l?m?ne katk?da bulunmak istiyorsan?z buraya t?klayarak size k?lavuzluk edecek sayfaya gidebilirsiniz.
-
- Lisans: {% for license in game.license.all %}{{ license.name }} {% endfor %}
- Paket boyutu: {{ game.download_size|filesizeformat }}
- Kurulu boyutu: {{ game.installed_size|filesizeformat }}
- Web sitesi >
+
| Lisans | :{% for license in game.license.all %}{{ license.name }}{% endfor %} | +|
| Paket boyutu | :{{ game.download_size|filesizeformat }} | +|
| Kurulu boyutu | :{{ game.installed_size|filesizeformat }} | +|
Oyunun Web sitesi > |
+ ||
??renme s?resi: {{ game.learning_time }}
+ Oynanabilirlik{{ game.gameplay }}/10 +{{ game.path }}
+ +
{% for tag in game.tags.all %}{{ tag.name }}, {% endfor %}
- ??renme s?resi: {{ game.learning_time }}
- Oynanabilirlik: {{ game.gameplay }}
- Grafik: {{ game.graphics }}
- Ses: {{ game.sound }}
- Senaryo: {{ game.scenario }}
- Atmosfer: {{ game.atmosphere }}
-
{{ game.path }}
- -
{% for tag in game.tags.all %}{{ tag.name }} {% endfor %}
- {% for wiki in game.wiki.all %}{{ wiki.name }}
{% endfor %}
+ {% for wiki in game.wiki.all %}{{ wiki.name }}
{% endfor %}
{% endif %}
-
+
+ + {% if game.videos.all %} +{% for video in game.videos.all %} {% include "video.html" %} {% endfor %} -
-{% endif %} -{{ game.author }}
+ + {% endif %} + +{{ game.author }}
-Oyunlar b?l?m?ne katk?da bulunmak istiyorsan?z Katk?da bulunun
+ Oyunlar b?l?m?ne katk?da bulunmak istiyorsan?z buraya t?klayarak size k?lavuzluk edecek
sayfaya gidebilirsiniz.
{{ game.path }}
{% for tag in game.tags.all %}{{ tag.name }}, {% endfor %}
{% for tag in game.tags.all %}{{ tag.name }}{% if not forloop.last %},{% endif %} {% endfor %}
- Lisans: {% for license in package.license.all %}{{ license.name }} {% endfor %}
- Paket boyutu: {{ package.download_size|filesizeformat }}
- Kurulu boyutu: {{ package.installed_size|filesizeformat }}
- Web sitesi
-
| Lisans | : {% for license in package.license.all %}{{ license.name }} {% endfor %} | +
| Paket boyutu | : {{ package.download_size|filesizeformat }} | +
| Kurulu boyutu: | : {{ package.installed_size|filesizeformat }} | +
Paketin Web sitesi > |
+ |
-

{% endfor %}{{ package.path }}
-
{% for tag in package.tags.all %}{{ tag.name }} {% endfor %}
+
{% for tag in package.tags.all %}{{ tag.name }}{% if not forloop.last%},{% endif %} {% endfor %}
{{ package.author }}
Paketler b?l?m?ne katk?da bulunmak istiyorsan?z buraya t?klayarak size k?lavuzluk edecek From oi-commits at pardus.org.tr Sat Sep 6 19:32:37 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 6 Sep 2008 19:32:37 +0300 (EEST) Subject: [Oi-commits] r1855 - branches/newdesign/st Message-ID: <20080906163237.4C525138416A@liste.pardus.org.tr> Author: huseyin.berberoglu Date: Sat Sep 6 19:32:37 2008 New Revision: 1855 Modified: branches/newdesign/st/views.py Log: for forloop Modified: branches/newdesign/st/views.py ================================================================= --- branches/newdesign/st/views.py (original) +++ branches/newdesign/st/views.py Sat Sep 6 19:32:37 2008 @@ -67,7 +67,11 @@ def game_detail(request, slug): game = get_object_or_404(Game, slug=slug) game.avg = ((game.gameplay + game.graphics + game.sound + game.scenario + game.atmosphere)/5.0) - + game.gameplay_range = range(1, game.gameplay) + game.graphics_range = range(1, game.graphics) + game.sound_range = range(1, game.sound) + game.scenario_range = range(1, game.scenario) + game.atmosphere_range = range(1, game.atmosphere) form=CommentForm() if request.user.is_authenticated(): @@ -113,7 +117,7 @@ if request.user.is_authenticated(): auth=True - + package.point = range(1, package.point) # we need to handle page titles that changed after creating try: topic = Topic.objects.filter(title=package.title)[0] From oi-commits at pardus.org.tr Sat Sep 6 19:32:48 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 6 Sep 2008 19:32:48 +0300 (EEST) Subject: [Oi-commits] r1856 - in branches/newdesign/ideas: . templates Message-ID: <20080906163248.D74B5138416A@liste.pardus.org.tr> Author: huseyin.berberoglu Date: Sat Sep 6 19:32:48 2008 New Revision: 1856 Modified: branches/newdesign/ideas/templates/idea_detail.html branches/newdesign/ideas/urls.py branches/newdesign/ideas/views.py Log: add delete idea Modified: branches/newdesign/ideas/templates/idea_detail.html ================================================================= --- branches/newdesign/ideas/templates/idea_detail.html (original) +++ branches/newdesign/ideas/templates/idea_detail.html Sat Sep 6 19:32:48 2008 @@ -41,8 +41,13 @@ {% endif %} -{% if perms.ideas.change_idea %} -
+ {% if perms.ideas.change_idea %} +
+
+
+
+
{{ idea.submitter }}
taraf?ndan {{ idea.submitted_date|date:"j M Y" }} tarihinde
{{ idea.category }} kategorisine
Modified: branches/newdesign/media/img/new/ideas_favorite.png
=================================================================
Binary files. No diff available.
Modified: branches/newdesign/media/img/new/ideas_favorited.png
=================================================================
Binary files. No diff available.
From oi-commits at pardus.org.tr Sun Sep 7 00:25:52 2008
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Sun, 7 Sep 2008 00:25:52 +0300 (EEST)
Subject: [Oi-commits] r1858 - branches/newdesign/ideas
Message-ID: <20080906212553.085D71384118@liste.pardus.org.tr>
Author: huseyin.berberoglu
Date: Sun Sep 7 00:25:52 2008
New Revision: 1858
Modified:
branches/newdesign/ideas/views.py
Log:
don't show hidden ideas
Modified: branches/newdesign/ideas/views.py
=================================================================
--- branches/newdesign/ideas/views.py (original)
+++ branches/newdesign/ideas/views.py Sun Sep 7 00:25:52 2008
@@ -85,8 +85,7 @@
def detail(request, idea_id):
absolute_url = "/yenifikir"
- idea = get_object_or_404(Idea, pk=idea_id)
-
+ idea = get_object_or_404(Idea, pk=idea_id, is_hidden=False)
if request.user.is_authenticated():
auth = True
try:
@@ -231,7 +230,7 @@
idea = Idea.objects.get(pk=idea_id)
idea.is_hidden = True
idea.save()
- return HttpResponseRedirect(idea.get_absolute_url())
+ return HttpResponseRedirect("/yenifikir/")
@login_required
def vote_idea(request, idea_id, vote):
From akin at omeroglu.net Sun Sep 7 02:20:29 2008
From: akin at omeroglu.net (=?utf-8?q?Ak=C4=B1n_=C3=96mero=C4=9Flu?=)
Date: Sun, 7 Sep 2008 02:20:29 +0300
Subject: [Oi-commits] r1851 - in branches/newdesign: . feedjack
flatpages forum ideas middleware seminar shop/product st tema
In-Reply-To: <9dca79e40809060524v7399e2c9j4d5ee45cb1d5f191@mail.gmail.com>
References: <20080906120600.2F45E138417D@liste.pardus.org.tr>
<9dca79e40809060524v7399e2c9j4d5ee45cb1d5f191@mail.gmail.com>
Message-ID: <200809070220.29239.akin@omeroglu.net>
On Saturday 06 September 2008 15:24:05 U?ur ?etin wrote:
> 2008/9/6 Ki?isel Bilgiler |
+ ||
| Ad? | : | {{ info.first_name }} | +
| Soyad? | : | {{ info.last_name }} | +
| ?ehir | : | {{ info.get_profile.get_city_display }} | +
| Do?um Tarihi | : | {{ info.get_profile.birthday|date:"d F Y" }} |
| Kay?t Tarihi | : | {{ info.date_joined|date:"d F Y" }} | +
?leti?im Bilgileri |
+ ||
| E-posta | : | {{ info.email }} | +
| Web | : | {{ info.get_profile.homepage }} | +
| Jabber | : | {{ info.get_profile.jabber }} | +
| MSN | : | {{ info.get_profile.msn }} | +
| ICQ | : | {{ info.get_profile.icq }} | +

+
From oi-commits at pardus.org.tr Tue Sep 9 14:58:42 2008
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Tue, 9 Sep 2008 14:58:42 +0300 (EEST)
Subject: [Oi-commits] r1872 - in branches/newdesign: templates
templates/forum templates/fs templates/game templates/howto
templates/news templates/package templates/user upload
Message-ID: <20080909115843.042232474020@liste.pardus.org.tr>
Author: jnmbk
Date: Tue Sep 9 14:58:41 2008
New Revision: 1872
Modified:
branches/newdesign/templates/forum/post_edit.html
branches/newdesign/templates/forum/reply.html
branches/newdesign/templates/forum/report.html
branches/newdesign/templates/forum/topic.html
branches/newdesign/templates/fs/fs_main.html
branches/newdesign/templates/game/game_main.html
branches/newdesign/templates/home.html
branches/newdesign/templates/howto/howto_main.html
branches/newdesign/templates/news/news_main.html
branches/newdesign/templates/package/package_detail.html
branches/newdesign/templates/package/package_main.html
branches/newdesign/templates/user/profile.html
branches/newdesign/templates/user/profile_edit.html
branches/newdesign/upload/models.py
Log:
get_file_url -> file.path
Modified: branches/newdesign/templates/forum/post_edit.html
=================================================================
--- branches/newdesign/templates/forum/post_edit.html (original)
+++ branches/newdesign/templates/forum/post_edit.html Tue Sep 9 14:58:41 2008
@@ -29,7 +29,7 @@


{{ package.author }}
Modified: branches/newdesign/templates/package/package_main.html ================================================================= --- branches/newdesign/templates/package/package_main.html (original) +++ branches/newdesign/templates/package/package_main.html Tue Sep 9 14:58:41 2008 @@ -10,7 +10,7 @@

{{ package.author }}
Modified: branches/newdesign/templates/package/package_main.html ================================================================= --- branches/newdesign/templates/package/package_main.html (original) +++ branches/newdesign/templates/package/package_main.html Tue Sep 9 15:04:56 2008 @@ -10,7 +10,7 @@{{ package.author }}
From oi-commits at pardus.org.tr Tue Sep 9 17:12:44 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 9 Sep 2008 17:12:44 +0300 (EEST) Subject: [Oi-commits] r1877 - branches/newdesign/st Message-ID: <20080909141244.2A15613840D4@liste.pardus.org.tr> Author: jnmbk Date: Tue Sep 9 17:12:43 2008 New Revision: 1877 Modified: branches/newdesign/st/admin.py branches/newdesign/st/models.py Log: remaining admin pages in st are done Modified: branches/newdesign/st/admin.py ================================================================= --- branches/newdesign/st/admin.py (original) +++ branches/newdesign/st/admin.py Tue Sep 9 17:12:43 2008 @@ -7,7 +7,7 @@ from django.contrib import admin -from oi.st.models import Tag, Wiki, Contribute, OtherFile, ScreenShot, Video, License, FS, HowTo, Game, News, Package +from oi.st.models import Tag, Wiki, Contribute, OtherFile, ScreenShot, Video, License, FS, HowTo, Game, News, Package, PardusVersion, PardusMirror class StSimpleAdmin(admin.ModelAdmin): list_display = ('name', 'id') @@ -61,6 +61,17 @@ ('Di?er', {'fields': ('slug',), 'classes': 'collapse'}), ) +class PardusVersionAdmin(admin.ModelAdmin): + list_display = ('number', 'codename', 'status') + ordering = ['-number'] + search_fields = ['codename'] + js = ("js/tinymce/tiny_mce.js", "js/tinymce/textareas.js",) + +class PardusMirrorAdmin(admin.ModelAdmin): + list_display = ('name', 'url', 'status') + ordering = ['-name'] + search_fields = ['name'] + admin.site.register(Tag, StSimpleAdmin) admin.site.register(Wiki, StSimpleAdmin) admin.site.register(Contribute, StSimpleAdmin) @@ -73,3 +84,5 @@ admin.site.register(Game, GameAdmin) admin.site.register(News, NewsAdmin) admin.site.register(Package, PackageAdmin) +admin.site.register(PardusVersion, PardusVersionAdmin) +admin.site.register(PardusMirror, PardusMirrorAdmin) Modified: branches/newdesign/st/models.py ================================================================= --- branches/newdesign/st/models.py (original) +++ branches/newdesign/st/models.py Tue Sep 9 17:12:43 2008 @@ -332,12 +332,6 @@ def get_absolute_url(self): return "/indir/%s/" % self.number - class Admin: - list_display = ('number', 'codename', 'status') - ordering = ['-number'] - search_fields = ['codename'] - js = ("js/tinymce/tiny_mce.js", "js/tinymce/textareas.js",) - class Meta: verbose_name = "Pardus S?r?m?" verbose_name_plural = "Pardus S?r?mleri" @@ -354,11 +348,6 @@ def __unicode__(self): return self.name - class Admin: - list_display = ('name', 'url', 'status') - ordering = ['-name'] - search_fields = ['name'] - class Meta: unique_together = (('type', 'order'),('type', 'name'),) verbose_name = "Pardus Yans?s?" From oi-commits at pardus.org.tr Tue Sep 9 17:31:55 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 9 Sep 2008 17:31:55 +0300 (EEST) Subject: [Oi-commits] r1878 - branches/newdesign/flatpages Message-ID: <20080909143155.ABA6C13840DC@liste.pardus.org.tr> Author: jnmbk Date: Tue Sep 9 17:31:55 2008 New Revision: 1878 Added: branches/newdesign/flatpages/admin.py Modified: branches/newdesign/flatpages/models.py Log: admin for flatpages Modified: branches/newdesign/flatpages/models.py ================================================================= --- branches/newdesign/flatpages/models.py (original) +++ branches/newdesign/flatpages/models.py Tue Sep 9 17:31:55 2008 @@ -23,18 +23,6 @@ verbose_name = 'Statik sayfa' verbose_name_plural = 'Statik sayfalar' - class Admin: - fields = ( - ('Genel', {'fields': ('url', 'title', 'text', 'tags', 'update')}), - ('Di?er', {'classes': 'collapse', 'fields': ('template_name',)}), - ) - - list_display = ('id', 'url', 'title', 'update') - list_filter = ['update'] - ordering = ['-update'] - search_fields = ['title', 'text', 'tags'] - js = ("js/tinymce/tiny_mce.js", "js/tinymce/textareas.js",) - def __unicode__(self): return "%s -- %s" % (self.url, self.title) From oi-commits at pardus.org.tr Tue Sep 9 17:39:26 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 9 Sep 2008 17:39:26 +0300 (EEST) Subject: [Oi-commits] r1879 - branches/newdesign/flatpages Message-ID: <20080909143926.1A06313840DA@liste.pardus.org.tr> Author: jnmbk Date: Tue Sep 9 17:39:25 2008 New Revision: 1879 Modified: branches/newdesign/flatpages/admin.py Log: fix Modified: branches/newdesign/flatpages/admin.py ================================================================= --- branches/newdesign/flatpages/admin.py (original) +++ branches/newdesign/flatpages/admin.py Tue Sep 9 17:39:25 2008 @@ -23,4 +23,4 @@ class Media: js = ("js/tinymce/tiny_mce.js", "js/tinymce/textareas.js",) -admin.site.register(FlatPageAdmin, FlatPage) +admin.site.register(FlatPage, FlatPageAdmin) From oi-commits at pardus.org.tr Tue Sep 9 20:20:25 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 9 Sep 2008 20:20:25 +0300 (EEST) Subject: [Oi-commits] r1880 - in branches/newdesign/shop: cart templates/cart Message-ID: <20080909172025.4F83313840DC@liste.pardus.org.tr> Author: jnmbk Date: Tue Sep 9 20:20:25 2008 New Revision: 1880 Added: branches/newdesign/shop/cart/forms.py branches/newdesign/shop/templates/cart/ branches/newdesign/shop/templates/cart/buy.html Modified: branches/newdesign/shop/cart/urls.py branches/newdesign/shop/cart/views.py Log: initial buyform Modified: branches/newdesign/shop/cart/urls.py ================================================================= --- branches/newdesign/shop/cart/urls.py (original) +++ branches/newdesign/shop/cart/urls.py Tue Sep 9 20:20:25 2008 @@ -11,4 +11,5 @@ (r'^$', 'cart.views.get_cart'), (r'^ekle/$', 'cart.views.add_product_to_cart'), (r'^cikar/$', 'cart.views.remove_item_from_cart'), + (r'^satinal/$', 'cart.views.buy'), ) Modified: branches/newdesign/shop/cart/views.py ================================================================= --- branches/newdesign/shop/cart/views.py (original) +++ branches/newdesign/shop/cart/views.py Tue Sep 9 20:20:25 2008 @@ -15,6 +15,7 @@ from oi.shop.shopprofile.models import ShopProfile from oi.shop.cart.models import Cart, CartItem from oi.shop.product.models import Product +from oi.shop.cart.forms import BuyForm def get_cart_for_user(user): try: @@ -58,3 +59,8 @@ for item in cart.items.all(): cart_html += '
+
+
Ka? tane alacaks?n?z?
From oi-commits at pardus.org.tr Fri Sep 12 18:14:11 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 12 Sep 2008 18:14:11 +0300 (EEST) Subject: [Oi-commits] r1897 - in branches/newdesign/shop: cart product/templatetags Message-ID: <20080912151411.AC84D1384168@liste.pardus.org.tr> Author: jnmbk Date: Fri Sep 12 18:14:11 2008 New Revision: 1897 Modified: branches/newdesign/shop/cart/views.py branches/newdesign/shop/product/templatetags/shop_library.py Log: Buy cart button Modified: branches/newdesign/shop/cart/views.py ================================================================= --- branches/newdesign/shop/cart/views.py (original) +++ branches/newdesign/shop/cart/views.py Fri Sep 12 18:14:11 2008 @@ -52,13 +52,18 @@ else: return HttpResponseRedirect("/dukkan/") +def get_cart_html(cart): + cart_html = '' + for item in cart.items.all(): + cart_html += 'Sepeti kullanabilmek i?in ?ncelikle bir al??veri? profili olu?turmal?s?n?z. Buraya t?klayarak profilinizi olu?turabilir ve ?r?n sipari?i vermeye ba?layabilirsiniz.
+ {% endif %} + {% else %} +Sepeti kullanabilmek i?in sa?daki kullan?c? kutusundan giri? yapmal?s?n?z.
+ {% endif %}
-
{% endfor %}
-
+
From oi-commits at pardus.org.tr Tue Sep 16 19:04:40 2008
From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr)
Date: Tue, 16 Sep 2008 19:04:40 +0300 (EEST)
Subject: [Oi-commits] r1915 - branches/newdesign/shop/shopprofile
Message-ID: <20080916160440.A6B2513841F8@liste.pardus.org.tr>
Author: jnmbk
Date: Tue Sep 16 19:04:40 2008
New Revision: 1915
Modified:
branches/newdesign/shop/shopprofile/models.py
branches/newdesign/shop/shopprofile/urls.py
branches/newdesign/shop/shopprofile/views.py
Log:
address field will be a charfield with 200 length
Modified: branches/newdesign/shop/shopprofile/models.py
=================================================================
--- branches/newdesign/shop/shopprofile/models.py (original)
+++ branches/newdesign/shop/shopprofile/models.py Tue Sep 16 19:04:40 2008
@@ -15,13 +15,13 @@
tcno = models.IntegerField("TC kimlik no", max_length=12, help_text="TC Kimlik numaran?z.")
phone = models.CharField('Telefon', max_length=10, help_text='Telefon numaras?. -


{{ package.path }}
From oi-commits at pardus.org.tr Wed Sep 17 15:27:49 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 17 Sep 2008 15:27:49 +0300 (EEST) Subject: [Oi-commits] r1919 - in branches/newdesign: . flatpages forum ideas st Message-ID: <20080917122749.73E201384141@liste.pardus.org.tr> Author: jnmbk Date: Wed Sep 17 15:27:49 2008 New Revision: 1919 Added: branches/newdesign/forum/tools.py branches/newdesign/st/tags.py Modified: branches/newdesign/flatpages/models.py branches/newdesign/forum/feeds.py branches/newdesign/forum/forms.py branches/newdesign/forum/models.py branches/newdesign/forum/views.py branches/newdesign/ideas/models.py branches/newdesign/st/admin.py branches/newdesign/st/models.py branches/newdesign/st/signals.py branches/newdesign/st/views.py branches/newdesign/urls.py Log: Big refactor for forum integration with rest of the site: * Moved Tag model to st/tags.py to prevent circular import in forum * Removed open_forum_topic signal from st/signals.py * Created forum/tools.py containing create_forum_topic (which also updates topic) * News, Package, Game and HowTo objects call create_forum_topic whenever saved Modified: branches/newdesign/flatpages/models.py ================================================================= --- branches/newdesign/flatpages/models.py (original) +++ branches/newdesign/flatpages/models.py Wed Sep 17 15:27:49 2008 @@ -7,7 +7,7 @@ from django.db import models from django.contrib.auth.models import User -from oi.st.models import Tag +from oi.st.tags import Tag from oi.middleware import threadlocals class FlatPage(models.Model): Modified: branches/newdesign/forum/feeds.py ================================================================= --- branches/newdesign/forum/feeds.py (original) +++ branches/newdesign/forum/feeds.py Wed Sep 17 15:27:49 2008 @@ -13,7 +13,7 @@ from django.contrib.syndication.feeds import FeedDoesNotExist from django.core.exceptions import ObjectDoesNotExist from oi.forum.models import Topic,Post -from oi.st.models import Tag +from oi.st.tags import Tag class RSS(Feed): Modified: branches/newdesign/forum/forms.py ================================================================= --- branches/newdesign/forum/forms.py (original) +++ branches/newdesign/forum/forms.py Wed Sep 17 15:27:49 2008 @@ -9,7 +9,7 @@ from django import forms from oi.forum.models import AbuseReport, Topic, Forum, WatchList -from oi.st.models import Tag +from oi.st.tags import Tag from oi.poll.models import Poll from oi.st.forms import XssField Modified: branches/newdesign/forum/models.py ================================================================= --- branches/newdesign/forum/models.py (original) +++ branches/newdesign/forum/models.py Wed Sep 17 15:27:49 2008 @@ -11,7 +11,7 @@ from django.contrib.auth.models import User from oi.middleware import threadlocals -from oi.st.models import Tag +from oi.st.tags import Tag from oi.poll.models import Poll from oi.forum.settings import FORUM_FROM_EMAIL Modified: branches/newdesign/forum/views.py ================================================================= --- branches/newdesign/forum/views.py (original) +++ branches/newdesign/forum/views.py Wed Sep 17 15:27:49 2008 @@ -24,7 +24,8 @@ from django.core.urlresolvers import reverse from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned from django.core.mail import send_mail -from oi.st.models import Tag, News +from oi.st.tags import Tag +from oi.st.models import News from oi.poll.models import Poll, PollOption, PollVote # import our function for sending e-mails and setting Modified: branches/newdesign/ideas/models.py ================================================================= --- branches/newdesign/ideas/models.py (original) +++ branches/newdesign/ideas/models.py Wed Sep 17 15:27:49 2008 @@ -4,7 +4,7 @@ import re from django.db import models from django.contrib.auth.models import User -from oi.st.models import Tag +from oi.st.tags import Tag from oi.forum.models import Topic Modified: branches/newdesign/st/admin.py ================================================================= --- branches/newdesign/st/admin.py (original) +++ branches/newdesign/st/admin.py Wed Sep 17 15:27:49 2008 @@ -7,7 +7,8 @@ from django.contrib import admin -from oi.st.models import Tag, Wiki, Contribute, OtherFile, ScreenShot, Video, License, FS, HowTo, Game, News, Package, PardusVersion, PardusMirror +from oi.st.models import Wiki, Contribute, OtherFile, ScreenShot, Video, License, FS, HowTo, Game, News, Package, PardusVersion, PardusMirror +from oi.st.tags import Tag class StSimpleAdmin(admin.ModelAdmin): list_display = ('name', 'id') Modified: branches/newdesign/st/models.py ================================================================= --- branches/newdesign/st/models.py (original) +++ branches/newdesign/st/models.py Wed Sep 17 15:27:49 2008 @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# Copyright 2007 Artistanbul +# Copyright 2007, 2008 Artistanbul # Licensed under the GNU General Public License, version 3. # See the file http://www.gnu.org/copyleft/gpl.txt. @@ -14,28 +14,17 @@ from oi.middleware import threadlocals from oi.settings import CITY_LIST, MEDIA_ROOT, MEDIA_URL +from oi.forum.models import Topic +from oi.forum.tools import create_forum_topic # the signal stuff from django.db.models import signals -from oi.st.signals import open_forum_topic, remove_video_thumbnail_on_delete +from oi.st.tags import Tag +from oi.st.signals import remove_video_thumbnail_on_delete from oi.upload.models import Image as Img FFMPEG_COMMAND = "ffmpeg" -class Tag(models.Model): - name = models.CharField('Etiket', max_length=32, blank=False, unique=True) - - def __unicode__(self): - return self.name - - def get_absolute_url(self): - return "/etiket/%s/" % self.name - - class Meta: - ordering = ['name'] - verbose_name = "Etiket" - verbose_name_plural = "Etiketler" - class Wiki(models.Model): name = models.CharField('Madde ad?', max_length=128, blank=False, unique=True) @@ -194,6 +183,7 @@ update = models.DateTimeField('Son G?ncelleme', blank=False) author = models.CharField('Yazar', max_length=32) status = models.BooleanField('Aktif') + topic = models.ForeignKey(Topic, verbose_name="Forumdaki Konusu") def __unicode__(self): return self.title @@ -204,12 +194,14 @@ def get_printable_url(self): return "/nasil/%s/yazdir/" % self.slug + def save(self): + create_forum_topic(self, "Nas?l") + super(HowTo, self).save() + class Meta: verbose_name = "Nas?l" verbose_name_plural = "Nas?l Belgeleri" -signals.pre_save.connect(open_forum_topic, sender=HowTo) - 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')) @@ -235,6 +227,7 @@ update = models.DateTimeField('Son G?ncelleme', blank=False) author = models.CharField('Yazar', max_length=32) status = models.BooleanField('Aktif') + topic = models.ForeignKey(Topic, verbose_name="Forumdaki Konusu") def __unicode__(self): return self.title @@ -245,12 +238,14 @@ def get_printable_url(self): return "/oyun/%s/yazdir/" % self.slug + def save(self): + create_forum_topic(self, "Oyunlar") + super(Game, self).save() + class Meta: verbose_name = "Oyun" verbose_name_plural = "Oyunlar" -signals.pre_save.connect(open_forum_topic, sender=Game) - class News(models.Model): title = models.CharField('Ba?l?k', max_length=32, blank=False) slug = models.SlugField('SEF Ba?l?k') @@ -261,6 +256,7 @@ update = models.DateTimeField('Tarih', blank=False) author = models.CharField('Yazar', max_length=32) status = models.BooleanField('Aktif') + topic = models.ForeignKey(Topic, verbose_name="Forumdaki Konusu") def __unicode__(self): return self.title @@ -271,12 +267,14 @@ def get_printable_url(self): return "/haber/%s/yazdir/" % self.slug + def save(self): + create_forum_topic(self, "Haberler") + super(News, self).save() + class Meta: verbose_name = "Haber" verbose_name_plural = "Haberler" -signals.pre_save.connect(open_forum_topic, sender=News) - class Package(models.Model): ratings = (('1','1'),('2','2'),('3','3'),('4','4'),('5','5'),('6','6'),('7','7'),('8','8'),('9','9'),('10','10')) @@ -298,6 +296,7 @@ update = models.DateTimeField('Son G?ncelleme', blank=False) author = models.CharField('Yazar', max_length=32) status = models.BooleanField('Aktif') + topic = models.ForeignKey(Topic, verbose_name="Forumdaki Konusu") def __unicode__(self): return self.title @@ -308,12 +307,14 @@ def get_printable_url(self): return "/paket/%s/yazdir/" % self.slug + def save(self): + create_forum_topic(self, "Paketler") + super(Package, self).save() + class Meta: verbose_name = "Paket" verbose_name_plural = "Paketler" -signals.pre_save.connect(open_forum_topic, sender=Package) - class PardusVersion(models.Model): number = models.CharField('S?r?m numaras?', max_length = 16, blank = False, unique = True) codename = models.CharField('Kod ad?', max_length = 64, unique = True) Modified: branches/newdesign/st/signals.py ================================================================= --- branches/newdesign/st/signals.py (original) +++ branches/newdesign/st/signals.py Wed Sep 17 15:27:49 2008 @@ -13,72 +13,3 @@ # video filename endswith *.flv and it's thumbnail *.png. so, when we replace *.flv to *.png, we get thumbnail path filename = instance.file.replace('.flv', '.png') remove(MEDIA_ROOT + filename) - -def open_forum_topic(sender, instance, signal, *args, **kwargs): - """When we add a news we should open a new topic in forum with the same text""" - from django.contrib.auth.models import User - from oi.forum.models import Forum,Topic,Post - from oi.middleware import threadlocals - - user=User.objects.filter(username=threadlocals.get_current_user()) - - #gerekenler :howto,game,package,news ??? _meta.module_name - - #lets make it more flexible: - if instance._meta.module_name=="howto": - name="Nas?l" - elif instance._meta.module_name=="game": - name="Oyunlar" - - elif instance._meta.module_name=="package": - name="Paketler" - - elif instance._meta.module_name=="news": - name="Haberler" - - forum=Forum.objects.filter(name=name) - - ch=sender.objects.filter(id=instance.id) - #if it is a new newss - if not ch: - if instance.status and forum and user: - - topic = Topic(forum=forum[0], - title=instance.title #or any - ) - topic.save() - - post = Post(topic=topic, - author=user[0], - text=instance.text - ) - post.save() - topic.topic_latest_post = post - topic.save() - - else: - return - - else: # eger orada varsa ve bu bir edit ise yani sonradan aktif yap?ld?ysa ... - if ch[0].status==False and instance.status==True: - t=Topic.objects.filter(title=ch[0].title) #?nceden varsa elleme - if not t: - if forum and user: - topic = Topic(forum=forum[0], - title=instance.title #news title - ) - topic.save() - for tag in instance.tags.all(): - topic.tags.add(tag) - - post = Post(topic=topic, - author=user[0], - text=instance.text - ) - post.save() - else: - return - else: - return - else: - return Modified: branches/newdesign/st/views.py ================================================================= --- branches/newdesign/st/views.py (original) +++ branches/newdesign/st/views.py Wed Sep 17 15:27:49 2008 @@ -16,7 +16,8 @@ from oi.st.forms import SearchForm,CommentForm,AdvancedSearchForm -from oi.st.models import News, Package, Game, HowTo, FS, Tag, PardusVersion, PardusMirror +from oi.st.models import News, Package, Game, HowTo, FS, PardusVersion, PardusMirror +from oi.st.tags import Tag from oi.st.wrappers import render_response from oi.flatpages.models import FlatPage Modified: branches/newdesign/urls.py ================================================================= --- branches/newdesign/urls.py (original) +++ branches/newdesign/urls.py Wed Sep 17 15:27:49 2008 @@ -8,7 +8,8 @@ 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, HOWTO_PER_PAGE -from oi.st.models import Package, Game, FS, News, Tag, HowTo +from oi.st.models import Package, Game, FS, News, HowTo +from oi.st.tags import Tag from oi.seminar.models import Seminar from oi.st.feeds import * from django.contrib import admin From oi-commits at pardus.org.tr Wed Sep 17 16:04:24 2008 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Wed, 17 Sep 2008 16:04:24 +0300 (EEST) Subject: [Oi-commits] r1920 - branches/newdesign/shop/templates/cart Message-ID: <20080917130424.D66B91384173@liste.pardus.org.tr> Author: jnmbk Date: Wed Sep 17 16:04:24 2008 New Revision: 1920 Modified: branches/newdesign/shop/templates/cart/buy.html Log: https Modified: branches/newdesign/shop/templates/cart/buy.html ================================================================= --- branches/newdesign/shop/templates/cart/buy.html (original) +++ branches/newdesign/shop/templates/cart/buy.html Wed Sep 17 16:04:24 2008 @@ -1,6 +1,6 @@ {% extends "shop_base.html" %} {% block content %} -{{ topic.poll.question }}
+
- {% else %}
-