projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6e9e3f3
)
RT#34237 v3 reconcile commit 9c67763013a6d16725f50637fe43bde5fe15bcd4
author
Jonathan Prykop
<jonathan@freeside.biz>
Wed, 3 Feb 2016 23:21:10 +0000
(17:21 -0600)
committer
Jonathan Prykop
<jonathan@freeside.biz>
Wed, 3 Feb 2016 23:21:10 +0000
(17:21 -0600)
rt/share/html/Elements/Header
patch
|
blob
|
history
diff --git
a/rt/share/html/Elements/Header
b/rt/share/html/Elements/Header
index
664da06
..
c409373
100755
(executable)
--- a/
rt/share/html/Elements/Header
+++ b/
rt/share/html/Elements/Header
@@
-98,9
+98,14
@@
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="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/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->{$_} . '" />';
for (keys %{$LinkRel || {}}) {
$head .= qq(<link rel="$_" href="$WebPath) . $LinkRel->{$_} . '" />';
@@
-154,4
+159,6
@@
$LinkRel => undef
$JavaScript => 1
$SkipDoctype => 0
$RichText => 1
$JavaScript => 1
$SkipDoctype => 0
$RichText => 1
+$BodyClass => undef
+$JavaScript => 1
</%ARGS>
</%ARGS>