From 2c09925cad2ade037e6ae953e4ed6fc056811f2f Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 12 Jun 2015 15:19:00 -0700
Subject: rt 4.0.23

---
 rt/share/html/Elements/Header | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rt/share/html/Elements/Header')

diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header
index 5e08fe384..1f6035d7d 100755
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
-- 
cgit v1.2.1


From e131b1f71f08b69abb832c1687d1f29682d171f8 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 9 Jul 2015 22:18:55 -0700
Subject: RT 4.2.11, ticket#13852

---
 rt/share/html/Elements/Header | 52 ++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 28 deletions(-)

(limited to 'rt/share/html/Elements/Header')

diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header
index 1f6035d7d..6c0f425c3 100755
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@ -55,8 +55,6 @@
 &>
 <%INIT>
 #for "Site CSS from theme editor" below
-#use Scalar::Util qw(blessed);
-
 $r->headers_out->{'Pragma'} = 'no-cache';
 $r->headers_out->{'Cache-control'} = 'no-cache';
 
@@ -74,17 +72,23 @@ my $style = $session{'CurrentUser'}
 
 my @css_files;
 if ( RT->Config->Get('DevelMode') ) {
-    @css_files = ( "$style/main.css", RT->Config->Get('CSSFiles' ) );
+    @css_files = map { "/static/css/$_" } "$style/main.css", RT->Config->Get('CSSFiles');
 }
 else {
     my $key =
       RT::Interface::Web::SquishedCSS( $style )->Key;
-    @css_files = "$style-squished-$key.css";
+    @css_files = "/NoAuth/css/$style/squished-$key.css";
 }
 
-my $head = '';
+# We use BodyClass in its $ARGS form so that callbacks have a chance to
+# massage it
+push @{$ARGS{'BodyClass'}}, lc $style;
 
-#XXX $head .= <& /Elements/Framekiller &>;
+if (RT->Config->Get("UseSideBySideLayout", $session{'CurrentUser'})) {
+    push @{$ARGS{'BodyClass'}}, 'sidebyside';
+}
+
+my $head = '';
 
 if ($Refresh && $Refresh =~ /^(\d+)/ && $1 > 0) {
   my $URL = $m->notes->{RefreshURL}; $URL = $URL ? ";URL=$URL" : "";
@@ -95,43 +99,37 @@ my $WebPath = RT->Config->Get('WebPath');
 my $WebImagesURL = RT->Config->Get('WebImagesURL');
 my $squished = RT->Config->Get('DevelMode') ? '' : '-squished';
 
-$head .= qq(<link rel="shortcut icon" href="${WebImagesURL}favicon.png" type="image/png" />\n);
-for my $cssfile ( @css_files ) {
-  $head .= qq(<link rel="stylesheet" href="$WebPath/NoAuth/css/$cssfile" type="text/css" media="all" />\n);
+if ( $JavaScript ) {
+  $head .= $m->scomp('JavascriptConfig');
 }
-$head .= qq(<link rel="stylesheet" href="$WebPath/NoAuth/css/print.css" type="text/css" media="print" />\n);
+
+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->{$_} . '" />';
 }
+$head .= qq(<link rel="shortcut icon" href="${WebImagesURL}favicon.png" type="image/png" />\n);
 
 if ( $RSSAutoDiscovery ) {
     $head .= qq(<link rel="alternate" href="$RSSAutoDiscovery" type="application/rss+xml" title="RSS RT Search" />);
 }
 
-if ($JavaScript) {
-    $head .= $m->scomp('HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText );
-}
-
 my $stylesheet_plugin = "/NoAuth/css/$style/InHeader";
 if ($m->comp_exists($stylesheet_plugin) ) {
     $head .= $m->scomp($stylesheet_plugin);
 }
 
-#<!-- Site CSS from theme editor -->
-#<style type="text/css" media="all" id="sitecss">
-#%# Header is used when there isn't a database (such as in the Installer) which means there is no
-#%# RT::System object, nor are there attributes.
-#% if (blessed(RT->System) and my $attr = RT->System->FirstAttribute('UserCSS')) {
-#<% $attr->Content |n %>
-#% }
-#</style>
-
 # $m->callback( %ARGS, CallbackName => 'Head' );
 $head .= $m->scomp( '/Elements/Callback', _CallbackName => 'Head', %ARGS );
 
-my $sbs = RT->Config->Get("UseSideBySideLayout", $session{'CurrentUser'}) ? ' sidebyside' : '';
-my $etc = qq[ class="\L$style$sbs" ];
+if ($JavaScript) {
+    $head .= $m->scomp('HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText );
+}
+
+#XXX $head .= <& /Elements/Framekiller &>;
+
+my $etc = ' class="'. join( '',@{$ARGS{'BodyClass'}}). '" ';
 $etc .= qq[ id="comp-$id"] if $id;
 
 </%INIT>
@@ -140,15 +138,13 @@ $etc .= qq[ id="comp-$id"] if $id;
 #$Focus => 'focus'
 $Focus => ''
 $Title =>  'RT'
-$Code => undef
 $Refresh => 0
-$Why => undef
 $ShowBar => 1
 $URL => undef
 $RSSAutoDiscovery => undef
 $onload => undef
 $LinkRel => undef
-$JavaScript => 1
 $SkipDoctype => 0
 $RichText => 1
+$BodyClass => undef
 </%ARGS>
-- 
cgit v1.2.1


From e09a570e1a1b53a29124e22494ce024840b18052 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 9 Jul 2015 22:29:58 -0700
Subject: Header changes to disable RT javascript, RT#34237

---
 rt/share/html/Elements/Header | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'rt/share/html/Elements/Header')

diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header
index 6c0f425c3..fb6cbdaa6 100755
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@ -46,11 +46,12 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <& /elements/header.html, {
-              'title' => $Title,
-              'head'  => $head,
-              'etc'   => $etc,
+              'title'     => $Title,
+              'head'      => $head,
+              'etc'       => $etc,
               #make space for RT menu for now# 'nobr'  => 1,
-              'nocss' => 1,
+              'nocss'     => 1,
+              'no_jquery' => $JavaScript,
           }
 &>
 <%INIT>
@@ -115,9 +116,11 @@ if ( $RSSAutoDiscovery ) {
     $head .= qq(<link rel="alternate" href="$RSSAutoDiscovery" type="application/rss+xml" title="RSS RT Search" />);
 }
 
-my $stylesheet_plugin = "/NoAuth/css/$style/InHeader";
-if ($m->comp_exists($stylesheet_plugin) ) {
-    $head .= $m->scomp($stylesheet_plugin);
+if ($JavaScript) {
+    my $stylesheet_plugin = "/NoAuth/css/$style/InHeader";
+    if ($m->comp_exists($stylesheet_plugin) ) {
+        $head .= $m->scomp($stylesheet_plugin);
+    }
 }
 
 # $m->callback( %ARGS, CallbackName => 'Head' );
-- 
cgit v1.2.1


From 8d081a1e84811838d0d6a400030e049d8a9365bd Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 9 Jul 2015 22:36:49 -0700
Subject: merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237

---
 rt/share/html/Elements/Header | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'rt/share/html/Elements/Header')

diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header
index fb6cbdaa6..521593425 100755
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@ -117,6 +117,8 @@ if ( $RSSAutoDiscovery ) {
 }
 
 if ($JavaScript) {
+    $head .= $m->scomp('HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText );
+
     my $stylesheet_plugin = "/NoAuth/css/$style/InHeader";
     if ($m->comp_exists($stylesheet_plugin) ) {
         $head .= $m->scomp($stylesheet_plugin);
@@ -126,10 +128,6 @@ if ($JavaScript) {
 # $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 );
-}
-
 #XXX $head .= <& /Elements/Framekiller &>;
 
 my $etc = ' class="'. join( '',@{$ARGS{'BodyClass'}}). '" ';
-- 
cgit v1.2.1


From 6799b211d676af19ca6156c7b5e4e8ee401438f0 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 9 Jul 2015 23:16:17 -0700
Subject: merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237

---
 rt/share/html/Elements/Header | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'rt/share/html/Elements/Header')

diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header
index 521593425..3aeb31972 100755
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@ -106,6 +106,7 @@ if ( $JavaScript ) {
 
 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->{$_} . '" />';
@@ -148,4 +149,5 @@ $LinkRel => undef
 $SkipDoctype => 0
 $RichText => 1
 $BodyClass => undef
+$JavaScript => 1
 </%ARGS>
-- 
cgit v1.2.1


From 937575b5e5e515192df036d25270ced126eedcd6 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 10 Jul 2015 01:28:02 -0700
Subject: fix RT 4.2.11 javascript inclusion, at least for RichText / ckeditor,
 RT#13852

---
 rt/share/html/Elements/Header | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'rt/share/html/Elements/Header')

diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header
index 3aeb31972..3a5be7aee 100755
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@ -101,7 +101,7 @@ 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 ) {
@@ -118,7 +118,7 @@ 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 );
 
     my $stylesheet_plugin = "/NoAuth/css/$style/InHeader";
     if ($m->comp_exists($stylesheet_plugin) ) {
@@ -135,7 +135,6 @@ my $etc = ' class="'. join( '',@{$ARGS{'BodyClass'}}). '" ';
 $etc .= qq[ id="comp-$id"] if $id;
 
 </%INIT>
-
 <%ARGS>
 #$Focus => 'focus'
 $Focus => ''
-- 
cgit v1.2.1


From ca64bd93f26360a0e5687d7b5ea12cba1f4cf71f Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 10 Jul 2015 02:37:23 -0700
Subject: restore ticket menus in RT 4.2, RT#13852

---
 rt/share/html/Elements/Header | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'rt/share/html/Elements/Header')

diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header
index 3a5be7aee..717bf070c 100755
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@ -49,7 +49,7 @@
               'title'     => $Title,
               'head'      => $head,
               'etc'       => $etc,
-              #make space for RT menu for now# 'nobr'  => 1,
+              'nobr'      => 1,
               'nocss'     => 1,
               'no_jquery' => $JavaScript,
           }
@@ -120,10 +120,20 @@ if ( $RSSAutoDiscovery ) {
 if ($JavaScript) {
     $head .= $m->scomp('/Elements/HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText );
 
-    my $stylesheet_plugin = "/NoAuth/css/$style/InHeader";
-    if ($m->comp_exists($stylesheet_plugin) ) {
-        $head .= $m->scomp($stylesheet_plugin);
-    }
+$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>
+];
+
 }
 
 # $m->callback( %ARGS, CallbackName => 'Head' );
-- 
cgit v1.2.1


From 6832c30b3be7fe87d1daafa52f54c203c4f44dab Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 10 Jul 2015 02:41:12 -0700
Subject: fix ticket subject double-escaping in RT 4.2, RT#13852

---
 rt/share/html/Elements/Header | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rt/share/html/Elements/Header')

diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header
index 717bf070c..2503455fc 100755
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@ -46,7 +46,7 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <& /elements/header.html, {
-              'title'     => $Title,
+              'title_noescape' => $Title,
               'head'      => $head,
               'etc'       => $etc,
               'nobr'      => 1,
-- 
cgit v1.2.1