Flagging Packages

From b59e79f3878d59b83c6867eb5c6196f8f003dcd9 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 1 May 2012 17:13:33 -0500 Subject: Opensearch enhancements * Add a 64x64 icon as indicated in the Opensearch specification. * Add suggestions capability and a new view providing suggestions based on package name starting with the typed value. Signed-off-by: Dan McGee --- templates/packages/opensearch.xml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/opensearch.xml b/templates/packages/opensearch.xml index 216be3e9..6c50d991 100644 --- a/templates/packages/opensearch.xml +++ b/templates/packages/opensearch.xml @@ -1,13 +1,18 @@ - +{% load static from staticfiles %} - Arch Linux Packages - Search the Arch Linux package repositories. + Arch Packages + Arch Linux Package Repository Search + Search the Arch Linux package repositories by keyword in package names and descriptions. linux archlinux package software - {{domain}}/static/favicon.ico + {{ domain }}{% static "favicon.ico" %} + {{ domain }}{% static "logos/icon-transparent-64x64.png" %} en-us UTF-8 UTF-8 - - + + + -- cgit v1.2.3-2-g168b From 768bc688aab844cf9fdf9809b9381aaf0042f2fc Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 2 May 2012 10:21:30 -0500 Subject: Flagging related cleanups and improvements Touch up the style slightly on the flag help popup to match the main site style more closely. When a logged-in user is flagging a package out of date, we have no need for them to fill in the email field since we already have an email address on file. Signed-off-by: Dan McGee --- templates/packages/flaghelp.html | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html index 819a2f01..399b7e01 100644 --- a/templates/packages/flaghelp.html +++ b/templates/packages/flaghelp.html @@ -1,20 +1,19 @@ - +{% load static from staticfiles %} Flagging Packages - -

Flagging Packages

-

If you notice that a package is out-of-date (i.e., there is a newer stable release available), then please notify us by using the Flag button in the Package Details @@ -29,8 +28,7 @@ with your additional text.

Note: Please do not use this facility if the - package is broken! Use the bugtracker instead.

- -- cgit v1.2.3-2-g168b From f36d876aca5571f09032d0d2a67c8b1f1a3258c8 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 12 May 2012 09:22:52 -0500 Subject: Change to new time access methods in pgpdump code Signed-off-by: Dan McGee --- templates/packages/details.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/packages') diff --git a/templates/packages/details.html b/templates/packages/details.html index 4ab55ef2..4cb6032e 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -165,7 +165,7 @@ {% 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 %} Signature Date: - {{ pkg.signature.datetime|date:"DATETIME_FORMAT" }} UTC + {{ pkg.signature.creation_time|date:"DATETIME_FORMAT" }} UTC {% else %} Signed By: Unsigned -- cgit v1.2.3-2-g168b From 1625cd31c334b017688a8c30631ddad60fafd8f4 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 18 May 2012 19:57:40 -0500 Subject: Link to provides/conflicts/replacements if we can in details template Use the newly implemented get_best_satisfier() method that is in the abstract base class for all of these types. Signed-off-by: Dan McGee --- templates/packages/details.html | 12 ++++++------ templates/packages/details_relatedto.html | 10 ++++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 templates/packages/details_relatedto.html (limited to 'templates/packages') diff --git a/templates/packages/details.html b/templates/packages/details.html index 4cb6032e..358ab525 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -120,22 +120,22 @@ {% endif %}{% endwith %} - {% with pkg.provides.all as provides %}{% if provides %} + {% with pkg.provides.all as all_related %}{% if all_related %} Provides: - {{ provides|join:", " }} + {% include "packages/details_relatedto.html" %} {% endif %}{% endwith %} - {% with pkg.conflicts.all as conflicts %}{% if conflicts %} + {% with pkg.conflicts.all as all_related %}{% if all_related %} Conflicts: - {{ conflicts|join:", " }} + {% include "packages/details_relatedto.html" %} {% endif %}{% endwith %} - {% with pkg.replaces.all as replaces %}{% if replaces %} + {% with pkg.replaces.all as all_related %}{% if all_related %} Replaces: - {{ replaces|join:", " }} + {% include "packages/details_relatedto.html" %} {% endif %}{% endwith %} diff --git a/templates/packages/details_relatedto.html b/templates/packages/details_relatedto.html new file mode 100644 index 00000000..1ffe2884 --- /dev/null +++ b/templates/packages/details_relatedto.html @@ -0,0 +1,10 @@ +{% load package_extras %} +{% for related in all_related %} +{% with related.get_best_satisfier as best_satisfier %} +{% ifequal best_satisfier None %} +{{ related.name }}{{ related.comparison|default:"" }}{{ related.version|default:"" }}{% if not forloop.last %}, {% endif %} +{% else %} +{% pkg_details_link best_satisfier %}{{ related.comparison|default:"" }}{{related.version|default:"" }}{% if not forloop.last %}, {% endif %} +{% endifequal %} +{% endwith %} +{% endfor %} -- cgit v1.2.3-2-g168b From 72a92102df4999dbcc370064707c9026d51c4fe7 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 18 May 2012 21:29:03 -0500 Subject: Switch to usage of new Depend object Signed-off-by: Dan McGee --- templates/packages/details_depend.html | 6 +++--- templates/packages/details_requiredby.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/details_depend.html b/templates/packages/details_depend.html index 8b6e85c9..0cf2c36a 100644 --- a/templates/packages/details_depend.html +++ b/templates/packages/details_depend.html @@ -2,12 +2,12 @@

{% ifequal depend.pkg None %} {% if depend.providers %} -{{ depend.dep.depname }} ({% multi_pkg_details depend.providers %}) +{{ depend.dep.name }}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} ({% multi_pkg_details depend.providers %}) {% else %} -{{ depend.dep.depname }} (virtual) +{{ depend.dep.name }}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} (virtual) {% endif %} {% else %} -{% pkg_details_link depend.pkg %}{{ depend.dep.depvcmp|default:"" }} +{% pkg_details_link depend.pkg %}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} {% if depend.pkg.repo.testing %} (testing){% endif %} {% if depend.pkg.repo.staging %} (staging){% endif %} {% endifequal %} diff --git a/templates/packages/details_requiredby.html b/templates/packages/details_requiredby.html index c7697289..ecc92b29 100644 --- a/templates/packages/details_requiredby.html +++ b/templates/packages/details_requiredby.html @@ -1,6 +1,6 @@ {% load package_extras %}

{% pkg_details_link req.pkg %} -{% if req.depname != pkg.pkgname %}(requires {{ req.depname }}){% endif %} +{% 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.optional %}(optional){% endif %} -- cgit v1.2.3-2-g168b From eef1ee7051093b9f6e74ab5669af8c57983872d9 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 19 May 2012 16:32:17 -0500 Subject: Add RSS links to /news/ and /packages/ URLs These were available only from the home page, but it makes sense to advertise them on the corresponding index pages too. Signed-off-by: Dan McGee --- templates/packages/search.html | 1 + 1 file changed, 1 insertion(+) (limited to 'templates/packages') diff --git a/templates/packages/search.html b/templates/packages/search.html index ebd4e6c4..df5c5791 100644 --- a/templates/packages/search.html +++ b/templates/packages/search.html @@ -8,6 +8,7 @@ {% block head %} {% if is_paginated and page_obj.number > 1 %}{% endif %} + {% endblock %} {% block content %} -- cgit v1.2.3-2-g168b From b88ef911b8c5e62b23ceb6d13d1a7a4f1b176f7f Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 1 Jul 2012 20:42:24 -0500 Subject: Update flag out of date verbiage when orphans are involved From FS#29922, indicate what happens if the package is unmaintained. Signed-off-by: Dan McGee --- templates/packages/flaghelp.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'templates/packages') diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html index 399b7e01..c298b5c5 100644 --- a/templates/packages/flaghelp.html +++ b/templates/packages/flaghelp.html @@ -18,7 +18,8 @@ stable release available), then please notify us by using the Flag button in the Package Details screen. This will notify the maintainer(s) responsible for that - package so they can update it.

+ package so they can update it. If the package is unmaintained, the + notification will be sent to a developer mailing list.

The message box portion of the flag utility is optional, and meant for short messages only. If you need more than 200 characters for your -- cgit v1.2.3-2-g168b From ca86b8d339ff3b8e74ac6d2ccf8a14458a690cf5 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 5 Jul 2012 17:36:22 -0500 Subject: Collapse the dependencies and required by lists when they are long For now, this happens when the lists are over 20 items. Using JS, hide the 21st and following packages listed in the list and replace them with a 'Show More...' link that users can click to get the full list. For a package such as glibc with 444 'Required By' entries, this can make quite a visual difference. Signed-off-by: Dan McGee --- templates/packages/details.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/details.html b/templates/packages/details.html index 358ab525..201e3074 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -186,7 +186,7 @@

Dependencies ({{deps|length}})

- {% if deps %}

{% for depend in deps %}{% include "packages/details_depend.html" %}{% endfor %}

@@ -196,7 +196,7 @@

Required By ({{rqdby|length}})

- {% if rqdby %}

{% for req in rqdby %}{% include "packages/details_requiredby.html" %}{% endfor %}

@@ -219,6 +219,10 @@ {% load cdn %}{% jquery %} {% endblock %} -- cgit v1.2.3-2-g168b From 8383a071608329c7683f7a710030ce945bd20b4d Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 8 Jul 2012 23:30:48 -0500 Subject: Add a new jquery_tablesorter CDN template tag And use it everywhere we were including the file before. This should make updating the version a heck of a lot easier. Signed-off-by: Dan McGee --- templates/packages/differences.html | 3 +-- templates/packages/groups.html | 3 +-- templates/packages/packages_list.html | 3 +-- templates/packages/signoffs.html | 3 +-- templates/packages/stale_relations.html | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/differences.html b/templates/packages/differences.html index 01e1f857..8d6887a3 100644 --- a/templates/packages/differences.html +++ b/templates/packages/differences.html @@ -95,8 +95,7 @@ -{% load cdn %}{% jquery %} - +{% load cdn %}{% jquery %}{% jquery_tablesorter %} +{% load cdn %}{% jquery %}{% jquery_tablesorter %} +{% load cdn %}{% jquery %}{% jquery_tablesorter %} +{% load cdn %}{% jquery %}{% jquery_tablesorter %} +{% load cdn %}{% jquery %}{% jquery_tablesorter %} {% endblock %} diff --git a/templates/packages/details_relatedto.html b/templates/packages/details_relatedto.html index 1ffe2884..e14375d3 100644 --- a/templates/packages/details_relatedto.html +++ b/templates/packages/details_relatedto.html @@ -1,10 +1,2 @@ -{% load package_extras %} -{% for related in all_related %} -{% with related.get_best_satisfier as best_satisfier %} -{% ifequal best_satisfier None %} -{{ related.name }}{{ related.comparison|default:"" }}{{ related.version|default:"" }}{% if not forloop.last %}, {% endif %} -{% else %} -{% pkg_details_link best_satisfier %}{{ related.comparison|default:"" }}{{related.version|default:"" }}{% if not forloop.last %}, {% endif %} -{% endifequal %} -{% endwith %} -{% endfor %} +{% load package_extras %}{% for related in all_related %}{% with related.get_best_satisfier as best_satisfier %} +{% endwith %}{% endfor %} -- cgit v1.2.3-2-g168b From eea25558c766d5f3a32879d16e579d051906cbf3 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 27 Nov 2012 08:48:01 -0600 Subject: Don't cache package properties as aggressively For package signatures, it turns out it is way cheaper to just parse the signature again rather than going though all the decorator and cache_function_key business. This speeds up the mismatched signatures report significantly once this is removed. For base_package, given that we only call it once from our package details template, it makes little sense to cache the result. Signed-off-by: Dan McGee --- templates/packages/details.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/details.html b/templates/packages/details.html index aa073551..0a47217c 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -103,12 +103,12 @@ {% else %} Base Package: - {% if pkg.base_package %} - {% pkg_details_link pkg.base_package %} + {% with pkg.base_package as base %}{% if base %} + {% pkg_details_link base %} {% else %} {{ pkg.pkgbase }} - {% endif %} + {% endif %}{% endwith %} {% endifequal %} -- cgit v1.2.3-2-g168b From 8a8542ede6493939bd6528a72b8fd912fdf4d14b Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 11 Dec 2012 10:02:26 -0600 Subject: Use multiple separate document.ready() handlers If one of them breaks, we don't want to prevent the rest of the on-load events from firing. This is currently a problem on some browsers with the versions of jQuery and tablesorter we are using. Signed-off-by: Dan McGee --- templates/packages/differences.html | 5 +++-- templates/packages/signoffs.html | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/differences.html b/templates/packages/differences.html index b0c5b539..61906fef 100644 --- a/templates/packages/differences.html +++ b/templates/packages/differences.html @@ -99,13 +99,14 @@ {% endif %} diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html index fc6adca2..b6737230 100644 --- a/templates/packages/signoffs.html +++ b/templates/packages/signoffs.html @@ -85,9 +85,11 @@ {% endblock %} -- cgit v1.2.3-2-g168b From e65c7805547484cad1be55dfa20355ef18b857be Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 8 Feb 2013 21:09:47 -0600 Subject: Remove package seach by 'Last Updated After' It is a lot easier to just sort the list rather than mess with this particular field, which didn't even allow you to specify a range or direction to search in. Signed-off-by: Dan McGee --- templates/packages/search.html | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/search.html b/templates/packages/search.html index ab9b6d32..a5d52d6c 100644 --- a/templates/packages/search.html +++ b/templates/packages/search.html @@ -1,13 +1,11 @@ {% extends "base.html" %} {% load package_extras %} -{% load admin_static %} {% block title %}Arch Linux - Package Database{% endblock %} {% block navbarclass %}anb-packages{% endblock %} {% block head %} {% if is_paginated and page_obj.number > 1 %}{% endif %} - {% endblock %} @@ -35,9 +33,6 @@

{{ search_form.maintainer.errors }} Maintainer{{ search_form.maintainer}}

-

{{ search_form.last_update.errors }} - - Last Updated After{{ search_form.last_update }}

{{ search_form.flagged.errors }} Flagged{{ search_form.flagged }}

@@ -126,13 +121,4 @@ For unsupported packages, browse the Arch User Repository (AUR).

- -{% load cdn %}{% jquery %} - - - -{{search_form.media}} {% endblock %} -- cgit v1.2.3-2-g168b From 10462425f989dc74653179f0845978a6b5e30045 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 16 Jan 2013 16:10:24 -0600 Subject: Remove {% load url from future %} from templates This is now the default in Django 1.5. Signed-off-by: Dan McGee --- templates/packages/removed.html | 1 - 1 file changed, 1 deletion(-) (limited to 'templates/packages') diff --git a/templates/packages/removed.html b/templates/packages/removed.html index ea20ce80..f188b6db 100644 --- a/templates/packages/removed.html +++ b/templates/packages/removed.html @@ -1,5 +1,4 @@ {% extends "base.html" %} -{% load url from future %} {% load package_extras %} {% block title %}Arch Linux - Not Available - {{ name }} {{ version }} ({{ arch.name }}){% endblock %} -- cgit v1.2.3-2-g168b From adc27750593aadb57f85f7b6817e4300f5ee180e Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 16 Feb 2013 15:04:50 -0600 Subject: Paginator template cleanup --- templates/packages/search_paginator.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/search_paginator.html b/templates/packages/search_paginator.html index 362b7cb3..758dca4c 100644 --- a/templates/packages/search_paginator.html +++ b/templates/packages/search_paginator.html @@ -1,12 +1,12 @@

{% if is_paginated %} -

{{paginator.count}} packages found. - Page {{page_obj.number}} of {{paginator.num_pages}}.

+

{{ paginator.count }} packages found. + Page {{ page_obj.number }} of {{ paginator.num_pages }}.

{% if page_obj.has_previous %} - < Prev {% else %} < Prev @@ -14,7 +14,7 @@ {% if page_obj.has_next %} - Next > {% else %} Next > -- cgit v1.2.3-2-g168b From e3837b5a872b6203b7ae338bc8075b339e031627 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 16 Feb 2013 15:23:49 -0600 Subject: Remove configurable pagination for package search Switch it to a hardcoded value of 100 for all searches instead. It didn't make much sense having a page number be part of the URL and a limit value being part of the query string. Signed-off-by: Dan McGee --- templates/packages/search.html | 3 --- 1 file changed, 3 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/search.html b/templates/packages/search.html index a5d52d6c..bf1eecd9 100644 --- a/templates/packages/search.html +++ b/templates/packages/search.html @@ -36,9 +36,6 @@

{{ search_form.flagged.errors }} Flagged{{ search_form.flagged }}

-

{{ search_form.limit.errors }} - - Per Page{{ search_form.limit }}

-- cgit v1.2.3-2-g168b From 746023d529489b68f1a2494ff7572734b3b368ce Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 16 Feb 2013 15:38:29 -0600 Subject: Make page a query string parameter on package search This is a bit silly to encode in the URL, or at least makes it much harder to screen out via robots.txt and other such things. Signed-off-by: Dan McGee --- templates/packages/search_paginator.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/search_paginator.html b/templates/packages/search_paginator.html index 758dca4c..3c368b82 100644 --- a/templates/packages/search_paginator.html +++ b/templates/packages/search_paginator.html @@ -6,7 +6,7 @@

{% if page_obj.has_previous %} - < Prev {% else %} < Prev @@ -14,7 +14,7 @@ {% if page_obj.has_next %} - Next > {% else %} Next > -- cgit v1.2.3-2-g168b