[freeside-commits] branch master updated. 026dc7ad72ba972f230b6709e31fa64397d75ad4

[Ivan]

The branch, master has been updated
       via  026dc7ad72ba972f230b6709e31fa64397d75ad4 (commit)
       via  07b4bc84d1078f7390221d766cdb3142513db4b0 (commit)
      from  1c538bfabc2cd31f27067505f0c3d1a46cba6ef0 (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 026dc7ad72ba972f230b6709e31fa64397d75ad4
Merge: 07b4bc8 1c538bf
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Jul 9 22:32:26 2015 -0700

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

diff --cc rt/share/html/Elements/Header
index 664da06,6c0f425..1e7eb35
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@@ -110,26 -115,11 +116,15 @@@ 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) {
 +    $head .= $m->scomp('HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText );
- }
 +
- if ($JavaScript) {
 +    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 );
  

commit 07b4bc84d1078f7390221d766cdb3142513db4b0
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Jul 9 22:30:09 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 1f6035d..664da06 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>
@@ -113,9 +114,11 @@ 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);
+if ($JavaScript) {
+    my $stylesheet_plugin = "/NoAuth/css/$style/InHeader";
+    if ($m->comp_exists($stylesheet_plugin) ) {
+        $head .= $m->scomp($stylesheet_plugin);
+    }
 }
 
 #<!-- Site CSS from theme editor -->

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

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