From 6568706a83a94faa18a715ec5e50a6282dc85c1a Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Mon, 27 Jul 2009 20:44:51 -0400
Subject: added APP_TITLE, APP_KEYWORDS and APP_DESCRIPTION

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

(limited to 'templates/index.html')

diff --git a/templates/index.html b/templates/index.html
index 2ef66d4e..db2bb12e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,8 +4,8 @@
 {% load humanize %}
 {% load extra_filters %}
 {% block title %}{% spaceless %}{% trans "Home" %}{% endspaceless %}{% endblock %}
-{% block meta %}<meta name="keywords" content="{% trans "meta site keywords, comma separated" %}" />
-        <meta name="description" content="{% trans "meta site content" %}" />{% endblock %}
+{% block meta %}<meta name="keywords" content="{{ APP_KEYWORDS }}" />
+        <meta name="description" content="{{ APP_DESCRIPTION }}" />{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
         $().ready(function(){
@@ -78,8 +78,7 @@
 <div class="boxA">
 	<h3>{% trans "welcome to website" %}</h3>
 	<div class="body">
-	  <p>{% trans "what is this website" %}</p>
-	  <p>{% trans "what can one do on this website" %}</p>
+      {{ APP_INTRO|safe }}
 	  <div class="more"><a href="/about">{% trans "about" %} »</a></div>
 	  <div class="more"><a href="/faq">{% trans "faq" %} »</a></div>
 	</div>
-- 
cgit v1.2.3-1-g7c22


From ef8f66ba6c7a22c277c6315df8040365b5684e6c Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 5 Aug 2009 22:50:08 -0400
Subject: added anonymous posting, per-question subscription and fixes by
 Pothers and some more, see development.log

---
 templates/index.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'templates/index.html')

diff --git a/templates/index.html b/templates/index.html
index db2bb12e..a1ab06a4 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,11 +1,12 @@
 {% extends "base.html" %}
+<!-- index.html -->
 {% load i18n %}
 {% load extra_tags %}
 {% load humanize %}
 {% load extra_filters %}
 {% block title %}{% spaceless %}{% trans "Home" %}{% endspaceless %}{% endblock %}
-{% block meta %}<meta name="keywords" content="{{ APP_KEYWORDS }}" />
-        <meta name="description" content="{{ APP_DESCRIPTION }}" />{% endblock %}
+{% block meta %}<meta name="keywords" content="{{ settings.APP_KEYWORDS }}" />
+        <meta name="description" content="{{ settings.APP_DESCRIPTION }}" />{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
         $().ready(function(){
@@ -78,7 +79,7 @@
 <div class="boxA">
 	<h3>{% trans "welcome to website" %}</h3>
 	<div class="body">
-      {{ 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>
@@ -117,6 +118,7 @@
 {% endblock %}
 {% block tail %}
 <div style="padding:5px 0 5px 5px;">
-<span class="evenMore">{% trans "Still looking for more? See" %} <a href="/questions/">{% trans "complete list of quesionts" %}</a>, {% trans "or" %} <a href="/tags/">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="/questions/unanswered">{% trans "unanswered questions" %}</a>{% trans "." %}</span>
+<span class="evenMore">{% trans "Still looking for more? See" %} <a href="/questions/">{% trans "complete list of questions" %}</a> {% trans "or" %} <a href="/tags/">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="/questions/unanswered">{% trans "list of unanswered questions" %}</a>{% trans "." %}</span>
 </div>
 {% endblock %}
+<!-- index.html -->
-- 
cgit v1.2.3-1-g7c22


From 2d1e60db89453f2c12132d657551090c7ea92506 Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Sun, 9 Aug 2009 23:52:33 -0300
Subject: Included i18n for links site-wide. Hope there is no bit left.

---
 templates/index.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'templates/index.html')

diff --git a/templates/index.html b/templates/index.html
index a1ab06a4..239b0ff4 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -24,7 +24,7 @@
     	 <a id="latest" href="?sort=latest" title="{% trans "last updated questions" %}" >{% trans "newest" %}</a>
         <a id="hottest" href="?sort=hottest" title="{% trans "hottest questions" %}" >{% trans "hottest" %}</a>
         <a id="mostvoted" href="?sort=mostvoted" title="{% trans "most voted questions" %}" >{% trans "most voted" %}</a>
-        <a id="all" href="/questions/" title="{% trans "all questions" %}" >{% trans "all questions" %}</a>
+        <a id="all" href="{% url questions %}" title="{% trans "all questions" %}" >{% trans "all questions" %}</a>
     </div>
 </div>
 <!-- 问题列表 -->
@@ -80,8 +80,8 @@
 	<h3>{% trans "welcome to website" %}</h3>
 	<div class="body">
       {{ 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 class="more"><a href="{% url about %}">{% trans "about" %} »</a></div>
+	  <div class="more"><a href="{% url faq %}">{% trans "faq" %} »</a></div>
 	</div>
 </div>
 {% endif %}
@@ -94,7 +94,7 @@
 				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 class="more"><a href="/tags">{% trans "popular tags" %} »</a> </div>
+        <div class="more"><a href="{% url tags %}">{% trans "popular tags" %} »</a> </div>
     </div>
 </div>
 <div class="boxB">
@@ -103,13 +103,13 @@
              <ul class="badge-list">
              {% for award in awards %}
                 <li>
-                <a href="/badges/{{award.badge_id}}/{{award.badge_name}}" title="{{ award.badge_description }}" class="medal">
+                <a href="{% url badges %}{{award.badge_id}}/{{award.badge_name}}" title="{{ award.badge_description }}" class="medal">
                 <span class="badge{{ award.badge_type }}">&#9679;</span>&nbsp;{{ award.badge_name }}</a> {% trans "given to" %}
-                <a href="/users/{{award.user_id}}/{{award.user_name}}">{{ award.user_name }}</a>
+                <a href="{% url users %}{{award.user_id}}/{{award.user_name}}">{{ award.user_name }}</a>
                 </li>
             {% endfor %}
             </ul>
-        	<div class="more"><a href="/badges/">{% trans "all awards" %} »</a> </div>
+        	<div class="more"><a href="{% url badges %}">{% trans "all awards" %} »</a> </div>
          </div>
 </div>
 <div id="feeds">
@@ -118,7 +118,7 @@
 {% endblock %}
 {% block tail %}
 <div style="padding:5px 0 5px 5px;">
-<span class="evenMore">{% trans "Still looking for more? See" %} <a href="/questions/">{% trans "complete list of questions" %}</a> {% trans "or" %} <a href="/tags/">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="/questions/unanswered">{% trans "list of unanswered questions" %}</a>{% trans "." %}</span>
+<span class="evenMore">{% trans "Still looking for more? See" %} <a href="{% url questions %}">{% trans "complete list of questions" %}</a> {% trans "or" %} <a href="/tags/">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="{% url questions %}unanswered">{% trans "list of unanswered questions" %}</a>{% trans "." %}</span>
 </div>
 {% endblock %}
 <!-- index.html -->
-- 
cgit v1.2.3-1-g7c22


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


From 5c6fceae98c0916c94ec5b919950c67475f44b67 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 12 Aug 2009 15:26:56 -0400
Subject: merged Bruno url translations, removed his local mods, added
 settings.BOOKS_ON, validated more templates

---
 templates/index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'templates/index.html')

diff --git a/templates/index.html b/templates/index.html
index b358c384..104b24d0 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -21,9 +21,9 @@
 <div class="tabBar">
     <div class="headQuestions">{% trans "Questions" %}</div>
     <div class="tabsA">
-    	 <a id="latest" href="?sort=latest" title="{% trans "last updated questions" %}" >{% trans "newest" %}</a>
-        <a id="hottest" href="?sort=hottest" title="{% trans "hottest questions" %}" >{% trans "hottest" %}</a>
-        <a id="mostvoted" href="?sort=mostvoted" title="{% trans "most voted questions" %}" >{% trans "most voted" %}</a>
+    	 <a id="latest" href="{% url questions %}?sort=latest" title="{% trans "last updated questions" %}" >{% trans "newest" %}</a>
+        <a id="hottest" href="{% url questions %}?sort=hottest" title="{% trans "hottest questions" %}" >{% trans "hottest" %}</a>
+        <a id="mostvoted" href="{% url questions %}?sort=mostvoted" title="{% trans "most voted questions" %}" >{% trans "most voted" %}</a>
         <a id="all" href="{% url questions %}" title="{% trans "all questions" %}" >{% trans "all questions" %}</a>
     </div>
 </div>
@@ -93,7 +93,7 @@
             <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="{% url tags %}">{% trans "popular tags" %} »</a> </div>
     </div>
 </div>
-- 
cgit v1.2.3-1-g7c22


From 7e4f1d542e00b4d3121da6ae5524e95867f2371b Mon Sep 17 00:00:00 2001
From: root <root@u15356270.onlinehome-server.com>
Date: Fri, 13 Nov 2009 20:18:55 -0500
Subject: better comments, email subscriptions, corrected view counter, some
 ie7 issues, wiki optional with settings.WIKI_ON, site can be mounted on
 arbitrary url prefix, english language improvements, added feedback form,
 versioned css and js files to force browser cache reload when
 settings.RESOURCE_REVISION is incremented , other fixes

---
 templates/index.html | 60 ++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 13 deletions(-)

(limited to 'templates/index.html')

diff --git a/templates/index.html b/templates/index.html
index 104b24d0..470612b4 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,6 +4,7 @@
 {% load extra_tags %}
 {% load humanize %}
 {% load extra_filters %}
+{% load smart_if %}
 {% block title %}{% spaceless %}{% trans "Home" %}{% endspaceless %}{% endblock %}
 {% block meta %}<meta name="keywords" content="{{ settings.APP_KEYWORDS }}" />
         <meta name="description" content="{{ settings.APP_DESCRIPTION }}" />{% endblock %}
@@ -32,30 +33,31 @@
     {% for question in questions %}
     <div class="qstA">
         <h2>
-            <a href="{{ question.get_absolute_url }}" title="{{ question.summary|collapse }}...">
-            {{ question.get_question_title }}
-            </a>
+            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
         </h2>
         <div class="stat">
             <table>
-	            <tr>
+                <tr>
                     <td><span class="num">{{ question.answer_count|intcomma }}</span> </td>
                     <td><span class="num">{{ question.score|intcomma }}</span> </td>
                     <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
-	            </tr>  
+                </tr>  
                 <tr>
                     <td><span class="unit">{% trans "answers" %}</span></td>
                     <td><span class="unit">{% trans "votes" %}</span></td>
                     <td><span class="unit">{% trans "views" %}</span></td>
-	            </tr> 
+                </tr> 
             </table>
         </div>
+        
         <div class="summary">
-            {{ question.summary}}...
+            {{ question.summary }}...                
         </div>
-        {% if question.wiki %}
+        
+        {% ifequal tab_id 'active'%}
+        {% if question.wiki and settings.WIKI_ON %}
         <span class="from wiki">{% trans "community wiki" %}</span>
-        <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
         {% else %}
         <div class="from">
             {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}
@@ -64,6 +66,38 @@
             <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
         </div>
         {% endif %}
+        {% else %}
+        {% if question.wiki and settings.WIKI_ON %}
+        <span class="from wiki">{% trans "community wiki" %}</span>
+        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+        {% else %}
+        <div class="from">
+            {% comment %}{% gravatar question.author 24 %}{% endcomment %}
+            {% if question.last_activity_at != question.added_at %}
+                {% if question.author.id != question.last_activity_by.id %}
+                    {% trans "Posted:" %}
+                    <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+                    <span class="score">{% get_score_badge question.author %} </span>
+                    / {% trans "Updated:" %}
+                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
+                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+                {% else %}
+                    {% trans "Updated:" %}
+                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
+                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+                {% endif %}
+            {% else %}
+                {% trans "Posted:" %}
+                <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+                <span class="score">{% get_score_badge question.author %} </span>
+                <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+            {% endif %}
+        </div>
+        {% endif %}
+        {% endifequal %}
+        
         <div class="tags">
         {% for tag in question.tagname_list %}
         <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
@@ -85,7 +119,7 @@
 	</div>
 </div>
 {% endif %}
-<div class="boxB">
+<div class="boxC">
 	<h3>{% trans "Recent tags" %}</h3>
 	<div class="body">
          <div class="tags">
@@ -98,7 +132,7 @@
     </div>
 </div>
 {% if awards %}
-<div class="boxB">
+<div class="boxC">
     <h3>{% trans "Recent awards" %}</h3>
         <div class="body">
              <ul class="badge-list">
@@ -115,12 +149,12 @@
 </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>
+<a href="{% href "/feeds/rss" %}" title="{% trans "subscribe to last 30 questions by RSS" %}">{% trans "subscribe to the questions feed" %}</a>
 </div>
 {% endblock %}
 {% block tail %}
 <div style="padding:5px 0 5px 5px;">
-<span class="evenMore">{% trans "Still looking for more? See" %} <a href="{% url questions %}">{% trans "complete list of questions" %}</a> {% trans "or" %} <a href="/tags/">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="{% url questions %}unanswered">{% trans "list of unanswered questions" %}</a>{% trans "." %}</span>
+<span class="evenMore">{% trans "Still looking for more? See" %} <a href="{% url questions %}">{% trans "complete list of questions" %}</a> {% trans "or" %} <a href="{% url tags %}">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="{% url questions %}unanswered">{% trans "list of unanswered questions" %}</a>{% trans "." %}</span>
 </div>
 {% endblock %}
 <!-- index.html -->
-- 
cgit v1.2.3-1-g7c22


From 9655bd421022dd6488b21184cc9fd0242c6b345e Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Tue, 8 Dec 2009 22:50:45 -0500
Subject: added interesting and ignored tag selectors (works) and per-tag
 subscription (not tested yet)

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

(limited to 'templates/index.html')

diff --git a/templates/index.html b/templates/index.html
index 470612b4..68a13197 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -10,13 +10,15 @@
         <meta name="description" content="{{ settings.APP_DESCRIPTION }}" />{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
-        $().ready(function(){
-            var tab_id = "{{ tab_id }}";
-            $("#"+tab_id).attr('className',"on");
-            $("#nav_questions").attr('className',"on");
-        });
-
-        </script>
+           var tags = {{ tags_autocomplete|safe }};
+           $().ready(function(){
+               var tab_id = "{{ tab_id }}";
+               $("#"+tab_id).attr('className',"on");
+               $("#nav_questions").attr('className',"on");
+           });
+       </script>
+       <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+       <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
 {% endblock %}
 {% block content %}
 <div class="tabBar">
@@ -118,6 +120,8 @@
 	  <div class="more"><a href="{% url faq %}">{% trans "faq" %} »</a></div>
 	</div>
 </div>
+{% else %}
+{% include "tag_selector.html" %}
 {% endif %}
 <div class="boxC">
 	<h3>{% trans "Recent tags" %}</h3>
-- 
cgit v1.2.3-1-g7c22


From 4be0491e6adef6bf5817545ec9e050555066352f Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 9 Dec 2009 12:13:32 -0500
Subject: better selector of ignored questions, split javascript tag_selector
 into separate file, fixed question counter messages in the english lang file

---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/index.html')

diff --git a/templates/index.html b/templates/index.html
index 68a13197..4041b863 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -18,7 +18,7 @@
            });
        </script>
        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
-       <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
+       <script type='text/javascript' src='{% href "/content/js/com.cnprog.tag_selector.js" %}'></script>
 {% endblock %}
 {% block content %}
 <div class="tabBar">
-- 
cgit v1.2.3-1-g7c22