diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2016-02-04 15:13:46 -0600 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2016-02-04 15:13:46 -0600 |
| commit | 70c5f94c948159a7f561d999dbad62e0eae0cd8f (patch) | |
| tree | 6bc0f05c552a3cb1bedea879a6ccdbf252faf2a9 /rt | |
| parent | 24d0c8a10e4c7db2cca056529faa677ea9df51e0 (diff) | |
RT#39694 Checkpoint for v3 backport
Diffstat (limited to 'rt')
| -rw-r--r-- | rt/sbin/rt-test-dependencies.in | 8 | ||||
| -rwxr-xr-x | rt/share/html/Elements/Header | 9 |
2 files changed, 5 insertions, 12 deletions
diff --git a/rt/sbin/rt-test-dependencies.in b/rt/sbin/rt-test-dependencies.in index 6fa29761e..ff987283b 100644 --- a/rt/sbin/rt-test-dependencies.in +++ b/rt/sbin/rt-test-dependencies.in @@ -101,16 +101,16 @@ my %default = ( 'with-CORE' => 1, 'with-CLI' => 1, 'with-MAILGATE' => 1, - 'with-DEVELOPER' => @RT_DEVELOPER@, - 'with-GPG' => @RT_GPG_DEPS@, - 'with-SMIME' => @RT_SMIME_DEPS@, + 'with-DEV' => @RT_DEVEL_MODE@, + 'with-GPG' => @RT_GPG@, 'with-ICAL' => 1, 'with-SMTP' => 1, 'with-GRAPHVIZ' => @RT_GRAPHVIZ@, 'with-GD' => @RT_GD@, 'with-DASHBOARDS' => 1, 'with-USERLOGO' => 1, - 'with-HTML-DOC' => @RT_DEVELOPER@, + 'with-SSL-MAILGATE' => @RT_SSL_MAILGATE@, + 'with-HTML-DOC' => @RT_DEVEL_MODE@, ); $args{$_} = $default{$_} foreach grep !exists $args{$_}, keys %default; diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header index d0662a57a..ddf35b089 100755 --- a/rt/share/html/Elements/Header +++ b/rt/share/html/Elements/Header @@ -62,7 +62,7 @@ 'etc' => $etc, #make space for RT menu for now# 'nobr' => 1, 'nocss' => 1, - 'no_jquery' => $JavaScript, + 'jquery' => ($JavaScript ? 0 : 1), } &> % } @@ -110,14 +110,9 @@ 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 $head .= qq(<link rel="stylesheet" href="$WebPath/NoAuth/css/$cssfile" type="text/css" media="all" />\n); } $head .= qq(<link rel="stylesheet" href="$WebPath/NoAuth/css/print.css" type="text/css" media="print" />\n); -======= - $head .= qq(<link rel="stylesheet" href="$WebPath$cssfile" type="text/css" media="all" />\n); -} ->>>>>>> 9c67763... merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237 for (keys %{$LinkRel || {}}) { $head .= qq(<link rel="$_" href="$WebPath) . $LinkRel->{$_} . '" />'; @@ -171,7 +166,5 @@ $LinkRel => undef $JavaScript => 1 $SkipDoctype => 0 $RichText => 1 -$BodyClass => undef -$JavaScript => 1 $Popup => 0 </%ARGS> |