From 9c400efddcecbd9900a8d39464c69796daa643d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20Ar=C4=B1c=C4=B1?= Date: Sat, 2 Jul 2011 15:23:42 +0000 Subject: [PATCH] Merging changes done to my branch into trunk. --- DJAGEN/trunk/djagen/collector/admin.py | 2 +- DJAGEN/trunk/djagen/collector/configini.py | 25 +- DJAGEN/trunk/djagen/collector/configxml.py | 2 +- DJAGEN/trunk/djagen/collector/forms.py | 14 +- .../trunk/djagen/collector/planethandler.py | 18 +- DJAGEN/trunk/djagen/collector/views.py | 134 +++- .../djagen/gezegen/gezegen/config_entries.ini | 750 +++++++++++++++++- .../djagen/gezegen/gezegen/config_header.ini | 30 + .../djagen/gezegen/tmp_ini/tmp_entries.ini | 12 +- DJAGEN/trunk/djagen/settings.py | 8 +- .../trunk/djagen/templates/main/archives.html | 17 + DJAGEN/trunk/djagen/templates/main/base.html | 3 +- DJAGEN/trunk/djagen/templates/main/query.html | 40 +- .../djagen/templates/main/searchresult.html | 102 +++ DJAGEN/trunk/djagen/urls.py | 3 +- 15 files changed, 1083 insertions(+), 77 deletions(-) create mode 100755 DJAGEN/trunk/djagen/gezegen/gezegen/config_header.ini create mode 100755 DJAGEN/trunk/djagen/templates/main/archives.html create mode 100755 DJAGEN/trunk/djagen/templates/main/searchresult.html diff --git a/DJAGEN/trunk/djagen/collector/admin.py b/DJAGEN/trunk/djagen/collector/admin.py index d2125b6..a7c133d 100755 --- a/DJAGEN/trunk/djagen/collector/admin.py +++ b/DJAGEN/trunk/djagen/collector/admin.py @@ -14,7 +14,7 @@ from djagen.collector.configini import * class AuthorsAdmin (admin.ModelAdmin): - list_display = ('author_id', 'author_name', 'author_email', 'author_face', 'current_status', 'is_approved', 'label_personal', 'label_lkd', 'label_community', 'label_eng') + list_display = ('author_id', 'author_name','author_surname' ,'author_email', 'author_face', 'current_status', 'is_approved', 'label_personal', 'label_lkd', 'label_community', 'label_eng') list_select_related = True search_fields = ['author_name', 'author_surname', 'author_email'] diff --git a/DJAGEN/trunk/djagen/collector/configini.py b/DJAGEN/trunk/djagen/collector/configini.py index af77005..acf8734 100755 --- a/DJAGEN/trunk/djagen/collector/configini.py +++ b/DJAGEN/trunk/djagen/collector/configini.py @@ -13,7 +13,7 @@ class Handler: self.id = id self.tmp_entries_ini = os.path.join(settings.MAIN_PATH, 'tmp_ini', 'tmp_entries.ini') - + self.config_header_ini = os.path.join(settings.MAIN_PATH, 'gezegen', 'config_header.ini') self.config_entries_ini = os.path.join(settings.MAIN_PATH, 'gezegen', 'config_entries.ini') @@ -29,7 +29,7 @@ class Handler: self.surname = author.author_surname self.face = author.author_face self.url = author.channel_url - + labels = { author.label_personal:'Personal', author.label_lkd: 'LKD', @@ -43,7 +43,7 @@ class Handler: return True def create_tmp_entries(self): - + if not self.__set_values(): return config_entries = open(self.config_entries_ini) @@ -56,6 +56,7 @@ class Handler: header = config_header.read() config_header.close() tmp_entries.write(header) + found = False for section in sections: if (section == 'Planet'): continue @@ -71,6 +72,7 @@ class Handler: config_face = None if config_id == self.id: + found = True url = self.url face = self.face @@ -98,5 +100,22 @@ class Handler: tmp_entries.write(s) + if found != True: + url = self.url + face = self.face + name = self.name + surname = self.surname + label = self.author_labels + + id = self.id + s = '['+url+']' + '\n' + s += 'name = ' + name + '\n' + s += 'surname = ' + surname + '\n' + s += 'label = ' + label + '\n' + if face: + s += 'face = ' + face + '\n' + s += 'id = ' + str(id) + '\n' + '\n' + tmp_entries.write(s) + tmp_entries.close() diff --git a/DJAGEN/trunk/djagen/collector/configxml.py b/DJAGEN/trunk/djagen/collector/configxml.py index e952792..fcacf65 100755 --- a/DJAGEN/trunk/djagen/collector/configxml.py +++ b/DJAGEN/trunk/djagen/collector/configxml.py @@ -80,7 +80,7 @@ class Handler: if node.nodeName == "label": self.label = child.toxml() - + if node.nodeName == "face": self.face = child.toxml() diff --git a/DJAGEN/trunk/djagen/collector/forms.py b/DJAGEN/trunk/djagen/collector/forms.py index f7faf58..b2e0dab 100755 --- a/DJAGEN/trunk/djagen/collector/forms.py +++ b/DJAGEN/trunk/djagen/collector/forms.py @@ -3,6 +3,8 @@ from django import forms from captcha.fields import CaptchaField +from datetime import date +from django.contrib.admin import widgets class ContactForm(forms.Form): @@ -19,6 +21,12 @@ class QueryForm(forms.Form): q_author_name = forms.CharField(max_length=25, required = False, label = 'Adı') q_author_surname = forms.CharField(max_length=25, required = False, label = 'Soyadı') q_text = forms.CharField(required = False, label = 'Aradığınız metin', widget = forms.widgets.Textarea() ) - q_date_year = forms.IntegerField(required = False, label = 'Blog girdisine ait yıl(Örn:2010)', widget=forms.widgets.DateTimeInput()) - q_date_month = forms.IntegerField(required = False, label = 'Blog girdisine ait ay(Örn:03)', widget=forms.widgets.DateTimeInput()) - q_date_day = forms.IntegerField(required = False, label = 'Blog girdisine ait gün (Örn:27)', widget=forms.widgets.DateTimeInput()) + + q_label_personal = forms.BooleanField(required = False, label = 'Kişisel Günlükler', initial = True) + q_label_lkd = forms.BooleanField(required = False, label = 'LKD Günlükleri', initial = True) + q_label_community = forms.BooleanField(required = False, label = 'Topluluk Günlükleri') + q_label_eng = forms.BooleanField(required = False, label = 'İngilizce Günlükler') + + + q_date_from = forms.DateField(required = False, initial=date.today,label = "Şurdan",widget = widgets.AdminDateWidget() ) + q_date_till = forms.DateField(required = False, initial=date.today,label = "Şuraya",widget = widgets.AdminDateWidget() ) diff --git a/DJAGEN/trunk/djagen/collector/planethandler.py b/DJAGEN/trunk/djagen/collector/planethandler.py index da4c0c4..d3003f0 100644 --- a/DJAGEN/trunk/djagen/collector/planethandler.py +++ b/DJAGEN/trunk/djagen/collector/planethandler.py @@ -7,17 +7,17 @@ __author__ = ['Oguz Yarimtepe ', 'Mustafa Arici Gezegen Arşivi + +
+ {% for date_y, l_date_m in archives_list %} +

{{ date_y.year }}

+ {% for date_m in l_date_m %} +
{{ date_m|date:"F" }}
+ + {% endfor %} + + {% endfor %} +
+ + {% endblock %} diff --git a/DJAGEN/trunk/djagen/templates/main/base.html b/DJAGEN/trunk/djagen/templates/main/base.html index b2a0e84..713b69f 100755 --- a/DJAGEN/trunk/djagen/templates/main/base.html +++ b/DJAGEN/trunk/djagen/templates/main/base.html @@ -18,6 +18,7 @@ + {% endblock %} @@ -45,7 +46,7 @@ {% blocktrans %}
  • İngilizce Günlükler
    • {% endblocktrans %}
  • Arşiv
      -
    • {% trans "Ara" %}
      • +
    • {% trans "Ara" %}
      • {% for dt in last_date_li %}
    • {{ dt|date:"d.m.Y" }} {% endfor %} diff --git a/DJAGEN/trunk/djagen/templates/main/query.html b/DJAGEN/trunk/djagen/templates/main/query.html index 3e96059..e117aa1 100755 --- a/DJAGEN/trunk/djagen/templates/main/query.html +++ b/DJAGEN/trunk/djagen/templates/main/query.html @@ -1,30 +1,34 @@ {% extends "main/base.html" %} {% block body %} -{% comment %} -
      - Yazar
      Adı:       - ve/veya - Soyadı:
      - veya
      - Aradığınız Metin: - -
      -{% endcomment %} -
      + + {% for field in q_form %} +
      - {% if field.errors %} - {{ field.errors }} - {% endif %} - {{ field.label_tag }} +
      + + {% if field.help_text %} - {{ field.help_text }} + {% endif %} - {{ field }} + + {% if field.errors %} + + {% endif %} + + + {% endfor %} +
      {{ field.label_tag }} + {{ field }} + + {{ field.help_text }} + + {{ field.errors }} +
      - +
      {% endblock %} diff --git a/DJAGEN/trunk/djagen/templates/main/searchresult.html b/DJAGEN/trunk/djagen/templates/main/searchresult.html new file mode 100755 index 0000000..522effb --- /dev/null +++ b/DJAGEN/trunk/djagen/templates/main/searchresult.html @@ -0,0 +1,102 @@ +{% extends "main/base.html" %} + + + {% block body %} + {% if entries_list|length %} + {% for entry in p_entries_list.object_list|slice:items_per_page %} + {% autoescape off %} + + {% ifequal entry.entry_id.is_approved 1 %} + + {% ifchanged entry.date.day entry.date.month entry.date.year %}
      {% endifchanged %} + + {% ifchanged %}

      {{ entry.date|date:"d F Y" }}

      {% endifchanged %} + +
      + + +

      {{ entry.title }}

      +

      + Yazar: {{ entry.entry_id.author_name }} {{ entry.entry_id.author_surname }} + Tarih: {{ entry.date|date:"d F Y H:i" }} +

      +
      + {{ entry.content_html|truncatewords_html:truncate_words }} +
      + {% endifequal %} + {% endautoescape %} + +
      + + + {% endfor %} + + + +{% else %} + + Sayfa {{ p_entries_list.number }} / {{ p_entries_list.paginator.num_pages }} + + +
      + {% if p_entries_list.has_previous %} + Geri + {% endif %} + | + + {% for pNum in p_entries_list.paginator.page_range %} + {% ifequal pNum p_entries_list.number %} + {{ pNum }} + {% else %} + {{ pNum }} + {% endifequal %} + {% endfor %} + + | + {% if p_entries_list.has_next %} + İleri + {% endif %} +
      + + + + +{% endif %} +{% else %} +
      +
      +

      Gösterecek veri yok!

      +
      +{% endif %} + {% endblock %} + diff --git a/DJAGEN/trunk/djagen/urls.py b/DJAGEN/trunk/djagen/urls.py index dd9ddca..a02ac30 100755 --- a/DJAGEN/trunk/djagen/urls.py +++ b/DJAGEN/trunk/djagen/urls.py @@ -28,7 +28,8 @@ urlpatterns = patterns('', (r'^archive/(?P\d{4})/$', archive), (r'^archive/(?P\d{4})/(?P\d{1,2})/$', archive), (r'^archive/(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/$', archive), - (r'^query/$',query), + (r'^search/$',query), + (r'^archives/$', list_archives) ) urlpatterns += patterns('', url(r'^captcha/', include('captcha.urls')),