merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237

1 files changed, 8 insertions, 10 deletions

diff --git a/rt/share/html/Elements/SelectDate b/rt/share/html/Elements/SelectDate
index 14835272b..1fd196843 100755
--- a/rt/share/html/Elements/SelectDate
+++ b/rt/share/html/Elements/SelectDate
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 %# in PageLayout instead, once <% include('/elements/init_calendar.html') |n %>
 % $m->callback( %ARGS, Name => $Name, CallbackName => 'BeforeDateInput' );
-<input type="text" class="ui-datepicker<% $ShowTime ? ' withtime' : '' %>" id="<% $Name %>" name="<% $Name %>" value="<% $Value %>" size="<% $Size %>" />
+<input type="text" class="datepicker<% $ShowTime ? ' withtime' : '' %>" id="<% $Name %>" name="<% $Name %>" value="<% $Value %>" size="<% $Size %>" />
 <IMG SRC="<%$fsurl%>images/calendar.png" ID="<% $Name %>_date_button" STYLE="cursor: pointer" TITLE="Select date">
 % $m->callback( %ARGS, Name => $Name, CallbackName => 'AfterDateInput' );
 <script type="text/javascript">
@@ -63,23 +63,21 @@ Calendar.setup({
 });
 </script>
 <%init>
-unless ((defined $Default) or 
-	($current <= 0)) {
-	my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
-                                            localtime($current);
-        $Default = sprintf("%04d-%02d-%02d %02d:%02d",                         
-                           $year+1900,$mon+1,$mday,                            
-                           $hour,$min);   
+unless ((defined $Default) or ($current <= 0)) {
+    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
+                                           localtime($current);
+    $Default = sprintf("%04d-%02d-%02d %02d:%02d",
+                       $year+1900,$mon+1,$mday,
+                       $hour,$min);
 }
 $Value = $Value || $Default;
 
 unless ($Name) {
-	$Name = $menu_prefix. "_Date";
+    $Name = $menu_prefix. "_Date";
 }
 </%init>
 
 <%args>
-
 $ShowTime => 1
 $menu_prefix=>''
 $current=>time