[Oi-commits] r1338 - in trunk: . sanat tema tema/templatetags templates/sanat templates/tema
oi-commits at pardus.org.tr
oi-commits at pardus.org.tr
Tue May 6 14:01:13 EEST 2008
Author: jnmbk
Date: Tue May 6 14:01:12 2008
New Revision: 1338
Added:
trunk/tema/
- copied from r1336, trunk/sanat/
trunk/tema/feeds.py
- copied, changed from r1337, trunk/sanat/feeds.py
trunk/tema/models.py
- copied, changed from r1337, trunk/sanat/models.py
trunk/templates/tema/
- copied from r1336, trunk/templates/sanat/
Removed:
trunk/sanat/
trunk/templates/sanat/
Modified:
trunk/settings.py
trunk/tema/forms.py
trunk/tema/templatetags/thumbman.py
trunk/tema/urls.py
trunk/tema/views.py
trunk/templates/tema/detail.html
trunk/templates/tema/eski_detail.html
trunk/templates/tema/main.html
trunk/urls.py
Log:
sanat>tema
Modified: trunk/settings.py
=================================================================
--- trunk/settings.py (original)
+++ trunk/settings.py Tue May 6 14:01:12 2008
@@ -114,7 +114,7 @@
'oi.seminar',
'oi.profile',
'oi.forum',
- 'oi.sanat',
+ 'oi.tema',
'oi.comments',
'oi.petition',
)
Copied: trunk/tema/feeds.py (from r1337, trunk/sanat/feeds.py)
=================================================================
--- trunk/sanat/feeds.py (original)
+++ trunk/tema/feeds.py Tue May 6 14:01:12 2008
@@ -8,7 +8,7 @@
from django.contrib.syndication.feeds import Feed
from django.utils.feedgenerator import Atom1Feed
-from oi.sanat.models import Dosya,Category
+from oi.tema.models import Dosya,Category
from oi.settings import SITE_NAME, WEB_URL, SITE_DESC
from django.contrib.syndication.feeds import FeedDoesNotExist
@@ -19,8 +19,8 @@
title = SITE_NAME + "Temalar"
link = WEB_URL
description = SITE_DESC + "Pencere dekorasyonları, duvar kağıtları ve daha fazlası."
- title_template = 'sanat/feed_title.html'
- description_template = 'sanat/feed_description.html'
+ title_template = 'tema/feed_title.html'
+ description_template = 'tema/feed_description.html'
def items(self):
return Dosya.objects.filter(state=True).order_by("-update")[:10]
Modified: trunk/tema/forms.py
=================================================================
--- trunk/sanat/forms.py (original)
+++ trunk/tema/forms.py Tue May 6 14:01:12 2008
@@ -11,8 +11,8 @@
import zipfile
from django import newforms as forms
-import sanat_settings as settings
-from oi.sanat.models import Dosya,SanatScreen,Category,License,ArsivDosya
+import tema_settings as settings
+from oi.tema.models import Dosya,SanatScreen,Category,License,ArsivDosya
import Image
from django.shortcuts import get_object_or_404
Copied: trunk/tema/models.py (from r1337, trunk/sanat/models.py)
=================================================================
--- trunk/sanat/models.py (original)
+++ trunk/tema/models.py Tue May 6 14:01:12 2008
@@ -10,7 +10,7 @@
from oi.st.models import License
from django.db.models import signals
from django.dispatch import dispatcher
-from oi.sanat.signals import rm_thumb,crt_thumb,rmv_files
+from oi.tema.signals import rm_thumb,crt_thumb,rmv_files
from oi.comments.moderation import CommentModerator, moderator
Modified: trunk/tema/templatetags/thumbman.py
=================================================================
--- trunk/sanat/templatetags/thumbman.py (original)
+++ trunk/tema/templatetags/thumbman.py Tue May 6 14:01:12 2008
@@ -12,7 +12,7 @@
from django import template
from django.template import TemplateSyntaxError
-from oi.sanat.utils import make_thumbnail, get_image_size
+from oi.tema.utils import make_thumbnail, get_image_size
register = template.Library()
##################################################
## FILTERS ##
Modified: trunk/tema/urls.py
=================================================================
--- trunk/sanat/urls.py (original)
+++ trunk/tema/urls.py Tue May 6 14:01:12 2008
@@ -1,5 +1,5 @@
from django.conf.urls.defaults import *
-from oi.sanat.feeds import *
+from oi.tema.feeds import *
feed_dict = {
'rss': Tema_RSS,
@@ -18,7 +18,7 @@
}
-urlpatterns = patterns ('oi.sanat.views',
+urlpatterns = patterns ('oi.tema.views',
#the first page listing
(r'^goster/(?P<sort_by>[a-z]+)/$','list_material'),
(r'^kategori/(?P<cat_name>[a-z]+)/$','list_category'),
Modified: trunk/tema/views.py
=================================================================
--- trunk/sanat/views.py (original)
+++ trunk/tema/views.py Tue May 6 14:01:12 2008
@@ -7,14 +7,14 @@
# Create your views here.
from django.views.generic.list_detail import object_list
-from sanat_settings import HOME_ITEMS
-from oi.sanat.models import Dosya,Category
+from tema_settings import HOME_ITEMS
+from oi.tema.models import Dosya,Category
from django.shortcuts import render_to_response,get_object_or_404
from django.contrib.auth.models import User
from django.http import HttpResponseRedirect
from django.contrib.auth.decorators import login_required
-from oi.sanat.forms import VoteForm,TemaUploadForm
+from oi.tema.forms import VoteForm,TemaUploadForm
from django.core.urlresolvers import reverse
try:
@@ -46,7 +46,7 @@
'queryset':sorgu,
'paginate_by':HOME_ITEMS,
- 'template_name':'sanat/main.html',
+ 'template_name':'tema/main.html',
}
@@ -88,7 +88,7 @@
'queryset':sorgu,
'paginate_by':HOME_ITEMS,
- 'template_name':'sanat/main.html',
+ 'template_name':'tema/main.html',
}
@@ -109,7 +109,7 @@
if request.user.is_authenticated():
auth=request.user.username
- return render_to_response('sanat/detail.html', {'dosya':dosya,'auth':auth,'form':VoteForm()})
+ return render_to_response('tema/detail.html', {'dosya':dosya,'auth':auth,'form':VoteForm()})
def list_user(request,username):
@@ -128,7 +128,7 @@
'queryset':sorgu,
'paginate_by':HOME_ITEMS,
- 'template_name':'sanat/main.html',
+ 'template_name':'tema/main.html',
}
@@ -156,22 +156,22 @@
#new_data.setlist('parent_category',[int(request.POST['parent_category'].strip())])
form=TemaUploadForm(new_data)
- #return render_to_response('sanat/upload.html',{'form':form,'extralar':new_data['parent_category'],'secenek':form.base_fields['parent_category'].choices})
+ #return render_to_response('tema/upload.html',{'form':form,'extralar':new_data['parent_category'],'secenek':form.base_fields['parent_category'].choices})
if form.is_valid():
#save all the things
form.save()
sort_by="son"
- #return render_to_response('sanat/upload.html',{'form':form})
- #return HttpResponseRedirect(reverse(viewname="oi.sanat.views.list_category",args=[sort_by]))
+ #return render_to_response('tema/upload.html',{'form':form})
+ #return HttpResponseRedirect(reverse(viewname="oi.tema.views.list_category",args=[sort_by]))
return HttpResponseRedirect("/tema/goster/begenilen/")
else:
form=TemaUploadForm()
else:
form=TemaUploadForm()
- return render_to_response('sanat/upload.html',{'form':form})
+ return render_to_response('tema/upload.html',{'form':form})
@@ -207,7 +207,7 @@
if request.session.get(d_id):
#it was voted before #should add a new error arg
- return render_to_response('sanat/detail.html',{'dosya':dosya,'auth':auth,'form':VoteForm(),'error':u'2 kez oy kullanamzsiniz'})
+ return render_to_response('tema/detail.html',{'dosya':dosya,'auth':auth,'form':VoteForm(),'error':u'2 kez oy kullanamzsiniz'})
vf=VoteForm( { 'vote':request.POST['vote'] } )
@@ -231,7 +231,7 @@
- return render_to_response('sanat/detail.html', {'dosya':dosya,'auth':auth,'form':VoteForm()})
+ return render_to_response('tema/detail.html', {'dosya':dosya,'auth':auth,'form':VoteForm()})
return render_to_response('404.html')
Modified: trunk/templates/tema/detail.html
=================================================================
--- trunk/templates/sanat/detail.html (original)
+++ trunk/templates/tema/detail.html Tue May 6 14:01:12 2008
@@ -72,7 +72,7 @@
<br/>
{% if auth %}
<div align="center">
- {% comment_form for sanat.dosya dosya.id %}
+ {% comment_form for tema.dosya dosya.id %}
</div>
{% endif %}
@@ -83,7 +83,7 @@
- {% get_public_comment_list for sanat.dosya dosya.id as comments %}
+ {% get_public_comment_list for tema.dosya dosya.id as comments %}
<br/>
<br/><br/>
{% if comments %}
Modified: trunk/templates/tema/eski_detail.html
=================================================================
--- trunk/templates/sanat/eski_detail.html (original)
+++ trunk/templates/tema/eski_detail.html Tue May 6 14:01:12 2008
@@ -47,11 +47,11 @@
</tbody>
</table>
- {% free_comment_form for sanat.dosya dosya.id %}
+ {% free_comment_form for tema.dosya dosya.id %}
- {% get_free_comment_list for sanat.dosya dosya.id as comment_list %}
+ {% get_free_comment_list for tema.dosya dosya.id as comment_list %}
{% if comment_list %}
<table summary="Submitted table designs" border="1" align="center">
Modified: trunk/templates/tema/main.html
=================================================================
--- trunk/templates/sanat/main.html (original)
+++ trunk/templates/tema/main.html Tue May 6 14:01:12 2008
@@ -49,7 +49,7 @@
<td>{{dosya.licence}}</td>
<td>{{dosya.counter}}</td>
<td>{{dosya.rate}}</td>
- <td>{% get_public_comment_count for sanat.dosya dosya.id as comment_count %}{{comment_count}}</td>
+ <td>{% get_public_comment_count for tema.dosya dosya.id as comment_count %}{{comment_count}}</td>
</tr>
{% endfor %}
Modified: trunk/urls.py
=================================================================
--- trunk/urls.py (original)
+++ trunk/urls.py Tue May 6 14:01:12 2008
@@ -166,7 +166,7 @@
(r'^gezegen/', include('oi.feedjack.urls')),
#Tema
- (r'^tema/', include('oi.sanat.urls')),
+ (r'^tema/', include('oi.tema.urls')),
#Petition
(r'^petition/', include('oi.petition.urls')),
More information about the Oi-commits
mailing list