diff options
Diffstat (limited to 'templates')
24 files changed, 73 insertions, 28 deletions
diff --git a/templates/devel/clock.html b/templates/devel/clock.html index a7bc7315..8970fad0 100644 --- a/templates/devel/clock.html +++ b/templates/devel/clock.html @@ -56,6 +56,9 @@ </tbody> </table> </div> +{% endblock %} + +{% block script_block %} {% load cdn %}{% jquery %}{% jquery_tablesorter %} <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> diff --git a/templates/devel/index.html b/templates/devel/index.html index b2dfe077..f3f32863 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -294,7 +294,9 @@ </table> </div>{# #dash-by-developer #} {% endcache %} +{% endblock %} +{% block script_block %} {% load cdn %}{% jquery %}{% jquery_tablesorter %} <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> diff --git a/templates/devel/packages.html b/templates/devel/packages.html index 0aed22f4..ed96ad5a 100644 --- a/templates/devel/packages.html +++ b/templates/devel/packages.html @@ -73,6 +73,9 @@ </tbody> </table> </div> +{% endblock %} + +{% block script_block %} {% load cdn %}{% jquery %}{% jquery_tablesorter %} <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> diff --git a/templates/devel/profile.html b/templates/devel/profile.html index 16057275..dff5d925 100644 --- a/templates/devel/profile.html +++ b/templates/devel/profile.html @@ -24,7 +24,9 @@ </form> </div> +{% endblock %} +{% block script_block %} {% load cdn %}{% jquery %} <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index 18f72125..98755ad2 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -106,11 +106,20 @@ {% endfor %} </tbody> </table> +</div> + +<div class="box"> + <h2>Mirror Status Charts</h2> - <h3>Mirror Status Chart</h3> + <p>Periodic checks of the mirrors are done from various geographic + locations, IP addresses, and using IPv4 or IPv6. These results are + summarized in graphical form below.</p> - <div id="visualize-mirror" class="visualize-chart"></div> + <div id="charts-container"></div> </div> +{% endblock %} + +{% block script_block %} {% load cdn %}{% jquery %}{% jquery_tablesorter %} <script type="text/javascript" src="{% static "d3-3.0.6.min.js" %}"></script> <script type="text/javascript" src="{% static "archweb.js" %}"></script> @@ -122,7 +131,7 @@ $(document).ready(function() { headers: { 8: { sorter: 'mostlydigit' }, 9: { sorter: 'mostlydigit' }, 10: { sorter: 'mostlydigit' } } }); }); $(document).ready(function() { - mirror_status("#visualize-mirror", "./json/"); + draw_graphs("/mirrors/locations/json/", "./json/", "#charts-container"); }); </script> {% endblock %} diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html index 9050414d..de2c3d5c 100644 --- a/templates/mirrors/status.html +++ b/templates/mirrors/status.html @@ -87,20 +87,21 @@ </tr> </thead> <tbody> - {% for log in error_logs %} - {% spaceless %}<tr class="{% cycle 'odd' 'even' %}"> + {% for log in error_logs %}<tr class="{% cycle 'odd' 'even' %}"> <td>{{ log.url__url }}</td> <td>{{ log.url__protocol__protocol }}</td> <td class="country">{% country_flag log.country %}{{ log.country.name }}</td> <td class="wrap">{{ log.error|linebreaksbr }}</td> <td>{{ log.last_occurred|date:'Y-m-d H:i' }}</td> <td>{{ log.error_count }}</td> - </tr> - {% endspaceless %}{% endfor %} + </tr>{% endfor %} </tbody> </table> </div> +{% endblock %} + +{% block script_block %} {% load cdn %}{% jquery %}{% jquery_tablesorter %} <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html index 2dd7ef49..e848a9c9 100644 --- a/templates/mirrors/status_table.html +++ b/templates/mirrors/status_table.html @@ -14,8 +14,7 @@ </tr> </thead> <tbody> - {% for m_url in urls %} - {% spaceless %}<tr class="{% cycle 'odd' 'even' %}"> + {% for m_url in urls %}<tr class="{% cycle 'odd' 'even' %}"> <td>{{ m_url.url }}</td> <td>{{ m_url.protocol }}</td> <td class="country">{% country_flag m_url.country %}{{ m_url.country.name }}</td> @@ -24,7 +23,6 @@ <td>{{ m_url.duration_avg|floatformat:2 }}</td> <td>{{ m_url.duration_stddev|floatformat:2 }}</td> <td>{{ m_url.score|floatformat:1|default:'∞' }}</td> - </tr> - {% endspaceless %}{% endfor %} + </tr>{% endfor %} </tbody> </table> diff --git a/templates/packages/details.html b/templates/packages/details.html index 36c422b2..07406fa2 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -229,7 +229,9 @@ </div> </div> </div> +{% endblock %} +{% block script_block %} {% load cdn %}{% jquery %} <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> diff --git a/templates/packages/details_depend.html b/templates/packages/details_depend.html index 4aa739c2..b89ffbfa 100644 --- a/templates/packages/details_depend.html +++ b/templates/packages/details_depend.html @@ -1,5 +1,4 @@ -{% load package_extras %}{% spaceless %}<li> -{% ifequal depend.pkg None %} +{% load package_extras %}<li>{% ifequal depend.pkg None %} {% if depend.providers %}{{ depend.dep.name }}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} <span class="virtual-dep">({% multi_pkg_details depend.providers %})</span> {% else %}{{ depend.dep.name }}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} <span class="virtual-dep">(virtual)</span> {% endif %}{% else %} @@ -11,4 +10,4 @@ {% endif %}{% if depend.dep.deptype == 'M' %} <span class="make-dep"> (make)</span> {% endif %}{% if depend.dep.deptype == 'C' %} <span class="check-dep"> (check)</span> {% endif %}{% if depend.dep.description %} - <span class="dep-desc">{{ depend.dep.description }}</span> -{% endif %}</li>{% endspaceless %} +{% endif %}</li> diff --git a/templates/packages/details_requiredby.html b/templates/packages/details_requiredby.html index e8c713ac..504a322f 100644 --- a/templates/packages/details_requiredby.html +++ b/templates/packages/details_requiredby.html @@ -1,8 +1,8 @@ -{% load package_extras %}{% spaceless %}<li>{% pkg_details_link req.pkg %} +{% load package_extras %}<li>{% pkg_details_link req.pkg %} {% if req.name != pkg.pkgname %}<span class="virtual-dep"> (requires {{ req.name }})</span> {% endif %}{% if req.pkg.repo.testing %}<span class="testing-dep"> (testing)</span> {% endif %}{% if req.pkg.repo.staging %}<span class="staging-dep"> (staging)</span> {% endif %}{% if req.deptype == 'O' %}<span class="opt-dep"> (optional)</span> {% endif %}{% if req.deptype == 'M' %}<span class="make-dep"> (make)</span> {% endif %}{% if req.deptype == 'C' %}<span class="check-dep"> (check)</span> -{% endif %}</li>{% endspaceless %} +{% endif %}</li> diff --git a/templates/packages/differences.html b/templates/packages/differences.html index 38a94775..1a1bf260 100644 --- a/templates/packages/differences.html +++ b/templates/packages/differences.html @@ -5,7 +5,6 @@ {% block navbarclass %}anb-packages{% endblock %} {% block content %} -{% if differences %} <div class="box"> <h2>Package Differences by Architecture</h2> <div class="filter-criteria"> @@ -93,7 +92,9 @@ </table> </div> +{% endblock %} +{% block script_block %} {% load cdn %}{% jquery %}{% jquery_tablesorter %} <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> @@ -109,5 +110,4 @@ $(document).ready(function() { filter_packages(); }); </script> -{% endif %} {% endblock %} diff --git a/templates/packages/groups.html b/templates/packages/groups.html index 95b1283c..c8f4aa5c 100644 --- a/templates/packages/groups.html +++ b/templates/packages/groups.html @@ -29,6 +29,9 @@ </tbody> </table> </div> +{% endblock %} + +{% block script_block %} {% load cdn %}{% jquery %}{% jquery_tablesorter %} <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> diff --git a/templates/packages/packages_list.html b/templates/packages/packages_list.html index f10f26be..110634b6 100644 --- a/templates/packages/packages_list.html +++ b/templates/packages/packages_list.html @@ -40,6 +40,9 @@ </tbody> </table> </div> +{% endblock %} + +{% block script_block %} {% load cdn %}{% jquery %}{% jquery_tablesorter %} <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> diff --git a/templates/packages/search.html b/templates/packages/search.html index 77e59813..b5b08268 100644 --- a/templates/packages/search.html +++ b/templates/packages/search.html @@ -69,8 +69,7 @@ </tr> </thead> <tbody> - {% for pkg in package_list %} - {% spaceless %}<tr class="{% cycle 'odd' 'even' %}"> + {% for pkg in package_list %}<tr class="{% cycle 'odd' 'even' %}"> {% if perms.main.change_package %} <td><input type="checkbox" name="pkgid" value="{{ pkg.id }}" /></td> {% endif %} @@ -85,8 +84,7 @@ <td class="wrap">{{ pkg.pkgdesc }}</td> <td>{{ pkg.last_update|date }}</td> <td>{{ pkg.flag_date|date }}</td> - </tr> - {% endspaceless %}{% endfor %} + </tr>{% endfor %} </tbody> </table> {% include "packages/search_paginator.html" %} diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html index c3e75ae2..a159e998 100644 --- a/templates/packages/signoffs.html +++ b/templates/packages/signoffs.html @@ -50,9 +50,7 @@ </tr> </thead> <tbody id="tbody_signoffs"> - {% for group in signoff_groups %} - <tr class="{% cycle 'odd' 'even' %} {{ group.arch.name }} {{ group.target_repo|lower }}"> - {% spaceless %} + {% for group in signoff_groups %}<tr class="{% cycle 'odd' 'even' %} {{ group.arch.name }} {{ group.target_repo|lower }}"> <td>{% pkg_details_link group.package %} {{ group.version }}</td> <td>{{ group.arch.name }}</td> <td>{{ group.target_repo }}</td> @@ -75,12 +73,13 @@ {% endcomment %}{% if spec.known_bad %}Package is known to be bad<br/>{% endif %}{% comment %} {% endcomment %}{{ spec.comments|default:""|linebreaksbr }} {% endwith %}{% endif %}</td> - {% endspaceless %} - </tr> - {% endfor %} + </tr>{% endfor %} </tbody> </table> </div> +{% endblock %} + +{% block script_block %} {% load cdn %}{% jquery %}{% jquery_tablesorter %} <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> diff --git a/templates/packages/stale_relations.html b/templates/packages/stale_relations.html index c24715cd..233b2835 100644 --- a/templates/packages/stale_relations.html +++ b/templates/packages/stale_relations.html @@ -107,6 +107,9 @@ </form> </div> +{% endblock %} + +{% block script_block %} {% load cdn %}{% jquery %}{% jquery_tablesorter %} <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> diff --git a/templates/public/keys.html b/templates/public/keys.html index c6da6c37..ab89423e 100644 --- a/templates/public/keys.html +++ b/templates/public/keys.html @@ -132,7 +132,9 @@ </tbody> </table> </div> +{% endblock %} +{% block script_block %} {% load cdn %}{% jquery %}{% jquery_tablesorter %} <script type="text/javascript" src="{% static "d3-3.0.6.min.js" %}"></script> <script type="text/javascript" src="{% static "archweb.js" %}"></script> diff --git a/templates/registration/login.html b/templates/registration/login.html index 226a0805..c722527d 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -21,7 +21,9 @@ </form> </div> +{% endblock %} +{% block script_block %} {% load cdn %}{% jquery %} <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> diff --git a/templates/releng/iso_overview.html b/templates/releng/iso_overview.html index 196f0c0a..1a35ead4 100644 --- a/templates/releng/iso_overview.html +++ b/templates/releng/iso_overview.html @@ -36,6 +36,9 @@ </tbody> </table> </div> +{% endblock %} + +{% block script_block %} {% load cdn %}{% jquery %}{% jquery_tablesorter %} <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html index 5f248264..7197cc8d 100644 --- a/templates/releng/release_list.html +++ b/templates/releng/release_list.html @@ -39,7 +39,9 @@ </tbody> </table> </div> +{% endblock %} +{% block script_block %} {% load cdn %}{% jquery %}{% jquery_tablesorter %} <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html index 67e5934d..281df083 100644 --- a/templates/releng/result_list.html +++ b/templates/releng/result_list.html @@ -33,6 +33,9 @@ </tbody> </table> </div> +{% endblock %} + +{% block script_block %} {% load cdn %}{% jquery %}{% jquery_tablesorter %} <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> diff --git a/templates/todolists/list.html b/templates/todolists/list.html index b7d10264..d950db94 100644 --- a/templates/todolists/list.html +++ b/templates/todolists/list.html @@ -46,6 +46,9 @@ </tbody> </table> </div> +{% endblock %} + +{% block script_block %} {% load cdn %}{% jquery %}{% jquery_tablesorter %} <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> diff --git a/templates/todolists/view.html b/templates/todolists/view.html index 644e78b0..e0cd4007 100644 --- a/templates/todolists/view.html +++ b/templates/todolists/view.html @@ -100,6 +100,9 @@ </tbody> </table> </div> +{% endblock %} + +{% block script_block %} {% load cdn %}{% jquery %}{% jquery_tablesorter %} <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> diff --git a/templates/visualize/index.html b/templates/visualize/index.html index bd98dcae..e091c761 100644 --- a/templates/visualize/index.html +++ b/templates/visualize/index.html @@ -23,7 +23,9 @@ </div> <div id="visualize-archrepo" class="visualize-chart"></div> </div> +{% endblock %} +{% block script_block %} {% load cdn %}{% jquery %} <script type="text/javascript" src="{% static "d3-3.0.6.min.js" %}"></script> <script type="text/javascript" src="{% static "archweb.js" %}"></script> |