[aur-dev] [PATCH 0/5] Package details view layout changes

older
[aur-dev] [PATCH] Set the title in...

Lukas Fleischer

4 Nov 2011 4 Nov '11

1:42 p.m.

This patch set basically syncs the package details layout with what archweb uses and makes the rendered page, as well as the source code, look cleaner and more consistent. I plan to put more efforts in cleaning up our HTML and making the AUR integrate well with the rest of www.archlinux.org. We might eventually just use "archweb.css" with a few AUR-specific extensions. Any objections from the "Arch Linux/AUR segregation" front..? Dan, any objections? Lukas Fleischer (5): pkg_details.php: Use a table for package details pkg_details.php: Add link to category search pkg_details.php: Sync metadata layout with archweb pkg_details.php: Sync package actions layout with archweb pkg_details.php: Use sane format for date strings web/html/css/arch.css | 3 - web/html/css/containers.css | 81 +++++++++++++++ web/template/pkg_details.php | 226 +++++++++++++++++++++--------------------- 3 files changed, 196 insertions(+), 114 deletions(-) -- 1.7.7.2

Show replies by date

Lukas Fleischer

4 Nov 4 Nov

1:42 p.m.

New subject: [aur-dev] [PATCH 1/5] pkg_details.php: Use a table for package details

Given that we only show a bunch of labels and associated details, using a table seems reasonable here. The CSS snippet was extracted from archweb's style sheet. Signed-off-by: Lukas Fleischer --- web/html/css/containers.css | 8 +++++ web/template/pkg_details.php | 71 +++++++++++++++++++++++++---------------- 2 files changed, 51 insertions(+), 28 deletions(-) diff --git a/web/html/css/containers.css b/web/html/css/containers.css index 237950f..9f845b0 100644 --- a/web/html/css/containers.css +++ b/web/html/css/containers.css @@ -186,3 +186,11 @@ input[type=image] { background: none; } +/* Package details */ +#pkginfo { + width: auto; +} + +#pkginfo td { + padding: 0.25em 0 0.25em 1.5em; +} diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 880a675..c8e703c 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -8,9 +8,8 @@ if ($uid == $row["MaintainerUID"] or $catarr = pkgCategories(); $edit_cat = "<form method='post' action='packages.php?ID=".$pkgid."'>\n"; - $edit_cat.= "<p>"; + $edit_cat.= "<div>"; $edit_cat.= "<input type='hidden' name='action' value='do_ChangeCategory' />"; - $edit_cat.= "<span class='f3'>" . __("Category") . ":</span> "; $edit_cat.= "<select name='category_id'>\n"; foreach ($catarr as $cid => $catname) { $edit_cat.= "

Lukas Fleischer

1:42 p.m.

New subject: [aur-dev] [PATCH 2/5] pkg_details.php: Add link to category search

This can be used as a shortcut to search for other packages in the same category. Signed-off-by: Lukas Fleischer --- web/template/pkg_details.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index c8e703c..f5ed32a 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -24,7 +24,7 @@ if ($uid == $row["MaintainerUID"] or } else { - $edit_cat = $row['Category']; + $edit_cat = '' . $row['Category'] . '</a>'; } if ($row["SubmitterUID"]) { -- 1.7.7.2

Dan McGee

3:26 p.m.

New subject: [aur-dev] [PATCH 2/5] pkg_details.php: Add link to category search

On Fri, Nov 4, 2011 at 8:42 AM, Lukas Fleischer wrote:

...

This can be used as a shortcut to search for other packages in the same category.

Signed-off-by: Lukas Fleischer Signed-off-by: Dan McGee --- web/template/pkg_details.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index c8e703c..f5ed32a 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -24,7 +24,7 @@ if ($uid == $row["MaintainerUID"] or

} else { - $edit_cat = $row['Category']; + $edit_cat = '' . $row['Category'] . '</a>'; }

if ($row["SubmitterUID"]) { -- 1.7.7.2

Lukas Fleischer

1:42 p.m.

New subject: [aur-dev] [PATCH 3/5] pkg_details.php: Sync metadata layout with archweb

Synchronize the way we display dependencies, required by packages and sources with archweb. Signed-off-by: Lukas Fleischer --- web/html/css/arch.css | 3 - web/html/css/containers.css | 39 ++++++++++++++ web/template/pkg_details.php | 120 ++++++++++++++++++----------------------- 3 files changed, 92 insertions(+), 70 deletions(-) diff --git a/web/html/css/arch.css b/web/html/css/arch.css index 1e588f1..23b8aa7 100644 --- a/web/html/css/arch.css +++ b/web/html/css/arch.css @@ -132,9 +132,6 @@ body { background-color: #f6f3dd; border: 1px solid #d9d6c2; } -div.listing { - padding-right: 10px; -} .error { color: #dd0000; font-size: small; diff --git a/web/html/css/containers.css b/web/html/css/containers.css index 9f845b0..70ffd5c 100644 --- a/web/html/css/containers.css +++ b/web/html/css/containers.css @@ -194,3 +194,42 @@ input[type=image] { #pkginfo td { padding: 0.25em 0 0.25em 1.5em; } + +/* Package metadata */ +#pkgdetails #metadata { + clear: both; +} + +#metadata h3 { + background: #555; + color: #fff; + font-size: 1em; + margin: 0.5em 0; + padding: 0.2em 0.35em; +} + +#metadata ul { + list-style: none; + margin: 0; + padding: 0; +} + +#metadata li { + padding-left: 0.5em; +} + +#metadata #pkgdeps { + float: left; + width: 48%; + margin-right: 2%; +} + +#metadata #pkgreqs { + float: left; + width: 50%; +} + +#metadata #pkgsrcs { + clear: left; + padding-top: 1em; +} diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index f5ed32a..e117e2a 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -61,7 +61,12 @@ $updated_time = ($row["ModifiedTS"] == 0) ? $msg : gmdate("r", intval($row["Modi $submitted_time = ($row["SubmittedTS"] == 0) ? $msg : gmdate("r", intval($row["SubmittedTS"])); $out_of_date_time = ($row["OutOfDateTS"] == 0) ? $msg : gmdate("r", intval($row["OutOfDateTS"])); +# Save package dependencies, "required by" and sources +$deps = package_dependencies($row["ID"]); +$required_by = package_required($row["Name"]); +$sources = package_sources($row["ID"]); ?> + <div class="pgbox"> <div class="pgboxtitle"><span class="f3"><?php echo __("Package Details") . ': ' . htmlspecialchars($row['Name']) . ' ' . htmlspecialchars($row['Version']) ?></span></div> <div class="pgboxbody"> @@ -116,76 +121,57 @@ $out_of_date_time = ($row["OutOfDateTS"] == 0) ? $msg : gmdate("r", intval($row[ } ?> </p> -<?php - - $deps = package_dependencies($row["ID"]); - $requiredby = package_required($row["Name"]); - - if (count($deps) > 0 || count($requiredby) > 0) { - echo '<p>'; - } - - if (count($deps) > 0) { - echo "<span class='boxSoftTitle'><span class='f3'>". __("Dependencies")."</span></span>"; - while (list($k, $darr) = each($deps)) { - # darr: (DepName, DepCondition, PackageID), where ID is NULL if it didn't exist - if (!is_null($darr[2])) { - echo " <a href='packages.php?ID=".$darr[2]."'>".$darr[0].$darr[1]."</a>"; - } else { - echo " <a href='http://www.archlinux.org/packages/?q=".urlencode($darr[0])."'>".$darr[0].$darr[1]."</a>"; + <div id="metadata"> + <div id="pkgdeps" class="listing"> + <h3><?php echo __("Dependencies") . ' (' . count($deps) . ')' ?></h3> + <ul> + <?php while (list($k, $darr) = each($deps)): ?> + <li> + <?php if (!is_null($darr[2])): ?> + <a href="packages.php?ID=<?php echo $darr[2] ?>"><?php echo $darr[0].$darr[1] ?></a> + <?php else: ?> + <a href="http://www.archlinux.org/packages/?q=<?php echo urlencode($darr[0]) ?>"><?php echo $darr[0].$darr[1] ?></a> + <?php endif; ?> + </li> + <?php endwhile; ?> + </ul> + </div> + + <div id="pkgreqs" class="listing"> + <h3><?php echo __("Required by") . ' (' . count($required_by) . ')' ?></h3> + <ul> + <?php while (list($k, $darr) = each($required_by)): ?> + <li><a href="packages.php?ID=<?php echo $darr[1] ?>"><?php echo $darr[0] ?></a></li> + <?php endwhile; ?> + </ul> + </div> + + <div id="pkgsrcs" class="listing"> + <h3><?php echo __("Sources") ?></h3> + <ul> + <?php + while (list($k, $src) = each($sources)) { + $src = explode('::', $src); + $parsed_url = parse_url($src[0]); + + echo '<li>'; + if (isset($parsed_url['scheme']) || isset($src[1])) { + # It is an external source + echo "<a href=\"" . htmlspecialchars((isset($src[1]) ? $src[1] : $src[0]), ENT_QUOTES) . "\">" . htmlspecialchars($src[0]) . "</a><br />\n"; + } + else { + $src = $src[0]; + # It is presumably an internal source + echo "<span class='f8'>" . htmlspecialchars($src) . "</span>"; + echo "<br />\n"; + } + echo '</li>'; } - } - - if (count($requiredby) > 0) { - echo '<br />'; - } - } - - if (count($requiredby) > 0) { - echo "<span class='boxSoftTitle'><span class='f3'>". __("Required by")."</span></span>"; - - while (list($k, $darr) = each($requiredby)) { - # darr: (PackageName, PackageID) - echo " <a href='packages.php?ID=".$darr[1]."'>".$darr[0]."</a>"; - } - } - - if (count($deps) > 0 || count($requiredby) > 0) { - echo '</p>'; - } - - - # $sources[0] = 'src'; - $sources = package_sources($row["ID"]); - - if (count($sources) > 0) { - -?> - <div class='boxSoftTitle'><span class='f3'><?php echo __('Sources') ?></span></div> - <div> -<?php - while (list($k, $src) = each($sources)) { - $src = explode('::', $src); - $parsed_url = parse_url($src[0]); - - if (isset($parsed_url['scheme']) || isset($src[1])) { - # It is an external source - echo "<a href=\"" . htmlspecialchars((isset($src[1]) ? $src[1] : $src[0]), ENT_QUOTES) . "\">" . htmlspecialchars($src[0]) . "</a><br />\n"; - } - else { - $src = $src[0]; - # It is presumably an internal source - echo "<span class='f8'>" . htmlspecialchars($src) . "</span>"; - echo "<br />\n"; - } - } -?> + ?> + </ul> + </div> </div> -<?php - } - -?> </div> </div> -- 1.7.7.2

Lukas Fleischer

1:42 p.m.

New subject: [aur-dev] [PATCH 4/5] pkg_details.php: Sync package actions layout with archweb

Also, relabel the "Tarball" link to "Download tarball" and "PKGBUILD" to "Preview PKGBUILD" to clarify that your shouldn't use the PKGBUILD to build a package. Signed-off-by: Lukas Fleischer --- web/html/css/containers.css | 34 ++++++++++++++++++++++++++++++++++ web/template/pkg_details.php | 27 +++++++++++++++------------ 2 files changed, 49 insertions(+), 12 deletions(-) diff --git a/web/html/css/containers.css b/web/html/css/containers.css index 70ffd5c..977e215 100644 --- a/web/html/css/containers.css +++ b/web/html/css/containers.css @@ -233,3 +233,37 @@ input[type=image] { clear: left; padding-top: 1em; } + +/* Details links */ +#detailslinks { + float: right; +} + +#detailslinks h4 { + color: black; + background: transparent; + font-size: 1.15em; + margin-top: 0; + margin-bottom: 0.25em; + padding: 0; +} + +#detailslinks ul { + list-style: none; + padding: 0; + margin-bottom: 0; + font-size: 0.846em; +} + +#detailslinks > div { + padding: 0.5em; + margin-bottom: 1em; + background: #eee; + border: 1px solid #bbb; +} + +#actionlist .flagged { + color: red; + font-size: 0.9em; + font-style: italic; +} diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index e117e2a..de398d8 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -54,7 +54,9 @@ if ($atype == "Developer" or $atype == "Trusted User") { # In case of wanting to put a custom message $msg = __('unknown'); + $license = empty($row['License']) ? $msg : $row['License']; +$urlpath = URL_DIR . substr($row['Name'], 0, 2) . "/" . $row['Name']; # Print the timestamps for last updates $updated_time = ($row["ModifiedTS"] == 0) ? $msg : gmdate("r", intval($row["ModifiedTS"])); @@ -71,6 +73,19 @@ $sources = package_sources($row["ID"]); <div class="pgboxtitle"><span class="f3"><?php echo __("Package Details") . ': ' . htmlspecialchars($row['Name']) . ' ' . htmlspecialchars($row['Version']) ?></span></div> <div class="pgboxbody"> + <div id="detailslinks" class="listing"> + <div id="actionlist"> + <h4>Package Actions</h4> + <ul class="small"> + <li><a href="<?php echo $urlpath ?>/PKGBUILD"><?php echo __("Preview PKGBUILD") ?></a></li> + <li><a href="<?php echo $urlpath . '/' . $row['Name'] ?>.tar.gz"><?php echo __("Download tarball") ?></a></li> + <?php if ($row["OutOfDateTS"] !== NULL): ?> + <li><span class="flagged"><?php echo __("Flagged out-of-date on") . ' ' . $out_of_date_time ?></span></li> + <?php endif; ?> + </ul> + </div> + </div> + <table id="pkginfo"> <tr> <th><?php echo __('Category') . ':' ?></th> @@ -110,18 +125,6 @@ $sources = package_sources($row["ID"]); </tr> </table> - <p><span class='f3'> -<?php - $urlpath = URL_DIR . substr($row['Name'], 0, 2) . "/" . $row['Name']; - print "<a href='$urlpath/" . $row['Name'] . ".tar.gz'>".__("Tarball")."</a> :: "; - print "<a href='$urlpath/PKGBUILD'>".__("PKGBUILD")."</a></span>"; - - if ($row["OutOfDateTS"] !== NULL) { - echo "<br /><span class='f6'>".__("This package has been flagged out of date.")." (${out_of_date_time})</span>"; - } -?> - </p> - <div id="metadata"> <div id="pkgdeps" class="listing"> <h3><?php echo __("Dependencies") . ' (' . count($deps) . ')' ?></h3> -- 1.7.7.2

Lukas Fleischer

1:42 p.m.

New subject: [aur-dev] [PATCH 5/5] pkg_details.php: Use sane format for date strings

No need to show a full RFC 2822-compliant date here. Instead, display date, hours and minutes for "Last Updated" and "First Submitted" fields and display the date only for the out-of-date time stamp. Signed-off-by: Lukas Fleischer --- web/template/pkg_details.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index de398d8..d8d1e4b 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -59,9 +59,9 @@ $license = empty($row['License']) ? $msg : $row['License']; $urlpath = URL_DIR . substr($row['Name'], 0, 2) . "/" . $row['Name']; # Print the timestamps for last updates -$updated_time = ($row["ModifiedTS"] == 0) ? $msg : gmdate("r", intval($row["ModifiedTS"])); -$submitted_time = ($row["SubmittedTS"] == 0) ? $msg : gmdate("r", intval($row["SubmittedTS"])); -$out_of_date_time = ($row["OutOfDateTS"] == 0) ? $msg : gmdate("r", intval($row["OutOfDateTS"])); +$updated_time = ($row["ModifiedTS"] == 0) ? $msg : gmdate("Y-m-d H:i", intval($row["ModifiedTS"])); +$submitted_time = ($row["SubmittedTS"] == 0) ? $msg : gmdate("Y-m-d H:i", intval($row["SubmittedTS"])); +$out_of_date_time = ($row["OutOfDateTS"] == 0) ? $msg : gmdate("Y-m-d", intval($row["OutOfDateTS"])); # Save package dependencies, "required by" and sources $deps = package_dependencies($row["ID"]); -- 1.7.7.2

Dan McGee

3:25 p.m.

New subject: [aur-dev] [PATCH 5/5] pkg_details.php: Use sane format for date strings

On Fri, Nov 4, 2011 at 8:42 AM, Lukas Fleischer wrote:

...

No need to show a full RFC 2822-compliant date here. Instead, display date, hours and minutes for "Last Updated" and "First Submitted" fields and display the date only for the out-of-date time stamp.

Signed-off-by: Lukas Fleischer Signed-off-by: Dan McGee --- web/template/pkg_details.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index de398d8..d8d1e4b 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -59,9 +59,9 @@ $license = empty($row['License']) ? $msg : $row['License']; $urlpath = URL_DIR . substr($row['Name'], 0, 2) . "/" . $row['Name'];

# Print the timestamps for last updates -$updated_time = ($row["ModifiedTS"] == 0) ? $msg : gmdate("r", intval($row["ModifiedTS"])); -$submitted_time = ($row["SubmittedTS"] == 0) ? $msg : gmdate("r", intval($row["SubmittedTS"])); -$out_of_date_time = ($row["OutOfDateTS"] == 0) ? $msg : gmdate("r", intval($row["OutOfDateTS"])); +$updated_time = ($row["ModifiedTS"] == 0) ? $msg : gmdate("Y-m-d H:i", intval($row["ModifiedTS"])); +$submitted_time = ($row["SubmittedTS"] == 0) ? $msg : gmdate("Y-m-d H:i", intval($row["SubmittedTS"])); +$out_of_date_time = ($row["OutOfDateTS"] == 0) ? $msg : gmdate("Y-m-d", intval($row["OutOfDateTS"]));

# Save package dependencies, "required by" and sources $deps = package_dependencies($row["ID"]); -- 1.7.7.2

Dan McGee

3:28 p.m.

On Fri, Nov 4, 2011 at 8:42 AM, Lukas Fleischer wrote:

...

This patch set basically syncs the package details layout with what archweb uses and makes the rendered page, as well as the source code, look cleaner and more consistent.

I plan to put more efforts in cleaning up our HTML and making the AUR integrate well with the rest of www.archlinux.org. We might eventually just use "archweb.css" with a few AUR-specific extensions. I'd be happy to ensure compatibility on this and keeping differences to a minimum or zero.

...

Any objections from the "Arch Linux/AUR segregation" front..?

Dan, any objections? Nope. I didn't look in detail at all of the patches but generally seems fine to me, as long as AUR is prominent somewhere near the top of the page and in the page title.

...

Lukas Fleischer (5): pkg_details.php: Use a table for package details pkg_details.php: Add link to category search pkg_details.php: Sync metadata layout with archweb pkg_details.php: Sync package actions layout with archweb pkg_details.php: Use sane format for date strings I realized I signed off on these date strings, but also noticed the dates on the front page stats and such are in the ugly format- might want to touch those up too.

...

web/html/css/arch.css | 3 - web/html/css/containers.css | 81 +++++++++++++++ web/template/pkg_details.php | 226 +++++++++++++++++++++--------------------- 3 files changed, 196 insertions(+), 114 deletions(-)

-- 1.7.7.2

Lukas Fleischer

17 Dec 17 Dec

2 p.m.

On Fri, Nov 04, 2011 at 10:28:33AM -0500, Dan McGee wrote:

...

On Fri, Nov 4, 2011 at 8:42 AM, Lukas Fleischer wrote:

...
This patch set basically syncs the package details layout with what archweb uses and makes the rendered page, as well as the source code, look cleaner and more consistent.

I plan to put more efforts in cleaning up our HTML and making the AUR integrate well with the rest of www.archlinux.org. We might eventually just use "archweb.css" with a few AUR-specific extensions. I'd be happy to ensure compatibility on this and keeping differences to a minimum or zero.

...
Any objections from the "Arch Linux/AUR segregation" front..?

Dan, any objections? Nope. I didn't look in detail at all of the patches but generally seems fine to me, as long as AUR is prominent somewhere near the top of the page and in the page title.

I rebased all of these patches and refactored several parts of the AUR website, based on the archweb layout. You can find these changes in my "archweb-integration" branch [1]. Note that I might rebase this branch from time to time, so be prepared when setting up a tracking branch. The most important parts are already fixed but there's still a lot of things to do. Comments and suggestions welcome!

...

...
Lukas Fleischer (5): pkg_details.php: Use a table for package details pkg_details.php: Add link to category search pkg_details.php: Sync metadata layout with archweb pkg_details.php: Sync package actions layout with archweb pkg_details.php: Use sane format for date strings I realized I signed off on these date strings, but also noticed the dates on the front page stats and such are in the ugly format- might want to touch those up too.

...
web/html/css/arch.css | 3 - web/html/css/containers.css | 81 +++++++++++++++ web/template/pkg_details.php | 226 +++++++++++++++++++++--------------------- 3 files changed, 196 insertions(+), 114 deletions(-)

-- 1.7.7.2

[1] http://git.cryptocrack.de/aur.git/?h=archweb-integration

4522

Age (days ago)

4565

Last active (days ago)

List overview

Download

9 comments

2 participants

participants (2)

Dan McGee
Lukas Fleischer

[aur-dev] [PATCH 0/5] Package details view layout changes

tags

participants (2)