From 08f67821d1c2002711f519b2f7a09c7a8b5c8c2e Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 11 Feb 2010 22:16:58 -0600 Subject: Make the package files view look better Make it look more like the dependencies and required-by panes on the main package details page. Some day you might even find it shows up below there too via an AJAX call or something. Signed-off-by: Dan McGee --- templates/packages/files.html | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'templates') diff --git a/templates/packages/files.html b/templates/packages/files.html index 145bcf2..dc0c64b 100644 --- a/templates/packages/files.html +++ b/templates/packages/files.html @@ -1,11 +1,16 @@ {% extends "base.html" %} -{% block title %}Pkg: {{ pkg.pkgname }} - Arch Linux Package File List{% endblock %} +{% block title %}Arch Linux - Package File List - {{ pkg.pkgname }}{% endblock %} {% block content %}
-

Viewing Files: {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}

- {% for file in files %} - {{ file.path }}
- {% endfor %} +

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

+
+

Files:

+
    + {% for file in files %} +
  • {{ file.path }}
    • + {% endfor %} +
+
{% endblock %} -- cgit v1.2.3-24-g4f1b From e119c75838a0c91fd63c9b2aa2bb3940cd6eaee5 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 11 Feb 2010 22:18:02 -0600 Subject: Re-add link to package files Put the link that has been commented back on the page, and point it at the new URL for package files. Also fix the page title to be more in line with all the other pages on the site. Signed-off-by: Dan McGee --- templates/packages/details.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/packages/details.html b/templates/packages/details.html index 5c3c949..f696231 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -1,6 +1,5 @@ {% extends "base.html" %} -{% load package_extras %} -{% block title %}Pkg: {{ pkg.pkgname }} - Arch Linux Package Details{% endblock %} +{% block title %}Arch Linux - Package Details - {{ pkg.pkgname }}{% endblock %} {% block content %}

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

@@ -9,7 +8,7 @@
  • SVN Entries ({{pkg.repo|lower}}-{{pkg.arch}})
  • SVN Entries (trunk)
  • Bug Reports
    • - +
  • View File List
  • {% if pkg.needupdate %} This package has been flagged out-of-date -- cgit v1.2.3-24-g4f1b From 8314777c5858b8f9dd954ef906e19de1322a61d0 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 27 Feb 2010 10:08:04 -0600 Subject: Make files view AJAX if supported This will put the filelist inline on the package details page if using a capable browser. It should still fallback to a separate page if necessary (e.g. all those users using links on the site). Signed-off-by: Dan McGee --- templates/packages/details.html | 19 ++++++++++++++++++- templates/packages/files-ajax.html | 8 ++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 templates/packages/files-ajax.html (limited to 'templates') diff --git a/templates/packages/details.html b/templates/packages/details.html index f696231..7e5216e 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -8,7 +8,6 @@
  • SVN Entries ({{pkg.repo|lower}}-{{pkg.arch}})
  • SVN Entries (trunk)
  • Bug Reports
    • -
  • View File List
  • {% if pkg.needupdate %} This package has been flagged out-of-date @@ -102,6 +101,24 @@ +
    +

    Files:

    + +
    • + + {% endblock %} diff --git a/templates/packages/files-ajax.html b/templates/packages/files-ajax.html new file mode 100644 index 0000000..9b4c83a --- /dev/null +++ b/templates/packages/files-ajax.html @@ -0,0 +1,8 @@ +
    +

    Files:

    +
      + {% for file in files %} +
    • {{ file.path }}
      • + {% endfor %} +
    +
    -- cgit v1.2.3-24-g4f1b From 7e1e5a5e8a2f3231d0878612508aba06f4397024 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 27 Feb 2010 10:31:55 -0600 Subject: files: template reuse Get rid of the copy/paste by including the sub-template. Signed-off-by: Dan McGee --- templates/packages/files-ajax.html | 8 -------- templates/packages/files-list.html | 8 ++++++++ templates/packages/files.html | 9 +-------- 3 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 templates/packages/files-ajax.html create mode 100644 templates/packages/files-list.html (limited to 'templates') diff --git a/templates/packages/files-ajax.html b/templates/packages/files-ajax.html deleted file mode 100644 index 9b4c83a..0000000 --- a/templates/packages/files-ajax.html +++ /dev/null @@ -1,8 +0,0 @@ -
    -

    Files:

    -
      - {% for file in files %} -
    • {{ file.path }}
      • - {% endfor %} -
    -
    diff --git a/templates/packages/files-list.html b/templates/packages/files-list.html new file mode 100644 index 0000000..9b4c83a --- /dev/null +++ b/templates/packages/files-list.html @@ -0,0 +1,8 @@ +
    +

    Files:

    +
      + {% for file in files %} +
    • {{ file.path }}
      • + {% endfor %} +
    +
    diff --git a/templates/packages/files.html b/templates/packages/files.html index dc0c64b..1d87246 100644 --- a/templates/packages/files.html +++ b/templates/packages/files.html @@ -3,14 +3,7 @@ {% block content %}

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

    -
    -

    Files:

    -
      - {% for file in files %} -
    • {{ file.path }}
      • - {% endfor %} -
    -
    + {% include "packages/files-list.html" %}
    {% endblock %} -- cgit v1.2.3-24-g4f1b From ffa7ea1b1f276ba146be5a8533a1125ee947e433 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 27 Feb 2010 12:44:18 -0600 Subject: Show message if no files available Signed-off-by: Dan McGee --- templates/packages/details.html | 6 +++--- templates/packages/files-list.html | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/packages/details.html b/templates/packages/details.html index 7e5216e..94e9f16 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -103,9 +103,9 @@

    Files:

    - +

    + View File List +

    diff --git a/templates/packages/files-list.html b/templates/packages/files-list.html index 9b4c83a..d26a11e 100644 --- a/templates/packages/files-list.html +++ b/templates/packages/files-list.html @@ -1,8 +1,12 @@

    Files:

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

    No filelist available.

    + {% endif %}
    -- cgit v1.2.3-24-g4f1b From 9b59f7e1ad0653747dc6580bedc443c54df9d53f Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 1 Mar 2010 21:41:44 -0600 Subject: Fix busted HTML on flag package page Missing a closing div and no real need for the br tag. Signed-off-by: Dan McGee --- templates/packages/flag.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/packages/flag.html b/templates/packages/flag.html index 0bea739..1071fdf 100644 --- a/templates/packages/flag.html +++ b/templates/packages/flag.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% block title %}Arch Linux - Flag Package - {{ pkg.pkgname }}{% endblock %} + {% block content %}
    {% if confirmed %} @@ -22,7 +23,7 @@ {{form}} -
    {% endif %} +
    {% endblock %} -- cgit v1.2.3-24-g4f1b From 6e9477ca630ebee48b3836cdc39bf5cd743e8084 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 1 Mar 2010 21:43:12 -0600 Subject: Unify spelling of 'Todo' We used 'Todo', 'ToDo', and 'To-do' in different places. Unify them all to the first. Signed-off-by: Dan McGee --- templates/todolists/view.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/todolists/view.html b/templates/todolists/view.html index b85a426..9bfda4a 100644 --- a/templates/todolists/view.html +++ b/templates/todolists/view.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% block title %}Arch Linux - Todo - {{ list.name }}{% endblock %} {% block content %}
    @@ -10,7 +11,7 @@ Edit Todo List {% endif %}
    -

    ToDo List: {{ list.name }}

    +

    Todo List: {{ list.name }}

    @@ -49,7 +50,7 @@ diff --git a/templates/devel/mirrorlist.html b/templates/devel/mirrorlist.html index 01699da..630d018 100644 --- a/templates/devel/mirrorlist.html +++ b/templates/devel/mirrorlist.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% block title %}Arch Linux - Mirror Overview{% endblock %} {% block content %}
    diff --git a/templates/news/add.html b/templates/news/add.html index daa7587..ef3f211 100644 --- a/templates/news/add.html +++ b/templates/news/add.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% block title %}Arch Linux - {% if form.instance.id %}Edit{% else %}Add{% endif %} News{% endblock %} {% block content %}
    diff --git a/templates/news/delete.html b/templates/news/delete.html index 0f48f8b..c3824a2 100644 --- a/templates/news/delete.html +++ b/templates/news/delete.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% block title %}Arch Linux - Delete News{% endblock %} {% block content %}
    diff --git a/templates/news/view.html b/templates/news/view.html index 281d8a7..2f7c3d8 100644 --- a/templates/news/view.html +++ b/templates/news/view.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% block title %}Arch Linux - {{ news.title }}{% endblock %} {% block content %}
    diff --git a/templates/packages/details.html b/templates/packages/details.html index 94e9f16..49fdc22 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block title %}Arch Linux - Package Details - {{ pkg.pkgname }}{% endblock %} +{% block title %}Arch Linux - {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }} - Package Details{% endblock %} {% block content %}

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

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

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

    diff --git a/templates/packages/flagged.html b/templates/packages/flagged.html index 738b633..64cb245 100644 --- a/templates/packages/flagged.html +++ b/templates/packages/flagged.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% block title %}Arch Linux - Flag Package - {{ pkg.pkgname }}{% endblock %} + {% block content %}

    {{pkg.pkgname}} on {{pkg.arch}} has already been flagged out of date. diff --git a/templates/todolists/list.html b/templates/todolists/list.html index 9b42334..ffbab2a 100644 --- a/templates/todolists/list.html +++ b/templates/todolists/list.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% block title %}Arch Linux - Todo Lists{% endblock %} {% block content %}

    diff --git a/templates/todolists/todolist_confirm_delete.html b/templates/todolists/todolist_confirm_delete.html index bfa3dba..c0742d2 100644 --- a/templates/todolists/todolist_confirm_delete.html +++ b/templates/todolists/todolist_confirm_delete.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% block title %}Arch Linux - Delete Todo List{% endblock %} {% block content %}
    -- cgit v1.2.3-24-g4f1b From f7e15ed728d7c5e3470f6127cc21e64baefcbfb2 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 1 Mar 2010 22:23:29 -0600 Subject: Add '(testing)' suffix to dependencies list Just like it already was in the required by list. This should address FS#10475. Signed-off-by: Dan McGee --- templates/packages/details.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/packages/details.html b/templates/packages/details.html index 49fdc22..9b7a049 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -77,7 +77,7 @@ {% ifequal depend.pkg None %}
  • {{ depend.dep.depname }} (virtual)
    • {% else %} -
  • {{ depend.dep.depname }}{{ depend.dep.depvcmp }}
    • +
  • {{ depend.dep.depname }}{{ depend.dep.depvcmp }}{% ifequal depend.pkg.repo.name "Testing" %} (testing){% endifequal %}
    • {% endifequal %} {% endfor %} @@ -92,7 +92,7 @@ {% if rqdby %} {% endif %} -- cgit v1.2.3-24-g4f1b