diff options
| -rwxr-xr-x | checksetup.pl | 1 | ||||
| -rw-r--r-- | globals.pl | 9 | ||||
| -rw-r--r-- | t/004template.t | 1 | ||||
| -rw-r--r-- | template/en/default/global/useful-links.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/list/table.html.tmpl | 11 |
5 files changed, 11 insertions, 15 deletions
diff --git a/checksetup.pl b/checksetup.pl index 738f99386..f4eff45c7 100755 --- a/checksetup.pl +++ b/checksetup.pl @@ -882,7 +882,6 @@ END js => sub { return $_; }, html => sub { return $_; }, url_quote => sub { return $_; }, - no_break => sub { return $_; } }, }) || die ("Could not create Template: " . Template->error() . "\n"); diff --git a/globals.pl b/globals.pl index 6e84cb0da..fdb189498 100644 --- a/globals.pl +++ b/globals.pl @@ -1568,15 +1568,6 @@ $::template ||= Template->new( # filter should be used for a full URL that may have # characters that need encoding. url_quote => \&url_quote , - - # Returns the text with spaces converted to non-breaking space - # HTML entities. - no_break => sub - { - my ($var) = @_; - $var =~ s/ /\ /g; - return $var; - } , } , } ) || DisplayError("Template creation failed: " . Template->error()) diff --git a/t/004template.t b/t/004template.t index f56a30140..ba50c1e66 100644 --- a/t/004template.t +++ b/t/004template.t @@ -80,7 +80,6 @@ my $template = Template->new( js => sub { return $_ } , strike => sub { return $_ } , url_quote => sub { return $_ } , - no_break => sub { return $_ } , }, } ); diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl index d8c443775..40207f3d6 100644 --- a/template/en/default/global/useful-links.html.tmpl +++ b/template/en/default/global/useful-links.html.tmpl @@ -106,7 +106,9 @@ [% FOREACH q = user.queries %] [% IF q.linkinfooter %] [% " | " IF print_pipe %] - <a href="buglist.cgi?cmdtype=runnamed&namedcmd=[% q.name FILTER url_quote %]">[% q.name FILTER html FILTER no_break %]</a> + <a href="buglist.cgi?cmdtype=runnamed&namedcmd=[% q.name FILTER url_quote %]"> + <nobr>[% q.name FILTER html %]</nobr> + </a> [% print_pipe = 1 %] [% END %] [% END %] diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl index 765883319..6d5ee0d6c 100644 --- a/template/en/default/list/table.html.tmpl +++ b/template/en/default/list/table.html.tmpl @@ -28,6 +28,8 @@ # the shortened title is included. For columns whose values should be # abbreviated, a maximum length is provided along with the ellipsis that # should be added to an abbreviated value, if any. + # wrap is set if a column's contents should be allowed to be word-wrapped + # by the browser. #%] [% abbrev = { @@ -39,8 +41,9 @@ "owner" => { maxlength => 30 , ellipsis => "..." } , "qa_contact" => { maxlength => 30 , ellipsis => "..." , title => "QAContact" } , "resolution" => { maxlength => 4 } , - "summary" => { maxlength => 60 , ellipsis => "..." } , - "status_whiteboard" => { title => "StatusSummary" } , + "summary" => { maxlength => 60 , ellipsis => "..." , wrap => 1 } , + "summaryfull" => { wrap => 1 } , + "status_whiteboard" => { title => "StatusSummary" , wrap => 1 } , "component" => { maxlength => 8 , title => "Comp" } , "product" => { maxlength => 8 } , "version" => { maxlength => 5 , title => "Vers" } , @@ -128,7 +131,9 @@ [% FOREACH column = displaycolumns %] <td> - [%+ bug.$column.truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html %] + [% '<nobr>' IF NOT abbrev.$column.wrap %] + [%- bug.$column.truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%] + [%- '</nobr>' IF NOT abbrev.$column.wrap %] </td> [% END %] |