Merge branch 'archweb-generic'

# Conflicts:
#	public/tests.py
#	templates/base.html

2 files changed, 28 insertions, 11 deletions

diff --git a/templates/base.html b/templates/base.html
index dd8e7a61..228ad65a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -66,16 +66,28 @@
             </div>
         {% endblock %}
         <div id="footer">
-            <p>Copyleft 2009-{% now "Y" %} Parabola Project. All content is
+            <p>Copyright © 2009-{% now "Y" %} Parabola Project. All content is
             released under the <a
               href="http://creativecommons.org/licenses/by-sa/3.0/"
               rel="license">cc by-sa 3.0 unported</a> license.</p>
             <p>Website software and layout is derivative of archweb, 
-            Copyright &copy; 2002-{% now "Y" %} <a href="mailto:jvinet@zeroflux.org"
+               Copyright © 2002-{% now "Y" %} <a href="mailto:jvinet@zeroflux.org"
                 title="Contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org"
                 title="Contact Aaron Griffin">Aaron Griffin</a>.</p>
         </div>
     </div>
+    <script type="application/ld+json">
+    {
+       "@context": "http://schema.org",
+       "@type": "WebSite",
+       "url": "{{ domain }}/",
+       "potentialAction": {
+         "@type": "SearchAction",
+         "target": "{{ domain }}/packages/?q={search_term}",
+         "query-input": "required name=search_term"
+       }
+    }
+    </script>
     {% block script_block %}{% endblock %}
 </body>
 </html>
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index c3ee57f8..4ae25fb0 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -22,16 +22,18 @@
         {% endif %}
     </ul>
 
-    <p class="todo-info">{{ list.created|date }} - {{ list.creator.get_full_name }}</p>
+    <div class="todo-info">{{ list.created|date }} - {{ list.creator.get_full_name }}</div>
 
-    <div>{{list.description|urlize|linebreaks}}</div>
-
-    <p>Link to lists of pkgbase values:</p>
-    <ul>{% for svn_root in svn_roots %}
-        <li><a href="pkgbases/{{ svn_root }}/">{{ svn_root }}</a></li>
-    {% endfor %}</ul>
+    <div class="todo-description">
+        {{list.stripped_description|default:'(no description)'|urlize|linebreaks}}
+    </div>
 
-    <p>{{ list.packages|length }} total todo list package{{ list.packages|pluralize }} found.</p>
+    <div class="todo-pkgbases">
+        <p>Link to lists of pkgbase values:</p>
+        <ul>{% for svn_root in svn_roots %}
+            <li><a href="pkgbases/{{ svn_root }}/">{{ svn_root }}</a></li>
+        {% endfor %}</ul>
+    </div>
 
     <div class="box filter-criteria">
         <h3>Filter Todo List Packages</h3>
@@ -54,7 +56,10 @@
                 <input type="checkbox" name="incomplete" id="id_incomplete" value="incomplete"/></div>
             <div ><label>&nbsp;</label><input title="Reset search criteria" type="button" id="criteria_reset" value="Reset"/></div>
             <div class="clear"></div>
-            <div id="filter-info"><span id="filter-count">{{ list.packages|length }}</span> todo list packages displayed.</div>
+            <div id="filter-info">
+                <span id="filter-count">{{ list.packages|length }}</span> packages displayed out of
+                {{ list.packages|length }} total package{{ list.packages|pluralize }}.
+            </div>
         </fieldset>
         </form>
     </div>