diff options
| -rw-r--r-- | Bugzilla/Template.pm | 8 | ||||
| -rw-r--r-- | t/004template.t | 1 | ||||
| -rw-r--r-- | template/en/default/admin/flag-type/list.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/attachment/list.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/bug/show-multiple.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/flag/list.html.tmpl | 6 | ||||
| -rw-r--r-- | template/en/default/global/choose-product.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/global/useful-links.html.tmpl | 2 |
8 files changed, 12 insertions, 19 deletions
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 3f3d5f399..1b6b48205 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -806,14 +806,6 @@ sub create { return $var; }, - # Prevents line break on hyphens and whitespaces. - no_break => sub { - my ($var) = @_; - $var =~ s/ /\ /g; - $var =~ s/-/\‑/g; - return $var; - }, - xml => \&Bugzilla::Util::xml_quote , # This filter is similar to url_quote but used a \ instead of a % diff --git a/t/004template.t b/t/004template.t index 6e366c044..ce45cfec1 100644 --- a/t/004template.t +++ b/t/004template.t @@ -71,7 +71,6 @@ foreach my $include_path (@include_paths) { FILTERS => { html_linebreak => sub { return $_; }, - no_break => sub { return $_; } , js => sub { return $_ } , base64 => sub { return $_ } , url_quote => sub { return $_ } , diff --git a/template/en/default/admin/flag-type/list.html.tmpl b/template/en/default/admin/flag-type/list.html.tmpl index f4836ca7d..b91b49199 100644 --- a/template/en/default/admin/flag-type/list.html.tmpl +++ b/template/en/default/admin/flag-type/list.html.tmpl @@ -109,7 +109,9 @@ [% FOREACH type = types %] <tr class="[% IF type.is_active %]active[% ELSE %]inactive[% END %]"> - <td><a href="editflagtypes.cgi?action=edit&id=[% type.id %]">[% type.name FILTER html FILTER no_break %]</a></td> + <td class="nowrap"> + <a href="editflagtypes.cgi?action=edit&id=[% type.id %]">[% type.name FILTER html %]</a> + </td> <td>[% type.description FILTER html %]</td> <td class="right">[% type.sortkey FILTER html %]</td> <td> diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl index 2e160eda7..97fd2dc95 100644 --- a/template/en/default/attachment/list.html.tmpl +++ b/template/en/default/attachment/list.html.tmpl @@ -122,7 +122,7 @@ function toggle_display(link) { [% ELSE %] [% flag.setter.nick FILTER html %]: [% END %] - [%+ flag.type.name FILTER html FILTER no_break %][% flag.status %] + [%+ flag.type.name FILTER html %][% flag.status %] [%+ IF flag.status == "?" && flag.requestee %] [% IF user.id %] (<span title="[% flag.requestee.identity FILTER html %]">[% flag.requestee.nick FILTER html %]</span>) diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl index 99dd53215..8babdf04a 100644 --- a/template/en/default/bug/show-multiple.html.tmpl +++ b/template/en/default/bug/show-multiple.html.tmpl @@ -263,7 +263,7 @@ [% ELSE %] [% FOREACH flag = attachment.flags %] [% flag.setter.nick FILTER html %]: - [%+ flag.type.name FILTER html FILTER no_break %][% flag.status %] + <span class="nowrap">[%+ flag.type.name FILTER html %][% flag.status %]</span> [% IF flag.status == "?" && flag.requestee %] ([% flag.requestee.nick FILTER html %]) [% END %][% ", " IF not loop.last() %] @@ -352,7 +352,7 @@ [% FOREACH type = bug.flag_types %] [% FOREACH flag = type.flags %] [% flag.setter.nick FILTER html %]: - [%+ flag.type.name FILTER html FILTER no_break %][% flag.status %] + <span class="nowrap">[%+ flag.type.name FILTER html %][% flag.status %]</span> [%+ IF flag.status == "?" && flag.requestee %] ([% flag.requestee.nick FILTER html %]) [% END %]<br> diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl index 7547e5687..047fd4425 100644 --- a/template/en/default/flag/list.html.tmpl +++ b/template/en/default/flag/list.html.tmpl @@ -80,7 +80,7 @@ [% ELSE %] [% flag.setter.nick FILTER html %]: [% END %] - [%+ type.name FILTER html FILTER no_break %][% flag.status %] + <span class="nowrap">[%+ type.name FILTER html %][% flag.status %]</span> [% IF flag.requestee %] [% IF flag.requestee.name %] (<span title="[% flag.requestee.name FILTER html %]">[% flag.requestee.nick FILTER html %]</span>) @@ -107,9 +107,9 @@ [% addl_text FILTER html %] [% END %] </td> - <td> + <td class="nowrap"> <label title="[% type.description FILTER html %]" for="[% fid FILTER html %]"> - [%- type.name FILTER html FILTER no_break -%]</label> + [%- type.name FILTER html %]</label> </td> <td> <input type="hidden" id="[% fid FILTER html %]_dirty"> diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl index 7349d1ced..a1582532a 100644 --- a/template/en/default/global/choose-product.html.tmpl +++ b/template/en/default/global/choose-product.html.tmpl @@ -45,10 +45,10 @@ [% FOREACH p = c.products %] <tr> - <th class="right"> + <th class="right nowrap"> <a href="[% target %]?product=[% p.name FILTER uri -%] [%- IF previous_params %]&[% previous_params FILTER none %][% END -%]"> - [% p.name FILTER html FILTER no_break %]</a>: + [% p.name FILTER html %]</a>: </th> <td>[% p.description FILTER html_light %]</td> diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl index 97c7f709c..5c5bfc316 100644 --- a/template/en/default/global/useful-links.html.tmpl +++ b/template/en/default/global/useful-links.html.tmpl @@ -46,7 +46,7 @@ <a href="buglist.cgi?cmdtype=dorem&remaction=run&namedcmd= [%- q.name FILTER uri %]&sharer_id=[% q.user.id FILTER uri %]" class="shared" title="Shared by [% q.user.identity FILTER html %]"> - [%- q.name FILTER html FILTER no_break %]</a> + [%- q.name FILTER html %]</a> </li> [% END %] </ul> |