[freeside-commits] branch FREESIDE_4_BRANCH updated. e09a570e1a1b53a29124e22494ce024840b18052

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  e09a570e1a1b53a29124e22494ce024840b18052 (commit)
      from  e131b1f71f08b69abb832c1687d1f29682d171f8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e09a570e1a1b53a29124e22494ce024840b18052
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Jul 9 22:29:58 2015 -0700

    Header changes to disable RT javascript, RT#34237

diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header
index 6c0f425..fb6cbda 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' );

-----------------------------------------------------------------------

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