Merge branch 'archweb' into archweb-generic2

Conflicts:
	devel/views.py
	feeds.py
	public/views.py
	settings.py
	sitestatic/archweb.js
	templates/base.html
	templates/devel/profile.html
	templates/mirrors/status.html
	templates/news/view.html
	templates/packages/flaghelp.html
	templates/packages/opensearch.xml
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/registration/login.html
	templates/releng/results.html
	templates/todolists/public_list.html

1 files changed, 42 insertions, 23 deletions

diff --git a/templates/packages/details.html b/templates/packages/details.html
index e4ae0781..36c422b2 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -72,6 +72,17 @@
         {% endif %}{% endwith %}
     </div>
 
+    <div itemscope itemtype="http://schema.org/SoftwareApplication">
+    <meta itemprop="name" content="{{ pkg.pkgname|escape }}"/>
+    <meta itemprop="version" content="{{ pkg.full_version|escape }}"/>
+    <meta itemprop="softwareVersion" content="{{ pkg.full_version|escape }}"/>
+    <meta itemprop="fileSize" content="{{ pkg.compressed_size }}"/>
+    <meta itemprop="dateCreated" content="{{ pkg.build_date|date:"Y-m-d" }}"/>
+    <meta itemprop="datePublished" content="{{ pkg.last_update|date:"Y-m-d" }}"/>
+    <meta itemprop="operatingSystem" content="Linux"/>
+    <div style="display:none" itemprop="provider" itemscope itemtype="http://schema.org/Person">
+        <meta itemprop="name" content="{{ pkg.packager.get_full_name|escape }}"/>
+    </div>
     <table id="pkginfo">
         <tr>
             <th>Architecture:</th>
@@ -86,26 +97,26 @@
         {% with pkg.split_packages as splits %}{% if splits %}
         <tr>
             <th>Split Packages:</th>
-            <td class="wrap">{% for s in splits %}{% pkg_details_link s %}{% if not forloop.last %}, {% endif %}{% endfor %}</td>
+            <td class="wrap relatedto">{% for s in splits %}<span class="related">{% pkg_details_link s %}{% if not forloop.last %}, {% endif %}</span>{% endfor %}</td>
         </tr>
         {% endif %}{% endwith %}
         {% else %}
         <tr>
             <th>Base Package:</th>
-            {% if pkg.base_package %}
-            <td>{% pkg_details_link pkg.base_package %}</td>
+            {% with pkg.base_package as base %}{% if base %}
+            <td>{% pkg_details_link base %}</td>
             {% else %}
             <td><a href="../{{ pkg.pkgbase }}/"
                     title="Split package details for {{ pkg.pkgbase }}">{{ pkg.pkgbase }}</a></td>
-            {% endif %}
+            {% endif %}{% endwith %}
         </tr>
         {% endifequal %}
         <tr>
             <th>Description:</th>
-            <td class="wrap">{{ pkg.pkgdesc|default:"" }}</td>
+            <td class="wrap" itemprop="description">{{ pkg.pkgdesc|default:"" }}</td>
         </tr><tr>
             <th>Upstream URL:</th>
-            <td>{% if pkg.url %}<a href="{{ pkg.url }}"
+            <td>{% if pkg.url %}<a itemprop="url" href="{{ pkg.url }}"
                     title="Visit the website for {{ pkg.pkgname }}">{{ pkg.url|url_unquote }}</a>{% endif %}</td>
         </tr><tr>
             <th>License(s):</th>
@@ -120,22 +131,29 @@
             </td>
         </tr>
         {% endif %}{% endwith %}
-        {% with pkg.provides.all as provides %}{% if provides %}
+        {% with pkg.provides.all as all_related %}{% if all_related %}
         <tr>
             <th>Provides:</th>
-            <td class="wrap">{{ provides|join:", " }}</td>
+            <td class="wrap relatedto">{% include "packages/details_relatedto.html" %}</td>
         </tr>
         {% endif %}{% endwith %}
-        {% with pkg.conflicts.all as conflicts %}{% if conflicts %}
+        {% with pkg.replaces.all as all_related %}{% if all_related %}
+        <tr>
+            <th>Replaces:</th>
+            <td class="wrap relatedto">{% include "packages/details_relatedto.html" %}</td>
+        </tr>
+        {% endif %}{% endwith %}
+        {% with pkg.conflicts.all as all_related %}{% if all_related %}
         <tr>
             <th>Conflicts:</th>
-            <td class="wrap">{{ conflicts|join:", " }}</td>
+            <td class="wrap relatedto">{% include "packages/details_relatedto.html" %}</td>
         </tr>
         {% endif %}{% endwith %}
-        {% with pkg.replaces.all as replaces %}{% if replaces %}
+        {% with pkg.reverse_conflicts as rev_conflicts %}{% if rev_conflicts %}
         <tr>
-            <th>Replaces:</th>
-            <td class="wrap">{{ replaces|join:", " }}</td>
+            <th>Reverse Conflicts:</th>
+            <td class="wrap relatedto">{% for conflict in rev_conflicts %}
+                <span class="related">{% pkg_details_link conflict %}{% if not forloop.last %}, {% endif %}</span>{% endfor %}</td>
         </tr>
         {% endif %}{% endwith %}
         <tr>
@@ -165,13 +183,13 @@
             <td>{% with pkg.signer as signer %}{% if signer %}{% pgp_key_link pkg.signature.key_id signer.get_full_name %}{% else %}Unknown ({% pgp_key_link pkg.signature.key_id %}){% endif %}{% endwith %}</td>
         </tr><tr>
             <th>Signature Date:</th>
-            <td>{{ pkg.signature.datetime|date:"DATETIME_FORMAT" }} UTC</td>
+            <td>{{ pkg.signature.creation_time|date:"DATETIME_FORMAT" }} UTC</td>
         </tr>{% else %}<tr>
             <th>Signed By:</th>
             <td>Unsigned</td>
         </tr>{% endif %}<tr>
             <th>Last Updated:</th>
-            <td>{{ pkg.last_update|date }}</td>
+            <td>{{ pkg.last_update|date:"DATETIME_FORMAT" }} UTC</td>
         </tr>
         {% if user.is_authenticated %}{% with pkg.flag_request as flag_request %}{% if flag_request %}<tr>
             <th>Last Flag Request:</th>
@@ -179,29 +197,27 @@
                 <div class="userdata">{{ flag_request.message|linebreaksbr|default:"{no message}" }}</div></td>
         </tr>{% endif %}{% endwith %}{% endif %}
     </table>
+    </div>
 
     <div id="metadata">
-
         {% with pkg.get_depends as deps %}
         <div id="pkgdeps" class="listing">
             <h3 title="{{ pkg.pkgname }} has the following dependencies">
                 Dependencies ({{deps|length}})</h3>
-            {% if deps %}<ul>
+            {% if deps %}<ul id="pkgdepslist">
                 {% for depend in deps %}{% include "packages/details_depend.html" %}{% endfor %}
             </ul>{% endif %}
         </div>
         {% endwith %}
-
         {% with pkg.get_requiredby as rqdby %}
         <div id="pkgreqs" class="listing">
             <h3 title="Packages that require {{ pkg.pkgname }}">
                 Required By ({{rqdby|length}})</h3>
-            {% if rqdby %}<ul>
+            {% if rqdby %}<ul id="pkgreqslist">
                 {% for req in rqdby %}{% include "packages/details_requiredby.html" %}{% endfor %}
             </ul>{% endif %}
         </div>
         {% endwith %}
-
         <div id="pkgfiles" class="listing">
             <h3 title="Complete list of files contained within this package">
                 Package Contents</h3>
@@ -211,14 +227,17 @@
                     View the file list for {{ pkg.pkgname }}</a></p>
             </div>
         </div>
-
     </div>
-
 </div>
 
 {% load cdn %}{% jquery %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
-$(document).ready(ajaxifyFiles);
+$(document).ready(function() {
+        ajaxifyFiles();
+        collapseDependsList("#pkgdepslist");
+        collapseDependsList("#pkgreqslist");
+        collapseRelatedTo(".relatedto");
+});
 </script>
 {% endblock %}