RT# 81692 Update use of deprecated callback element in RT

[freeside.git] / rt / share / html / Elements / Header

diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header
index 1e7eb35..58136c5 100755 (executable)
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2017 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -45,15 +45,27 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
+% if ( $Popup ) {
+<& /elements/header-popup.html, {
+              'title_noescape' => $Title,
+              'head'      => $head,
+              'etc'       => $etc,
+              'nobr'      => 1,
+              #'nocss'     => 1,
+              'no_jquery' => $JavaScript,
+          }
+&>
+% } else {
 <& /elements/header.html, {
-              'title'     => $Title,
+              'title_noescape' => $Title,
               'head'      => $head,
               'etc'       => $etc,
-              #make space for RT menu for now# 'nobr'  => 1,
+              'nobr'      => 1,
               'nocss'     => 1,
               'no_jquery' => $JavaScript,
           }
 &>
+% }
 <%INIT>
 #for "Site CSS from theme editor" below
 $r->headers_out->{'Pragma'} = 'no-cache';
@@ -101,11 +113,12 @@ my $WebImagesURL = RT->Config->Get('WebImagesURL');
 my $squished = RT->Config->Get('DevelMode') ? '' : '-squished';
 
 if ( $JavaScript ) {
-  $head .= $m->scomp('JavascriptConfig');
+  $head .= $m->scomp('/Elements/JavascriptConfig');
 }
 
 for my $cssfile ( @css_files ) {
   $head .= qq(<link rel="stylesheet" href="$WebPath$cssfile" type="text/css" media="all" />\n);
+}
 
 for (keys %{$LinkRel || {}}) {
   $head .= qq(<link rel="$_" href="$WebPath) . $LinkRel->{$_} . '" />';
@@ -117,20 +130,29 @@ if ( $RSSAutoDiscovery ) {
 }
 
 if ($JavaScript) {
-    $head .= $m->scomp('HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText );
+    $head .= $m->scomp('/Elements/HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText );
+
+$head .= q[
+<script type="text/javascript">
+jQuery(document).ready(function(){
+    jQuery.fn.supersubs.defaults = {
+        maxWidth: 30,
+        extraWidth: 2
+    };
+
+    jQuery("#app-nav.toplevel").addClass('sf-menu sf-js-enabled sf-shadow').supersubs().superfish({ speed: 'fast' });
+    jQuery("#page-menu.toplevel").addClass('sf-menu sf-js-enabled').supersubs().superfish({ dropShadows: false, speed: 'fast' }).supposition();
+});
+</script>
+];
 
-    my $stylesheet_plugin = "/NoAuth/css/$style/InHeader";
-    if ($m->comp_exists($stylesheet_plugin) ) {
-        $head .= $m->scomp($stylesheet_plugin);
-    }
 }
 
-# $m->callback( %ARGS, CallbackName => 'Head' );
-$head .= $m->scomp( '/Elements/Callback', _CallbackName => 'Head', %ARGS );
-
-if ($JavaScript) {
-    $head .= $m->scomp('HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText );
-}
+$head .= $m->callback(
+  %ARGS,
+  CallbackName => 'Head',
+  ReturnComponentOutput => 1,
+);
 
 #XXX $head .= <& /Elements/Framekiller &>;
 
@@ -138,7 +160,6 @@ my $etc = ' class="'. join( '',@{$ARGS{'BodyClass'}}). '" ';
 $etc .= qq[ id="comp-$id"] if $id;
 
 </%INIT>
-
 <%ARGS>
 #$Focus => 'focus'
 $Focus => ''
@@ -152,4 +173,6 @@ $LinkRel => undef
 $SkipDoctype => 0
 $RichText => 1
 $BodyClass => undef
+$JavaScript => 1
+$Popup => 0
 </%ARGS>