Merged back the changes that are done to trunk into my branch.
And also fixed a mistaken modification done to templates/main/base.html with the last commit of mine.
This commit is contained in:
Mustafa Arıcı
parent
1e8c02891f
commit
a37af854a4
|
|
@ -39,7 +39,7 @@ def main(request):
|
|||
last_entry_date -= day
|
||||
last_date_li.append(last_entry_date)
|
||||
|
||||
return render_to_response('main/main.html' ,{
|
||||
return render_response(request, 'main/main.html' ,{
|
||||
'entries_list':entries_list,
|
||||
'truncate_words':truncate_words,
|
||||
'items_per_page':repr(items_per_page),
|
||||
|
|
@ -60,9 +60,9 @@ def member_subscribe(request):
|
|||
try:
|
||||
check = handle_uploaded_file(request.FILES['hackergotchi'])
|
||||
except MultiValueDictKeyError:
|
||||
check = (False, '')
|
||||
|
||||
check = (False,False)
|
||||
#save the author information
|
||||
|
||||
if check[0]:
|
||||
f = request.FILES['hackergotchi']
|
||||
|
||||
|
|
@ -72,10 +72,12 @@ def member_subscribe(request):
|
|||
author = Authors(author_name=request.POST['name'], author_surname=request.POST['surname'], author_email=request.POST['email'], channel_url=request.POST['feed'], author_face=f.name, is_approved=0, current_status=5)
|
||||
else:
|
||||
author = Authors(author_name=request.POST['name'], author_surname=request.POST['surname'], author_email=request.POST['email'], channel_url=request.POST['feed'], is_approved=0, current_status=5)
|
||||
author.save()
|
||||
|
||||
#save the history with explanation
|
||||
author.history_set.create(action_type=5, action_date=datetime.datetime.now(), action_explanation=request.POST['message'])
|
||||
author.save()
|
||||
|
||||
#save the history with explanation
|
||||
author.history_set.create(action_type=5, action_date=datetime.datetime.now(), action_explanation=request.POST['message'])
|
||||
|
||||
#send mail part
|
||||
#fill it here
|
||||
return render_response(request, 'main/subscribe.html/',{'submit': 'done', 'BASE_URL': BASE_URL,'info_area':info_area})
|
||||
|
|
|
|||
|
|
@ -27,6 +27,74 @@ new_date_format = %d %B %Y
|
|||
facewidth = 64
|
||||
faceheight = 64
|
||||
|
||||
[http://ahmet.pardusman.org/blog/feed/?cat=2]
|
||||
name = Ahmet Aygün
|
||||
face = ahmetaygun.png
|
||||
nick = aaygun
|
||||
label = Personal
|
||||
id = 1
|
||||
|
||||
#12 Nisan 2007'de rss adresi degisti. DG.
|
||||
#Eskisi : http://cekirdek.pardus.org.tr/~meren/blog/rss.cgi]
|
||||
[http://cekirdek.pardus.org.tr/~meren/blog/feed/rss/]
|
||||
name = A. Murat Eren
|
||||
face = meren.png
|
||||
nick = meren
|
||||
label = Personal
|
||||
id = 2
|
||||
|
||||
[http://www.ademalpyildiz.com.tr/feed/]
|
||||
name = Adem Alp Yıldız
|
||||
nick = ayildiz
|
||||
label = Personal
|
||||
id = 3
|
||||
|
||||
[http://www.erdinc.info/?cat=6&feed=rss2]
|
||||
name = Ali Erdinç Köroğlu
|
||||
face = alierdinckoroglu.png
|
||||
nick = aek
|
||||
label = Personal
|
||||
id = 4
|
||||
|
||||
[http://feeds2.feedburner.com/raptiye_linux_gezegeni]
|
||||
name = Alper Kanat
|
||||
face = alperkanat.png
|
||||
nick = akanat
|
||||
label = Personal
|
||||
id = 5
|
||||
|
||||
[http://blog.oguz.biz/category/gezegen/rss2]
|
||||
name = Alper Oğuz
|
||||
face =
|
||||
nick = aoguz
|
||||
label = Personal
|
||||
id = 6
|
||||
|
||||
[http://www.murekkep.org/konu/acik-kaynak-ve-linux/feed]
|
||||
name = Alper Orus
|
||||
nick = aorus
|
||||
label = Personal
|
||||
id = 7
|
||||
|
||||
[http://www.alpersomuncu.com/weblog/index.php?/feeds/categories/8-Linux.rss]
|
||||
name = Alper Somuncu
|
||||
face = alpersomuncu.png
|
||||
nick = asomuncu
|
||||
label = Personal
|
||||
id = 8
|
||||
|
||||
[http://armish.linux-sevenler.org/blog/category/gezegen/feed]
|
||||
name = Arman Aksoy
|
||||
face = armanaksoy.png
|
||||
nick = aaksoy
|
||||
label = Personal
|
||||
id = 9
|
||||
|
||||
[http://anilozbek.blogspot.com/feeds/posts/default/-/gnu%2Flinux]
|
||||
name = Anıl Özbek
|
||||
nick = aozbek
|
||||
label = Personal
|
||||
id = 10
|
||||
|
||||
[http://www.hakanuygun.com/blog/?feed=atom&cat=13]
|
||||
name = Hakan Uygun
|
||||
|
|
|
|||
|
|
@ -215,6 +215,7 @@ body {
|
|||
.innercontent {padding:20px;}
|
||||
|
||||
.face {
|
||||
clear:both;
|
||||
float:left;
|
||||
width:80px;
|
||||
height:80px;
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
feed = [http://www.google.com.tr/]
|
||||
name = Oğuz
|
||||
nick = oğuzyarımtepe
|
||||
label = Personal
|
||||
id = 1
|
||||
feed = [http://www.bugunlinux.com/?feed=rss3]
|
||||
name = Ahmet Yıldızz
|
||||
nick = ayildizz
|
||||
label = LKD
|
||||
id = 2
|
||||
feed = [http://www.google.com.tr/]
|
||||
name = Oğuzz
|
||||
nick = oğuzzyarımtepe
|
||||
label = Personal
|
||||
id = 1
|
||||
feed = [http://www.bugunlinux.com/?feed=rss3]
|
||||
name = Ahmet Yıldızz
|
||||
nick = ayildizz
|
||||
label = LKD
|
||||
id = 2
|
||||
feed = [http://www.google.com.tr/]
|
||||
name = Oğuzz
|
||||
nick = oğuzzyarımtepe
|
||||
label = Personal
|
||||
id = 1
|
||||
feed = [http://www.bugunlinux.com/?feed=rss3]
|
||||
name = Ahmet Yıldızz
|
||||
nick = ayildizz
|
||||
label = LKD
|
||||
id = 2
|
||||
feed = [http://www.google.com.tr/]
|
||||
name = Oğuzz
|
||||
nick = oğuzzyarımtepe
|
||||
label = Personal
|
||||
id = 1
|
||||
feed = [http://www.bugunlinux.com/?feed=rss3]
|
||||
name = Ahmet Yıldızz
|
||||
nick = ayildizz
|
||||
label = LKD
|
||||
id = 2
|
||||
|
|
@ -48,15 +48,15 @@
|
|||
{% for dt in last_date_li %}
|
||||
<li><a href="{{ BASE_URL }}/archive/{{ dt|date:"Y/m/d"}}">{{ dt|date:"d.m.Y" }}</a>
|
||||
{% endfor %}
|
||||
<li><a href="{{ BASE_URL }}/main/">{% trans "Tümü" %}</a></li>
|
||||
</ul>
|
||||
<li><a href="{{ BASE_URL }}/main/">{% trans "Tümü" %}</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</ul>
|
||||
{% endblock %}
|
||||
</div>
|
||||
|
||||
<div class="content <div class="contenttop">
|
||||
<div class="contenttop">
|
||||
|
||||
{% if info_area == "main" %}
|
||||
<p>Gezegen her 10 dakikada bir yenilenir. Son güncelleme: {{ run_time.get_run_time }}</p>
|
||||
|
|
@ -99,7 +99,8 @@
|
|||
{% if info_area == "members" %}
|
||||
{% endif %}
|
||||
</div>
|
||||
t">
|
||||
|
||||
<div class="content">
|
||||
|
||||
{% block body %}
|
||||
{% endblock %}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user