rt 4.2.16

[freeside.git] / rt / share / html / Widgets / TitleBoxStart

diff --git a/rt/share/html/Widgets/TitleBoxStart b/rt/share/html/Widgets/TitleBoxStart
index 492cfab..723cb05 100755 (executable)
--- 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-2019 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|n,j%>);" 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,20 +71,23 @@ $titleright => ''
 $titleright_raw => ''
 $id => ''
 $hideable => 1
+$rolledup => 0
 </%ARGS>
 
 <%init>
+$hideable = 1 if $rolledup;
 #
 # This should be pretty bulletproof
 #
 my $page = $m->request_comp->path;
 
-my $title_b64 = MIME::Base64::encode_base64(Encode::encode_utf8($title), '');
+my $title_b64 = MIME::Base64::encode_base64(Encode::encode( "UTF-8", $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");