From 15c94b2061de4ba618af977279fe2575db2ac0a5 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 27 Apr 2012 09:02:18 -0500 Subject: Make sorting by time on clocks page more predictable This is a little bit of a hack but works well. Add the timezone name to the end of the sort so those in the same time zone end up next to each other. For timezones like CEST that have many different specifiers, it makes more sense to group them by 'Europe/Berlin', 'Europe/Paris', etc. Signed-off-by: Dan McGee --- templates/devel/clock.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/devel/clock.html b/templates/devel/clock.html index 61e67c32..bdb7341d 100644 --- a/templates/devel/clock.html +++ b/templates/devel/clock.html @@ -34,7 +34,7 @@ {{ dev.userprofile.alias }} {% if dev.userprofile.country %}{{ dev.userprofile.country.name }} {% endif %}{{ dev.userprofile.location }} {{ dev.userprofile.time_zone }} - {{ utc_now|timezone:dev.userprofile.time_zone|date:"Y-m-d H:i T" }} + {{ utc_now|timezone:dev.userprofile.time_zone|date:"Y-m-d H:i T" }} {{ dev.userprofile.time_zone }} {% endfor %} -- cgit v1.2.3-2-g168b From 80e7d19726a95b40727b7f35b9ad80b436b14b93 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 27 Apr 2012 09:24:34 -0500 Subject: Dev dashboard performance improvement Rather than one query per cell in the arches and repos statistics tables, we can group these together up front using Django annotations. This means we only need one query per table. In my local instance with all of the staging repos imported, this reduces the total query count on this page from 56 to 26, a rather marked improvement. Signed-off-by: Dan McGee --- templates/devel/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'templates') diff --git a/templates/devel/index.html b/templates/devel/index.html index a0ccb91f..c67cf277 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -194,10 +194,10 @@ {{ arch.name }} - {{ arch.packages.count }} packages + {{ arch.total_ct }} packages - {{ arch.packages.flagged.count }} packages + {{ arch.flagged_ct }} packages {% endfor %} @@ -224,10 +224,10 @@ {{ repo.name }} - {{ repo.packages.count }} packages + {{ repo.total_ct }} packages - {{ repo.packages.flagged.count }} packages + {{ repo.flagged_ct }} packages {% endfor %} -- cgit v1.2.3-2-g168b From baaa14dfc06cf8c381363883ebf4fd805b348e34 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 27 Apr 2012 09:57:08 -0500 Subject: Flip package update feeds table orientation Most of the time, more rows is better than more columns, and there are more repositories than architectures. Signed-off-by: Dan McGee --- templates/public/feeds.html | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'templates') diff --git a/templates/public/feeds.html b/templates/public/feeds.html index 0f80e1c2..b4214b1b 100644 --- a/templates/public/feeds.html +++ b/templates/public/feeds.html @@ -35,19 +35,23 @@ - - - {% for repo in repos %} - + + {% for arch in arches %} + {% endfor %} - {% for arch in arches %} - + + {% for arch in arches %} - {% for repo in repos %} + {% endfor %} + + {% for repo in repos %} + + + {% for arch in arches %} {% endfor %} -- cgit v1.2.3-2-g168b From 942f73deba9b6e13da8b4e801ddd98bee3e0b90d Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 29 Apr 2012 19:00:41 -0500 Subject: Make colspan match number of columns in developer dashboard Signed-off-by: Dan McGee --- templates/devel/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/devel/index.html b/templates/devel/index.html index c67cf277..d1bd4d2c 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -39,7 +39,7 @@ {% empty %} - + {% endfor %}
ArchitectureAll Repos{{ repo }}{{ arch }}
{{ arch }}All ReposFeed
{{ repo }}Feed
{{ pkg.last_update|date }}
No flagged packages to display
No flagged packages to display
-- cgit v1.2.3-2-g168b From 25a2fbc7c1cb50fa80ed4de50830721507765a91 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 29 Apr 2012 19:15:19 -0500 Subject: Add a "last action" column to developer clocks page This allows people to easily see if a developer has done anything recently that we can easily grab a date for. Obviously this doesn't include all sources of activity, so the list of things checked is clearly stated at the top. Signed-off-by: Dan McGee --- templates/devel/clock.html | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/devel/clock.html b/templates/devel/clock.html index bdb7341d..6a3f0a69 100644 --- a/templates/devel/clock.html +++ b/templates/devel/clock.html @@ -11,8 +11,18 @@

This page helps prevent you from waking a sleeping developer. It also depends on developers keeping the time zone information up to date, so if you see 'UTC' listed, pester them to update their settings.

+

The "Last Action" column shows the last time this developer has done + something we know about. Considered dates for each developer include:

+
    +
  • Build date of a package in the repositories
    • +
  • Last login to the developer side of this site
    • +
  • Admin log entry on this site (e.g., adding a donor, modifying a + mirror)
    • +
  • Post date of a news item
    • +
  • Signing off on a package
    • +

- UTC Time: {{ utc_now|date:"Y-m-d H:i T" }} + Current UTC Time: {{ utc_now|date:"Y-m-d H:i T" }}

@@ -21,6 +31,7 @@ + @@ -32,6 +43,7 @@ + @@ -45,8 +57,11 @@ {% endblock %} -- cgit v1.2.3-2-g168b From b06efbe343eb6cd5cafe4c121d53a538302f9156 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 1 May 2012 16:33:58 -0500 Subject: Add a 144x144 apple-touch-icon to the resources This is used on the high-resolution display of newer iPads, as well as other tablets sure to come with high-resolution displays. Signed-off-by: Dan McGee --- templates/base.html | 1 + 1 file changed, 1 insertion(+) (limited to 'templates') diff --git a/templates/base.html b/templates/base.html index b8a5be46..e6ccc972 100644 --- a/templates/base.html +++ b/templates/base.html @@ -10,6 +10,7 @@ + {% block head %}{% endblock %} -- cgit v1.2.3-2-g168b 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') 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 a03cb4ba1994296bff4a0237439144b0b3d8f01b Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 2 May 2012 09:38:10 -0500 Subject: Move release version scope up a bit on the page Signed-off-by: Dan McGee --- templates/public/download.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/public/download.html b/templates/public/download.html index f57e565a..6c9ccf11 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -7,11 +7,11 @@ {% block navbarclass %}anb-download{% endblock %} {% block content %} +{% with "2011.08.19" as version %}

Arch Linux Downloads

- {% with "2011.08.19" as version %}

Release Info

All available images can be burned to a CD, mounted as an ISO file, @@ -164,10 +164,10 @@ {% endfor %}

{% endcache %} - {% endwith %}

If you want to become an Official Arch Linux Mirror please follow the instructions listed here.

+{% endwith %} {% endblock %} -- 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') 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 12bf4c1b1e7df2d934b9dfde8629137dedeea99f Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 18 Feb 2012 19:17:00 -0600 Subject: Add a smart protocol filter to mirrorlist generator This will only list FTP mirrors for a given country if there are no HTTP mirrors available, since FTP must die. Signed-off-by: Dan McGee --- templates/mirrors/mirrorlist_generate.html | 1 + 1 file changed, 1 insertion(+) (limited to 'templates') diff --git a/templates/mirrors/mirrorlist_generate.html b/templates/mirrors/mirrorlist_generate.html index e6f5e28c..34bda63d 100644 --- a/templates/mirrors/mirrorlist_generate.html +++ b/templates/mirrors/mirrorlist_generate.html @@ -23,6 +23,7 @@
  • All mirrors
  • All mirrors, FTP only
  • All mirrors, HTTP only
    • +
  • All mirrors, Smart protocols: this link only includes FTP mirrors if an HTTP mirror is not available in a given country.

    • Customized by country mirrorlist

    -- cgit v1.2.3-2-g168b From 5a5f667885827f5a22f9994b5f4897e63bc07178 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 5 May 2012 18:32:00 -0500 Subject: Update SevenL sponsor verbiage Signed-off-by: Dan McGee --- templates/public/donate.html | 22 ++++++++++++---------- templates/public/index.html | 6 +++--- 2 files changed, 15 insertions(+), 13 deletions(-) (limited to 'templates') diff --git a/templates/public/donate.html b/templates/public/donate.html index 3b3ee108..0809e2a6 100644 --- a/templates/public/donate.html +++ b/templates/public/donate.html @@ -44,17 +44,19 @@ title="velocity network"> -

    We also wish to extend a special Thank You to SevenL Networks +

    We also wish to extend a special thank you to 7L Networks for their generous and ongoing contribution of a dedicated Arch Linux - server. You too can have a dedicated Arch Linux server hosted by SevenL... - head over to their website for more details.

    - - + server. You too can have a dedicated Arch Linux server, or your server colocation service, + with 7L. Head over to their website for more details.

    + +

    More thanks go to AirVM.com for contributing a VMWare-based Virtual Machine.

    diff --git a/templates/public/index.html b/templates/public/index.html index de77b47f..32e25f98 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -209,11 +209,11 @@ Velocity Network - It's about time - - We would like to express our thanks to SevenL Networks for their generous contribution + + 7L Networks Inc. - AirVM.com - Your Green Technology Partner + AirVM.com - Your Green Technology Partner -- 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') 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 @@     - + {% else %} -- cgit v1.2.3-2-g168b From 3b0b9012353d5ffda564998cab58f986770361be Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 13 May 2012 20:14:16 -0500 Subject: Use linebreaksbr filter on log error message text If we get a multi-line message in, we should show line breaks at the appropriate places. Signed-off-by: Dan McGee --- templates/mirrors/status.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html index 8ee1d46e..34896c07 100644 --- a/templates/mirrors/status.html +++ b/templates/mirrors/status.html @@ -89,7 +89,7 @@ - + -- cgit v1.2.3-2-g168b From 2f7d770b261b3428bcff366ba6ff4fa631dd980a Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 13 May 2012 20:15:00 -0500 Subject: Add rsync support to mirrorcheck and other small improvements The main changes in this patch implement rsync:// protocol checking support by calling the rsync binary, requested in FS#29878. We track and log much of the same things as we already do for FTP and HTTP URLs- check time, last sync, total check duration, etc. Also added in this patch is a configurable timeout value which defaults to the previous hardcoded value of 10 seconds; this can be passed as an option to the mirrorcheck command. Signed-off-by: Dan McGee --- templates/mirrors/status.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html index 34896c07..2c350f56 100644 --- a/templates/mirrors/status.html +++ b/templates/mirrors/status.html @@ -16,8 +16,8 @@ has synced recently. This page contains several pieces of information about each mirror.

      -
    • Mirror URL: Mirrors are checked on a per-URL basis. If - both FTP and HTTP access are provided, both will be listed here.
      • +
    • Mirror URL: Mirrors are checked on a per-URL basis. All + available URLs and protocols for each known mirror are listed.
    • Completion %: The number of mirror checks that have successfully connected and disconnected from the given URL. If this is below 100%, the mirror may be unreliable.
      • -- cgit v1.2.3-2-g168b From ae1c526ffbe908322f0dd8d8805360b81ab22b0f Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 13 May 2012 20:35:50 -0500 Subject: Add ability to restrict status report to single tier This should make it easier to catch errors in our Tier 1 mirrors. Signed-off-by: Dan McGee --- templates/mirrors/status.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html index 2c350f56..472e9501 100644 --- a/templates/mirrors/status.html +++ b/templates/mirrors/status.html @@ -2,11 +2,11 @@ {% load static from staticfiles %} {% load mirror_status %} -{% block title %}Arch Linux - Mirror Status{% endblock %} +{% block title %}Arch Linux - Mirror Status{% if tier != None %} - Tier {{ tier }}{% endif %}{% endblock %} {% block content %}
      -

      Mirror Status

      +

      Mirror Status{% if tier != None %} - Tier {{ tier }}{% endif %}

      This page reports the status of all known, public, and active Arch Linux mirrors. All data on this page reflects the status of the mirrors within the last {{ cutoff|hours }}. All listed times are UTC. The check script runs -- 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') 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 %}

    - + {% endif %}{% endwith %} - {% with pkg.conflicts.all as conflicts %}{% if conflicts %} + {% with pkg.conflicts.all as all_related %}{% if all_related %} - + {% endif %}{% endwith %} - {% with pkg.replaces.all as replaces %}{% if replaces %} + {% with pkg.replaces.all as all_related %}{% if all_related %} - + {% 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') 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/news/list.html | 4 ++++ templates/packages/search.html | 1 + 2 files changed, 5 insertions(+) (limited to 'templates') diff --git a/templates/news/list.html b/templates/news/list.html index a72a2dda..e85ceced 100644 --- a/templates/news/list.html +++ b/templates/news/list.html @@ -1,6 +1,10 @@ {% extends "base.html" %} {% block title %}Arch Linux - News{% endblock %} +{% block head %} + +{% endblock %} + {% block content %}
    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 a5fafae94f23ca2cf138cf07774e2c2a1a7d993a Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 7 Jun 2012 20:29:07 -0500 Subject: Fix a few minor markup errors Signed-off-by: Dan McGee --- templates/public/donate.html | 2 +- templates/releng/result_section.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/public/donate.html b/templates/public/donate.html index 0809e2a6..b1d52f88 100644 --- a/templates/public/donate.html +++ b/templates/public/donate.html @@ -23,7 +23,7 @@

    Monetary donations

    -

    Financial contributions are accepted via Click&Pledge. +

    Financial contributions are accepted via Click&Pledge. Arch Linux is a member project of the Software in the Public Interest, Inc. non-profit corporation. Funds are used for hosting costs, server hardware diff --git a/templates/releng/result_section.html b/templates/releng/result_section.html index 91a75613..ae951ebe 100644 --- a/templates/releng/result_section.html +++ b/templates/releng/result_section.html @@ -1,6 +1,6 @@ {% load url from future %}

    • - -- 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') 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') 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 %}
      + {% if deps %}
        {% for depend in deps %}{% include "packages/details_depend.html" %}{% endfor %}
      {% endif %}
    @@ -196,7 +196,7 @@

    Required By ({{rqdby|length}})

    - {% if rqdby %}
      + {% if rqdby %}
        {% for req in rqdby %}{% include "packages/details_requiredby.html" %}{% endfor %}
      {% endif %}
    @@ -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/devel/clock.html | 3 +-- templates/devel/index.html | 3 +-- templates/devel/packages.html | 3 +-- templates/mirrors/mirror_details.html | 3 +-- templates/mirrors/mirrors.html | 3 +-- templates/mirrors/status.html | 3 +-- 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 +-- templates/public/keys.html | 3 +-- templates/releng/iso_overview.html | 3 +-- templates/releng/result_list.html | 3 +-- templates/todolists/list.html | 3 +-- templates/todolists/public_list.html | 3 +-- templates/todolists/view.html | 3 +-- 17 files changed, 17 insertions(+), 34 deletions(-) (limited to 'templates') diff --git a/templates/devel/clock.html b/templates/devel/clock.html index 6a3f0a69..9ebea06c 100644 --- a/templates/devel/clock.html +++ b/templates/devel/clock.html @@ -52,8 +52,7 @@
    Developer Username AliasLast Action Location Time Zone Current Time{{ dev.get_full_name }} {{ dev.username }} {{ dev.userprofile.alias }}{{ dev.last_action }} {% if dev.userprofile.country %}{{ dev.userprofile.country.name }} {% endif %}{{ dev.userprofile.location }} {{ dev.userprofile.time_zone }} {{ utc_now|timezone:dev.userprofile.time_zone|date:"Y-m-d H:i T" }} {{ dev.userprofile.time_zone }} {% 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
    Signed By: Unsigned{{ log.url__url }} {{ log.url__protocol__protocol }} {% if log.country %} {% endif %}{{ log.country.name }}{{ log.error }}{{ log.error|linebreaksbr }} {{ log.last_occurred|date:'Y-m-d H:i' }} {{ log.error_count }}
    Provides:{{ provides|join:", " }}{% include "packages/details_relatedto.html" %}
    Conflicts:{{ conflicts|join:", " }}{% include "packages/details_relatedto.html" %}
    Replaces:{{ replaces|join:", " }}{% include "packages/details_relatedto.html" %}
    {% if option.is_rollback %}Rollback: {% endif %}{{ option.name|title }} + {% if option.is_rollback %}Rollback: {% endif %}{{ option.name|title }} Last Success Last Failure
    -{% 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 %} +{% 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 %} +{% 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 %} +{% load cdn %}{% jquery %}{% jquery_tablesorter %} +{% load cdn %}{% jquery %}{% jquery_tablesorter %} {% endblock %} -- cgit v1.2.3-2-g168b From c1a6a87e23864ea044cb15f76b9dbb16734f08d8 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 25 Jul 2012 00:45:36 -0500 Subject: Add arch and repo filter to todolist packages This matches what we do on signoffs. Also beef up the styling a bit and add the dynamically updated package count info. Signed-off-by: Dan McGee --- templates/todolists/view.html | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/todolists/view.html b/templates/todolists/view.html index 69595e1a..35bc9446 100644 --- a/templates/todolists/view.html +++ b/templates/todolists/view.html @@ -29,16 +29,28 @@
  • {{ svn_root }}
    • {% endfor %} -
    +

    {{ list.packages|length }} total todolist package{{ list.packages|pluralize }} found.

    + +

    Filter Todolist Packages

    Select filter criteria + {% for arch in arches %} +
    +
    + {% endfor %} + {% for repo in repos %} +
    +
    + {% endfor %}
    +
    +
    {{ list.packages|length }} todolist packages displayed.
    @@ -56,7 +68,7 @@ {% for pkg in list.packages %} - + {{ pkg.pkg.arch.name }} {{ pkg.pkg.repo.name|capfirst }} {% pkg_details_link pkg.pkg %} -- cgit v1.2.3-2-g168b From 2a221fa72fd8491ca1a0633ba62b6a846267b4fc Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 9 Jul 2012 00:40:17 -0500 Subject: Upgrade to jQuery 1.7.2 and a maintained tablesorter This touches a wide variety of files as well as makes updates to some of our own code to be fully compatible. We also use some of the newer locale/accent sorting features of tablesorter to make tables with developer names sort in a more sane fashion. Signed-off-by: Dan McGee --- templates/devel/clock.html | 1 + templates/devel/index.html | 7 +++++-- templates/public/keys.html | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/devel/clock.html b/templates/devel/clock.html index 9ebea06c..bf4614b5 100644 --- a/templates/devel/clock.html +++ b/templates/devel/clock.html @@ -58,6 +58,7 @@ $(document).ready(function() { $("#clocks-table:has(tbody tr)").tablesorter({ widgets: ['zebra'], + sortLocaleCompare: true, sortList: [[0,0]], headers: { 4: { sorter: false } } }); diff --git a/templates/devel/index.html b/templates/devel/index.html index ad8ee0ee..488b6755 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -306,11 +306,14 @@ $(document).ready(function() { sortList: [[0,0]], headers: { 6: {sorter: false } } }); - $(".dash-stats").tablesorter({ + var settings = { widgets: ['zebra'], sortList: [[0,0]], headers: { 1: { sorter: 'pkgcount' }, 2: { sorter: 'pkgcount' }, 3: { sorter: 'pkgcount' } } - }); + }; + $(".dash-stats").not($("#stats-by-maintainer")).tablesorter(settings); + settings['sortLocaleCompare'] = true; + $("#stats-by-maintainer").tablesorter(settings); }); {% endblock %} diff --git a/templates/public/keys.html b/templates/public/keys.html index cd0b0592..1fed3c15 100644 --- a/templates/public/keys.html +++ b/templates/public/keys.html @@ -94,6 +94,7 @@ {% endblock %} -- cgit v1.2.3-2-g168b From 5f85a1240da14e57760c2ba6585ae943d7a1d8c2 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 31 Jul 2012 19:31:44 -0500 Subject: Reuse removed template for packages with multiple replacements For example, bitcoin-git in the Arch repos is currently marked replaced by both bitcoin-qt and bitcoin-daemon. This allows us to show a page with both options listed instead of a blank 404 page. Signed-off-by: Dan McGee --- templates/packages/removed.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'templates') diff --git a/templates/packages/removed.html b/templates/packages/removed.html index 17b1f989..ea20ce80 100644 --- a/templates/packages/removed.html +++ b/templates/packages/removed.html @@ -2,17 +2,17 @@ {% load url from future %} {% load package_extras %} -{% block title %}Arch Linux - Not Available - {{ update.pkgname }} {{ update.old_version }} ({{ update.arch.name }}){% endblock %} +{% block title %}Arch Linux - Not Available - {{ name }} {{ version }} ({{ arch.name }}){% endblock %} {% block navbarclass %}anb-packages{% endblock %} {% block content %}
    -

    {{ update.pkgname }} {{ update.old_version }} is no longer available

    +

    {{ name }} {{ version }} is no longer available

    -

    {{ update.pkgname }} {{ update.old_version }} has been removed from the [{{ update.repo.name|lower }}] repository.

    +

    {{ name }} {{ version }} has been removed from the [{{ repo.name|lower }}] repository.

    - {% with update.elsewhere as elsewhere %}{% if elsewhere %} -

    However, this package is available in other repositories:

    + {% if elsewhere %} +

    However, this package or replacements are available elsewhere:

      {% for pkg in elsewhere %}
    • {% pkg_details_link pkg %} {{ pkg.full_version }} [{{ pkg.repo.name|lower }}] ({{ pkg.arch.name }})
      • @@ -23,6 +23,6 @@ Try using the package search page, or try searching the AUR to see if the package can be found there.

      - {% endif %}{% endwith %} + {% endif %}
    {% endblock %} -- cgit v1.2.3-2-g168b From a64bbbd4139d91cbbca10d804067cbd87a95872d Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 31 Jul 2012 20:27:43 -0500 Subject: Make adjustments for optional -> deptype conversion Very little dealt directly with this field. Signed-off-by: Dan McGee --- templates/packages/details_depend.html | 2 +- templates/packages/details_requiredby.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/packages/details_depend.html b/templates/packages/details_depend.html index 0cf2c36a..1eb35474 100644 --- a/templates/packages/details_depend.html +++ b/templates/packages/details_depend.html @@ -11,6 +11,6 @@ {% if depend.pkg.repo.testing %} (testing){% endif %} {% if depend.pkg.repo.staging %} (staging){% endif %} {% endifequal %} -{% if depend.dep.optional %} (optional){% endif %} +{% if depend.dep.deptype == 'O' %} (optional){% endif %} {% if depend.dep.description %}- {{ depend.dep.description }}{% endif %} diff --git a/templates/packages/details_requiredby.html b/templates/packages/details_requiredby.html index ecc92b29..15c62c61 100644 --- a/templates/packages/details_requiredby.html +++ b/templates/packages/details_requiredby.html @@ -3,5 +3,5 @@ {% 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 %} +{% if req.deptype == 'O' %}(optional){% endif %} -- cgit v1.2.3-2-g168b From 4613f862d76b6ab5de7dc98021fa37341945a2c2 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 4 Aug 2012 15:14:53 -0500 Subject: Add support to templates for make/check depends Signed-off-by: Dan McGee --- templates/packages/details_depend.html | 2 ++ templates/packages/details_requiredby.html | 2 ++ 2 files changed, 4 insertions(+) (limited to 'templates') diff --git a/templates/packages/details_depend.html b/templates/packages/details_depend.html index 1eb35474..a26d67bd 100644 --- a/templates/packages/details_depend.html +++ b/templates/packages/details_depend.html @@ -12,5 +12,7 @@ {% if depend.pkg.repo.staging %} (staging){% endif %} {% endifequal %} {% if depend.dep.deptype == 'O' %} (optional){% endif %} +{% if depend.dep.deptype == 'M' %} (make){% endif %} +{% if depend.dep.deptype == 'C' %} (check){% endif %} {% if depend.dep.description %}- {{ depend.dep.description }}{% endif %} diff --git a/templates/packages/details_requiredby.html b/templates/packages/details_requiredby.html index 15c62c61..24f8bbb1 100644 --- a/templates/packages/details_requiredby.html +++ b/templates/packages/details_requiredby.html @@ -4,4 +4,6 @@ {% 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 %} -- cgit v1.2.3-2-g168b From c51ffa07fc46eeab001b1e71ebc0cee1d408aaea Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 4 Aug 2012 15:28:53 -0500 Subject: Adjust depends & required by templates to spew less whitespace Use the spaceless tag and structure the {% if %} blocks smartly so spaceless actually works and we aren't outputting one blank line per if statement. Signed-off-by: Dan McGee --- templates/packages/details_depend.html | 28 ++++++++++++---------------- templates/packages/details_requiredby.html | 17 ++++++++--------- 2 files changed, 20 insertions(+), 25 deletions(-) (limited to 'templates') diff --git a/templates/packages/details_depend.html b/templates/packages/details_depend.html index a26d67bd..420af93c 100644 --- a/templates/packages/details_depend.html +++ b/templates/packages/details_depend.html @@ -1,18 +1,14 @@ -{% load package_extras %} -
  • +{% load package_extras %}{% spaceless %}
  • {% 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 %} +{% 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 %} {% 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 %} -{% if depend.dep.deptype == 'O' %} (optional){% endif %} -{% if depend.dep.deptype == 'M' %} (make){% endif %} -{% if depend.dep.deptype == 'C' %} (check){% endif %} -{% if depend.dep.description %}- {{ depend.dep.description }}{% endif %} -
    • +{% if depend.pkg.repo.testing %} (testing) +{% endif %}{% if depend.pkg.repo.staging %} (staging) +{% endif %}{% endifequal %} +{% if depend.dep.deptype == 'O' %} (optional) +{% endif %}{% if depend.dep.deptype == 'M' %} (make) +{% endif %}{% if depend.dep.deptype == 'C' %} (check) +{% endif %}{% if depend.dep.description %}- {{ depend.dep.description }} +{% endif %}{% endspaceless %} diff --git a/templates/packages/details_requiredby.html b/templates/packages/details_requiredby.html index 24f8bbb1..f498bd5e 100644 --- a/templates/packages/details_requiredby.html +++ b/templates/packages/details_requiredby.html @@ -1,9 +1,8 @@ -{% 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 %} -
    • +{% load package_extras %}{% spaceless %}
  • {% 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 %} -- cgit v1.2.3-2-g168b From d557d267c906f2844331cafb57a81dc5a43bb125 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 4 Aug 2012 08:53:22 +0200 Subject: Update download page for 2012.08.04 iso image * the -netinstall suffix was removed from the filename * the wiki entry about the "Arch Install Scripts" was redirected to "Installation Guide" Signed-off-by: Pierre Schmitz Signed-off-by: Dan McGee --- templates/public/download.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'templates') diff --git a/templates/public/download.html b/templates/public/download.html index e6c4b18d..f5f6f4d1 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -7,7 +7,7 @@ {% block navbarclass %}anb-download{% endblock %} {% block content %} -{% with version="2012.07.15" kernel_version="3.4.4" %} +{% with version="2012.08.04" kernel_version="3.4.7" %}

    Arch Linux Downloads

    @@ -21,8 +21,8 @@
    • Current Release: {{ version }}
      • -
    • Included Kernel: {{ kernel_version }}
      • -
    • Arch Install Scripts
      • +
    • Included Kernel: {{ kernel_version }}
      • +
    • Installation Guide
    • Resources:
      • A web-seed capable client is recommended for fastest download speeds.

        Test ISO Info

        @@ -75,7 +75,7 @@

        File integrity checksums for the latest releases can be found below:

          -
        • PGP signature
        • SHA1 checksums
          • -- cgit v1.2.3-2-g168b From cdbbf81f49a9b82fcadcdb795de5d543cd0af916 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 4 Aug 2012 18:49:11 -0500 Subject: Restore proper whitespace in depends/required by display Signed-off-by: Dan McGee --- templates/packages/details_depend.html | 12 ++++++------ templates/packages/details_requiredby.html | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'templates') diff --git a/templates/packages/details_depend.html b/templates/packages/details_depend.html index 420af93c..4aa739c2 100644 --- a/templates/packages/details_depend.html +++ b/templates/packages/details_depend.html @@ -4,11 +4,11 @@ {% else %}{{ depend.dep.name }}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} (virtual) {% endif %}{% else %} {% 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) +{% if depend.pkg.repo.testing %} (testing) +{% endif %}{% if depend.pkg.repo.staging %} (staging) {% endif %}{% endifequal %} -{% if depend.dep.deptype == 'O' %} (optional) -{% endif %}{% if depend.dep.deptype == 'M' %} (make) -{% endif %}{% if depend.dep.deptype == 'C' %} (check) -{% endif %}{% if depend.dep.description %}- {{ depend.dep.description }} +{% if depend.dep.deptype == 'O' %} (optional) +{% endif %}{% if depend.dep.deptype == 'M' %} (make) +{% endif %}{% if depend.dep.deptype == 'C' %} (check) +{% endif %}{% if depend.dep.description %} - {{ depend.dep.description }} {% endif %}{% endspaceless %} diff --git a/templates/packages/details_requiredby.html b/templates/packages/details_requiredby.html index f498bd5e..e8c713ac 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 %} -{% 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) +{% 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 %} -- cgit v1.2.3-2-g168b From 7d9ed0b881bd05878e7a54f785c2551bc6e336d6 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 7 Aug 2012 01:16:51 -0500 Subject: Add reverse conflicts to package details This is a place where calling vercmp could come in really handy. Signed-off-by: Dan McGee --- templates/packages/details.html | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/packages/details.html b/templates/packages/details.html index 201e3074..9e898b7f 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -126,16 +126,23 @@ {% include "packages/details_relatedto.html" %} {% endif %}{% endwith %} + {% with pkg.replaces.all as all_related %}{% if all_related %} + + Replaces: + {% include "packages/details_relatedto.html" %} + + {% endif %}{% endwith %} {% with pkg.conflicts.all as all_related %}{% if all_related %} Conflicts: {% include "packages/details_relatedto.html" %} {% endif %}{% endwith %} - {% with pkg.replaces.all as all_related %}{% if all_related %} + {% with pkg.reverse_conflicts as rev_conflicts %}{% if rev_conflicts %} - Replaces: - {% include "packages/details_relatedto.html" %} + Reverse Conflicts: + {% for conflict in rev_conflicts %} + {% pkg_details_link conflict %}{% if not forloop.last %}, {% endif %}{% endfor %} {% endif %}{% endwith %} -- cgit v1.2.3-2-g168b From 94ea63afdd1f07392f2212dd69c3807986c161d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20B=C3=A4chler?= Date: Tue, 7 Aug 2012 22:08:24 +0200 Subject: Add a link to netboot outside of the "Test ISO" section. Signed-off-by: Dan McGee --- templates/public/download.html | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/public/download.html b/templates/public/download.html index f5f6f4d1..79a82f8b 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -49,6 +49,14 @@ title="Download for both architectures">Download archlinux-{{version}}-dual.iso.torrent
        +

        Netboot

        + +

        If you have a wired connection, you can boot the latest release directly over the network.

        + +

        Test ISO Info

        We provide daily snapshot ISOs. Those are largely untested, @@ -57,8 +65,7 @@

      • Download snapshots
      • Boot latest snapshots over the network - New
        • + title="Arch Linux Netboot Live System">Boot latest snapshots over the network
      • Feedback
      -- cgit v1.2.3-2-g168b From 978a5c61a5412eeed054307d3e2979324ffcb64a Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 8 Aug 2012 19:34:37 -0500 Subject: Add flag requests to developer last action calculation Signed-off-by: Dan McGee --- templates/devel/clock.html | 1 + 1 file changed, 1 insertion(+) (limited to 'templates') diff --git a/templates/devel/clock.html b/templates/devel/clock.html index bf4614b5..02e42749 100644 --- a/templates/devel/clock.html +++ b/templates/devel/clock.html @@ -20,6 +20,7 @@ mirror)
    • Post date of a news item
    • Signing off on a package
      • +
    • Flagging a package out-of-date

    Current UTC Time: {{ utc_now|date:"Y-m-d H:i T" }} -- cgit v1.2.3-2-g168b From acf252f7f3c0af95b3e90f07d0e4d878e4d0d776 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 5 Sep 2012 09:29:38 -0500 Subject: Add some HTML5-ization in JS of various input attributes On the login page, give focus to the username box when the page loads as well as turning autocorrection and auto-capitalization off on the username box. For the developer profile page, we can add some minor validation and typing of certain form fields that allow things like iPhone and Android to customize the presented keyboard to the user, as well as allowing browsers to do some client-side validation. Signed-off-by: Dan McGee --- templates/devel/profile.html | 14 ++++++++++++++ templates/registration/login.html | 11 +++++++++++ 2 files changed, 25 insertions(+) (limited to 'templates') diff --git a/templates/devel/profile.html b/templates/devel/profile.html index b6580ab8..9806552a 100644 --- a/templates/devel/profile.html +++ b/templates/devel/profile.html @@ -1,4 +1,6 @@ {% extends "base.html" %} +{% load static from staticfiles %} + {% block title %}Arch Linux - Edit Profile{% endblock %} {% block content %} @@ -22,4 +24,16 @@

    + +{% load cdn %}{% jquery %} + + {% endblock %} diff --git a/templates/registration/login.html b/templates/registration/login.html index ad1ac1ea..edbb77ea 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -1,4 +1,6 @@ {% extends "base.html" %} +{% load static from staticfiles %} + {% block title %}Arch Linux - Developer Login{% endblock %} {% block content %} @@ -19,4 +21,13 @@
    + +{% load cdn %}{% jquery %} + + {% endblock %} -- cgit v1.2.3-2-g168b From 3769994c4e58197fbb063c9e9bdc184af66edaf9 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 7 Sep 2012 09:34:11 -0500 Subject: Update downloads page for September release Signed-off-by: Dan McGee --- templates/public/download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/public/download.html b/templates/public/download.html index 79a82f8b..63f6d79c 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -7,7 +7,7 @@ {% block navbarclass %}anb-download{% endblock %} {% block content %} -{% with version="2012.08.04" kernel_version="3.4.7" %} +{% with version="2012.09.07" kernel_version="3.5.3" %}

    Arch Linux Downloads

    -- cgit v1.2.3-2-g168b From f221426a3286b9c9cfcc63a9caea861be9e99d02 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 8 Sep 2012 10:07:30 -0500 Subject: Remove 'new' markers from home page These things aren't so new anymore. Signed-off-by: Dan McGee --- templates/public/index.html | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'templates') diff --git a/templates/public/index.html b/templates/public/index.html index 0b97baf8..60ae442d 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -156,8 +156,7 @@
  • Mirror Status
  • Differences Reports - New
    • + title="See differences in packages between available architectures">Differences Reports

    Development

    @@ -176,16 +175,14 @@
  • Releng Testbuild Feedback
  • Visualizations - New
    • + title="View visualizations">Visualizations

    More Resources

    • Signing Master Keys - New
      • + title="Package/Database signing master keys">Signing Master Keys
    • Press Coverage
    • Logos & Artwork
      • -- cgit v1.2.3-2-g168b From 585b53a52a441761690ef81cd293597f38fa8a2f Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 8 Sep 2012 11:08:36 -0500 Subject: Add structured data markup from schema.org to package details This might help out search engines show more helpful blurbs for our package details pages. Tested using the Google Rich Snippets Testing Tool at http://www.google.com/webmasters/tools/richsnippets. Signed-off-by: Dan McGee --- templates/packages/details.html | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'templates') diff --git a/templates/packages/details.html b/templates/packages/details.html index 9e898b7f..5a5598a0 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -72,6 +72,17 @@ {% endif %}{% endwith %}
    +
    + + + + + + + +
    + +
    @@ -102,10 +113,10 @@ {% endifequal %} - + - @@ -186,9 +197,9 @@
    {{ flag_request.message|linebreaksbr|default:"{no message}" }}
    {% endif %}{% endwith %}{% endif %}
    Architecture:
    Description:{{ pkg.pkgdesc|default:"" }}{{ pkg.pkgdesc|default:"" }}
    Upstream URL:{% if pkg.url %}{% if pkg.url %}{% endif %}
    License(s):
    +
    - {% with pkg.get_depends as deps %}

    @@ -198,7 +209,6 @@ {% endif %}

    {% endwith %} - {% with pkg.get_requiredby as rqdby %}

    @@ -208,7 +218,6 @@ {% endif %}

    {% endwith %} -

    Package Contents

    @@ -218,9 +227,7 @@ View the file list for {{ pkg.pkgname }}

    - - {% load cdn %}{% jquery %} -- cgit v1.2.3-2-g168b From 59c353e22c5a9d1fda347e82f0734cf78bc7d387 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 15 Sep 2012 08:52:34 -0500 Subject: Standardize spelling of 'todo list' We use a space everywhere but a few places; fix the exceptions. Signed-off-by: Dan McGee --- templates/todolists/view.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/todolists/view.html b/templates/todolists/view.html index 35bc9446..c22bfecf 100644 --- a/templates/todolists/view.html +++ b/templates/todolists/view.html @@ -29,10 +29,10 @@
  • {{ svn_root }}
    • {% endfor %} -

    {{ list.packages|length }} total todolist package{{ list.packages|pluralize }} found.

    +

    {{ list.packages|length }} total todo list package{{ list.packages|pluralize }} found.

    -

    Filter Todolist Packages

    +

    Filter Todo List Packages

    Select filter criteria @@ -50,7 +50,7 @@
    -
    {{ list.packages|length }} todolist packages displayed.
    +
    {{ list.packages|length }} todo list packages displayed.
    -- cgit v1.2.3-2-g168b From dfbf7cdd4c273f2b1f3c1c79b97149d37e63e028 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 15 Sep 2012 09:13:58 -0500 Subject: Make todolist filtering functions more generic This will allow us to use them elsewhere in a future commit. Signed-off-by: Dan McGee --- templates/todolists/view.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/todolists/view.html b/templates/todolists/view.html index c22bfecf..eff81aaf 100644 --- a/templates/todolists/view.html +++ b/templates/todolists/view.html @@ -106,10 +106,11 @@ $(document).ready(function() { headers: { 5: { sorter: 'todostatus' } } }); $('a.status-link').click(todolist_flag); - $('#todolist_filter input').change(filter_todolist); - $('#criteria_reset').click(filter_todolist_reset); + filter_func = function() { filter_pkgs_list('#todolist_filter', '#dev-todo-pkglist tbody'); }; + $('#todolist_filter input').change(filter_func); + $('#criteria_reset').click(function() { filter_pkgs_reset(filter_func); }); // fire function on page load to ensure the current form selections take effect - filter_todolist(); + filter_func(); }); {% endblock %} -- cgit v1.2.3-2-g168b From a2034fc80d4e73816502537f8dfe864ab4ef8db3 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 15 Sep 2012 09:14:36 -0500 Subject: Add JS-based filtering to the developer reports This can use the todolist filtering functions we made more generic in a previous commit. Signed-off-by: Dan McGee --- templates/devel/packages.html | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/devel/packages.html b/templates/devel/packages.html index ac368124..4e1381ab 100644 --- a/templates/devel/packages.html +++ b/templates/devel/packages.html @@ -13,7 +13,28 @@ {% if maintainer %}This report only includes packages maintained by {{ maintainer.get_full_name }} ({{ maintainer.username }}).{% endif %}

    - + +
    +

    Filter Packages

    +
    +
    + Select filter criteria + {% for arch in arches %} +
    +
    + {% endfor %} + {% for repo in repos %} +
    +
    + {% endfor %} +
    +
    +
    {{ packages|length }} packages displayed.
    +
    + +
    + +
    @@ -31,7 +52,7 @@ {% for pkg in packages %} - + @@ -57,6 +78,11 @@ {% endblock %} -- cgit v1.2.3-2-g168b From b379981938db8561bd1ba856bbd7b2dfbe98dfaf Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Fri, 14 Sep 2012 21:41:20 +0200 Subject: donate.html: Add kartenzia.de Signed-off-by: Florian Pritz --- templates/public/donate.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'templates') diff --git a/templates/public/donate.html b/templates/public/donate.html index b1d52f88..202c5351 100644 --- a/templates/public/donate.html +++ b/templates/public/donate.html @@ -65,6 +65,12 @@ title="AirVM.com - Your Green Technology Partner"> +

    We would also like to thank Kartenzia for sponsoring a dedicated Arch Linux Server. + Kartenzia.de is a new Start-Up based in Germany and specializes in + eco-friendly invitations like Weihnachtskarten.

    + + +

    Past donors

    -- cgit v1.2.3-2-g168b From 47ec2603ba50099be7ce45920e6411a3c2939481 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 15 Sep 2012 09:20:28 -0500 Subject: Switch to Kartenzia PNG logo Signed-off-by: Dan McGee --- templates/public/donate.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/public/donate.html b/templates/public/donate.html index 202c5351..265a0085 100644 --- a/templates/public/donate.html +++ b/templates/public/donate.html @@ -69,7 +69,7 @@ Kartenzia.de is a new Start-Up based in Germany and specializes in eco-friendly invitations like Weihnachtskarten.

    - +

    Past donors

    -- cgit v1.2.3-2-g168b From 97595b7a26f09f89905e893b8be56b1424d0584b Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 15 Sep 2012 09:44:55 -0500 Subject: Add structured data markup from schema.org to news items We use the 'Article' type since this isn't print media. Signed-off-by: Dan McGee --- templates/news/view.html | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/news/view.html b/templates/news/view.html index 7788dece..8a4d8122 100644 --- a/templates/news/view.html +++ b/templates/news/view.html @@ -3,9 +3,19 @@ {% block title %}Arch Linux - News: {{ news.title }}{% endblock %} {% block content %} -
    +
    -

    News: {{ news.title }}

    +

    {{ news.title }}

    + + + + + +
    + +
    {% if perms.news.change_news %}
      -- cgit v1.2.3-2-g168b From 6c8413172506b5cce4f39e17f09803efea753be7 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 17 Sep 2012 20:47:33 -0500 Subject: More structured data markup for news articles Signed-off-by: Dan McGee --- templates/news/view.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/news/view.html b/templates/news/view.html index 8a4d8122..445f0398 100644 --- a/templates/news/view.html +++ b/templates/news/view.html @@ -4,12 +4,12 @@ {% block content %}
      -

      {{ news.title }}

      + @@ -28,7 +28,6 @@

      {{ news.postdate|date }} - {{ news.author.get_full_name }}

      -
      {{ news.content|markdown }}
      - +
      {{ news.content|markdown }}
      {% endblock %} -- cgit v1.2.3-2-g168b From cf5b31952e119d7fe7ad98cd739aa7cc564fe07b Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 17 Sep 2012 21:15:54 -0500 Subject: Minor updates to Kartenzia linkage And add some transparent rounded corners to the logo so it fits in better with the rest of our sponsor buttons. Signed-off-by: Dan McGee --- templates/public/donate.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/public/donate.html b/templates/public/donate.html index 265a0085..988ec50c 100644 --- a/templates/public/donate.html +++ b/templates/public/donate.html @@ -67,9 +67,9 @@

      We would also like to thank Kartenzia for sponsoring a dedicated Arch Linux Server. Kartenzia.de is a new Start-Up based in Germany and specializes in - eco-friendly invitations like Weihnachtskarten.

      + eco-friendly invitations like Weihnachten.

      - +

      Past donors

      -- cgit v1.2.3-2-g168b From 2fd5c74004c4b42bb363007d565ac9cb0890818c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20B=C3=A4chler?= Date: Thu, 20 Sep 2012 15:51:55 +0200 Subject: More minor updates to Kartenzia linkage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The last update broke one of the links. Signed-off-by: Thomas Bächler Signed-off-by: Dan McGee --- templates/public/donate.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/public/donate.html b/templates/public/donate.html index 988ec50c..b47683e7 100644 --- a/templates/public/donate.html +++ b/templates/public/donate.html @@ -67,7 +67,7 @@

      We would also like to thank Kartenzia for sponsoring a dedicated Arch Linux Server. Kartenzia.de is a new Start-Up based in Germany and specializes in - eco-friendly invitations like Weihnachten.

      + eco-friendly invitations like Weihnachten.

      -- cgit v1.2.3-2-g168b From d69e30cbf2cd76bdf87de138db030209ca43b2e1 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 24 Sep 2012 20:15:54 -0500 Subject: Add typeahead dropdown to front page packages search This uses the existing OpenSearch query endpoint to perform the search and displays the results accordingly. Signed-off-by: Dan McGee --- templates/public/index.html | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'templates') diff --git a/templates/public/index.html b/templates/public/index.html index 60ae442d..4af5995e 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -215,4 +215,22 @@
    {% endcache %} + +{% load cdn %}{% jquery %} + + {% endblock %} -- cgit v1.2.3-2-g168b From 05f309d7e57a66d9309abbf19b4328bad514b978 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 24 Sep 2012 21:13:02 -0500 Subject: Add a new column to developer repo stats Signed-off-by: Dan McGee --- templates/devel/index.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'templates') diff --git a/templates/devel/index.html b/templates/devel/index.html index 488b6755..a07a4190 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -216,6 +216,7 @@
    + @@ -228,6 +229,8 @@ + + {% endfor %} -- cgit v1.2.3-2-g168b From 3eed426027ed6bc87b58f82d48da06bea55b265f Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 25 Sep 2012 00:30:05 -0500 Subject: Add structured data to developer listing pages Signed-off-by: Dan McGee --- templates/public/developer_list.html | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'templates') diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html index 376ab433..df4137eb 100644 --- a/templates/public/developer_list.html +++ b/templates/public/developer_list.html @@ -12,17 +12,24 @@
    Arch
    {{ pkg.arch.name }} {{ pkg.repo.name|capfirst }} {% pkg_details_link pkg %}Repository # Packages # Flagged# Maintainers
    {{ repo.flagged_ct }} packages{{ repo.maintainer_ct }} maintainers
    {% for dev in dev_list %} {% with dev.userprofile as prof %} - + - + {% if user.is_authenticated %} -- cgit v1.2.3-2-g168b From cd625181344c73bdb761520dd23549a112549501 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 13 Nov 2012 09:12:09 -0600 Subject: Slight master key template adjustment This is in anticipation of moving the visualization stuff to this page rather than grouped with unrelated things. Signed-off-by: Dan McGee --- templates/public/keys.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'templates') diff --git a/templates/public/keys.html b/templates/public/keys.html index 1b027202..f23d1c40 100644 --- a/templates/public/keys.html +++ b/templates/public/keys.html @@ -47,6 +47,10 @@ {% endfor %}
    - Image for {{ prof.alias }} + Image for {{ prof.alias }} + + + + +
    + +

    {{ dev.get_full_name }}{% if prof.latin_name %} ({{ prof.latin_name}}){% endif %} ¶

    - + @@ -38,7 +45,7 @@ - @@ -46,7 +53,7 @@ - + -- cgit v1.2.3-2-g168b From 182a45ace9ba4690aa826b3faf34884fbd3f68ae Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 25 Sep 2012 18:20:50 -0500 Subject: Use minified typeahead JS file Signed-off-by: Dan McGee --- templates/public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/public/index.html b/templates/public/index.html index 4af5995e..3aab5da2 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -217,7 +217,7 @@ {% endcache %} {% load cdn %}{% jquery %} - + {% 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 %}{% ifequal best_satisfier None %}{{ related.name }}{% else %}{% pkg_details_link best_satisfier %}{% endifequal %}{{ related.comparison|default:"" }}{{ related.version|default:"" }}{% if not forloop.last %}, {% endif %} +{% endwith %}{% endfor %} -- cgit v1.2.3-2-g168b From 8463c3c121c2a7afcbcca08b9b1ef6b5d1782587 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 4 Oct 2012 13:32:54 -0500 Subject: Update bugs link for feeds for all projects Apparantly 'project=99' is not the correct way to do this; 'project=0' is. Flip the links so they all use the new form. FS#31561. Signed-off-by: Dan McGee --- templates/public/feeds.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/public/feeds.html b/templates/public/feeds.html index f5378afb..4a24b8d5 100644 --- a/templates/public/feeds.html +++ b/templates/public/feeds.html @@ -82,9 +82,9 @@ - - - + + + -- cgit v1.2.3-2-g168b From 627a3567271122c7a9e71b692538863aef69fda5 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 6 Oct 2012 10:34:29 -0500 Subject: Update download page for new release Signed-off-by: Dan McGee --- templates/public/download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/public/download.html b/templates/public/download.html index 63f6d79c..4b94e183 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -7,7 +7,7 @@ {% block navbarclass %}anb-download{% endblock %} {% block content %} -{% with version="2012.09.07" kernel_version="3.5.3" %} +{% with version="2012.10.06" kernel_version="3.5.5" %}

    Arch Linux Downloads

    -- cgit v1.2.3-2-g168b From cec2b52a8d1cb321710495f02e010f5d9070975d Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 14 Oct 2012 19:59:32 -0500 Subject: Convert Click & Pledge logo to PNG Signed-off-by: Dan McGee --- templates/public/donate.html | 2 +- templates/public/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/public/donate.html b/templates/public/donate.html index b47683e7..08234006 100644 --- a/templates/public/donate.html +++ b/templates/public/donate.html @@ -31,7 +31,7 @@ as how donations work.

    - Donate via Click&Pledge to Arch Linux + Donate via Click&Pledge to Arch Linux

    Commercial sponsors and contributions

    diff --git a/templates/public/index.html b/templates/public/index.html index cebb0681..000a527b 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -198,7 +198,7 @@ -- cgit v1.2.3-2-g168b From e0cb92480e7d9d4b21a5b5878af6d2cf2fba34cf Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 14 Oct 2012 20:04:09 -0500 Subject: Remove print stylesheet This hasn't been updated in ages, and who is printing out pages from the website anyway? Signed-off-by: Dan McGee --- templates/base.html | 1 - 1 file changed, 1 deletion(-) (limited to 'templates') diff --git a/templates/base.html b/templates/base.html index e6ccc972..392bf22f 100644 --- a/templates/base.html +++ b/templates/base.html @@ -4,7 +4,6 @@ {% block title %}Arch Linux{% endblock %} - -- cgit v1.2.3-2-g168b From e398a957bb1cc338fe16548f0c6a330bea823c95 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 21 Oct 2012 10:15:19 -0500 Subject: Remove charset declaration tag This belongs in HTTP headers, not here. Signed-off-by: Dan McGee --- templates/base.html | 1 - 1 file changed, 1 deletion(-) (limited to 'templates') diff --git a/templates/base.html b/templates/base.html index 392bf22f..2617bc31 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,7 +2,6 @@ {% block title %}Arch Linux{% endblock %} - -- cgit v1.2.3-2-g168b From 0b97d52351fc2bdcae16f1a1e7c56afd4ed476ad Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 26 Oct 2012 16:49:58 -0500 Subject: Enable safe mode for markdown parsing Although we don't allow unauthenticated users to post content, we should still cover our bases here and ensure people can't inject stuff into the production website via an inadvertent XSS. Signed-off-by: Dan McGee --- templates/feeds/news_description.html | 2 +- templates/news/view.html | 2 +- templates/public/index.html | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'templates') diff --git a/templates/feeds/news_description.html b/templates/feeds/news_description.html index e75d0af7..77830367 100644 --- a/templates/feeds/news_description.html +++ b/templates/feeds/news_description.html @@ -1,3 +1,3 @@ {% load markup %}

    {{obj.author.get_full_name}} wrote:

    -{{ obj.content|markdown }} \ No newline at end of file +{{ obj.content|markdown:'safe' }} diff --git a/templates/news/view.html b/templates/news/view.html index 445f0398..b6c06b28 100644 --- a/templates/news/view.html +++ b/templates/news/view.html @@ -28,6 +28,6 @@

    {{ news.postdate|date }} - {{ news.author.get_full_name }}

    -
    {{ news.content|markdown }}
    +
    {{ news.content|markdown:'safe' }}
    {% endblock %} diff --git a/templates/public/index.html b/templates/public/index.html index 000a527b..762433a4 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -53,8 +53,8 @@

    {{ news.postdate|date }}

    - {% if forloop.counter0 == 0 %}{{ news.content|markdown|truncatewords_html:300 }} - {% else %}{{ news.content|markdown|truncatewords_html:100 }}{% endif %} + {% if forloop.counter0 == 0 %}{{ news.content|markdown:'safe'|truncatewords_html:300 }} + {% else %}{{ news.content|markdown:'safe'|truncatewords_html:100 }}{% endif %}
    {% else %} {% if forloop.counter0 == 5 %} -- cgit v1.2.3-2-g168b From 62bb3db8ada68a22c7a58f32b2e6bed63f19e53c Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 26 Oct 2012 17:36:12 -0500 Subject: Remove usages of 'django.contrib.markup' Switch to the news model being able to spit out the HTML version of the content, and don't use the markup contrib module. This is deprecated as of Django 1.5 so we can move off it now to save trouble down the road when it is fully removed. Signed-off-by: Dan McGee --- templates/feeds/news_description.html | 3 +-- templates/news/view.html | 3 +-- templates/public/index.html | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) (limited to 'templates') diff --git a/templates/feeds/news_description.html b/templates/feeds/news_description.html index 77830367..d3cacebc 100644 --- a/templates/feeds/news_description.html +++ b/templates/feeds/news_description.html @@ -1,3 +1,2 @@ -{% load markup %}

    {{obj.author.get_full_name}} wrote:

    -{{ obj.content|markdown:'safe' }} +{{ obj.content.html }} diff --git a/templates/news/view.html b/templates/news/view.html index b6c06b28..8f49fb1f 100644 --- a/templates/news/view.html +++ b/templates/news/view.html @@ -1,5 +1,4 @@ {% extends "base.html" %} -{% load markup %} {% block title %}Arch Linux - News: {{ news.title }}{% endblock %} {% block content %} @@ -28,6 +27,6 @@

    {{ news.postdate|date }} - {{ news.author.get_full_name }}

    -
    {{ news.content|markdown:'safe' }}
    +
    {{ news.html }}
    {% endblock %} diff --git a/templates/public/index.html b/templates/public/index.html index 762433a4..686fbdda 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load markup cache %} +{% load cache %} {% load url from future %} {% load static from staticfiles %} @@ -53,8 +53,8 @@

    {{ news.postdate|date }}

    - {% if forloop.counter0 == 0 %}{{ news.content|markdown:'safe'|truncatewords_html:300 }} - {% else %}{{ news.content|markdown:'safe'|truncatewords_html:100 }}{% endif %} + {% if forloop.counter0 == 0 %}{{ news.html|truncatewords_html:300 }} + {% else %}{{ news.html|truncatewords_html:100 }}{% endif %}
    {% else %} {% if forloop.counter0 == 5 %} -- cgit v1.2.3-2-g168b From bcccd16606a89507e5d5083440a50c98c576d380 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 27 Oct 2012 13:53:24 -0500 Subject: Fix news feed content display Signed-off-by: Dan McGee --- templates/feeds/news_description.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/feeds/news_description.html b/templates/feeds/news_description.html index d3cacebc..61ceedf3 100644 --- a/templates/feeds/news_description.html +++ b/templates/feeds/news_description.html @@ -1,2 +1,2 @@

    {{obj.author.get_full_name}} wrote:

    -{{ obj.content.html }} +{{ obj.html }} -- cgit v1.2.3-2-g168b From e2f7f3c9ea90d66c5d9678bd4b182917b03a2a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20B=C3=A4chler?= Date: Mon, 29 Oct 2012 22:49:24 +0100 Subject: Remove information regarding test ISOs The test builds are dead and nobody is taking care of them. With our monthly releases, they serve no purpose. Signed-off-by: Dan McGee --- templates/public/download.html | 13 ------------- templates/public/index.html | 2 -- 2 files changed, 15 deletions(-) (limited to 'templates') diff --git a/templates/public/download.html b/templates/public/download.html index 4b94e183..ba4c3282 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -57,19 +57,6 @@ title="Arch Linux Netboot Live System">Arch Linux Netboot -

    Test ISO Info

    - -

    We provide daily snapshot ISOs. Those are largely untested, - but may be more up to date than the releases.

    - -

    HTTP Direct Downloads

    In addition to the BitTorrent links above, install images can also be diff --git a/templates/public/index.html b/templates/public/index.html index 686fbdda..2da03f4b 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -173,8 +173,6 @@ title="View the available package groups">Package Groups

  • Todo Lists
    • -
  • Releng Testbuild Feedback
  • Visualizations
    • -- cgit v1.2.3-2-g168b From 1b28881f7ec58f87bc75699b2d906d28837bccb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20B=C3=A4chler?= Date: Wed, 31 Oct 2012 15:09:51 +0100 Subject: download.html: Provide a magnet link Some people prefer these over torrent files, as they're easier to pass than the torrent files themselves. On updates, this only needs the new info hash. The tracker bits are optional, but ensure that the torrent client gets peers more quickly to receive the actual torrent file. Signed-off-by: Dan McGee --- templates/public/download.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/public/download.html b/templates/public/download.html index ba4c3282..14e77b6d 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -7,7 +7,7 @@ {% block navbarclass %}anb-download{% endblock %} {% block content %} -{% with version="2012.10.06" kernel_version="3.5.5" %} +{% with version="2012.10.06" kernel_version="3.5.5" torrent_infohash="b4865374f39a2b34f4c9517ec4b532f65094a28d" %}

    Arch Linux Downloads

    @@ -46,7 +46,8 @@ A web-seed capable client is recommended for fastest download speeds.

    Netboot

    -- cgit v1.2.3-2-g168b From 49546cddcab13c1767e386d6061493a25388b4bd Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 1 Nov 2012 08:29:30 -0500 Subject: Update for November ISO release Signed-off-by: Dan McGee --- templates/public/download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/public/download.html b/templates/public/download.html index 14e77b6d..2fddd4e9 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -7,7 +7,7 @@ {% block navbarclass %}anb-download{% endblock %} {% block content %} -{% with version="2012.10.06" kernel_version="3.5.5" torrent_infohash="b4865374f39a2b34f4c9517ec4b532f65094a28d" %} +{% with version="2012.11.01" kernel_version="3.6.4" torrent_infohash="f86f84c74edc90336f94f0837afa3071ada2aaa8" %}

    Arch Linux Downloads

    -- cgit v1.2.3-2-g168b From 07d2fc5d358992a52908cccbbca4a11d01e98da3 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 10 Nov 2012 15:41:09 -0600 Subject: Add initial version of mirror status chart Still have some hardcoded stuff to rip out and replace to make this a bit more dynamic on things like sizing, but for now, this is a great start. Signed-off-by: Dan McGee --- templates/mirrors/mirror_details.html | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'templates') diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index 18175845..32ef8a7a 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -104,14 +104,21 @@ {% endfor %}
    Alias:{{ prof.alias }}{{ prof.alias }}
    Email: {{ prof.public_email }}
    Website:{% if prof.website %}{% if prof.website %}{% endif %}
    {{ prof.occupation }}
    YOB:{% if prof.yob %}{{ prof.yob }}{% endif %}{% if prof.yob %}{{ prof.yob }}{% endif %}
    Location: {% if dev.userprofile.country %}{{ dev.userprofile.country.name }} {% endif %}{{ prof.location }}
    All ProjectsFeedFeedFeedFeedFeedFeed
    Arch Linux Feed
    + +

    Mirror Status Chart

    + +
    {% load cdn %}{% jquery %}{% jquery_tablesorter %} + + {% endblock %} -- cgit v1.2.3-2-g168b From 2339f42ef0f95e55d99be47ed2327c3d127ebc29 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 29 Oct 2012 20:07:54 -0500 Subject: Remove SevenL from sponsors list They've been good to us for several years, but our hardware requirements have changed and we've moved on to using different machines for the purposes this donated machine served. Thanks! Signed-off-by: Dan McGee --- templates/public/donate.html | 14 -------------- templates/public/index.html | 5 ----- 2 files changed, 19 deletions(-) (limited to 'templates') diff --git a/templates/public/donate.html b/templates/public/donate.html index 08234006..ef80baea 100644 --- a/templates/public/donate.html +++ b/templates/public/donate.html @@ -44,20 +44,6 @@ title="velocity network"> -

    We also wish to extend a special thank you to 7L Networks - for their generous and ongoing contribution of a dedicated Arch Linux - server. You too can have a dedicated Arch Linux server, or your server colocation service, - with 7L. Head over to their website for more details.

    - - -

    More thanks go to AirVM.com for contributing a VMWare-based Virtual Machine.

    diff --git a/templates/public/index.html b/templates/public/index.html index 2da03f4b..55298ae3 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -201,17 +201,12 @@ {% endcache %} -- cgit v1.2.3-2-g168b From 92837c93acc66056391dd0b98515b89f8fc49691 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 12 Nov 2012 21:37:08 -0600 Subject: Prefetch the available protocols on the mirror overview page Otherwise we are doing one query per mirror, which at this point is over 100 separate queries. Signed-off-by: Dan McGee --- templates/mirrors/mirrors.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/mirrors/mirrors.html b/templates/mirrors/mirrors.html index 0950520d..c83d0d43 100644 --- a/templates/mirrors/mirrors.html +++ b/templates/mirrors/mirrors.html @@ -29,7 +29,7 @@     		{{ mirror.get_tier_display }} {% if mirror.country %} {% endif %}{{ mirror.country.name }} {{ mirror.isos|yesno|capfirst }}{{ mirror.supported_protocols|join:", " }}{{ mirror.protocols|join:", " }}{{ mirror.public|yesno|capfirst }} {{ mirror.active|yesno|capfirst }}
    + + +
    +

    Master Key Signatures

    The following table shows all active developers and trusted users along with the status of their personal signing key. A 'Yes' indicates that the -- cgit v1.2.3-2-g168b From 59f5b6ed5524300cc0373ad934b251e220c66da9 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 13 Nov 2012 09:51:11 -0600 Subject: Mirror details style and JS cleanup Signed-off-by: Dan McGee --- templates/mirrors/mirror_details.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index 32ef8a7a..884187b9 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -5,12 +5,11 @@ {% block title %}Arch Linux - {{ mirror.name }} - Mirror Details{% endblock %} {% block content %} - -

    +

    Mirror Details: {{ mirror.name }}

    - +
    @@ -118,6 +117,8 @@ $(document).ready(function() { $("#available_urls:has(tbody tr)").tablesorter( {widgets: ['zebra'], sortList: [[0,0]], headers: { 6: { sorter: 'mostlydigit' }, 7: { sorter: 'mostlydigit' }, 8: { sorter: 'mostlydigit' } } }); +}); +$(document).ready(function() { mirror_status("#visualize-mirror", "./json/"); }); -- cgit v1.2.3-2-g168b From 500d19a914eb13c310a1d2c7d28a1befce468419 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 13 Nov 2012 09:51:59 -0600 Subject: Move PGP key visualizations to master keys page Signed-off-by: Dan McGee --- templates/public/keys.html | 23 +++++++++++++++++++++-- templates/visualize/index.html | 5 ----- 2 files changed, 21 insertions(+), 7 deletions(-) (limited to 'templates') diff --git a/templates/public/keys.html b/templates/public/keys.html index f23d1c40..81713efb 100644 --- a/templates/public/keys.html +++ b/templates/public/keys.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% load static from staticfiles %} +{% load url from future %} {% load pgp %} {% block title %}Arch Linux - Master Signing Keys{% endblock %} @@ -47,10 +48,16 @@ {% endfor %}
    Name: {{ mirror.name }}
    + +
    -

    Master Key Signatures

    +

    Master Key Signatures

    The following table shows all active developers and trusted users along with the status of their personal signing key. A 'Yes' indicates that the @@ -95,7 +102,13 @@

    -

    Developer Cross-Signatures

    +

    Visualization of PGP Master and Developer Keys

    + +
    +
    + +
    +

    Developer Cross-Signatures

    This table lists signatures directly between developer keys.

    @@ -120,8 +133,11 @@
    + {% load cdn %}{% jquery %}{% jquery_tablesorter %} + + {% endblock %} diff --git a/templates/visualize/index.html b/templates/visualize/index.html index 95cf6c1c..242a7f0b 100644 --- a/templates/visualize/index.html +++ b/templates/visualize/index.html @@ -24,11 +24,7 @@
    -
    -

    Visualization of PGP Master and Signing Keys

    -
    -
    {% load cdn %}{% jquery %} @@ -40,7 +36,6 @@ $(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' %}"); }); {% endblock %} -- cgit v1.2.3-2-g168b From 45d81a9578e846062550335495dbceb82f16a1a0 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 13 Nov 2012 10:03:55 -0600 Subject: Move JSON keys view to public/ app This seems like a more appropriate place, and now the visualization is done here anyway so we should move the data backing it. Signed-off-by: Dan McGee --- templates/public/keys.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/public/keys.html b/templates/public/keys.html index 81713efb..9af491e2 100644 --- a/templates/public/keys.html +++ b/templates/public/keys.html @@ -149,7 +149,7 @@ $(document).ready(function() { }); }); $(document).ready(function() { - developer_keys("#visualize-keys", "{% url 'visualize-pgp_keys' %}"); + developer_keys("#visualize-keys", "{% url 'pgp-keys-json' %}"); }); {% endblock %} -- cgit v1.2.3-2-g168b From f7331a0eca351300685ebee494e810d8c82c35b1 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 20 Nov 2012 19:16:25 -0600 Subject: Add Release model to releng This should prevent the need for monthly template updates from Pierre and Thomas; best to just let them enter the data themselves and have it show up on the website. Signed-off-by: Dan McGee --- templates/public/download.html | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'templates') diff --git a/templates/public/download.html b/templates/public/download.html index 2fddd4e9..d0754e5b 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -7,7 +7,6 @@ {% block navbarclass %}anb-download{% endblock %} {% block content %} -{% with version="2012.11.01" kernel_version="3.6.4" torrent_infohash="f86f84c74edc90336f94f0837afa3071ada2aaa8" %}

    Arch Linux Downloads

    @@ -20,8 +19,8 @@ can always be updated with `pacman -Syu`.

    -{% endwith %} {% endblock %} -- cgit v1.2.3-2-g168b From 402487b007e206b013ecbf8b3017dc1231f4bbbc Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 20 Nov 2012 19:33:49 -0600 Subject: Move some logic out of the templates to the Release model This includes magnet URI generation, ISO paths, etc. Signed-off-by: Dan McGee --- templates/public/download.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'templates') diff --git a/templates/public/download.html b/templates/public/download.html index d0754e5b..5733ee94 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -44,9 +44,9 @@ download is finished, so you can seed it back to others. A web-seed capable client is recommended for fastest download speeds.

    Netboot

    @@ -69,11 +69,11 @@

    File integrity checksums for the latest releases can be found below:

    @@ -85,8 +85,8 @@ {% else %}
    Worldwide
    {% endif %} {% endfor %} -- cgit v1.2.3-2-g168b From c81a9271b8bbc03418442c01d50a4c4945999e71 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 21 Nov 2012 00:10:12 -0500 Subject: Show release notes on downloads page Signed-off-by: Dan McGee --- templates/public/download.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'templates') diff --git a/templates/public/download.html b/templates/public/download.html index 5733ee94..5f6f2d02 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -32,6 +32,12 @@ + {% if release.info %} +

    Release Notes

    + +
    {{ release.info_html }}
    + {% endif %} +

    Existing Arch Users

    If you are an existing Arch user, there is no need to download a new ISO -- cgit v1.2.3-2-g168b From 9db1d4c6a0c60f32628dbd8d217fbd6c3ba99509 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 21 Nov 2012 00:19:23 -0500 Subject: Minor download template tweaks Signed-off-by: Dan McGee --- templates/public/download.html | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'templates') diff --git a/templates/public/download.html b/templates/public/download.html index 5f6f2d02..3005ffb3 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -20,7 +20,7 @@

    • Current Release: {{ release.version }}
      • -
    • Included Kernel: {{ release.kernel_version }}
      • + {% if release.kernel_version %}
    • Included Kernel: {{ release.kernel_version }}
      • {% endif %}
    • Installation Guide
    • Resources:
        @@ -49,19 +49,15 @@

        If you can spare the bytes, please leave the client open after your download is finished, so you can seed it back to others. A web-seed capable client is recommended for fastest download speeds.

        - +

        Download torrent for {{ release.version }} + (Magnet)

        Netboot

        If you have a wired connection, you can boot the latest release directly over the network.

        - +

        Arch Linux Netboot

        HTTP Direct Downloads

        -- 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') 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 f7fe73eff01195d3b2d8cd7898e48384d331e12e Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 4 Dec 2012 16:05:00 -0600 Subject: Add charset to meta tags Signed-off-by: Dan McGee --- templates/base.html | 1 + 1 file changed, 1 insertion(+) (limited to 'templates') diff --git a/templates/base.html b/templates/base.html index 2617bc31..2592c9b0 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,6 +1,7 @@ {% load url from future %}{% load static from staticfiles %} + {% block title %}Arch Linux{% endblock %} -- 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/devel/packages.html | 4 +++- templates/packages/differences.html | 5 +++-- templates/packages/signoffs.html | 6 ++++-- templates/todolists/view.html | 4 +++- 4 files changed, 13 insertions(+), 6 deletions(-) (limited to 'templates') diff --git a/templates/devel/packages.html b/templates/devel/packages.html index 4e1381ab..a62ae1ab 100644 --- a/templates/devel/packages.html +++ b/templates/devel/packages.html @@ -78,7 +78,9 @@ {% 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 2b9519996a47fd1d978ccac36246f0245ad668fb Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 27 Dec 2012 16:43:01 -0600 Subject: Update D3 to 3.0.0 Signed-off-by: Dan McGee --- templates/mirrors/mirror_details.html | 2 +- templates/public/keys.html | 2 +- templates/visualize/index.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index 884187b9..132557cd 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -109,7 +109,7 @@
        {% load cdn %}{% jquery %}{% jquery_tablesorter %} - + + + {% endblock %} diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html index 1961d222..c7394de6 100644 --- a/templates/mirrors/status_table.html +++ b/templates/mirrors/status_table.html @@ -17,7 +17,7 @@ {% spaceless %} {{ m_url.url }} {{ m_url.protocol }} - {% if m_url.real_country %} {% endif %}{{ m_url.real_country.name }} + {% if m_url.country %} {% endif %}{{ m_url.country.name }} {{ m_url.completion_pct|percentage:1 }} {{ m_url.delay|duration|default:'unknown' }} {{ m_url.duration_avg|floatformat:2 }} diff --git a/templates/public/download.html b/templates/public/download.html index 3005ffb3..0c96fcef 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -81,7 +81,7 @@ {% cache 600 download-mirrors %}
        - {% regroup mirror_urls by real_country as grouped_urls %} + {% regroup mirror_urls by country as grouped_urls %} {% for country in grouped_urls %} {% if country.grouper %}
        {{ country.grouper.name }}
        {% else %}
        Worldwide
        {% endif %} -- cgit v1.2.3-2-g168b From 131d238ae38034c3df0ab1dbc307773ac6a38442 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 15 Jan 2013 22:59:13 -0600 Subject: Add a little easter egg for people to find Signed-off-by: Dan McGee --- templates/base.html | 1 + templates/public/index.html | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) (limited to 'templates') diff --git a/templates/base.html b/templates/base.html index a7ebc7d3..c6aa3f17 100644 --- a/templates/base.html +++ b/templates/base.html @@ -68,6 +68,7 @@ {% block content_right %}{% endblock %}
        {% endblock %} + {% block content_after %}{% endblock %} {% endcache %} +{% endblock %} + +{% block content_after %} + {% load cdn %}{% jquery %} + {% endblock %} -- cgit v1.2.3-2-g168b From 0b930fd92140858f4ad21e593feb057996af9b95 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 16 Jan 2013 00:36:17 -0600 Subject: Convert all usages of flag icons to new sprite This uses a new template tag to avoid repeating construction of the necessary HTML element all over the place. The site should look exactly as it did before, except now you don't have to download 20+ images to see some pages. Signed-off-by: Dan McGee --- templates/devel/clock.html | 5 ++++- templates/mirrors/mirror_details.html | 5 ++++- templates/mirrors/status.html | 5 ++++- templates/mirrors/status_table.html | 3 ++- templates/public/developer_list.html | 3 ++- templates/public/download.html | 6 +++++- templates/public/userlist.html | 3 +++ 7 files changed, 24 insertions(+), 6 deletions(-) (limited to 'templates') diff --git a/templates/devel/clock.html b/templates/devel/clock.html index 02e42749..83fbb70b 100644 --- a/templates/devel/clock.html +++ b/templates/devel/clock.html @@ -1,9 +1,12 @@ {% extends "base.html" %} {% load static from staticfiles %} +{% load flags %} {% load tz %} {% block title %}Arch Linux - Developer World Clocks{% endblock %} +{% block head %}{% endblock %} + {% block content %}

        Developer World Clocks

        @@ -45,7 +48,7 @@ {{ dev.username }} {{ dev.userprofile.alias }} {{ dev.last_action }} - {% if dev.userprofile.country %}{{ dev.userprofile.country.name }} {% endif %}{{ dev.userprofile.location }} + {% country_flag dev.userprofile.country %}{{ dev.userprofile.location }} {{ dev.userprofile.time_zone }} {{ utc_now|timezone:dev.userprofile.time_zone|date:"Y-m-d H:i T" }} {{ dev.userprofile.time_zone }} diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index a56123ff..8ea6bbec 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -1,9 +1,12 @@ {% extends "base.html" %} {% load static from staticfiles %} {% load mirror_status %} +{% load flags %} {% block title %}Arch Linux - {{ mirror.name }} - Mirror Details{% endblock %} +{% block head %}{% endblock %} + {% block content %}
        @@ -90,7 +93,7 @@ {% if m_url.protocol.is_download %}{{ m_url.url }}{% else %}{{ m_url.url }}{% endif %} {{ m_url.protocol }} - {% if m_url.country %} {% endif %}{{ m_url.country.name }} + {% country_flag m_url.country %}{{ m_url.country.name }} {{ m_url.has_ipv4|yesno|capfirst }} {{ m_url.has_ipv6|yesno|capfirst }} {{ m_url.last_sync|date:'Y-m-d H:i'|default:'unknown' }} diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html index ec2ae568..8d32d3fa 100644 --- a/templates/mirrors/status.html +++ b/templates/mirrors/status.html @@ -1,9 +1,12 @@ {% extends "base.html" %} {% load static from staticfiles %} {% load mirror_status %} +{% load flags %} {% block title %}Arch Linux - Mirror Status{% if tier != None %} - Tier {{ tier }}{% endif %}{% endblock %} +{% block head %}{% endblock %} + {% block content %}

        Mirror Status{% if tier != None %} - Tier {{ tier }}{% endif %}

        @@ -88,7 +91,7 @@ {% spaceless %} {{ log.url__url }} {{ log.url__protocol__protocol }} - {% if log.country %} {% endif %}{{ log.country.name }} + {% country_flag log.country %}{{ log.country.name }} {{ log.error|linebreaksbr }} {{ log.last_occurred|date:'Y-m-d H:i' }} {{ log.error_count }} diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html index c7394de6..2dd7ef49 100644 --- a/templates/mirrors/status_table.html +++ b/templates/mirrors/status_table.html @@ -1,4 +1,5 @@ {% load mirror_status %} +{% load flags %} @@ -17,7 +18,7 @@ {% spaceless %} - + diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html index df4137eb..4401d97b 100644 --- a/templates/public/developer_list.html +++ b/templates/public/developer_list.html @@ -1,3 +1,4 @@ +{% load flags %} {% load pgp %}
        @@ -56,7 +57,7 @@
        - + diff --git a/templates/public/download.html b/templates/public/download.html index 0c96fcef..7de49778 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -2,8 +2,12 @@ {% load cache %} {% load url from future %} {% load static from staticfiles %} +{% load flags %} {% block title %}Arch Linux - Downloads{% endblock %} + +{% block head %}{% endblock %} + {% block navbarclass %}anb-download{% endblock %} {% block content %} @@ -83,7 +87,7 @@
        {% regroup mirror_urls by country as grouped_urls %} {% for country in grouped_urls %} - {% if country.grouper %}
        {{ country.grouper.name }}
        + {% if country.grouper %}
        {% country_flag country.grouper %}{{ country.grouper.name }}
        {% else %}
        Worldwide
        {% endif %}
          {% for mirror_url in country.list %} diff --git a/templates/public/userlist.html b/templates/public/userlist.html index 0077f611..35104317 100644 --- a/templates/public/userlist.html +++ b/templates/public/userlist.html @@ -1,8 +1,11 @@ {% extends "base.html" %} +{% load static from staticfiles %} {% load cache %} {% block title %}Arch Linux - {{ user_type }}{% endblock %} +{% block head %}{% endblock %} + {% block content %} {% cache 600 dev-tu-profiles user_type %}
          -- cgit v1.2.3-2-g168b From a42a0dc6e400d03609d2d53c0955273b3c05c7ea Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 19 Jan 2013 09:48:15 -0600 Subject: Add double click event handler to hide image Signed-off-by: Dan McGee --- templates/public/index.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'templates') diff --git a/templates/public/index.html b/templates/public/index.html index abf16afd..6fc90436 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -240,6 +240,9 @@ $(document).ready(function() { setTimeout(function() { $('#konami').fadeIn(500); }, 500); + $('#konami').click(function() { + $('#konami').fadeOut(500); + }); }; konami.iphone.code = konami.code; konami.load(); -- cgit v1.2.3-2-g168b From 721f092e4a36a58da2f701973521fb087a977693 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 19 Jan 2013 10:36:49 -0600 Subject: Publicize the releases feed Signed-off-by: Dan McGee --- templates/public/download.html | 5 ++++- templates/public/feeds.html | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/public/download.html b/templates/public/download.html index 7de49778..8ddbc23e 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -6,7 +6,10 @@ {% block title %}Arch Linux - Downloads{% endblock %} -{% block head %}{% endblock %} +{% block head %} + + +{% endblock %} {% block navbarclass %}anb-download{% endblock %} diff --git a/templates/public/feeds.html b/templates/public/feeds.html index 4a24b8d5..f354fa47 100644 --- a/templates/public/feeds.html +++ b/templates/public/feeds.html @@ -12,7 +12,7 @@

          News and Activity Feeds

          -

          Grab the news item feed +

          Grab the news item feed to keep up-to-date with the latest news from the Arch Linux development staff.

          The A newest packages feed is also available from the Arch User Repository (AUR).

          +

          Release Feed

          + +

          Grab the ISO release feed + if you want to help seed the ISO release torrents as they come out.

          +

          Development Feeds

          Subscribe to any of the following to track bug tickets and feature -- cgit v1.2.3-2-g168b From 8cfaa39a0464f7ee35af76473d3e73ae587a6cb8 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 19 Jan 2013 10:55:58 -0600 Subject: Add more metadata to releng Release model Add a file_size field which we will use in the RSS feed, and also add a field for future storage of the torrent data itself. Signed-off-by: Dan McGee --- templates/public/download.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/public/download.html b/templates/public/download.html index 8ddbc23e..29490849 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -58,7 +58,9 @@ A web-seed capable client is recommended for fastest download speeds.

          Download torrent for {{ release.version }} - (Magnet)

          + (Magnet) + {% if release.file_size %}({{ release.file_size|filesizeformat }}){% endif %} +

          Netboot

          -- cgit v1.2.3-2-g168b From 1a7e5d22f1c4e948c624d26b4d8c1ed30189acfe Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 19 Jan 2013 12:06:47 -0600 Subject: Add basic release list and details views Signed-off-by: Dan McGee --- templates/releng/release_detail.html | 24 ++++++++++++++++++++ templates/releng/release_list.html | 44 ++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 templates/releng/release_detail.html create mode 100644 templates/releng/release_list.html (limited to 'templates') diff --git a/templates/releng/release_detail.html b/templates/releng/release_detail.html new file mode 100644 index 00000000..fec9ce2b --- /dev/null +++ b/templates/releng/release_detail.html @@ -0,0 +1,24 @@ +{% extends "base.html" %} +{% block title %}Arch Linux - Release: {{ release.version }}{% endblock %} + +{% block content %} +
          +

          {{ release.version }}

          + +
            +
          • Release Date: {{ release.release_date|date }}
            • + {% if release.kernel_version %}
          • Kernel Version: {{ release.kernel_version }}
            • {% endif %} +
          • Available: {{ release.available|yesno }}
            • + {% if release.available %}
          • Torrent
            • {% endif %} + {% if release.available %}
          • Magnet
            • {% endif %} +
          • Download Size: {% if release.file_size %}{{ release.file_size|filesizeformat }}{% else %}Unknown{% endif %}
            • +
          + + {% if release.info %} +

          Release Notes

          + +
          {{ release.info_html }}
          + {% endif %} +
          +{% endblock %} diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html new file mode 100644 index 00000000..1657249f --- /dev/null +++ b/templates/releng/release_list.html @@ -0,0 +1,44 @@ +{% extends "base.html" %} +{% load url from future %} + +{% block title %}Arch Linux - Releases{% endblock %} + +{% block head %} + +{% endblock %} + +{% block content %} +
          + +

          Releases

          + +
        {{ m_url.url }} {{ m_url.protocol }}{% if m_url.country %} {% endif %}{{ m_url.country.name }}{% country_flag m_url.country %}{{ m_url.country.name }} {{ m_url.completion_pct|percentage:1 }} {{ m_url.delay|duration|default:'unknown' }} {{ m_url.duration_avg|floatformat:2 }}{% if prof.yob %}{{ prof.yob }}{% endif %}
        Location:{% if dev.userprofile.country %}{{ dev.userprofile.country.name }} {% endif %}{{ prof.location }}{% country_flag dev.userprofile.country %}{{ prof.location }}
        Languages: {{ prof.languages }}
        + + + + + + + + + + + + + {% for item in release_list %} + + + + + + + + + + {% endfor %} + +
        Release DateVersionKernel VersionAvailable?TorrentMagnetDownload Size
        {{ item.release_date|date }}{{ item.version }}{{ item.kernel_version|default:"" }}{{ item.available|yesno }}{% if item.available %}Torrent{% endif %}{% if item.available %}Magnet{% endif %}{% if item.file_size %}{{ item.file_size|filesizeformat }}{% endif %}
        + +
        +{% endblock %} -- cgit v1.2.3-2-g168b From 71c0c7453a5bc28b6e6576fe4f1351139f33ade5 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 19 Jan 2013 13:08:06 -0600 Subject: Implement torrent data parsing and extraction via bencode This allows uploading of the actual torrent file itself into the webapp and then pulling the relevant pieces of information out of it. Signed-off-by: Dan McGee --- templates/releng/release_detail.html | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/releng/release_detail.html b/templates/releng/release_detail.html index fec9ce2b..f4de9e52 100644 --- a/templates/releng/release_detail.html +++ b/templates/releng/release_detail.html @@ -9,9 +9,10 @@
      • Release Date: {{ release.release_date|date }}
        • {% if release.kernel_version %}
      • Kernel Version: {{ release.kernel_version }}
        • {% endif %}
      • Available: {{ release.available|yesno }}
        • - {% if release.available %}
      • Torrent
        • {% endif %} - {% if release.available %}
      • Magnet
        • {% endif %} + {% if release.available %}
      • Download: Torrent, + Magnet
        • {% endif %} + {% if release.torrent_infohash %}
      • Torrent Info Hash: {{ release.torrent_infohash }}
        • {% endif %}
      • Download Size: {% if release.file_size %}{{ release.file_size|filesizeformat }}{% else %}Unknown{% endif %}
      @@ -20,5 +21,22 @@
      {{ release.info_html }}
      {% endif %} + + {% if release.torrent_data %}{% with release.torrent as torrent %} +

      Torrent Information

      + +
        +
      • Comment: {{ torrent.comment }}
        • +
      • Creation Date: {{ torrent.creation_date|date:"DATETIME_FORMAT" }} UTC
        • +
      • Created By: {{ torrent.created_by }}
        • +
      • Announce URL: {{ torrent.announce }}
        • +
      • File Name: {{ torrent.file_name }}
        • +
      • File Length: {{ torrent.file_length|filesizeformat }}
        • +
      • Piece Count: {{ torrent.piece_count }} pieces
        • +
      • Piece Length: {{ torrent.piece_length|filesizeformat }}
        • +
      • Computed Info Hash: {{ torrent.info_hash }}
        • +
      • URL List Length: {{ torrent.url_list|length }} URLs
        • +
      + {% endwith %}{% endif %} {% endblock %} -- cgit v1.2.3-2-g168b From e9e1c071654edd7b95e20c8105abbc23f426cecc Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 22 Jan 2013 16:47:43 -0600 Subject: Show staging version on todolist view page If one exists, it is easy enough to show it here so in-progress todolists can easily be cross-checked with the current state of the repository. Signed-off-by: Dan McGee --- templates/todolists/view.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'templates') diff --git a/templates/todolists/view.html b/templates/todolists/view.html index 86221127..e544fa12 100644 --- a/templates/todolists/view.html +++ b/templates/todolists/view.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% load static from staticfiles %} +{% load package_extras %} {% load todolists %} {% block title %}Arch Linux - Todo: {{ list.name }}{% endblock %} @@ -62,6 +63,7 @@ Repository Name Current Version + Staging Version Maintainers Status @@ -77,6 +79,9 @@ {% else %} {{ pkg.pkg.full_version }} {% endif %} + {% with staging=pkg.staging %} + {% pkg_details_link staging staging.full_version %} + {% endwith %} {{ pkg.maintainers|join:', ' }} {% if perms.todolists.change_todolistpackage %} -- cgit v1.2.3-2-g168b From 69fd83df03806585c3b7d6b115af916a73f4ae41 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 22 Jan 2013 20:21:40 -0700 Subject: Spice up the release listing page a bit Add JS tablesorter code and add some style to the yesno column. Signed-off-by: Dan McGee --- templates/releng/release_list.html | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'templates') diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html index 1657249f..84008541 100644 --- a/templates/releng/release_list.html +++ b/templates/releng/release_list.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% load url from future %} +{% load static from staticfiles %} {% block title %}Arch Linux - Releases{% endblock %} @@ -9,7 +10,6 @@ {% block content %}
      -

      Releases

      @@ -28,9 +28,9 @@ {% for item in release_list %} - + - + @@ -39,6 +39,17 @@ {% endfor %}
      {{ item.release_date|date }}{{ item.version }}{{ item.version }} {{ item.kernel_version|default:"" }}{{ item.available|yesno }}{{ item.available|yesno|capfirst }} {% if item.available %}Torrent{% endif %} {% if item.available %}Magnet{% endif %}
      -
      + +{% load cdn %}{% jquery %}{% jquery_tablesorter %} + + {% endblock %} -- cgit v1.2.3-2-g168b From 44dde6f02f649244d7c1b9dcf03d8ce592bbbbcb Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 27 Jan 2013 09:44:38 -0600 Subject: Fix todolist maintainer sorting And also fix up a place where we dereferenced a variable in a template that doesn't exist. Signed-off-by: Dan McGee --- templates/todolists/view.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/todolists/view.html b/templates/todolists/view.html index e544fa12..934e3ae8 100644 --- a/templates/todolists/view.html +++ b/templates/todolists/view.html @@ -80,7 +80,7 @@ {{ pkg.pkg.full_version }} {% endif %} {% with staging=pkg.staging %} - {% pkg_details_link staging staging.full_version %} + {% if staging %}{% pkg_details_link staging staging.full_version %}{% endif %} {% endwith %} {{ pkg.maintainers|join:', ' }} @@ -103,7 +103,7 @@ $(document).ready(function() { $(".results").tablesorter({ widgets: ['zebra'], sortList: [[2,0], [0,0]], - headers: { 5: { sorter: 'todostatus' } } + headers: { 6: { sorter: 'todostatus' } } }); }); $(document).ready(function() { -- cgit v1.2.3-2-g168b From 7d4a8b9adf353d7adce4c3c22101e774092eb4de Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 28 Jan 2013 14:06:41 -0700 Subject: Add MD5 and SHA1 fields for releases Signed-off-by: Dan McGee --- templates/releng/release_detail.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'templates') diff --git a/templates/releng/release_detail.html b/templates/releng/release_detail.html index f4de9e52..ea54be66 100644 --- a/templates/releng/release_detail.html +++ b/templates/releng/release_detail.html @@ -13,6 +13,8 @@ title="Download torrent for {{ release.version }}">Torrent, Magnet
      • {% endif %} {% if release.torrent_infohash %}
    • Torrent Info Hash: {{ release.torrent_infohash }}
      • {% endif %} + {% if release.md5_sum %}
    • MD5: {{ release.md5_sum }}
      • {% endif %} + {% if release.sha1_sum %}
    • SHA1: {{ release.sha1_sum }}
      • {% endif %}
    • Download Size: {% if release.file_size %}{{ release.file_size|filesizeformat }}{% else %}Unknown{% endif %}
    -- cgit v1.2.3-2-g168b From a471316a58a9c62b869696fe36d72abcbf9f2ab1 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 28 Jan 2013 14:27:44 -0700 Subject: Use torrent view and checksums where appropriate We no longer need to link externally to these items since we have all the data available in the web application now. Signed-off-by: Dan McGee --- templates/public/download.html | 12 +++++------- templates/releng/release_detail.html | 5 ++++- templates/releng/release_list.html | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'templates') diff --git a/templates/public/download.html b/templates/public/download.html index 29490849..f385ea29 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -56,8 +56,8 @@

    If you can spare the bytes, please leave the client open after your download is finished, so you can seed it back to others. A web-seed capable client is recommended for fastest download speeds.

    -

    Download torrent for {{ release.version }} +

    Download torrent for {{ release.version }} (Magnet) {% if release.file_size %}({{ release.file_size|filesizeformat }}){% endif %}

    @@ -81,11 +81,9 @@
    • PGP signature
      • -
    • SHA1 checksums
      • -
    • MD5 checksums
      • + title="PGP signature">PGP signature + {% if release.md5_sum %}
    • MD5: {{ release.md5_sum }}
      • {% endif %} + {% if release.sha1_sum %}
    • SHA1: {{ release.sha1_sum }}
      • {% endif %}
    {% cache 600 download-mirrors %} diff --git a/templates/releng/release_detail.html b/templates/releng/release_detail.html index ea54be66..01c0319e 100644 --- a/templates/releng/release_detail.html +++ b/templates/releng/release_detail.html @@ -1,4 +1,6 @@ {% extends "base.html" %} +{% load url from future %} + {% block title %}Arch Linux - Release: {{ release.version }}{% endblock %} {% block content %} @@ -9,7 +11,8 @@
  • Release Date: {{ release.release_date|date }}
    • {% if release.kernel_version %}
  • Kernel Version: {{ release.kernel_version }}
    • {% endif %}
  • Available: {{ release.available|yesno }}
    • - {% if release.available %}
  • Download: Download: Torrent, Magnet
    • {% endif %} {% if release.torrent_infohash %}
  • Torrent Info Hash: {{ release.torrent_infohash }}
    • {% endif %} diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html index 84008541..ef53a93d 100644 --- a/templates/releng/release_list.html +++ b/templates/releng/release_list.html @@ -31,7 +31,7 @@ {{ item.version }} {{ item.kernel_version|default:"" }} {{ item.available|yesno|capfirst }} - {% if item.available %}{% if item.available %}Torrent{% endif %} {% if item.available %}Magnet{% endif %} {% if item.file_size %}{{ item.file_size|filesizeformat }}{% endif %} -- cgit v1.2.3-2-g168b From 6cf98552f1c83d8e4fca1526131febd17045eae7 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 28 Jan 2013 14:48:37 -0700 Subject: Slight reorginization in the download page template Move things up that don't belong to the torrent section; make magnet link more prominent by using a bulleted list. Signed-off-by: Dan McGee --- templates/public/download.html | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'templates') diff --git a/templates/public/download.html b/templates/public/download.html index f385ea29..c68cf66b 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -28,6 +28,7 @@
    • Current Release: {{ release.version }}
      • {% if release.kernel_version %}
    • Included Kernel: {{ release.kernel_version }}
      • {% endif %} + {% if release.file_size %}
    • ISO Size: {{ release.file_size|filesizeformat }}
      • {% endif %}
    • Installation Guide
    • Resources:
        @@ -56,17 +57,21 @@

        If you can spare the bytes, please leave the client open after your download is finished, so you can seed it back to others. A web-seed capable client is recommended for fastest download speeds.

        -

        Download torrent for {{ release.version }} - (Magnet) - {% if release.file_size %}({{ release.file_size|filesizeformat }}){% endif %} -

        + +

        Netboot

        If you have a wired connection, you can boot the latest release directly over the network.

        -

        Arch Linux Netboot

        +

        HTTP Direct Downloads

        -- cgit v1.2.3-2-g168b From 839371f3f8a7b6de199c48735098567db297928a Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 28 Jan 2013 23:00:18 -0600 Subject: Fix missing template variable for removed todolist packages When there was no longer an attached package, running in template debug mode showed we were trying to dereference a variable that didn't exist. Fix the issue by adding a bit more to the if conditional block. Signed-off-by: Dan McGee --- templates/todolists/view.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/todolists/view.html b/templates/todolists/view.html index 934e3ae8..1b9a9e37 100644 --- a/templates/todolists/view.html +++ b/templates/todolists/view.html @@ -76,8 +76,10 @@ {% todopkg_details_link pkg %} {% if pkg.pkg.flag_date %} {{ pkg.pkg.full_version }} - {% else %} + {% elif pkg.pkg %} {{ pkg.pkg.full_version }} + {% else %} + {% endif %} {% with staging=pkg.staging %} {% if staging %}{% pkg_details_link staging staging.full_version %}{% endif %} -- cgit v1.2.3-2-g168b From b82c7b6a3a0f5b42990ec017bf91e66f71f9bfe2 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 31 Jan 2013 13:01:27 -0600 Subject: Remove some whitespace from index template We had a lot going on here in the news section as far as Django template tags go, so remove some whitespace to prevent so many empty lines from being ommitted. This doesn't remove all of it from the generated HTML, but does cut it down significantly. Signed-off-by: Dan McGee --- templates/public/index.html | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'templates') diff --git a/templates/public/index.html b/templates/public/index.html index 6fc90436..1a1a8f2d 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -45,8 +45,7 @@ RSS Feed - {% for news in news_updates %} - {% if forloop.counter0 < 5 %} + {% for news in news_updates %}{% if forloop.counter0 < 5 %}

        {{ news.title }} @@ -56,8 +55,7 @@ {% if forloop.counter0 == 0 %}{{ news.html|truncatewords_html:300 }} {% else %}{{ news.html|truncatewords_html:100 }}{% endif %} - {% else %} - {% if forloop.counter0 == 5 %} + {% else %}{% if forloop.counter0 == 5 %}

        Older News @@ -70,11 +68,8 @@ {{ news.title }} - {% if forloop.last %} - - {% endif %} - {% endif %} - {% endfor %} + {% if forloop.last %}{% endif %} + {% endif %}{% endfor %} {% endcache %} {% endblock %} -- cgit v1.2.3-2-g168b From 844ed8109317db882e5d2b2ae8fa6084f794d798 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 3 Feb 2013 13:39:08 -0600 Subject: Move the home page script block further down the page Put it after every bit of HTML content, including the page footer. Right now this was the only page using this block in the main template; we should move some other pages using a lot of JS to this format as well. Signed-off-by: Dan McGee --- templates/base.html | 2 +- templates/public/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/base.html b/templates/base.html index c6aa3f17..cc507fbf 100644 --- a/templates/base.html +++ b/templates/base.html @@ -68,7 +68,6 @@ {% block content_right %}{% endblock %} {% endblock %} - {% block content_after %}{% endblock %} + {% block script_block %}{% endblock %} diff --git a/templates/public/index.html b/templates/public/index.html index 1a1a8f2d..8926a061 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -208,7 +208,7 @@ {% endcache %} {% endblock %} -{% block content_after %} +{% block script_block %} {% load cdn %}{% jquery %} -- cgit v1.2.3-2-g168b From d63a800348f81823f157ec9ed03f9985308c3ea3 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 3 Feb 2013 14:40:41 -0600 Subject: Update user_pgp_key_link template tag to use DeveloperKey model The first of several small updates to use the new data we have available. Signed-off-by: Dan McGee --- templates/public/keys.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/public/keys.html b/templates/public/keys.html index 35bf414c..cf8ac784 100644 --- a/templates/public/keys.html +++ b/templates/public/keys.html @@ -124,8 +124,8 @@ {% for sig in cross_signatures %} - {% user_pgp_key_link active_users sig.signer %} - {% user_pgp_key_link active_users sig.signee %} + {% user_pgp_key_link sig.signer %} + {% user_pgp_key_link sig.signee %} {{ sig.created }} {{ sig.expires|default:"" }} -- 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') 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 }} {{ search_form.maintainer}}
        -
        {{ search_form.last_update.errors }} - {{ search_form.last_update }}
        {{ search_form.flagged.errors }} {{ 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 82947873d65d06d4d938402b57e9244629f97228 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 8 Feb 2013 21:19:17 -0600 Subject: Upgrade D3 to 3.0.6 Signed-off-by: Dan McGee --- templates/mirrors/mirror_details.html | 2 +- templates/public/keys.html | 2 +- templates/visualize/index.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index 8ea6bbec..02d68a3a 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -112,7 +112,7 @@
        {% load cdn %}{% jquery %}{% jquery_tablesorter %} - + + + - + {% 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/base.html | 2 +- templates/packages/removed.html | 1 - templates/public/download.html | 1 - templates/public/index.html | 1 - templates/public/keys.html | 1 - templates/releng/add.html | 1 - templates/releng/iso_overview.html | 1 - templates/releng/release_detail.html | 1 - templates/releng/release_list.html | 1 - templates/releng/result_list.html | 1 - templates/releng/result_section.html | 1 - templates/releng/results.html | 1 - templates/releng/thanks.html | 1 - templates/visualize/index.html | 1 - 14 files changed, 1 insertion(+), 14 deletions(-) (limited to 'templates') diff --git a/templates/base.html b/templates/base.html index cc507fbf..15bb7e28 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,4 +1,4 @@ -{% load url from future %}{% load static from staticfiles %} +{% load static from staticfiles %} 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 %} diff --git a/templates/public/download.html b/templates/public/download.html index c68cf66b..7936efb5 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -1,6 +1,5 @@ {% extends "base.html" %} {% load cache %} -{% load url from future %} {% load static from staticfiles %} {% load flags %} diff --git a/templates/public/index.html b/templates/public/index.html index 8926a061..3f88c183 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -1,6 +1,5 @@ {% extends "base.html" %} {% load cache %} -{% load url from future %} {% load static from staticfiles %} {% block head %} diff --git a/templates/public/keys.html b/templates/public/keys.html index ad2dd19d..91b53075 100644 --- a/templates/public/keys.html +++ b/templates/public/keys.html @@ -1,6 +1,5 @@ {% extends "base.html" %} {% load static from staticfiles %} -{% load url from future %} {% load pgp %} {% block title %}Arch Linux - Master Signing Keys{% endblock %} diff --git a/templates/releng/add.html b/templates/releng/add.html index ed02984e..d060395d 100644 --- a/templates/releng/add.html +++ b/templates/releng/add.html @@ -1,5 +1,4 @@ {% extends "base.html" %} -{% load url from future %} {% block title %}Arch Linux - Test Result Entry{% endblock %} diff --git a/templates/releng/iso_overview.html b/templates/releng/iso_overview.html index 23ef0135..196f0c0a 100644 --- a/templates/releng/iso_overview.html +++ b/templates/releng/iso_overview.html @@ -1,6 +1,5 @@ {% extends "base.html" %} {% load static from staticfiles %} -{% load url from future %} {% block content %}
        diff --git a/templates/releng/release_detail.html b/templates/releng/release_detail.html index 01c0319e..09507536 100644 --- a/templates/releng/release_detail.html +++ b/templates/releng/release_detail.html @@ -1,5 +1,4 @@ {% extends "base.html" %} -{% load url from future %} {% block title %}Arch Linux - Release: {{ release.version }}{% endblock %} diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html index ef53a93d..5f248264 100644 --- a/templates/releng/release_list.html +++ b/templates/releng/release_list.html @@ -1,5 +1,4 @@ {% extends "base.html" %} -{% load url from future %} {% load static from staticfiles %} {% block title %}Arch Linux - Releases{% endblock %} diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html index be5783b3..12bf39db 100644 --- a/templates/releng/result_list.html +++ b/templates/releng/result_list.html @@ -1,6 +1,5 @@ {% extends "base.html" %} {% load static from staticfiles %} -{% load url from future %} {% block content %}
        diff --git a/templates/releng/result_section.html b/templates/releng/result_section.html index ae951ebe..5e0b6f62 100644 --- a/templates/releng/result_section.html +++ b/templates/releng/result_section.html @@ -1,4 +1,3 @@ -{% load url from future %} {% if option.is_rollback %}Rollback: {% endif %}{{ option.name|title }} Last Success diff --git a/templates/releng/results.html b/templates/releng/results.html index c19b42a6..59d8351d 100644 --- a/templates/releng/results.html +++ b/templates/releng/results.html @@ -1,5 +1,4 @@ {% extends "base.html" %} -{% load url from future %} {% block title %}Arch Linux - Release Engineering Testbuild Results{% endblock %} diff --git a/templates/releng/thanks.html b/templates/releng/thanks.html index 66d65a5c..2462dafd 100644 --- a/templates/releng/thanks.html +++ b/templates/releng/thanks.html @@ -1,5 +1,4 @@ {% extends "base.html" %} -{% load url from future %} {% block title %}Arch Linux - Feedback - Thanks!{% endblock %} diff --git a/templates/visualize/index.html b/templates/visualize/index.html index 1e932d9b..2b79d601 100644 --- a/templates/visualize/index.html +++ b/templates/visualize/index.html @@ -1,6 +1,5 @@ {% extends "base.html" %} {% load static from staticfiles %} -{% load url from future %} {% block title %}Arch Linux - Visualizations{% endblock %} -- cgit v1.2.3-2-g168b From 51a6669c3c8a44b6b9e7fd09f8253d3a36953eb6 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 16 Feb 2013 13:54:11 -0600 Subject: Defer loading of some JS on public index page We don't need typeahead and easter eggs working right away, so defer them into a onload event. Signed-off-by: Dan McGee --- templates/public/index.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'templates') diff --git a/templates/public/index.html b/templates/public/index.html index 89aa3b8a..dad6a05b 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -212,10 +212,8 @@ {% load cdn %}{% jquery %} - - {% endblock %} -- cgit v1.2.3-2-g168b From 1b323ed9b2ac170cea4207ae75fd2849be8ff646 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 16 Feb 2013 14:08:49 -0600 Subject: Fix missing template variable Signed-off-by: Dan McGee --- templates/releng/result_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html index be5783b3..f6a825dc 100644 --- a/templates/releng/result_list.html +++ b/templates/releng/result_list.html @@ -6,7 +6,7 @@

        Results for: {% if option %}{{ option.verbose_name|title }}: {{ value }}{% endif %} - {{ iso_name|default:"" }} + {% if iso_name %}{{ iso_name|default:"" }}{% endif %}

        Go back to testing results

        -- 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/news/paginator.html | 10 +++++----- templates/packages/search_paginator.html | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'templates') diff --git a/templates/news/paginator.html b/templates/news/paginator.html index fbd0546b..57fbeb15 100644 --- a/templates/news/paginator.html +++ b/templates/news/paginator.html @@ -1,20 +1,20 @@ {% if is_paginated %}