From cdff7527e453e352f90983b92c4d7a75d71ca249 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 2 Aug 2017 01:08:19 +0300 Subject: Reorder urls and emails on package details and version details pages --- mod/mod-package-details.cxx | 6 +++--- mod/mod-package-version-details.cxx | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'mod') diff --git a/mod/mod-package-details.cxx b/mod/mod-package-details.cxx index 605022d..dce7f3b 100644 --- a/mod/mod-package-details.cxx +++ b/mod/mod-package-details.cxx @@ -179,8 +179,7 @@ handle (request& rq, response& rs) s << TABLE(CLASS="proplist", ID="package") << TBODY << TR_LICENSE (licenses) - << TR_URL (pkg->url) - << TR_EMAIL (pkg->email); + << TR_URL (pkg->url); if (pkg->doc_url) s << TR_URL (*pkg->doc_url, "doc-url"); @@ -188,7 +187,8 @@ handle (request& rq, response& rs) if (pkg->src_url) s << TR_URL (*pkg->src_url, "src-url"); - s << TR_TAGS (pkg->tags, root) + s << TR_EMAIL (pkg->email) + << TR_TAGS (pkg->tags, root) << ~TBODY << ~TABLE; } diff --git a/mod/mod-package-version-details.cxx b/mod/mod-package-version-details.cxx index 1186470..6007a80 100644 --- a/mod/mod-package-version-details.cxx +++ b/mod/mod-package-version-details.cxx @@ -171,7 +171,6 @@ handle (request& rq, response& rs) assert (pkg->location && pkg->sha256sum); - const email& em (pkg->email); const repository_location& rl (pkg->internal_repository.load ()->location); s << TABLE(CLASS="proplist", ID="version") @@ -192,8 +191,7 @@ handle (request& rq, response& rs) << TABLE(CLASS="proplist", ID="package") << TBODY - << TR_URL (pkg->url) - << TR_EMAIL (em); + << TR_URL (pkg->url); if (pkg->doc_url) s << TR_URL (*pkg->doc_url, "doc-url"); @@ -205,6 +203,9 @@ handle (request& rq, response& rs) if (pu && *pu != pkg->url) s << TR_URL (*pu, "package-url"); + const email& em (pkg->email); + s << TR_EMAIL (em); + const auto& pe (pkg->package_email); if (pe && *pe != em) s << TR_EMAIL (*pe, "package-email"); -- cgit v1.1