From 1eacc7a42618e84766477fbcc2c32a1da3547115 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Mon, 10 Aug 2009 21:40:01 -0400
Subject: untested commit. merged Adolfos mods, validated most of html, slugify
 urls, fixed IE issues in openid signin

---
 templates/index.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'templates/index.html')

diff --git a/templates/index.html b/templates/index.html
index a1ab06a4..964721f7 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -32,7 +32,7 @@
     {% for question in questions %}
     <div class="qstA">
         <h2>
-            <a href="{{ question.get_absolute_url }}" title="{{ question.summary }}...">
+            <a href="{{ question.get_absolute_url }}" title="{{ question.summary|collapse }}...">
             {{ question.get_question_title }}
             </a>
         </h2>
@@ -51,7 +51,7 @@
             </table>
         </div>
         <div class="summary">
-            {{ question.summary }}...
+            {{ question.summary}}...
         </div>
         {% if question.wiki %}
         <span class="from wiki">{% trans "community wiki" %}</span>
@@ -79,7 +79,7 @@
 <div class="boxA">
 	<h3>{% trans "welcome to website" %}</h3>
 	<div class="body">
-      {{ settings.APP_INTRO|safe }}
+      {{settings.APP_INTRO|safe}}
 	  <div class="more"><a href="/about">{% trans "about" %} »</a></div>
 	  <div class="more"><a href="/faq">{% trans "faq" %} »</a></div>
 	</div>
@@ -88,15 +88,16 @@
 <div class="boxB">
 	<h3>{% trans "Recent tags" %}</h3>
 	<div class="body">
-         <p class="tagsbox">
+         <div class="tags">
         {% for tag in tags %}
             <a rel="tag" 
 				title="{% blocktrans with tag.name as tagname %}see questions tagged '{{tagname}}'{% endblocktrans %}" href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
         {% endfor %}
-        </p>
+        </div>
         <div class="more"><a href="/tags">{% trans "popular tags" %} »</a> </div>
     </div>
 </div>
+{% if awards %}
 <div class="boxB">
     <h3>{% trans "Recent awards" %}</h3>
         <div class="body">
@@ -112,6 +113,7 @@
         	<div class="more"><a href="/badges/">{% trans "all awards" %} »</a> </div>
          </div>
 </div>
+{% endif %}
 <div id="feeds">
 <a href="/feeds/rss" title="{% trans "subscribe to last 30 questions by RSS" %}">{% trans "subscribe to the questions feed" %}</a>
 </div>
-- 
cgit v1.2.3-1-g7c22