[Rt-commit] rt branch, 4.0/suppress-dashboard-javascript, updated. rt-4.0.6-127-g8869e3c

[Alex Vandiver]

The branch, 4.0/suppress-dashboard-javascript has been updated
       via  8869e3c7e3632b9ada3bbaa8c41aa8a07ab35f42 (commit)
      from  68e12a79cf5dfef9533c5cb3054e4bb070769014 (commit)

Summary of changes:
 share/html/Elements/Header             |    2 +-
 share/html/NoAuth/css/aileron/InHeader |    5 +++++
 share/html/NoAuth/css/web2/InHeader    |    5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 8869e3c7e3632b9ada3bbaa8c41aa8a07ab35f42
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Jun 14 14:42:26 2012 -0400

    Suppress menu javascript in emailed dashboards, as well

diff --git a/share/html/Elements/Header b/share/html/Elements/Header
index edf2d05..992360f 100755
--- a/share/html/Elements/Header
+++ b/share/html/Elements/Header
@@ -83,7 +83,7 @@
 
 % my $stylesheet_plugin = "/NoAuth/css/".$style."/InHeader";
 % if ($m->comp_exists($stylesheet_plugin) ) {
-<& $stylesheet_plugin &>
+<& $stylesheet_plugin, JavaScript => $JavaScript &>
 % }
 
 <!-- Site CSS from theme editor -->
diff --git a/share/html/NoAuth/css/aileron/InHeader b/share/html/NoAuth/css/aileron/InHeader
index e6d4cb3..257b8fd 100644
--- a/share/html/NoAuth/css/aileron/InHeader
+++ b/share/html/NoAuth/css/aileron/InHeader
@@ -51,6 +51,7 @@
 <!--[if lt IE 7]>
 <link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/NoAuth/css/aileron/msie6.css" type="text/css" media="all" />
 <![endif]-->
+% if ($JavaScript) {
 <script type="text/javascript">
 jQuery(document).ready(function(){
     jQuery.fn.supersubs.defaults = {
@@ -62,3 +63,7 @@ jQuery(document).ready(function(){
     jQuery("#page-menu.toplevel").addClass('sf-menu sf-js-enabled').supersubs().superfish({ dropShadows: false, speed: 'fast' }).supposition();
 });
 </script>
+% }
+<%args>
+$JavaScript => 1
+</%args>
diff --git a/share/html/NoAuth/css/web2/InHeader b/share/html/NoAuth/css/web2/InHeader
index a083eec..48c2dfc 100644
--- a/share/html/NoAuth/css/web2/InHeader
+++ b/share/html/NoAuth/css/web2/InHeader
@@ -52,6 +52,7 @@
 <!--[if lt IE 7]>
 <link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/NoAuth/css/web2/msie6.css" type="text/css" media="all" />
 <![endif]-->
+% if ($JavaScript) {
 <script type="text/javascript">
 jQuery(document).ready(function(){
     jQuery("#quick-personal").append('<ul id="prefs-menu"></ul>');
@@ -73,3 +74,7 @@ jQuery(document).ready(function(){
     jQuery("#prefs-menu").addClass("sf-menu sf-js-enabled").supersubs().superfish().supposition({ speed: 'fast' });
 });
 </script>
+% }
+<%args>
+$JavaScript => 1
+</%args>

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