diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | httemplate/elements/header.html | 8 | ||||
| -rw-r--r-- | rt/sbin/rt-test-dependencies.in | 8 | ||||
| -rwxr-xr-x | rt/share/html/Elements/Header | 9 |
4 files changed, 14 insertions, 13 deletions
@@ -117,7 +117,7 @@ FREESIDE_URL = "http://localhost/freeside/" #for now, same db as specified in DATASOURCE... eventually, otherwise? RT_DB_DATABASE = freeside -TORRUS_ENABLED = 1 +TORRUS_ENABLED = 0 # for auto-version updates, so we can "make release" more things automatically RPM_SPECFILE = rpm/freeside.spec diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index e5211bf46..5e949af15 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -42,6 +42,12 @@ Example: ) |n %> +% if ( $jquery ) { + <link rel="stylesheet" href="<% $fsurl %>elements/jquery-ui.min.css"> + <SCRIPT SRC="<% $fsurl %>elements/jquery.js"></SCRIPT> + <SCRIPT SRC="<% $fsurl %>elements/jquery-ui.min.js"></SCRIPT> +% } + <% include('init_overlib.html') |n %> <% include('rs_init_object.html') |n %> <% include('logout.html') |n %> @@ -181,6 +187,7 @@ Example: my( $title, $menubar, $etc, $head ) = ( '', '', '', '' ); my( $nobr, $nocss ) = ( 0, 0 ); +my $jquery = 0; my $mobile; @@ -193,6 +200,7 @@ if ( ref($_[0]) ) { $nobr = $opt->{nobr}; $nocss = $opt->{nocss}; $mobile = $opt->{mobile}; + $jquery = $opt->{jquery}; } else { ($title, $menubar) = ( shift, shift ); $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc. 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> |