From f19b45e0d63d4c18c11b893912946ef2573a17bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mustafa=20Ar=C4=B1c=C4=B1?= <mustafa.arici90@gmail.com>
Date: Sun, 8 Aug 2010 13:29:29 +0000
Subject: [PATCH] Proper messages for users are added under contenttop div.

---
 .../mustafa_branch/djagen/collector/views.py  |  5 +-
 .../djagen/gezegen/www/layout.css             |  2 +-
 .../djagen/templates/main/base.html           | 60 +++++++++++--------
 3 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/DJAGEN/branches/mustafa_branch/djagen/collector/views.py b/DJAGEN/branches/mustafa_branch/djagen/collector/views.py
index dce141a..a9fbb30 100755
--- a/DJAGEN/branches/mustafa_branch/djagen/collector/views.py
+++ b/DJAGEN/branches/mustafa_branch/djagen/collector/views.py
@@ -161,7 +161,7 @@ def query(request):
 
 
 def archive(request,archive_year=None,archive_month=None,archive_day=None):
-    info_area = 'query'
+    info_area = 'archive'
     # This setting gets the content truncated which contains more than <truncate_words> words.
     truncate_words = 250
     items_per_page = 25
@@ -255,6 +255,9 @@ def archive(request,archive_year=None,archive_month=None,archive_day=None):
                         'items_per_page':repr(items_per_page),
                         'run_time':run_time,
                         'info_area':info_area,
+                        'archive_year' : archive_year,
+                        'archive_month' : archive_month,
+                        'archive_day' : archive_day,
                         'q_author_name':q_author_name,
                         'q_author_surname':q_author_surname,
                         'q_text':q_text,
diff --git a/DJAGEN/branches/mustafa_branch/djagen/gezegen/www/layout.css b/DJAGEN/branches/mustafa_branch/djagen/gezegen/www/layout.css
index 16c6b88..e5197fc 100755
--- a/DJAGEN/branches/mustafa_branch/djagen/gezegen/www/layout.css
+++ b/DJAGEN/branches/mustafa_branch/djagen/gezegen/www/layout.css
@@ -182,7 +182,7 @@ body {
 
 .contenttop {
 	background:url(img/bg_slice.png) no-repeat scroll transparent;
-	height:37px;
+	height:45px;
 	width:950px;
 }
 
diff --git a/DJAGEN/branches/mustafa_branch/djagen/templates/main/base.html b/DJAGEN/branches/mustafa_branch/djagen/templates/main/base.html
index db317ee..610145e 100755
--- a/DJAGEN/branches/mustafa_branch/djagen/templates/main/base.html
+++ b/DJAGEN/branches/mustafa_branch/djagen/templates/main/base.html
@@ -61,36 +61,48 @@
 		<div class="contenttop">
 
 		{% if info_area == "main" %}
-		<p>Gezegen her 10 dakikada bir yenilenir. Son güncelleme: {{ run_time.get_run_time }}</p>
+		<p>Gezegen her <b>10</b> dakikada bir yenilenir. Son güncelleme: <b>{{ run_time.get_run_time }}</b></p>
 		{% endif %}
 
 		{% if info_area == "archive" %}
-			<p>Gezegen arşivi: <b>{{ archive_year }}</b> yılı,
-			{% if archive_month %}
-			<b>{{ archive_month }}</b>. ay,
-			{% endif %}
-			{% if archive_day %}
-			<b>{{ archive_day }}</b>. gün
-			{% endif %}
-			arşivini gezmektesiniz. Bu arşivde toplam <b>{{ entries_list|length }}</b> blog girdisi mevcuttur.</p>
+			{% if entries_list|length %}
+				<p>{% if archive_year %}
+				<b>{{ archive_year }}</b> yılı,
+				{% endif %}
+				{% if archive_month %}
+				<b>{{ archive_month }}</b>. ayı,
+				{% endif %}
+				{% if archive_day %}
+				<b>{{ archive_day }}</b>. günü
+				{% endif %}
+
+				{% if q_author_name or q_author_surname %}
+					{% if q_author_name %}
+						<b>{{ q_author_name }}</b> isimli,
+					{% endif %}
+					{% if q_author_surname %}
+						<b>{{ q_author_surname }}</b> soyisimli,
+					{% endif %}
+					yazara ait
+				{% endif %}
+
+				{% if q_text %}
+					içinde <b>"{{ q_text|truncatewords:4 }} ..."</b> geçen yazıların olduğu
+				{% endif %}
+				{% if archive_year or q_author_name or q_author_surname or q_text %}
+				gezegen
+				{% else %}
+				Gezegen
+				{% endif %}
+				 arşivini gezmektesiniz.
+	Bu arşivde toplam <b>{{ entries_list|length }}</b> blog girdisi mevcuttur.</p>
+		{% else %}
+		<p><img src="/djagenmedia/img/warning.png" width="25" height="25" /> Bu kriterlere ait herhangi bir girdi <b>bulunmuyor</b>!</p>
 		{% endif %}
+	{% endif %}
 
 		{% if info_area == "query" %}
-			<p>Aradığınız kriterler:
-			{% if q_author_name or q_author_surname %}
-				 {% if q_author_name %}
-				 	<b>{{ q_author_name }}</b>
-				 {% endif %}
-
-				 {% if q_author_surname %}
-				 	<b> {{ q_author_surname }}</b>
-				 {% endif %}
-				 isimli yazarlar
-			{% endif %}
-
-			{% if q_text %}
-				İçinde <b>{{ q_text|truncatewords:8 }}</b> geçen girdiler
-			{% endif %}.</p>
+			<p>Lütfen aramak istediğiniz kriterleri giriniz.</p>
 		{% endif %}