From 5a31b868715dbd1a4e7fd87f0f9f04e2c8395391 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 13 Jan 2015 18:17:27 -0600 Subject: Slight tweaks to login and logout pages Turns out has_errors hasn't worked since Django pre-1.0, wow. Remove that old code and clean up some other small things while we're in there. Signed-off-by: Dan McGee --- templates/registration/login.html | 10 ++-------- templates/registration/logout.html | 5 +++-- 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'templates') diff --git a/templates/registration/login.html b/templates/registration/login.html index 82f74f58..b5894319 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -5,21 +5,15 @@ {% block content %}
-

Developer Login

- {% if form.has_errors %} - - {% endif %} -
{% csrf_token %}
- Enter login credentials + Please enter your credentials to login. {{ form.as_p }} -

+

-
{% endblock %} diff --git a/templates/registration/logout.html b/templates/registration/logout.html index 50b3574b..84bbff94 100644 --- a/templates/registration/logout.html +++ b/templates/registration/logout.html @@ -1,11 +1,12 @@ {% extends "base.html" %} + {% block title %}Arch Linux - Logout successful{% endblock %} {% block content %}

Developer Logout

-

Logout was successful.

+

Logout was successful. + Click here to login again.

{% endblock %} - -- cgit v1.2.3 From 8afa3cc2df4d3a53eec44b1b977b0b50b096617d Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 26 Feb 2015 18:34:21 -0600 Subject: Add details links to third mirror status table Signed-off-by: Dan McGee --- templates/mirrors/error_table.html.jinja | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/mirrors/error_table.html.jinja b/templates/mirrors/error_table.html.jinja index 52f68135..132aae63 100644 --- a/templates/mirrors/error_table.html.jinja +++ b/templates/mirrors/error_table.html.jinja @@ -7,16 +7,18 @@ Error Message Last Occurred Occurrences (last {{ cutoff|hours }}) + {% for log in error_logs %} - {{ log.url__url }} - {{ log.url__protocol__protocol }} - {{ country_flag(log.country) }}{{ log.country.name }} + {{ log.url.url }} + {{ log.url.protocol.protocol }} + {{ country_flag(log.url.country) }}{{ log.url.country.name }} {{ log.error|linebreaksbr }} {{ log.last_occurred|date('Y-m-d H:i') }} {{ log.error_count }} + details {% endfor %} -- cgit v1.2.3 From b5c0092e9a7581501b1087844d9cc460cbe8d925 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 15 Mar 2015 11:07:24 -0500 Subject: FS#44192 fix dead link to ftp.archlinux.org Use the new sources.archlinux.org domain instead. Signed-off-by: Dan McGee --- templates/public/art.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/public/art.html b/templates/public/art.html index 96312971..afab5498 100644 --- a/templates/public/art.html +++ b/templates/public/art.html @@ -68,14 +68,14 @@
  • archlinux-themes-slim - SLiM login themes
    • -

    Alternatively, you can download the source files via FTP.

    +

    Alternatively, you can download the source files.

    Former Logos

    Arch has gone through a few generations of branding and what follows are some of our past logos. Although these images are no longer used frequently, - they remain subject to license restrictions. Email + they remain subject to license restrictions. Email trademarks@archlinux.org with any questions.

    Original Ribbon Series

    -- cgit v1.2.3 From 57198b5cb45fb390b2fa75faff371d323de27dab Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 7 Apr 2015 18:51:44 -0500 Subject: Fix URL details page when checks don't have locations Signed-off-by: Dan McGee --- templates/mirrors/url_details_logs.html.jinja | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/mirrors/url_details_logs.html.jinja b/templates/mirrors/url_details_logs.html.jinja index 58f179d8..51f54931 100644 --- a/templates/mirrors/url_details_logs.html.jinja +++ b/templates/mirrors/url_details_logs.html.jinja @@ -14,8 +14,8 @@ {% for log in logs %} {{ log.check_time|date('Y-m-d H:i') }} - {{ country_flag(log.location.country) }}{{ log.location.country.name }} - {{ log.location.source_ip }} + {% if log.location %}{{ country_flag(log.location.country) }}{{ log.location.country.name }}{% else %}Unknown{% endif %} + {% if log.location %}{{ log.location.source_ip }}{% else %}Unknown{% endif %} {{ log.last_sync|date('Y-m-d H:i') }} {{ log.delay|duration }} {{ log.duration|floatvalue }} -- cgit v1.2.3 From a2b020ed3554b47c0b27982cf47431126c103ef4 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 12 Apr 2015 09:50:13 -0500 Subject: Add true parameter to Jinja2 default filter We need this to make it act more like the Django filter, which prints the default value not only when the variable is undefined, but also when it evaluates to being false (such as a None value). Noticed by felixonmars on packages that provided other packages; None was always showing as the comparison operator. More embarrassing is that our file lists were always showing 'None' concatenated onto all directory entries. Signed-off-by: Dan McGee --- templates/packages/details.html.jinja | 4 ++-- templates/packages/details_depend.html.jinja | 6 +++--- templates/packages/details_relatedto.html.jinja | 2 +- templates/packages/files_list.html.jinja | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'templates') diff --git a/templates/packages/details.html.jinja b/templates/packages/details.html.jinja index 2215f8dc..9a72622d 100644 --- a/templates/packages/details.html.jinja +++ b/templates/packages/details.html.jinja @@ -103,7 +103,7 @@ {% endif %} Description: - {{ pkg.pkgdesc|default("") }} + {{ pkg.pkgdesc|default("", true) }} Upstream URL: {% if pkg.url %}