From b26e0d1fd66d7b74e3da5f1e62757401811b46ab Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 12:00:40 -0700 Subject: Redesigned Package Details page * better semantics * removed unnecessary CSS * form accessibility * dynamic/descriptive href titles throughout Signed-off-by: Dan McGee --- templates/packages/details.html | 258 ++++++++++++++++++++++------------------ 1 file changed, 145 insertions(+), 113 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/details.html b/templates/packages/details.html index 78209d83..19a4b2bc 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -1,134 +1,166 @@ {% extends "base.html" %} {% block title %}Arch Linux - {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }} - Package Details{% endblock %} + {% block content %} -
-

{{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}

-
-
    -
  • SVN Entries ({{pkg.repo|lower}}-{{pkg.arch}})
    • -
  • SVN Entries (trunk)
    • -
  • Bug Reports
    • -
  • +
    + +

    Package Details: {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}

    + +
    + + + + {% if user.is_authenticated %} +
    +
    +

    +   

    +
    + {% endif %} + +
    + + + + + + + + + + {% ifnotequal pkg.pkgname pkg.pkgbase %} + + + {% endifnotequal %} + + + + + + + + + + + {% with pkg.maintainers as maints %} + + {% endwith %} + + + + + + + + + + + + + +
    Architecture:{{ pkg.arch.name }}
    Repository:{{ pkg.repo.name|capfirst }}
    Base Package Name:{{ pkg.pkgbase }}
    Description:{% if pkg.pkgdesc %}{{ pkg.pkgdesc }}{% endif %}
    Upstream URL:{% if pkg.url %}{{ pkg.url }}{% endif %}
    License:{{ pkg.license }}
    Maintainers:{% if maints %} + {% for m in maints %} + {{ m.get_full_name }}
    + {% endfor %} + {% else %}Orphan{% endif %} +
    Package Size:{{ pkg.compressed_size|filesizeformat }}
    Installed Size:{{ pkg.installed_size|filesizeformat }}
    Build Date:{{ pkg.build_date }} UTC
    Last Updated:{{ pkg.last_update|date:"Y-m-d" }}
    + +
    + + {% with pkg.get_depends as deps %} +
    + +

    + Dependencies ({{deps|length}})

    + + {% if deps %} +
      + {% for depend in deps %} + {% ifequal depend.pkg None %} +
    • {{ depend.dep.depname }} (virtual)
      • + {% else %} +
    • {{ depend.dep.depname }} + {{ depend.dep.depvcmp }}{% if depend.pkg.repo.testing %} + (testing){% endif %}
      • + {% endifequal %} + {% endfor %}
    -
    - - - - - - - - {% ifnotequal pkg.pkgname pkg.pkgbase %} - - - {% endifnotequal %} - - - - - - - - - - - {% with pkg.maintainers as maints %} - - {% endwith %} - - - - - - - - - - - - - -
    Architecture:{{ pkg.arch.name }}
    Repository:{{ pkg.repo.name|capfirst }}
    Base Package Name:{{ pkg.pkgbase }}
    Description:{% if pkg.pkgdesc %}{{ pkg.pkgdesc }}{% endif %}
    Upstream URL:{% if pkg.url %}{{ pkg.url }}{% endif %}
    License:{{ pkg.license }}
    Maintainer:{% if maints %} - {% for m in maints %} - {{ m.get_full_name }}
    - {% endfor %} - {% else %}Orphan{% endif %} -
    Package Size:{{ pkg.compressed_size|filesizeformat }}
    Installed Size:{{ pkg.installed_size|filesizeformat }}
    Build Date:{{ pkg.build_date }} UTC
    Last Updated:{{ pkg.last_update|date:"Y-m-d" }}
    -
    - - - - - -
    - {% with pkg.get_depends as deps %} -
    -

    Dependencies ({{deps|length}}):

    - {% if deps %} -
      - {% for depend in deps %} - {% ifequal depend.pkg None %} -
    • {{ depend.dep.depname }} (virtual)
      • - {% else %} -
    • {{ depend.dep.depname }}{{ depend.dep.depvcmp }}{% if depend.pkg.repo.testing %} (testing){% endif %}
      • - {% endifequal %} - {% endfor %} -
    - {% endif %} -
    - {% endwith %} -     		- {% with pkg.get_requiredby as rqdby %} -
    -

    Required By ({{rqdby|length}}):

    - {% if rqdby %} -
      - {% for req in rqdby %} -
    • {{ req.pkgname }}{% if req.repo.testing %} (testing){% endif %}
      • - {% endfor %} -
    - {% endif %} -
    - {% endwith %} -
    -
    -

    Files:

    -

    - View File List -

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

    + Required By ({{rqdby|length}})

    + + {% if rqdby %} +
      + {% for req in rqdby %} +
    • {{ req.pkgname }} + {% if req.repo.testing %} (testing){% endif %}
      • + {% endfor %} +
    + {% endif %} + +
    + {% endwith %} + +
    + +

    + Package Contents

    + + + +
    + +
+
+ {% load cdn %}{% jquery %} {% endblock %} - -- cgit v1.2.3-54-g00ecf From d7d0b26593348e17fa85889c4adbf72c1680bc4c Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:56:56 -0700 Subject: Redesigned flag page * form accessibility * descriptive href titles * better semantics Signed-off-by: Dan McGee --- templates/packages/flag.html | 56 +++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 22 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/flag.html b/templates/packages/flag.html index 1071fdf8..1e85be89 100644 --- a/templates/packages/flag.html +++ b/templates/packages/flag.html @@ -2,28 +2,40 @@ {% block title %}Arch Linux - Flag Package - {{ pkg.pkgname }}{% endblock %} {% block content %} -
- {% if confirmed %} -

Thank you. Maintainers have been notified.

- {% else %} -

If you notice that one of Arch's packages is out of date (ie, there is a - newer stable release available), then please notify us using the - form below.

-

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 - message, then file a bug report, email the maintainer directly, or send an - email to the arch-general mailing list with your additional text.

- -

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

+
+{% if confirmed %} +

Package Flagged

+ +

Thank you, the maintainers have been notified about {{ pkg.pkgname }}.

+ +

You can return to the package details page for + {{pkg.pkgname}}.

+{% else %} +

Flag Package: {{ pkg.pkgname }}

+ +

If you notice a package is out of date (i.e., there is a newer + stable release available), then please notify us using + the form below.

+ +

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 + message, then file a bug report, email the maintainer directly, or send + an email to the arch-general mailing list + with your additional text.

+ +

Note: Please do not use this facility if the + package is broken! Use the bug tracker instead.

+

Please confirm your flag request for {{pkg.pkgname}}:

-
- - {{form}} -
- -
- {% endif %} + +
+
+ {{ form.as_p }} +
+

+
+{% endif %}
{% endblock %} -- cgit v1.2.3-54-g00ecf From 5c8f957904c1fb3cb1d7835e24048ca0263ab291 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:54:42 -0700 Subject: Redesigned flaghelp page * better semantics * consistent appearance with archweb theme * descriptive href titles Signed-off-by: Dan McGee --- templates/packages/flaghelp.html | 52 ++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 21 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html index c376175e..d8ca643b 100644 --- a/templates/packages/flaghelp.html +++ b/templates/packages/flaghelp.html @@ -1,27 +1,37 @@ - - Flagging Packages - - - -
-

If you notice that one of Arch's packages is out of date (ie, - there is a newer stable release available), then please - notify us by using the Flag button in the Package - Details screen. This will notify the maintainer responsible - for that package so they can update it.

+ + Flagging Packages + + + + -

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 message, then file a bug report, email the maintainer - directly, or send an email to the arch-general mailing list with - your additional text.

+

Flagging Packages

-

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

-
- +

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 + screen. This will notify the maintainer(s) responsible for that + package so they can update it.

+ +

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 + message, then file a bug report, email the maintainer directly, or send + an email to the arch-general mailing list + with your additional text.

+ +

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

+ + -- cgit v1.2.3-54-g00ecf From 663aa383ffb28ba9e6d5ee2f770b47ba3ed97e99 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:58:29 -0700 Subject: Redesigned Signoffs page * descriptive href titles * better semantics (page titles, etc) * added tbody for prettier printing * proper django cycling Signed-off-by: Dan McGee --- templates/packages/signoffs.html | 43 ++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 17 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html index cb6a848e..930b606e 100644 --- a/templates/packages/signoffs.html +++ b/templates/packages/signoffs.html @@ -2,9 +2,13 @@ {% block title %}Arch Linux - Package Signoffs{% endblock %} {% block content %} - {% if packages %} -
- +{% if packages %} +
+ +

Package Signoffs

+ +
+ @@ -14,28 +18,33 @@ - {% for pkg,target in packages %} - + + + {% for pkg,target in packages %} + - + - + {% endfor %} -
Arch PackageApproved Signoff
{{ pkg.arch.name }}{{ pkg.pkgname }}{{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }} {{ pkg.last_update }} {{ target }}{{ pkg.approved_for_signoff|yesno:"Yes,No" }} + {{ pkg.approved_for_signoff|yesno:"Yes,No" }}
    - {% for signoff in pkg.signoffs %} -
  • {{signoff.packager}}
    • - {% endfor %} -
  • - Signoff -
    • +
  • Signoff +
    • + {% for signoff in pkg.signoffs %} +
  • + {{signoff.packager}}
    • + {% endfor %}
-
- {% endif %} + + +
+{% endif %} {% endblock %} - -- cgit v1.2.3-54-g00ecf From ebf292292f7ac8a4e69f9f8078c1dfbd2a5954b9 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 12:02:32 -0700 Subject: Redesigned Package Search page * moved non-tabular data out of tables * added tbody for pretty printing * form accessibility * descriptive href titles throughout * code cleanup (removing unnecessary line breaks, styling, etc.) * renamed page to Package Database * add descriptive text to bottom of database pages Signed-off-by: Dan McGee --- templates/packages/search.html | 235 ++++++++++++++++++++++------------------- 1 file changed, 126 insertions(+), 109 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/search.html b/templates/packages/search.html index 4f7bc776..2c85f0bc 100644 --- a/templates/packages/search.html +++ b/templates/packages/search.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% load package_extras %} -{% block title %}Arch Linux - Package Search{% endblock %} +{% block title %}Arch Linux - Package Database{% endblock %} + {% block head %} @@ -9,129 +10,145 @@ {% endblock %} {% block content %} -
-

Search Criteria

-
- - - - - - - - - - - - - {% td_input search_form.arch %} - {% td_input search_form.repo %} - {% td_input search_form.q %} - {% td_input search_form.maintainer%} - {% td_input search_form.last_update %} - {% td_input search_form.flagged %} - {% td_input search_form.limit %} - - -
ArchRepositoryKeywordsMaintainerLast UpdateFlaggedPer Page
-
+ + +{% if package_list %} +
+ + {% if paginator %} +
+ +

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

+ +

+ {% if page_obj.has_previous %} + + {% else %} + < Prev + {% endif %} + {% if page_obj.has_next %} + + {% else %} + Next > + {% endif %} +

+
-

+ {% endif %} + +
- {% if package_list %} -
- - - {% if paginator %} +
+ - - - + {% if user.is_authenticated %} + + {% endif %} + + + + + + - {% endif %} - - {% if user.is_authenticated %} - - {% endif %} - - - - - - - - + + {% for pkg in package_list %} - + {% if user.is_authenticated %} {% endif %} - - {% if pkg.needupdate %} - - {% else %} + + {% if pkg.needupdate %} + + {% else %} - {% endif %} - + {% endif %} + {% endfor %} - {% if paginator %} - - - - - - {% endif %} +
- {{paginator.count}} packages found. - Page {{page_obj.number}} of {{paginator.num_pages}}. - - {% if page_obj.has_previous %} - - <<< Previous - - {% else %} - <<< Previous - {% endif %} - - {% if page_obj.has_next %} - - Next >>> - - {% else %} - Next >>> - {% endif %} -  ArchRepoNameVersionDescriptionLast Updated
 ArchRepoNameVersionDescriptionLast Updated
{{ pkg.arch.name }} {{ pkg.repo.name|capfirst }}{{ pkg.pkgname }}{{ pkg.pkgver }}-{{ pkg.pkgrel }}{{ pkg.pkgname }}{{ pkg.pkgver }}-{{ pkg.pkgrel }}{{ pkg.pkgver }}-{{ pkg.pkgrel }}{{ pkg.pkgdesc }}{{ pkg.pkgdesc }} {{ pkg.last_update|date:"Y-m-d" }}
- {{paginator.count}} packages found. - Page {{page_obj.number}} of {{paginator.num_pages}}. - - {% if page_obj.has_previous %} - - <<< Previous - - {% else %} - <<< Previous - {% endif %} - - {% if page_obj.has_next %} - - Next >>> - - {% else %} - Next >>> - {% endif %} -
- {% if user.is_authenticated %} -
- - + + {% if paginator %} +
+ +

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

+ +

+ {% if page_obj.has_previous %} + + {% else %} + < Prev + {% endif %} + {% if page_obj.has_next %} + + {% else %} + Next > + {% endif %} +

+
{% endif %} - -
- {% endif %} -{% endblock %} + {% if user.is_authenticated %} +

+

+ {% endif %} + + + +
+ +
+

You are browsing the Arch Linux package database. From here you can find + detailed information about packages located in the official supported repositories. + For unsupported packages, browse the Arch User Repository (AUR).

+
+{% endif %} +{% endblock %} -- cgit v1.2.3-54-g00ecf From 5813ec18197dc76c99f85f8fc1d1c41ed7f396e3 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:52:37 -0700 Subject: Filelists: Touch up the HTML of file list views Remove some unnecessary classes and touch up the direct and AJAX views. Signed-off-by: Dan McGee --- templates/packages/files-list.html | 11 +++++------ templates/packages/files.html | 16 +++++++++------- 2 files changed, 14 insertions(+), 13 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/files-list.html b/templates/packages/files-list.html index dee18ecd..c45e0f10 100644 --- a/templates/packages/files-list.html +++ b/templates/packages/files-list.html @@ -1,10 +1,9 @@ -

Files:

{% if files.count %} -
    -{% for file in files %} -
  • {{ file.path }}
    • -{% endfor %} +
      + {% for file in files %} +
    • {{ file.path }}
      • + {% endfor %}
    {% else %} -

    No filelist available.

    +

    No file list available.

    {% endif %} diff --git a/templates/packages/files.html b/templates/packages/files.html index 2f951062..7dc111b4 100644 --- a/templates/packages/files.html +++ b/templates/packages/files.html @@ -1,14 +1,16 @@ {% extends "base.html" %} {% block title %}Arch Linux - {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }} - Package File List{% endblock %} + {% block content %} -
    -

    {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}

    -

    - Back to Package -

    -
    +
    + +

    Package File List: {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}

    +

    Back to Package

    + +
    {% include "packages/files-list.html" %} -
    + +
    {% endblock %} -- cgit v1.2.3-54-g00ecf From 3a39352883f3ff5ddf5e393c6d7248157972d698 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:53:13 -0700 Subject: Redesigned flagged page * indentation * consistent semantics Signed-off-by: Dan McGee --- templates/packages/flagged.html | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'templates/packages') diff --git a/templates/packages/flagged.html b/templates/packages/flagged.html index 3461bbda..7d5e1c60 100644 --- a/templates/packages/flagged.html +++ b/templates/packages/flagged.html @@ -2,7 +2,14 @@ {% block title %}Arch Linux - Flag Package - {{ pkg.pkgname }}{% endblock %} {% block content %} -

    - {{pkg.pkgname}} has already been flagged out of date. -

    +
    + +

    Error: Package already flagged

    + +

    {{pkg.pkgname}} has already been flagged out-of-date.

    + +

    You can return to the package details page for + {{pkg.pkgname}}.

    + +
    {% endblock %} -- cgit v1.2.3-54-g00ecf