From oi-commits at pardus.org.tr Fri Jun 1 18:48:38 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 18:48:38 +0300 (EEST) Subject: [Oi-commits] r128 - templates Message-ID: <20070601154838.2F7C87C003D@liste.uludag.org.tr> Author: erenturkay Date: Fri Jun 1 18:48:37 2007 New Revision: 128 Modified: templates/tag_detail.html Log: for testing, to see whether the site works with svn Modified: templates/tag_detail.html ================================================================= --- templates/tag_detail.html (original) +++ templates/tag_detail.html Fri Jun 1 18:48:37 2007 @@ -109,7 +109,7 @@ {% if games %}
-
Oyunlar
+
Oyunlar-test
{{ games.count }} adet
@@ -146,4 +146,4 @@
{% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} From oi-commits at pardus.org.tr Fri Jun 1 18:49:08 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 18:49:08 +0300 (EEST) Subject: [Oi-commits] r129 - templates Message-ID: <20070601154908.C100D7C0044@liste.uludag.org.tr> Author: erenturkay Date: Fri Jun 1 18:49:08 2007 New Revision: 129 Modified: templates/tag_detail.html Log: revert Modified: templates/tag_detail.html ================================================================= --- templates/tag_detail.html (original) +++ templates/tag_detail.html Fri Jun 1 18:49:08 2007 @@ -109,7 +109,7 @@ {% if games %}
-
Oyunlar-test
+
Oyunlar
{{ games.count }} adet
@@ -146,4 +146,4 @@
{% endif %} -{% endblock %} +{% endblock %} \ No newline at end of file From oi-commits at pardus.org.tr Fri Jun 1 18:52:55 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 18:52:55 +0300 (EEST) Subject: [Oi-commits] r130 - Message-ID: <20070601155255.40B8A7C0044@liste.uludag.org.tr> Author: erenturkay Date: Fri Jun 1 18:52:55 2007 New Revision: 130 Added: TODO Log: TODO From oi-commits at pardus.org.tr Fri Jun 1 19:22:45 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 19:22:45 +0300 (EEST) Subject: [Oi-commits] r131 - media/css Message-ID: <20070601162246.07E497C0044@liste.uludag.org.tr> Author: erenturkay Date: Fri Jun 1 19:22:45 2007 New Revision: 131 Modified: TODO media/css/style.css Log: ?zerine t?klay?nca a?a??da a??lan i?eri?i kullan?c?lar?n anlamas? i?in cursor de?i?sin Modified: TODO ================================================================= --- TODO (original) +++ TODO Fri Jun 1 19:22:45 2007 @@ -1,5 +1,3 @@ -* Tag listesinde ??elerin ?zerine gelindi?inde cursor de?i?sin, kullan?c?lar orada t?klanabilir bir ??e oldu?unu anlas?n - * Olmayan bir tag g?sterilmeye ?al???ld???nda hata sayfas? g?sterilsin * Admin panelinde kolayca resim eklemesi i?in metin edit?r?ne yama yap?ls?n. Copy,paste gibi simgelerin oldu?u b?l?me bir upload butonu eklenerek popup i?erisinde ayr?ca yap?lm?? olan upload sayfas? bu i?i halledebilir. Resim upload edildi?inde orijinal boyutu g?sterilir ve image se?ilerek edit?re yap??t?r?l?r. Modified: media/css/style.css ================================================================= --- media/css/style.css (original) +++ media/css/style.css Fri Jun 1 19:22:45 2007 @@ -780,6 +780,10 @@ min-height: 16px; } +.fs_list_title:hover { + cursor: pointer; +} + .odd{ background: #FFF url('/media/img/list_odd.png') repeat-x left bottom; } @@ -926,4 +930,5 @@ .rating_bar { text-align: center; -} \ No newline at end of file +} + From oi-commits at pardus.org.tr Fri Jun 1 19:27:54 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 19:27:54 +0300 (EEST) Subject: [Oi-commits] r132 - Message-ID: <20070601162754.0ED967C0044@liste.uludag.org.tr> Author: ahmet Date: Fri Jun 1 19:27:53 2007 New Revision: 132 Removed: ChangeLog Log: Buna gerek yok herhalde, commits listemiz geldi :) From oi-commits at pardus.org.tr Fri Jun 1 19:36:27 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 19:36:27 +0300 (EEST) Subject: [Oi-commits] r133 - Message-ID: <20070601163627.88CF57C0044@liste.uludag.org.tr> Author: ahmet Date: Fri Jun 1 19:36:27 2007 New Revision: 133 Modified: TODO Log: ?ekilli todo Modified: TODO ================================================================= --- TODO (original) +++ TODO Fri Jun 1 19:36:27 2007 @@ -1,4 +1,15 @@ -* Olmayan bir tag g?sterilmeye ?al???ld???nda hata sayfas? g?sterilsin +===================================================== +"Don?t code today what you can?t debug tommorow." +===================================================== -* Admin panelinde kolayca resim eklemesi i?in metin edit?r?ne yama yap?ls?n. Copy,paste gibi simgelerin oldu?u b?l?me bir upload butonu eklenerek popup i?erisinde ayr?ca yap?lm?? olan upload sayfas? bu i?i halledebilir. Resim upload edildi?inde orijinal boyutu g?sterilir ve image se?ilerek edit?re yap??t?r?l?r. +Legend: +- To do +? Not sure +/ In progress ++ Completed + + +- General 404 error pages (we can use get_object_or_404 function of django) +- File upload support in wysiwyg editor (tinymce) +- User management system (basic login/logout and user profiles) From oi-commits at pardus.org.tr Fri Jun 1 19:37:53 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 19:37:53 +0300 (EEST) Subject: [Oi-commits] r134 - branches trunk Message-ID: <20070601163753.9B7F67C0044@liste.uludag.org.tr> Author: ahmet Date: Fri Jun 1 19:37:53 2007 New Revision: 134 Added: branches/ trunk/ Log: Eren b?yle istiyor :D From oi-commits at pardus.org.tr Fri Jun 1 19:39:40 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 19:39:40 +0300 (EEST) Subject: [Oi-commits] r135 - flatpages middleware st templates trunk trunk/flatpages trunk/middleware trunk/st trunk/templates Message-ID: <20070601163940.1D0EC7C0044@liste.uludag.org.tr> Author: ahmet Date: Fri Jun 1 19:39:39 2007 New Revision: 135 Added: trunk/TODO - copied unchanged from r133, TODO trunk/__init__.py - copied unchanged from r131, __init__.py trunk/flatpages/ - copied from r131, flatpages/ trunk/htaccess - copied unchanged from r131, htaccess trunk/manage.py - copied unchanged from r131, manage.py trunk/middleware/ - copied from r131, middleware/ trunk/robots.txt - copied unchanged from r131, robots.txt trunk/settings.py - copied unchanged from r131, settings.py trunk/st/ - copied from r131, st/ trunk/templates/ - copied from r131, templates/ trunk/urls.py - copied unchanged from r131, urls.py Removed: TODO __init__.py flatpages/ htaccess manage.py middleware/ robots.txt settings.py st/ templates/ urls.py Log: asd From oi-commits at pardus.org.tr Fri Jun 1 19:43:07 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 19:43:07 +0300 (EEST) Subject: [Oi-commits] r136 - media trunk/media Message-ID: <20070601164307.C3B877C0044@liste.uludag.org.tr> Author: erenturkay Date: Fri Jun 1 19:43:07 2007 New Revision: 136 Added: trunk/media/ - copied from r135, media/ Removed: media/ Log: move the media dir to trunk/, too From oi-commits at pardus.org.tr Fri Jun 1 19:44:31 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 19:44:31 +0300 (EEST) Subject: [Oi-commits] r137 - branches/ozgurlukicin Message-ID: <20070601164431.433CA7C0044@liste.uludag.org.tr> Author: erenturkay Date: Fri Jun 1 19:44:30 2007 New Revision: 137 Added: branches/ozgurlukicin/ Log: please symlink this directory to /var/www/localhost/htdocs, if we want to change something on site, we just merge the changes to this directory From oi-commits at pardus.org.tr Fri Jun 1 19:46:58 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 19:46:58 +0300 (EEST) Subject: [Oi-commits] r138 - trunk Message-ID: <20070601164658.97E2B7C0044@liste.uludag.org.tr> Author: erenturkay Date: Fri Jun 1 19:46:58 2007 New Revision: 138 Modified: trunk/settings.py Log: admin media prefix is not the same, we should symlink with python site-packages dir Modified: trunk/settings.py ================================================================= --- trunk/settings.py (original) +++ trunk/settings.py Fri Jun 1 19:46:58 2007 @@ -33,7 +33,7 @@ MEDIA_URL = '%s/media/' % WEB_URL # Examples: "http://foo.com/media/", "/media/". -ADMIN_MEDIA_PREFIX = '%s/media/' % WEB_URL +ADMIN_MEDIA_PREFIX = '%s/media/admin/' % WEB_URL # Make this unique, and don't share it with anybody. SECRET_KEY = 'n9-*x3!&!(x*z_!13)cyxil4fh+ov_+3!y($&4t7iit=)d)=93' From oi-commits at pardus.org.tr Fri Jun 1 19:59:07 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 19:59:07 +0300 (EEST) Subject: [Oi-commits] r139 - in branches: oi ozgurlukicin Message-ID: <20070601165907.65F5C7C0042@liste.uludag.org.tr> Author: erenturkay Date: Fri Jun 1 19:59:07 2007 New Revision: 139 Added: branches/oi/ - copied from r137, branches/ozgurlukicin/ Removed: branches/ozgurlukicin/ Log: PythonPath tan?mlad???m?z zaman oi.* s?nflar?n? kullan?yoruz, direk branch dizinini verince do?al olarak bulam?yor ve hata veriyor From oi-commits at pardus.org.tr Fri Jun 1 19:59:38 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 19:59:38 +0300 (EEST) Subject: [Oi-commits] r140 - trunk/oi Message-ID: <20070601165938.78A2F7C0044@liste.uludag.org.tr> Author: erenturkay Date: Fri Jun 1 19:59:38 2007 New Revision: 140 Added: trunk/oi/ Log: add oi dir From oi-commits at pardus.org.tr Fri Jun 1 20:02:22 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 20:02:22 +0300 (EEST) Subject: [Oi-commits] r141 - in trunk: . flatpages media middleware oi oi/flatpages oi/media oi/middleware oi/st oi/templates st templates Message-ID: <20070601170222.935DA7C0042@liste.uludag.org.tr> Author: erenturkay Date: Fri Jun 1 20:02:22 2007 New Revision: 141 Added: trunk/oi/TODO - copied unchanged from r135, trunk/TODO trunk/oi/__init__.py - copied unchanged from r135, trunk/__init__.py trunk/oi/flatpages/ - copied from r135, trunk/flatpages/ trunk/oi/htaccess - copied unchanged from r135, trunk/htaccess trunk/oi/manage.py - copied unchanged from r135, trunk/manage.py trunk/oi/media/ - copied from r136, trunk/media/ trunk/oi/middleware/ - copied from r135, trunk/middleware/ trunk/oi/robots.txt - copied unchanged from r135, trunk/robots.txt trunk/oi/settings.py - copied unchanged from r138, trunk/settings.py trunk/oi/st/ - copied from r135, trunk/st/ trunk/oi/templates/ - copied from r135, trunk/templates/ trunk/oi/urls.py - copied unchanged from r135, trunk/urls.py Removed: trunk/TODO trunk/__init__.py trunk/flatpages/ trunk/htaccess trunk/manage.py trunk/media/ trunk/middleware/ trunk/robots.txt trunk/settings.py trunk/st/ trunk/templates/ trunk/urls.py Log: move From oi-commits at pardus.org.tr Fri Jun 1 20:03:57 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 20:03:57 +0300 (EEST) Subject: [Oi-commits] r142 - trunk Message-ID: <20070601170357.5858F7C0044@liste.uludag.org.tr> Author: erenturkay Date: Fri Jun 1 20:03:57 2007 New Revision: 142 Added: trunk/__init__.py - copied unchanged from r141, trunk/oi/__init__.py Log: add __init__ From oi-commits at pardus.org.tr Fri Jun 1 20:05:24 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 20:05:24 +0300 (EEST) Subject: [Oi-commits] r143 - trunk/oi/db Message-ID: <20070601170524.A2EC57C0044@liste.uludag.org.tr> Author: erenturkay Date: Fri Jun 1 20:05:24 2007 New Revision: 143 Added: trunk/oi/db/ Log: db dir should be created first From oi-commits at pardus.org.tr Fri Jun 1 20:37:43 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 20:37:43 +0300 (EEST) Subject: [Oi-commits] r144 - in trunk/oi: . st Message-ID: <20070601173743.1A2CF7C0044@liste.uludag.org.tr> Author: erenturkay Date: Fri Jun 1 20:37:42 2007 New Revision: 144 Modified: trunk/oi/st/models.py trunk/oi/urls.py Log: better URLing :) * ozgurlukicin.com/ia/baslangic.html/yazdir is better than ozgurlukicin.com/ia/yazdir/baslangic Modified: trunk/oi/st/models.py ================================================================= --- trunk/oi/st/models.py (original) +++ trunk/oi/st/models.py Fri Jun 1 20:37:42 2007 @@ -120,7 +120,7 @@ return "/oyun/%s.html" % self.sef_title def get_printable_url(self): - return "/oyun/yazdir/%s.html" % self.sef_title + return "/oyun/%s.html/yazdir" % self.sef_title class Admin: fields = ( @@ -153,7 +153,7 @@ return "/haber/%s.html" % self.sef_title def get_printable_url(self): - return "/haber/yazdir/%s.html" % self.sef_title + return "/haber/%s.html/yazdir" % self.sef_title def save(self): self.author = threadlocals.get_current_user() @@ -198,7 +198,7 @@ return "/paket/%s.html" % self.name def get_printable_url(self): - return "/paket/yazdir/%s.html" % self.name + return "/paket/%s.html/yazdir" % self.name class Admin: list_display = ('name', 'sum') @@ -209,4 +209,4 @@ class Meta: verbose_name = "Paket" - verbose_name_plural = "Paketler" \ No newline at end of file + verbose_name_plural = "Paketler" Modified: trunk/oi/urls.py ================================================================= --- trunk/oi/urls.py (original) +++ trunk/oi/urls.py Fri Jun 1 20:37:42 2007 @@ -17,22 +17,22 @@ #(r'^haber/$', 'oi.st.views.archive'), (r'^haber/$', 'django.views.generic.simple.redirect_to', {'url': '/'}), (r'^$', 'oi.st.views.news_main'), - (r'^haber/yazdir/(?P.*)\.html$', 'oi.st.views.news_printable'), + (r'^haber/(?P.*)\.html/yazdir/$', 'oi.st.views.news_printable'), (r'^haber/(?P.*)\.html$', 'oi.st.views.news_detail'), #Packages (r'^paket/$', 'oi.st.views.pkg_main'), - (r'^paket/yazdir/(?P.*)\.html$', 'oi.st.views.pkg_printable'), + (r'^paket/(?P.*)\.html/yazdir/$', 'oi.st.views.pkg_printable'), (r'^paket/(?P.*)\.html$', 'oi.st.views.pkg_detail'), #First Steps (r'^ia/$', 'oi.st.views.fs_main'), - (r'^ia/yazdir/(?P.*)\.html$', 'oi.st.views.fs_printable'), + (r'^ia/(?P.*)\.html/yazdir/$', 'oi.st.views.fs_printable'), (r'^ia/(?P.*)\.html$', 'oi.st.views.fs_detail'), #Games (r'^oyun/$', 'oi.st.views.game_main'), - (r'^oyun/yazdir/(?P.*)\.html$', 'oi.st.views.game_printable'), + (r'^oyun/(?P.*)\.html/yazdir/$', 'oi.st.views.game_printable'), (r'^oyun/(?P.*)\.html$', 'oi.st.views.game_detail'), #Tags From oi-commits at pardus.org.tr Fri Jun 1 20:47:27 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 1 Jun 2007 20:47:27 +0300 (EEST) Subject: [Oi-commits] r145 - trunk/oi/templates Message-ID: <20070601174727.78A4E7C0044@liste.uludag.org.tr> Author: erenturkay Date: Fri Jun 1 20:47:27 2007 New Revision: 145 Modified: trunk/oi/templates/package_detail.html Log: birden fazla lisans olunca aralar?ndaki bo?luklar y?z?nden kar???yor, | karakteri gayet iyi durdu bence, iyi durmad?ysa d?zeltebilirsiniz tabe :) Modified: trunk/oi/templates/package_detail.html ================================================================= --- trunk/oi/templates/package_detail.html (original) +++ trunk/oi/templates/package_detail.html Fri Jun 1 20:47:27 2007 @@ -23,7 +23,7 @@ {% block sidebar %} - \ No newline at end of file + From oi-commits at pardus.org.tr Tue Jun 12 11:57:59 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 12 Jun 2007 11:57:59 +0300 (EEST) Subject: [Oi-commits] r193 - trunk/st Message-ID: <20070612085759.7259E7C00EC@liste.uludag.org.tr> Author: erenturkay Date: Tue Jun 12 11:57:59 2007 New Revision: 193 Modified: trunk/st/views.py Log: * kullan?c? yanl?? bir url verdi?inde ba?a d?ns?n Modified: trunk/st/views.py ================================================================= --- trunk/st/views.py (original) +++ trunk/st/views.py Tue Jun 12 11:57:59 2007 @@ -8,6 +8,7 @@ from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User from django.core.paginator import ObjectPaginator, InvalidPage +from django.views.generic.simple import redirect_to from oi.st.models import FS, Game, News, Package, ScreenShot, Tag, UserProfile from oi.flatpages.models import FlatPage @@ -109,9 +110,13 @@ except ValueError: page = 1 - users = paginator.get_page(page-1) + try: + users = paginator.get_page(page-1) + return render_response(request, 'userlist.html', {'users': users, + 'page': page, + 'pages': paginator.pages, + 'paginator': paginator}) + except InvalidPage: + return redirect_to({'url': '/user/'}) + - return render_response(request, 'userlist.html', {'users': users, - 'page': page, - 'pages': paginator.pages, - 'paginator': paginator}) From oi-commits at pardus.org.tr Tue Jun 12 12:03:48 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 12 Jun 2007 12:03:48 +0300 (EEST) Subject: [Oi-commits] r194 - in trunk: . bug templates Message-ID: <20070612090348.B49A27C00EC@liste.uludag.org.tr> Author: ahmet Date: Tue Jun 12 12:03:48 2007 New Revision: 194 Added: trunk/bug/ trunk/bug/__init__.py trunk/bug/models.py trunk/bug/urls.py trunk/bug/views.py trunk/templates/bug_detail.html trunk/templates/bug_main.html Modified: trunk/settings.py trunk/urls.py Log: Issue tracker'?m?z :D B?ylece kals?n, sonra ilgileniriz. Modified: trunk/settings.py ================================================================= --- trunk/settings.py (original) +++ trunk/settings.py Tue Jun 12 12:03:48 2007 @@ -77,4 +77,5 @@ 'oi.flatpages', 'oi.st', 'oi.upload', + 'oi.bug', ) Modified: trunk/urls.py ================================================================= --- trunk/urls.py (original) +++ trunk/urls.py Tue Jun 12 12:03:48 2007 @@ -47,6 +47,9 @@ #Forum (r'^forum/$', 'django.views.generic.date_based.archive_index', {"queryset": News.objects.all(), "date_field": "date", "template_name": "forum.html", "allow_empty": True}), + #Bug tracker + (r'^bocuk/$', include('oi.bug.urls')), + #Django (r'^$', 'oi.st.views.home'), (r'^admin/upload/image/$', 'oi.upload.views.upload'), From oi-commits at pardus.org.tr Tue Jun 12 12:11:55 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 12 Jun 2007 12:11:55 +0300 (EEST) Subject: [Oi-commits] r195 - trunk/bug Message-ID: <20070612091155.33A667C00EB@liste.uludag.org.tr> Author: erenturkay Date: Tue Jun 12 12:11:54 2007 New Revision: 195 Modified: trunk/bug/models.py Log: * 1000+ kullan?c?m?z oldu?unda sa?daki user listesi ?i?ecek, onun yerine status ve submit date g?sterilsin, arama k?sm?nda userlar aranabilsin Modified: trunk/bug/models.py ================================================================= --- trunk/bug/models.py (original) +++ trunk/bug/models.py Tue Jun 12 12:11:54 2007 @@ -31,5 +31,5 @@ class Admin: list_display = ('status', 'title', 'submitter', 'assigned_to') - list_filter = ('assigned_to', 'submitter', 'submitted_date') - search_fields = ('title', 'description') \ No newline at end of file + list_filter = ('status', 'submitted_date') + search_fields = ('assigned_to', 'submitter', 'title', 'description') From oi-commits at pardus.org.tr Tue Jun 12 13:22:03 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 12 Jun 2007 13:22:03 +0300 (EEST) Subject: [Oi-commits] r196 - trunk/media/css Message-ID: <20070612102203.6ED767C00EB@liste.uludag.org.tr> Author: ahmet Date: Tue Jun 12 13:22:03 2007 New Revision: 196 Modified: trunk/media/css/global.css trunk/media/css/style.css Log: django'nun de?il bizim css'imizde dursun Modified: trunk/media/css/global.css ================================================================= --- trunk/media/css/global.css (original) +++ trunk/media/css/global.css Tue Jun 12 13:22:03 2007 @@ -138,11 +138,4 @@ /* OBJECT HISTORY */ table#change-history { width:100%; } -table#change-history tbody th { width:16em; } - -.paginator { padding: .25em .25em .6em .25em; } -.paginate-pages { padding: 2px 3px; border: 1px solid #ddd; cursor: pointer; text-decoration: underline; } -.paginate-first, .paginate-last { padding: 2px 6px; border: 1px solid #ddd; font-weight: bold; } -.paginate-previous, .paginate-next { padding: 2px 3px; border: 1px solid #ddd; } -.paginate-link { padding: 2px 4px; border: 1px solid #ddd; } -.paginate-current { padding: 2px 4px; border: 1px solid #ddd; font-weight: bold; background:#417690; color:#f4f379; } +table#change-history tbody th { width:16em; } \ No newline at end of file Modified: trunk/media/css/style.css ================================================================= --- trunk/media/css/style.css (original) +++ trunk/media/css/style.css Tue Jun 12 13:22:03 2007 @@ -935,4 +935,39 @@ .rating_bar { text-align: center; +} + +.paginator { + padding: .25em .25em .6em .25em; +} + +.paginate-pages { + padding: 2px 3px; + border: 1px solid #ddd; + cursor: pointer; + text-decoration: underline; +} + +.paginate-first, .paginate-last { + padding: 2px 6px; + border: 1px solid #ddd; + font-weight: bold; +} + +.paginate-previous, .paginate-next { + padding: 2px 3px; + border: 1px solid #ddd; +} + +.paginate-link { + padding: 2px 4px; + border: 1px solid #ddd; +} + +.paginate-current { + padding: 2px 4px; + border: 1px solid #ddd; + font-weight: bold; + background:#417690; + color:#f4f379; } \ No newline at end of file From oi-commits at pardus.org.tr Tue Jun 12 13:25:35 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 12 Jun 2007 13:25:35 +0300 (EEST) Subject: [Oi-commits] r197 - trunk/media/js Message-ID: <20070612102535.77FFC7C00EB@liste.uludag.org.tr> Author: erenturkay Date: Tue Jun 12 13:25:35 2007 New Revision: 197 Modified: trunk/media/js/paginator.js Log: t?rk?e olsun Modified: trunk/media/js/paginator.js ================================================================= --- trunk/media/js/paginator.js (original) +++ trunk/media/js/paginator.js Tue Jun 12 13:25:35 2007 @@ -2,7 +2,7 @@ { jumpToPage: function(pages) { - var page = prompt("Enter a number between 1 and " + pages + " to jump to that page", ""); + var page = prompt("Sayfa atlamak i?in 1 ve " + pages + " aras?nda bir say? girin", ""); if (page != undefined) { page = parseInt(page, 10) @@ -12,4 +12,4 @@ } } } -}; \ No newline at end of file +}; From oi-commits at pardus.org.tr Tue Jun 12 14:32:50 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 12 Jun 2007 14:32:50 +0300 (EEST) Subject: [Oi-commits] r198 - trunk/templates Message-ID: <20070612113251.006527C00E7@liste.uludag.org.tr> Author: ahmet Date: Tue Jun 12 14:32:50 2007 New Revision: 198 Added: trunk/templates/user_list.html Removed: trunk/templates/userlist.html Modified: trunk/templates/base.html trunk/templates/paginator.html Log: G?zelle?tirme denemeleri #1 Modified: trunk/templates/base.html ================================================================= --- trunk/templates/base.html (original) +++ trunk/templates/base.html Tue Jun 12 14:32:50 2007 @@ -8,7 +8,6 @@ - {% block extrahead %}{% endblock %} Modified: trunk/templates/paginator.html ================================================================= --- trunk/templates/paginator.html (original) +++ trunk/templates/paginator.html Tue Jun 12 14:32:50 2007 @@ -1,14 +1,17 @@ {% spaceless %} -{{ pages }} Sayfa -{% if show_first %}«{% endif %} -{% if has_previous %}<{% endif %} -{% for num in page_numbers %} - {% ifequal num page %} - {{ num }} - {% else %} - {{ num }} - {% endifequal %} -{% endfor %} -{% if has_next %}>{% endif %} -{% if show_last %}»{% endif %} -{% endspaceless %} + {{total_results}} {% trans " result(s) in " %} {{total_page}} {% trans "page(s)" %} + + {% if prev %} + {% trans "Previous Page" %} + {% else %} + {% trans "Previous Page" %} + {% endif %} + +  - {{current_page|add:"1"}} / {{total_page}} -  + + {% if next %} + {% trans "Next Page" %} + {% else %} + {% trans "Next Page" %} + {% endif%} +{% endspaceless %} \ No newline at end of file From oi-commits at pardus.org.tr Tue Jun 12 14:33:18 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 12 Jun 2007 14:33:18 +0300 (EEST) Subject: [Oi-commits] r199 - trunk/media/js Message-ID: <20070612113318.525A97C00EB@liste.uludag.org.tr> Author: ahmet Date: Tue Jun 12 14:33:18 2007 New Revision: 199 Removed: trunk/media/js/paginator.js Log: GereNksiz :) From oi-commits at pardus.org.tr Tue Jun 12 14:33:37 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 12 Jun 2007 14:33:37 +0300 (EEST) Subject: [Oi-commits] r200 - trunk Message-ID: <20070612113337.B7FDF7C00E7@liste.uludag.org.tr> Author: ahmet Date: Tue Jun 12 14:33:37 2007 New Revision: 200 Modified: trunk/TODO Log: update TODO Modified: trunk/TODO ================================================================= --- trunk/TODO (original) +++ trunk/TODO Tue Jun 12 14:33:37 2007 @@ -12,7 +12,14 @@ + File upload support in wysiwyg editor (tinymce) / User management system (basic login/logout/register and user profiles) -/ Avatar support + - avatar support + + login + + logout + - register + - show profile + - edit profile + / user list -- General 404 error pages (we can use get_object_or_404 function of django) +- General 404 error pages - Forum +- Planet \ No newline at end of file From oi-commits at pardus.org.tr Tue Jun 12 14:34:30 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 12 Jun 2007 14:34:30 +0300 (EEST) Subject: [Oi-commits] r202 - trunk Message-ID: <20070612113430.D580D7C00EE@liste.uludag.org.tr> Author: ahmet Date: Tue Jun 12 14:34:30 2007 New Revision: 202 Modified: trunk/settings.py Log: pagination settings Modified: trunk/settings.py ================================================================= --- trunk/settings.py (original) +++ trunk/settings.py Tue Jun 12 14:34:30 2007 @@ -5,16 +5,19 @@ # Licensed under the GNU General Public License, version 2. # See the file http://www.gnu.org/copyleft/gpl.txt. +#FIXME: Turn debug mode to False when the development ends. DEBUG = True TEMPLATE_DEBUG = DEBUG ADMINS = () MANAGERS = ADMINS +#Site configuration SITE_NAME = '?zg?rl?k i?in...' WEB_URL = 'http://django' DOCUMENT_ROOT = '/home/ahmet/public_html/oi' +#Database settings DATABASE_ENGINE = 'sqlite3' DATABASE_NAME = '%s/db/oi.db' % DOCUMENT_ROOT DATABASE_USER = '' @@ -22,6 +25,12 @@ DATABASE_HOST = '' DATABASE_PORT = '' +#Pagination +USER_PER_PAGE = 10 +PACKAGE_PER_PAGE = 10 +FS_PER_PAGE = 10 +GAME_PER_PAGE = 10 + # For extending User class AUTH_PROFILE_MODULE = 'st.UserProfile' From oi-commits at pardus.org.tr Tue Jun 12 14:34:18 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 12 Jun 2007 14:34:18 +0300 (EEST) Subject: [Oi-commits] r201 - trunk Message-ID: <20070612113418.B8BF67C00EB@liste.uludag.org.tr> Author: ahmet Date: Tue Jun 12 14:34:18 2007 New Revision: 201 Modified: trunk/urls.py Log: beautify urls :) Modified: trunk/urls.py ================================================================= --- trunk/urls.py (original) +++ trunk/urls.py Tue Jun 12 14:34:18 2007 @@ -27,8 +27,10 @@ (r'^user/login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}), (r'^user/logout/$', 'django.contrib.auth.views.logout', {'template_name': 'logout.html'}), (r'^user/dashboard/$', 'oi.st.views.user_dashboard'), + (r'^user/page/(?P\d+)/$', 'oi.st.views.user_list'), + (r'^user/$', 'oi.st.views.user_list'), (r'^user/(?P.*)/$', 'oi.st.views.user_profile'), - (r'^user/$', 'oi.st.views.list_users'), + (r'^user/(?P.*)/edit/$', 'oi.st.views.edit_profile'), #First Steps (r'^ia/$', 'oi.st.views.fs_main'), From oi-commits at pardus.org.tr Tue Jun 12 14:39:51 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 12 Jun 2007 14:39:51 +0300 (EEST) Subject: [Oi-commits] r203 - in trunk/st: . templatetags Message-ID: <20070612113951.7AA027C00E7@liste.uludag.org.tr> Author: ahmet Date: Tue Jun 12 14:39:51 2007 New Revision: 203 Modified: trunk/st/templatetags/library.py trunk/st/views.py Log: ?imdilik biraz sorunlu ama d?zelecek abisi?? Modified: trunk/st/templatetags/library.py ================================================================= --- trunk/st/templatetags/library.py (original) +++ trunk/st/templatetags/library.py Tue Jun 12 14:39:51 2007 @@ -22,30 +22,4 @@ image.save(miniature_filename, image.format) return miniature_url -register.filter(thumbnail) - -def paginator(context, adjacent_pages=2): - """ - To be used in conjunction with the object_list generic view. - - Adds pagination context variables for use in displaying first, adjacent and - last page links in addition to those created by the object_list generic - view. - """ - page_numbers = [n for n in \ - range(context["page"] - adjacent_pages, context["page"] + adjacent_pages + 1) \ - if n > 0 and n <= context["paginator"].pages] - return { - "hits": context["paginator"].hits, - "page": context["page"], - "pages": context["pages"], - "page_numbers": page_numbers, - "next": context["page"]+1, - "previous": context["page"]-1, - "has_next": context["paginator"].has_next_page(context["page"]), - "has_previous": context["paginator"].has_previous_page(context["page"]-1), - "show_first": 1 not in page_numbers, - "show_last": context["pages"] not in page_numbers, - } - -register.inclusion_tag("paginator.html", takes_context=True)(paginator) +register.filter(thumbnail) \ No newline at end of file Modified: trunk/st/views.py ================================================================= --- trunk/st/views.py (original) +++ trunk/st/views.py Tue Jun 12 14:39:51 2007 @@ -7,17 +7,33 @@ from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User +from django.shortcuts import render_to_response from django.core.paginator import ObjectPaginator, InvalidPage -from django.views.generic.simple import redirect_to from oi.st.models import FS, Game, News, Package, ScreenShot, Tag, UserProfile from oi.flatpages.models import FlatPage from oi.st.wrappers import render_response +from oi.settings import USER_PER_PAGE def home(request): news = News.objects.all().order_by('-date')[:4] return render_response(request, 'home.html', locals()) +def build_paginator_dict(results, page, item_per_page): + paginator_result = ObjectPaginator(results, item_per_page) + try: + retval = {"results": paginator_result.get_page(page), + "paginator": True, + "current_page": page, + "total_page": paginator_result.pages, + "total_results": paginator_result.hits, + "next": paginator_result.has_next_page(page), + "prev": paginator_result.has_previous_page(page)} + except InvalidPage: + retval = {} + + return retval + def fs_main(request): fs_all = FS.objects.all() return render_response(request, 'fs_main.html', locals()) @@ -100,23 +116,8 @@ return render_response(request, 'profile.html', locals()) -def list_users(request): - paginator = ObjectPaginator(User.objects.all(), 3) - if not request.GET.has_key('page'): - page = 1 - else: - try: - page = int(request.GET['page']) - except ValueError: - page = 1 - - try: - users = paginator.get_page(page-1) - return render_response(request, 'userlist.html', {'users': users, - 'page': page, - 'pages': paginator.pages, - 'paginator': paginator}) - except InvalidPage: - return redirect_to({'url': '/user/'}) - - +def user_list(request, page = 0): + paginator_dict = build_paginator_dict(User.objects.all(), int(page), USER_PER_PAGE) + response_dict = {'url_tip': '/user/page/'} + response_dict.update(paginator_dict) + return render_to_response("user_list.html", response_dict) \ No newline at end of file From oi-commits at pardus.org.tr Tue Jun 12 14:45:49 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 12 Jun 2007 14:45:49 +0300 (EEST) Subject: [Oi-commits] r204 - trunk/st Message-ID: <20070612114549.7EDF27C00EB@liste.uludag.org.tr> Author: erenturkay Date: Tue Jun 12 14:45:49 2007 New Revision: 204 Modified: trunk/st/views.py Log: her template'de user bilgilerine eri?mek i?in gerekli bu Modified: trunk/st/views.py ================================================================= --- trunk/st/views.py (original) +++ trunk/st/views.py Tue Jun 12 14:45:49 2007 @@ -120,4 +120,4 @@ paginator_dict = build_paginator_dict(User.objects.all(), int(page), USER_PER_PAGE) response_dict = {'url_tip': '/user/page/'} response_dict.update(paginator_dict) - return render_to_response("user_list.html", response_dict) \ No newline at end of file + return render_response(request, "user_list.html", response_dict) From oi-commits at pardus.org.tr Tue Jun 12 14:53:25 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Tue, 12 Jun 2007 14:53:25 +0300 (EEST) Subject: [Oi-commits] r205 - in trunk: st templates Message-ID: <20070612115325.D092D7C00DD@liste.uludag.org.tr> Author: ahmet Date: Tue Jun 12 14:53:25 2007 New Revision: 205 Modified: trunk/st/views.py trunk/templates/paginator.html trunk/templates/user_list.html Log: Done :D Modified: trunk/st/views.py ================================================================= --- trunk/st/views.py (original) +++ trunk/st/views.py Tue Jun 12 14:53:25 2007 @@ -120,4 +120,4 @@ paginator_dict = build_paginator_dict(User.objects.all(), int(page), USER_PER_PAGE) response_dict = {'url_tip': '/user/page/'} response_dict.update(paginator_dict) - return render_response(request, "user_list.html", response_dict) + return render_response(request, "user_list.html", response_dict) \ No newline at end of file Modified: trunk/templates/paginator.html ================================================================= --- trunk/templates/paginator.html (original) +++ trunk/templates/paginator.html Tue Jun 12 14:53:25 2007 @@ -1,17 +1,17 @@ {% spaceless %} - {{total_results}} {% trans " result(s) in " %} {{total_page}} {% trans "page(s)" %} + {{total_results}} result(s) in {{total_page}} page(s) {% if prev %} - {% trans "Previous Page" %} + Previous Page {% else %} - {% trans "Previous Page" %} + Previous Page {% endif %}  - {{current_page|add:"1"}} / {{total_page}} -  {% if next %} - {% trans "Next Page" %} + Next Page {% else %} - {% trans "Next Page" %} + Next Page {% endif%} {% endspaceless %} \ No newline at end of file Modified: trunk/templates/user_list.html ================================================================= --- trunk/templates/user_list.html (original) +++