diff options
Diffstat (limited to 'rt/share/html/Widgets/TitleBoxStart')
| -rwxr-xr-x | rt/share/html/Widgets/TitleBoxStart | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/rt/share/html/Widgets/TitleBoxStart b/rt/share/html/Widgets/TitleBoxStart index 492cfab0b..a03147785 100755 --- a/rt/share/html/Widgets/TitleBoxStart +++ b/rt/share/html/Widgets/TitleBoxStart @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -45,24 +45,20 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -<div class="titlebox<% $class ? " $class " : '' %>" id="<% $id %>"> +<div class="titlebox<% $class ? " $class " : '' %><% $rolledup ? " rolled-up" : ""%>" id="<% $id %>"> <div class="titlebox-title<% $title_class ? " $title_class" : ''%>"> % if ($hideable) { - <span class="widget"><a href="#" - onclick="return rollup('<%$tid%>');" - title="Toggle visibility"></a> - </span> + <span class="widget"><a href="#" onclick="return rollup('<%$tid%>');" title="Toggle visibility"></a></span> % } - <span class="left"> - <% $title_href ? qq[<a href="$title_href">] : '' | n + <span class="left"><% + $title_href ? qq[<a href="$title_href">] : '' | n %><% $title %><% $title_raw |n %><% $title_href ? "</a>" : '' |n%></span> - <span class="right<%($titleright_href || $titleright || $titleright_raw) ? '' : '-empty' %>"> - <% $titleright_href ? qq[<a href="$titleright_href">] : '' | n %> - <% $titleright %><% $titleright_raw |n%><% $titleright_href ? "</a>" : '' |n%> + <span class="right<%($titleright_href || $titleright || $titleright_raw) ? '' : '-empty' %>">\ + <% $titleright_href ? qq[<a href="$titleright_href">] : '' | n %>\ + <% $titleright %><% $titleright_raw |n%><% $titleright_href ? "</a>" : '' |n%>\ </span> </div> - <div class="titlebox-content <% $bodyclass %>" id="<% $tid %>"> - + <div class="titlebox-content <% $bodyclass %><% $rolledup ? " hidden" : ""%>" id="<% $tid %>"> <%ARGS> $class => '' $bodyclass => '' @@ -75,9 +71,11 @@ $titleright => '' $titleright_raw => '' $id => '' $hideable => 1 +$rolledup => 0 </%ARGS> <%init> +$hideable = 1 if $rolledup; # # This should be pretty bulletproof # @@ -88,7 +86,8 @@ my $title_b64 = MIME::Base64::encode_base64(Encode::encode_utf8($title), ''); my $tid = "TitleBox--$page--" . join '--', ($class, $bodyclass, $title_b64, $id); -$tid =~ s{[^A-Za-z0-9\-_:\.]+}{_}g; +# Replace anything that ISN'T alphanumeric, a hyphen, or an underscore +$tid =~ s{[^A-Za-z0-9\-_]}{_}g; my $i = 0; $i++ while $m->notes("$tid-$i"); |