Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 880282: Replace |FILTER no_break| by |class="nowrap"| to prevent dashes (U+002D) from being replaced by non-breaking hyphens/dashes (U+2011)

Browse Source 
r=dkl a=justdave


git-svn-id: svn://10.0.0.236/trunk@265860 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2015-03-11 18:16:45 +00:00
parent 0bb19b0db2
commit 6ca7ee8774
10 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
9332
9333

2
mozilla/webtools/bugzilla/.gitrev
View File

@ -1 +1 @@
e7526caf7802734ca54ee907e8a2cecf61013b25
17d05cc7addbf4288c537f8e56c60e7dee24c6d8

8
mozilla/webtools/bugzilla/Bugzilla/Template.pm
View File

@ -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 %

1
mozilla/webtools/bugzilla/t/004template.t
View File

@ -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 $_ } ,

4
mozilla/webtools/bugzilla/template/en/default/admin/flag-type/list.html.tmpl
View File

@ -109,7 +109,9 @@
[% FOREACH type = types %]
<tr class="[% IF type.is_active %]active[% ELSE %]inactive[% END %]">
<td><a href="editflagtypes.cgi?action=edit&amp;id=[% type.id %]">[% type.name FILTER html FILTER no_break %]</a></td>
<td class="nowrap">
<a href="editflagtypes.cgi?action=edit&amp;id=[% type.id %]">[% type.name FILTER html %]</a>
</td>
<td>[% type.description FILTER html %]</td>
<td class="right">[% type.sortkey FILTER html %]</td>
<td>

2
mozilla/webtools/bugzilla/template/en/default/attachment/list.html.tmpl
View File

@ -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>)

4
mozilla/webtools/bugzilla/template/en/default/bug/show-multiple.html.tmpl
View File

@ -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>

6
mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl
View File

@ -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">

4
mozilla/webtools/bugzilla/template/en/default/global/choose-product.html.tmpl
View File

@ -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 %]&amp;[% previous_params FILTER none %][% END -%]">
[% p.name FILTER html FILTER no_break %]</a>:&nbsp;
[% p.name FILTER html %]</a>:
</th>
<td>[% p.description FILTER html_light %]</td>

2
mozilla/webtools/bugzilla/template/en/default/global/useful-links.html.tmpl
View File

@ -46,7 +46,7 @@
<a href="buglist.cgi?cmdtype=dorem&amp;remaction=run&amp;namedcmd=
[%- q.name FILTER uri %]&amp;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>