From 95ceb2a4a42093c9fd728e9e3d546943bc7b0b9d Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 20 Apr 2013 11:03:00 -0500 Subject: Remove spaceless from depends and required by template fragments This was a bit of premature optimization, and ends up slowing the page generation a good amount since we have to run this ~400 times on some packages with long depends or required by lists. Webserver compression should handle this just fine and not result in too much page bloat. Signed-off-by: Dan McGee --- templates/packages/details_depend.html | 5 ++--- templates/packages/details_requiredby.html | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'templates/packages') 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 %}
  • -{% ifequal depend.pkg None %} +{% load package_extras %}
  • {% ifequal depend.pkg None %} {% if depend.providers %}{{ depend.dep.name }}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} ({% multi_pkg_details depend.providers %}) {% else %}{{ depend.dep.name }}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} (virtual) {% endif %}{% else %} @@ -11,4 +10,4 @@ {% endif %}{% if depend.dep.deptype == 'M' %} (make) {% endif %}{% if depend.dep.deptype == 'C' %} (check) {% endif %}{% if depend.dep.description %} - {{ depend.dep.description }} -{% endif %}
  • {% endspaceless %} +{% endif %} 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 %}
  • {% pkg_details_link req.pkg %} +{% load package_extras %}
  • {% pkg_details_link req.pkg %} {% if req.name != pkg.pkgname %} (requires {{ req.name }}) {% endif %}{% if req.pkg.repo.testing %} (testing) {% endif %}{% if req.pkg.repo.staging %} (staging) {% endif %}{% if req.deptype == 'O' %} (optional) {% endif %}{% if req.deptype == 'M' %} (make) {% endif %}{% if req.deptype == 'C' %} (check) -{% endif %}
  • {% endspaceless %} +{% endif %} -- cgit v1.2.3-2-g168b From b519c40e0af5b86ba660cf9d9cfc53a66fd8bef8 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 20 Apr 2013 11:11:04 -0500 Subject: Remove {% spaceless %} tag from a few more places This tag is simply not worth the time it takes to do what it does. Signed-off-by: Dan McGee --- templates/packages/search.html | 6 ++---- templates/packages/signoffs.html | 8 ++------ 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/search.html b/templates/packages/search.html index bf1eecd9..f50bc8be 100644 --- a/templates/packages/search.html +++ b/templates/packages/search.html @@ -69,8 +69,7 @@ - {% for pkg in package_list %} - {% spaceless %} + {% for pkg in package_list %} {% if perms.main.change_package %} {% endif %} @@ -85,8 +84,7 @@ {{ pkg.pkgdesc }} {{ pkg.last_update|date }} {{ pkg.flag_date|date }} - - {% endspaceless %}{% endfor %} + {% endfor %} {% include "packages/search_paginator.html" %} diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html index 20371f95..2879c30b 100644 --- a/templates/packages/signoffs.html +++ b/templates/packages/signoffs.html @@ -50,9 +50,7 @@ - {% for group in signoff_groups %} - - {% spaceless %} + {% for group in signoff_groups %} {% pkg_details_link group.package %} {{ group.version }} {{ group.arch.name }} {{ group.target_repo }} @@ -75,9 +73,7 @@ {% endcomment %}{% if spec.known_bad %}Package is known to be bad
    {% endif %}{% comment %} {% endcomment %}{{ spec.comments|default:""|linebreaksbr }} {% endwith %}{% endif %} - {% endspaceless %} - - {% endfor %} + {% endfor %} -- cgit v1.2.3-2-g168b From 3e085183bf39c59fdcd0b9e67b5a02653a51d30e Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 20 Apr 2013 11:28:12 -0500 Subject: Move all script blocks into {% script_block %} section I added this a while back, but didn't roll it out to all templates. Signed-off-by: Dan McGee --- templates/packages/details.html | 2 ++ templates/packages/differences.html | 2 ++ templates/packages/groups.html | 3 +++ templates/packages/packages_list.html | 3 +++ templates/packages/signoffs.html | 3 +++ templates/packages/stale_relations.html | 3 +++ 6 files changed, 16 insertions(+) (limited to 'templates/packages') diff --git a/templates/packages/details.html b/templates/packages/details.html index 0a47217c..bfa2de16 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -229,7 +229,9 @@ +{% endblock %} +{% block script_block %} {% load cdn %}{% jquery %} -{% endif %} {% endblock %} -- cgit v1.2.3-2-g168b