diff options
Diffstat (limited to 'templates')
22 files changed, 36 insertions, 33 deletions
diff --git a/templates/base.html b/templates/base.html index 3bae7285..cf65ce8e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,6 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<!DOCTYPE html> +<html lang="en"> <head> <title>{% block title %}Parabola GNU/Linux-libre{% endblock %}</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> diff --git a/templates/devel/clock.html b/templates/devel/clock.html index 1f9f51d2..2eafd529 100644 --- a/templates/devel/clock.html +++ b/templates/devel/clock.html @@ -40,7 +40,7 @@ </table> </div> {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/jquery.tablesorter.js"></script> +<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> <script type="text/javascript" src="/media/archweb.js"></script> <script type="text/javascript"> $(document).ready(function() { diff --git a/templates/devel/index.html b/templates/devel/index.html index 2c94c9e3..ad024a34 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -288,7 +288,7 @@ {% endcache %} {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/jquery.tablesorter.js"></script> +<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> <script type="text/javascript" src="/media/archweb.js"></script> <script type="text/javascript"> $(document).ready(function() { diff --git a/templates/devel/packages.html b/templates/devel/packages.html index 108ac3e7..bd126593 100644 --- a/templates/devel/packages.html +++ b/templates/devel/packages.html @@ -52,7 +52,7 @@ </table> </div> {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/jquery.tablesorter.js"></script> +<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> <script type="text/javascript" src="/media/archweb.js"></script> <script type="text/javascript"> $(document).ready(function() { diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index a7cc4d75..0f071b8c 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -105,7 +105,7 @@ </table> </div> {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/jquery.tablesorter.js"></script> +<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> <script type="text/javascript" src="/media/archweb.js"></script> <script type="text/javascript"> $(document).ready(function() { diff --git a/templates/mirrors/mirrors.html b/templates/mirrors/mirrors.html index 87315005..c9ab46db 100644 --- a/templates/mirrors/mirrors.html +++ b/templates/mirrors/mirrors.html @@ -41,7 +41,7 @@ </table> </div> {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/jquery.tablesorter.js"></script> +<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> <script type="text/javascript"> $(document).ready(function() { $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0], [2,0]]}); diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html index afeb38c6..f315f7c3 100644 --- a/templates/mirrors/status.html +++ b/templates/mirrors/status.html @@ -102,7 +102,7 @@ </div> {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/jquery.tablesorter.js"></script> +<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> <script type="text/javascript" src="/media/archweb.js"></script> <script type="text/javascript"> $(document).ready(function() { diff --git a/templates/packages/details.html b/templates/packages/details.html index 4570627f..d0e60ab2 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -132,7 +132,7 @@ {% with pkg.maintainers as maints %} <td>{% if maints %} {% for m in maints %} - {% userpkgs m %}<br/> + {% maintainer_link m %}<br/> {% endfor %} {% else %}Orphan{% endif %} </td> @@ -145,7 +145,7 @@ <td>{{ pkg.installed_size|filesizeformat }}</td> </tr><tr> <th>Last Packager:</th> - <td>{% with pkg.packager as pkgr %}{% if pkgr %}{% userpkgs pkgr %}{% else %}{{ pkg.packager_str }}{% endif %}{% endwith %}</td> + <td>{% with pkg.packager as pkgr %}{% if pkgr %}{% packager_link pkgr %}{% else %}{{ pkg.packager_str }}{% endif %}{% endwith %}</td> </tr><tr> <th>Signed:</th> <td>{{ pkg.is_signed|yesno|capfirst }}</td> diff --git a/templates/packages/differences.html b/templates/packages/differences.html index f0d596bd..0412f8c2 100644 --- a/templates/packages/differences.html +++ b/templates/packages/differences.html @@ -87,7 +87,7 @@ </table> </div> {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/jquery.tablesorter.js"></script> +<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> <script type="text/javascript" src="/media/archweb.js"></script> <script type="text/javascript"> $(document).ready(function() { diff --git a/templates/packages/files.html b/templates/packages/files.html index 78a40def..8cf6738d 100644 --- a/templates/packages/files.html +++ b/templates/packages/files.html @@ -8,9 +8,9 @@ <h2>Package File List: {{ pkg.pkgname }} {{ pkg.full_version }}</h2> <div id="metadata"> <p><a href="{{ pkg.get_absolute_url }}">Back to Package</a></p> - {% include "packages/files-list.html" %} + <p>Package has {{ files_count }} file{{ files_count|pluralize }} and {{ dir_count }} director{{ dir_count|pluralize:"y,ies" }}.</p> + {% include "packages/files_list.html" %} </div> </div> {% endblock %} - diff --git a/templates/packages/files-list.html b/templates/packages/files_list.html index 95a85d24..156d8588 100644 --- a/templates/packages/files-list.html +++ b/templates/packages/files_list.html @@ -5,9 +5,8 @@ of the package; it may be out of date.</p> {% if pkg.files_last_update %} {% if files|length %} <ul> - {% for file in files %} - <li>{{ file.directory }}{{ file.filename|default:'' }}</li> - {% endfor %} +{% for file in files %} +<li>{{ file.directory }}{{ file.filename|default:'' }}</li>{% endfor %} </ul> {% else %} <p class="message">Package has no files.</p> diff --git a/templates/packages/groups.html b/templates/packages/groups.html index d2b09de0..941ec8de 100644 --- a/templates/packages/groups.html +++ b/templates/packages/groups.html @@ -28,7 +28,7 @@ </table> </div> {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/jquery.tablesorter.js"></script> +<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> <script type="text/javascript"> $(document).ready(function() { $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0], [0,0]]}); diff --git a/templates/packages/packages_list.html b/templates/packages/packages_list.html index 0467b0eb..ed376705 100644 --- a/templates/packages/packages_list.html +++ b/templates/packages/packages_list.html @@ -40,7 +40,7 @@ </table> </div> {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/jquery.tablesorter.js"></script> +<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> <script type="text/javascript"> $(document).ready(function() { $(".results").tablesorter({widgets: ['zebra'], sortList: [[2,0]]}); diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html index 4ed26a40..c24774a9 100644 --- a/templates/packages/signoffs.html +++ b/templates/packages/signoffs.html @@ -79,7 +79,7 @@ </table> </div> {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/jquery.tablesorter.js"></script> +<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> <script type="text/javascript" src="/media/archweb.js"></script> <script type="text/javascript"> $(document).ready(function() { diff --git a/templates/packages/stale_relations.html b/templates/packages/stale_relations.html index 674a846e..6cff8d3d 100644 --- a/templates/packages/stale_relations.html +++ b/templates/packages/stale_relations.html @@ -106,7 +106,7 @@ </div> {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/jquery.tablesorter.js"></script> +<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> <script type="text/javascript" src="/media/archweb.js"></script> <script type="text/javascript"> $(document).ready(function() { diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html index 5aa4c6b2..83c62952 100644 --- a/templates/public/developer_list.html +++ b/templates/public/developer_list.html @@ -18,7 +18,7 @@ </td> <td> <a name="{{ dev.username }}"></a> - <table class="bio bio-{{ dev.username }}" cellspacing="0"> + <table class="bio bio-{{ dev.username }}"> <tr> <th>Name:</th> <td>{{ dev.get_full_name }}{% if prof.latin_name %} ({{ prof.latin_name}}){% endif %}</td> diff --git a/templates/releng/iso_overview.html b/templates/releng/iso_overview.html index 64f1c713..8280f100 100644 --- a/templates/releng/iso_overview.html +++ b/templates/releng/iso_overview.html @@ -30,7 +30,7 @@ </table> </div> {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/jquery.tablesorter.js"></script> +<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> <script type="text/javascript" src="/media/archweb.js"></script> <script type="text/javascript"> $(document).ready(function() { diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html index 90827cd6..845d330d 100644 --- a/templates/releng/result_list.html +++ b/templates/releng/result_list.html @@ -33,7 +33,7 @@ </table> </div> {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/jquery.tablesorter.js"></script> +<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> <script type="text/javascript" src="/media/archweb.js"></script> <script type="text/javascript"> $(document).ready(function() { diff --git a/templates/todolists/list.html b/templates/todolists/list.html index ac93aade..38d491d9 100644 --- a/templates/todolists/list.html +++ b/templates/todolists/list.html @@ -43,7 +43,7 @@ </table> </div> {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/jquery.tablesorter.js"></script> +<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> <script type="text/javascript"> $(document).ready(function() { // I'm not sure why it didn't autodetect digit, but it has to be explicit diff --git a/templates/todolists/public_list.html b/templates/todolists/public_list.html index 839122dc..fcb77c65 100644 --- a/templates/todolists/public_list.html +++ b/templates/todolists/public_list.html @@ -65,7 +65,7 @@ </div> {% endif %} {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/jquery.tablesorter.js"></script> +<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> <script type="text/javascript"> $(document).ready(function() { $(".results").tablesorter({widgets: ['zebra'], sortList: [[0,0], [1,0]]}); diff --git a/templates/todolists/view.html b/templates/todolists/view.html index 58e96acf..d48c362d 100644 --- a/templates/todolists/view.html +++ b/templates/todolists/view.html @@ -57,7 +57,7 @@ </table> </div> {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/jquery.tablesorter.js"></script> +<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> <script type="text/javascript" src="/media/archweb.js"></script> <script type="text/javascript"> $(document).ready(function() { diff --git a/templates/visualize/index.html b/templates/visualize/index.html index 45bf4ec2..1854eb58 100644 --- a/templates/visualize/index.html +++ b/templates/visualize/index.html @@ -4,10 +4,7 @@ {% block content %} <div class="box"> - - <h2>Visualizations of Packaging Data</h2> - - <h3>Package Treemap</h3> + <h2>Visualization of Package Data</h2> <div class="visualize-buttons"> <div> @@ -25,10 +22,17 @@ </div> <div id="visualize-archrepo" class="visualize-chart"></div> </div> +{% comment %} +<div class="box"> + <h2>Visualization of PGP Master and Signing Keys</h2> + <div id="visualize-keys" class="visualize-chart"></div> +</div> +{% endcomment %} {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/d3.js"></script> -<script type="text/javascript" src="/media/d3.layout.js"></script> +<script type="text/javascript" src="/media/d3.min.js"></script> +<script type="text/javascript" src="/media/d3.geom.min.js"></script> +<script type="text/javascript" src="/media/d3.layout.min.js"></script> <script type="text/javascript" src="/media/archweb.js"></script> <script type="text/javascript" src="/media/visualize.js"></script> <script type="text/javascript"> @@ -38,6 +42,7 @@ $(document).ready(function() { "arch": { url: "{% url visualize-byarch %}", color_attr: "arch" }, }; packages_treemap("#visualize-archrepo", orderings, "repo"); + /*developer_keys("#visualize-keys", "{% url visualize-pgp_keys %}");*/ }); </script> {% endblock %} |