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

Bug 245282 : Flags should use nonbreaking hyphens or nowrap or somehow prevent hyphens from breaking flag names

Browse Source 
Patch by LpSolit@gmail.com    r=wurblzap    a=myk


git-svn-id: svn://10.0.0.236/trunk@167948 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
travis%sedsystems.ca 2005-01-18 18:29:27 +00:00
parent 1f8244603d
commit df9f480900
6 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,6 +249,14 @@ sub create {
return $var; 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 , xml => \&Bugzilla::Util::xml_quote ,
# This filter escapes characters in a variable or value string for # This filter escapes characters in a variable or value string for

1
mozilla/webtools/bugzilla/checksetup.pl
View File

@ -1249,6 +1249,7 @@ END
obsolete => sub { return $_; }, obsolete => sub { return $_; },
js => sub { return $_; }, js => sub { return $_; },
html_linebreak => sub { return $_; }, html_linebreak => sub { return $_; },
no_break => sub { return $_; },
url_quote => sub { return $_; }, url_quote => sub { return $_; },
xml => sub { return $_; }, xml => sub { return $_; },
quoteUrls => sub { return $_; }, quoteUrls => sub { return $_; },

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

@ -93,6 +93,7 @@ foreach my $include_path (@include_paths) {
FILTERS => FILTERS =>
{ {
html_linebreak => sub { return $_; }, html_linebreak => sub { return $_; },
no_break => sub { return $_; } ,
js => sub { return $_ } , js => sub { return $_ } ,
inactive => [ sub { return sub { return $_; } }, 1] , inactive => [ sub { return sub { return $_; } }, 1] ,
closed => [ sub { return sub { return $_; } }, 1] , closed => [ sub { return sub { return $_; } }, 1] ,

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

@ -93,7 +93,7 @@
[% FOREACH type = types %] [% FOREACH type = types %]
<tr class="[% IF type.is_active %]active[% ELSE %]inactive[% END %]"> <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 %]</a></td> <td><a href="editflagtypes.cgi?action=edit&amp;id=[% type.id %]">[% type.name FILTER html FILTER no_break %]</a></td>
<td>[% type.description FILTER html %]</td> <td>[% type.description FILTER html %]</td>
<td> <td>
<a href="editflagtypes.cgi?action=copy&amp;id=[% type.id %]">Copy</a> <a href="editflagtypes.cgi?action=copy&amp;id=[% type.id %]">Copy</a>

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

@ -59,7 +59,7 @@
[% IF flag.setter %] [% IF flag.setter %]
[% flag.setter.nick FILTER html %]: [% flag.setter.nick FILTER html %]:
[% END %] [% END %]
[%+ flag.type.name FILTER html %][% flag.status %] [%+ flag.type.name FILTER html FILTER no_break %][% flag.status %]
[%+ IF flag.status == "?" && flag.requestee %] [%+ IF flag.status == "?" && flag.requestee %]
([% flag.requestee.nick FILTER html %]) ([% flag.requestee.nick FILTER html %])
[% END %]<br> [% END %]<br>

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

@ -98,7 +98,7 @@
[% flag.setter.nick FILTER html %]: [% flag.setter.nick FILTER html %]:
</td> </td>
<td> <td>
[% type.name FILTER html %] [% type.name FILTER html FILTER no_break %]
</td> </td>
<td> <td>
<select id="flag-[% flag.id %]" name="flag-[% flag.id %]" <select id="flag-[% flag.id %]" name="flag-[% flag.id %]"
@ -137,7 +137,7 @@
[% IF (!type.flags || type.flags.size == 0) && type.is_active %] [% IF (!type.flags || type.flags.size == 0) && type.is_active %]
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>[% type.name FILTER html %]</td> <td>[% type.name FILTER html FILTER no_break %]</td>
<td> <td>
<select id="flag_type-[% type.id %]" name="flag_type-[% type.id %]" <select id="flag_type-[% type.id %]" name="flag_type-[% type.id %]"
onchange="toggleRequesteeField(this);"> onchange="toggleRequesteeField(this);">
@ -172,7 +172,7 @@
[% separator_displayed = 1 %] [% separator_displayed = 1 %]
[% END %] [% END %]
<tr> <tr>
<td colspan="2">addl. [% type.name FILTER html %]</td> <td colspan="2">addl. [% type.name FILTER html FILTER no_break %]</td>
<td> <td>
<select id="flag_type-[% type.id %]" name="flag_type-[% type.id %]" <select id="flag_type-[% type.id %]" name="flag_type-[% type.id %]"
onchange="toggleRequesteeField(this);"> onchange="toggleRequesteeField(this);">