[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#881609: DDPO: align columns in all tables, and allow long package names to wrap



Control: close -1

closing as it got filed twice, see https://bugs.debian.org/881607

On Sat, Nov 11, 2017 at 06:39:42PM +0100, Ximin Luo wrote:
> Package: qa.debian.org
> Severity: wishlist
> Tags: patch
> 
> Dear Maintainer,
> 
> Please see the attached patches, as well as the attached screenshot.
> 
> Note that the screenshot was produced by manually editing the DOM elements in
> Firefox, I did not get a chance to test out the patch yet. If they are buggy,
> the screenshot indicates "what was intended" so let me know and I'll fix it.
> 
> As comparison, this is what it looks like now:
> https://qa.debian.org/developer.php?login=infinity0&version=testing&bin=1
> 
> X
> 
> -- System Information:
> Debian Release: buster/sid
>   APT prefers testing
>   APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'buildd-unstable'), (300, 'unstable'), (100, 'experimental'), (1, 'experimental-debug')
> Architecture: amd64 (x86_64)
> Foreign Architectures: i386
> 
> Kernel: Linux 4.13.0-1-amd64 (SMP w/4 CPU cores)
> Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8), LANGUAGE=en_GB:en (charmap=UTF-8)
> Shell: /bin/sh linked to /bin/dash
> Init: systemd (via /run/systemd/system)

> From 1d64564862438e2d0f33cfde5c5234adfbcfe325 Mon Sep 17 00:00:00 2001
> From: Ximin Luo <infinity0@debian.org>
> Date: Sat, 11 Nov 2017 18:26:55 +0100
> Subject: [PATCH 1/2] Align all columns in all the tables, by combining them
>  into one table
> 
> ---
>  wml/developer.css |  5 +++++
>  wml/developer.wml | 11 +++++++----
>  2 files changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/wml/developer.css b/wml/developer.css
> index 699980b4..1415d9b0 100644
> --- a/wml/developer.css
> +++ b/wml/developer.css
> @@ -55,6 +55,11 @@ h3 { margin-bottom: 0.5em; }
>  	text-align: center;
>  	vertical-align: middle;
>  }
> +.packagetable th.pkgsection-header {
> +	text-align: left;
> +	color: inherit;
> +	border: 0;
> +}
>  .packagetable td {
>  	border: 1px solid #333333;
>  	padding: 2px;
> diff --git a/wml/developer.wml b/wml/developer.wml
> index cab0b582..047d4334 100644
> --- a/wml/developer.wml
> +++ b/wml/developer.wml
> @@ -1221,8 +1221,6 @@ function print_package_entries($branch, $packages, $skip_seen)
>  
>      if (!count($trs)) return;
>  
> -    print html_h(html_a_name(html_em($branch) . " (" . count($trs) . ")", $branch), 3);
> -
>      /* contruct the table header */
>      $ths = html_th("Source" . html_blank(). "Name", "", 2);
>      if(isdisplayed('description')) $ths .= html_th("Description", "", 2);
> @@ -1286,10 +1284,11 @@ function print_package_entries($branch, $packages, $skip_seen)
>      }
>      if(isdisplayed('ci')) $ths .= html_th(html_a("Rep", "https://tests.reproducible-builds.org";, "", "Reproducible builds"));
>  
> +    $th3 = html_h(html_a_name(html_em($branch) . " (" . count($trs) . ")", $branch), 3);
> +    $th3 = $th_level1 . html_tr("<th class=\"pkgsection-header\" colspan=\"999\">$th3</th>");
>      $ths = $th_level1 . html_tr($ths);
> -    print html_table_begin("<thead>$ths</thead>", "", "packagetable sortable");
> +    print "<thead>$th3$ths</thead>"
>      foreach ($trs as $line) print $line;
> -    print html_table_end();
>  }
>  
>  function subscribe_db()
> @@ -1467,6 +1466,8 @@ function print_developer($login, $name)
>      print_header_entries_top($login, $name);
>      print_header_entries_body($login, $name);
>  
> +    print html_table_begin("", "", "packagetable sortable");
> +
>      /* ordering 3: print subscribed packages first. Subscribed packages will
>       * not show up in main/contrib/non-free (and vice-versa for other
>       * orderings) */
> @@ -1493,6 +1494,8 @@ function print_developer($login, $name)
>          foreach ($uploaders as $uploader)
>              print_uploaded_packages(array($uploader));
>      }
> +
> +    print html_table_end();
>  }
>  
>  function delete_duplicates_from_array( $array )
> -- 
> 2.14.2
> 

> From e663cded8c8ef7fbad1ce4d6ee259a25be2f3122 Mon Sep 17 00:00:00 2001
> From: Ximin Luo <infinity0@debian.org>
> Date: Sat, 11 Nov 2017 18:27:12 +0100
> Subject: [PATCH 2/2] Allow very long package names like
>  sagemath-database-conway-polynomials to wrap
> 
> ---
>  wml/developer.css | 5 +++--
>  wml/developer.wml | 2 +-
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/wml/developer.css b/wml/developer.css
> index 1415d9b0..77882336 100644
> --- a/wml/developer.css
> +++ b/wml/developer.css
> @@ -8,10 +8,8 @@ a.dash:link,a.dash:visited,a.dash:active {text-decoration: none;}
>  h3 { margin-bottom: 0.5em; }
>  .small { font-size:small }
>  .own_package { color:black !important;
> -	white-space:nowrap;
>  	text-decoration: none !important; }
>  .uploader { color:blue !important;
> -	white-space:nowrap;
>  	text-decoration: none !important; }
>  
>  .bpo, .oldstable-bpo, .oldstable-bpo-sloppy, .oldoldstable-bpo, .oldoldstable-bpo-sloppy { color:#7400ff }
> @@ -66,6 +64,9 @@ h3 { margin-bottom: 0.5em; }
>  	text-align: center;
>  	vertical-align: middle;
>  }
> +.packagetable td:first-child {
> +	max-width: 16em;
> +}
>  
>  
>  #settings {
> diff --git a/wml/developer.wml b/wml/developer.wml
> index 047d4334..b9194108 100644
> --- a/wml/developer.wml
> +++ b/wml/developer.wml
> @@ -782,7 +782,7 @@ function print_package_entry($package, $uploader, $back_tr_color, $skip_seen)
>      $line_data = html_b(html_a($package_quoted,
>              "https://tracker.debian.org/pkg/$urlpackage";,
>              $uploader ? "uploader" : "own_package", $description, $package_quoted)) .
> -        "<sup>" . $com_nr . $dmpackage . get_wnpp_rm($package) . "</sup>" .
> +        "<wbr /><sup>" . $com_nr . $dmpackage . get_wnpp_rm($package) . "</sup>" .
>          html_br() .
>          html_a("PTS", "https://packages.qa.debian.org/".get_rep($urlpackage)."/$urlpackage.html") . html_blank() .
>          html_a("Pool", $pool);
> -- 
> 2.14.2
> 



-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-

Attachment: signature.asc
Description: PGP signature


Reply to: