[Oi-commits] r1507 - in branches/stable: . media/img st templates templates/feedjack/oi

[oi-commits at pardus.org.tr]

Author: jnmbk
Date: Thu Jun 26 18:20:27 2008
New Revision: 1507

Added:
   branches/stable/media/img/oi-edergi-3-kapak.jpg
      - copied unchanged from r1506, trunk/media/img/oi-edergi-3-kapak.jpg
Removed:
   branches/stable/media/img/oi-edergi-2-kapak.jpg
   branches/stable/media/img/oi-edergi-kapak.jpg
Modified:
   branches/stable/st/views.py
   branches/stable/templates/base.html
   branches/stable/templates/feedjack/oi/post_list.html
   branches/stable/urls.py
Log:
merge

Modified: branches/stable/st/views.py
=================================================================
--- branches/stable/st/views.py	(original)
+++ branches/stable/st/views.py	Thu Jun 26 18:20:27 2008
@@ -29,10 +29,10 @@
     return render_response(request, 'robots.txt')
 
 def home(request):
-    news = News.objects.filter(status=1).order_by('-update')[:NEWS_IN_HOMEPAGE]
-    packages = Package.objects.filter(status=1).order_by('-update')[:PACKAGES_IN_HOMEPAGE]
-    games = Game.objects.filter(status=1).order_by('-update')[:GAMES_IN_HOMEPAGE]
-    howtos = HowTo.objects.filter(status=1).order_by('-update')[:HOWTOS_IN_HOMEPAGE]
+    news = News.objects.filter(status=True).order_by('-update')[:NEWS_IN_HOMEPAGE]
+    packages = Package.objects.filter(status=True).order_by('-update')[:PACKAGES_IN_HOMEPAGE]
+    games = Game.objects.filter(status=True).order_by('-update')[:GAMES_IN_HOMEPAGE]
+    howtos = HowTo.objects.filter(status=True).order_by('-update')[:HOWTOS_IN_HOMEPAGE]
     return render_response(request, 'home.html', locals())
 
 def fs_detail(request, slug):

Modified: branches/stable/templates/base.html
=================================================================
--- branches/stable/templates/base.html	(original)
+++ branches/stable/templates/base.html	Thu Jun 26 18:20:27 2008
@@ -77,7 +77,7 @@
             <div class="sidebar_top">&nbsp;</div>
             <div class="sidebar_middle">
                 <h2>Özgürlükiçin E-Dergisi</h2>
-                <a href="/e-dergi/"><img src="/media/img/oi-edergi-2-kapak.jpg" alt="e-dergi" /></a>
+                <a href="/e-dergi/"><img src="/media/img/oi-edergi-3-kapak.jpg" alt="e-dergi" /></a>
                 Özgürlükiçin'in şimdi bir de e-dergisi var! Okumak için <a href="/e-dergi/">buraya</a> tıklayın.
             </div>
             <div class="sidebar_bottom">&nbsp;</div>

Modified: branches/stable/templates/feedjack/oi/post_list.html
=================================================================
--- branches/stable/templates/feedjack/oi/post_list.html	(original)
+++ branches/stable/templates/feedjack/oi/post_list.html	Thu Jun 26 18:20:27 2008
@@ -103,7 +103,7 @@
     <div class="sidebar_top">&nbsp;</div>
     <div class="sidebar_middle">
         <h2>Özgürlükiçin E-Dergisi</h2>
-        <a href="/e-dergi/"><img src="/media/img/oi-edergi-2-kapak.jpg" alt="e-dergi" /></a>
+        <a href="/e-dergi/"><img src="/media/img/oi-edergi-3-kapak.jpg" alt="e-dergi" /></a>
         Özgürlükiçin'in şimdi bir de e-dergisi var! Okumak için <a href="/e-dergi/">buraya</a> tıklayın.
     </div>
     <div class="sidebar_bottom">&nbsp;</div>

Modified: branches/stable/urls.py
=================================================================
--- branches/stable/urls.py	(original)
+++ branches/stable/urls.py	Thu Jun 26 18:20:27 2008
@@ -32,43 +32,43 @@
             }
 
 package_dict = {
-                'queryset': Package.objects.filter(status=1).order_by('title'),
+                'queryset': Package.objects.filter(status=True).order_by('title'),
                 'template_name': 'package/package_main.html',
                 'paginate_by': PACKAGE_PER_PAGE,
                 'template_object_name': 'package',
                }
 
 game_dict = {
-             'queryset': Game.objects.filter(status=1).order_by('title'),
+             'queryset': Game.objects.filter(status=True).order_by('title'),
              'template_name': 'game/game_main.html',
              'paginate_by': GAME_PER_PAGE,
              'template_object_name': 'game',
             }
 
 fs_dict = {
-           'queryset': FS.objects.filter(status=1).order_by('order'),
+           'queryset': FS.objects.filter(status=True).order_by('order'),
            'template_name': 'fs/fs_main.html',
            'paginate_by': FS_PER_PAGE,
            'template_object_name': 'fs',
           }
 
 howto_dict = {
-              'queryset': HowTo.objects.filter(status=1).order_by('title'),
+              'queryset': HowTo.objects.filter(status=True).order_by('title'),
               'template_name': 'howto/howto_main.html',
               'paginate_by': HOWTO_PER_PAGE,
               'template_object_name': 'howto',
               'extra_context': {
-                  'firststep': FS.objects.filter(status=1).order_by('order')[:10],
+                  'firststep': FS.objects.filter(status=True).order_by('order')[:10],
                   },
              }
 
 news_dict = {
-             'queryset': News.objects.filter(status=1).order_by('-update'),
+             'queryset': News.objects.filter(status=True).order_by('-update'),
              'template_name': 'news/news_main.html',
              'paginate_by': NEWS_PER_PAGE,
              'template_object_name': 'news',
              'extra_context': {
-                 'seminar': Seminar.objects.filter(status=1).order_by('-date'),
+                 'seminar': Seminar.objects.filter(status=True).order_by('-date'),
                  }
             }