X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FElements%2FHeader;h=5e08fe384ae8b643f144cd6213481b46379ddf89;hb=b8988e1d3ac75af63c85e8563e57701030315a9e;hp=d970ac52f685f529fddb857def9c2a9c41aaadc2;hpb=0e1c02eb2b9bf0035b59eb7639891eac79480739;p=freeside.git

diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header
index d970ac52f..5e08fe384 100755
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@ -1,40 +1,40 @@
 %# BEGIN BPS TAGGED BLOCK {{{
-%# 
+%#
 %# COPYRIGHT:
-%# 
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%#                                          <jesse@bestpractical.com>
-%# 
+%#
+%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
+%#                                          <sales@bestpractical.com>
+%#
 %# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
+%#
+%#
 %# LICENSE:
-%# 
+%#
 %# This work is made available to you under the terms of Version 2 of
 %# the GNU General Public License. A copy of that license should have
 %# been provided with this software, but in any event can be snarfed
 %# from www.gnu.org.
-%# 
+%#
 %# This work is distributed in the hope that it will be useful, but
 %# WITHOUT ANY WARRANTY; without even the implied warranty of
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
-%# 
+%#
 %# You should have received a copy of the GNU General Public License
 %# along with this program; if not, write to the Free Software
 %# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 %# 02110-1301 or visit their web page on the internet at
 %# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-%# 
-%# 
+%#
+%#
 %# CONTRIBUTION SUBMISSION POLICY:
-%# 
+%#
 %# (The following paragraph is not intended to limit the rights granted
 %# to you to modify and distribute this software under the terms of
 %# the GNU General Public License and is only of importance to you if
 %# you choose to contribute your changes and enhancements to the
 %# community by submitting them to Best Practical Solutions, LLC.)
-%# 
+%#
 %# By intentionally submitting any modifications, corrections or
 %# derivatives to this work, or any other work intended for use with
 %# Request Tracker, to Best Practical Solutions, LLC, you confirm that
@@ -43,17 +43,20 @@
 %# royalty-free, perpetual, license to use, copy, create derivative
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
-%# 
+%#
 %# END BPS TAGGED BLOCK }}}
-<% include( '/elements/header.html', {
+<& /elements/header.html, {
               'title' => $Title,
               'head'  => $head,
               'etc'   => $etc,
-              'nobr'  => 1,
+              #make space for RT menu for now# 'nobr'  => 1,
               'nocss' => 1,
-          }) |n
-%>
+          }
+&>
 <%INIT>
+#for "Site CSS from theme editor" below
+#use Scalar::Util qw(blessed);
+
 $r->headers_out->{'Pragma'} = 'no-cache';
 $r->headers_out->{'Cache-control'} = 'no-cache';
 
@@ -65,23 +68,38 @@ $id =~ s|index$||g
     if $id ne 'index';
 $id =~ s|-$||g;
 
+my $style = $session{'CurrentUser'}
+          ? $session{'CurrentUser'}->Stylesheet
+          : RT->Config->Get('WebDefaultStylesheet');
+
+my @css_files;
+if ( RT->Config->Get('DevelMode') ) {
+    @css_files = ( "$style/main.css", RT->Config->Get('CSSFiles' ) );
+}
+else {
+    my $key =
+      RT::Interface::Web::SquishedCSS( $style )->Key;
+    @css_files = "$style-squished-$key.css";
+}
+
 my $head = '';
 
+#XXX $head .= <& /Elements/Framekiller &>;
+
 if ($Refresh && $Refresh =~ /^(\d+)/ && $1 > 0) {
-  $head .= '<meta http-equiv="refresh" content="$Refresh" />';
+  my $URL = $m->notes->{RefreshURL}; $URL = $URL ? ";URL=$URL" : "";
+  $head .= qq( <meta http-equiv="refresh" content="$1$URL" /> );
 }
 
 my $WebPath = RT->Config->Get('WebPath');
 my $WebImagesURL = RT->Config->Get('WebImagesURL');
-my $WebDefaultStylesheet =
-  RT->Config->Get('WebDefaultStylesheet', $session{'CurrentUser'});
 my $squished = RT->Config->Get('DevelMode') ? '' : '-squished';
 
-$head .= <<END;
-<link rel="shortcut icon" href="$WebImagesURL/favicon.png" type="image/png" />
-<link rel="stylesheet" href="$WebPath/NoAuth/css/$WebDefaultStylesheet/main$squished.css" type="text/css" media="all" />
-<link rel="stylesheet" href="$WebPath/NoAuth/css/print.css" type="text/css" media="print" />
-END
+$head .= qq(<link rel="shortcut icon" href="${WebImagesURL}favicon.png" type="image/png" />\n);
+for my $cssfile ( @css_files ) {
+  $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);
 
 for (keys %{$LinkRel || {}}) {
   $head .= qq(<link rel="$_" href="$WebPath) . $LinkRel->{$_} . '" />';
@@ -92,18 +110,28 @@ if ( $RSSAutoDiscovery ) {
 }
 
 if ($JavaScript) {
-    $head .= $m->scomp('HeaderJavascript', focus => $Focus, onload => $onload);
+    $head .= $m->scomp('HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText );
 }
 
-my $stylesheet_plugin = "/NoAuth/css/$WebDefaultStylesheet/InHeader";
+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 );
 
-my $etc = '';
+my $sbs = RT->Config->Get("UseSideBySideLayout", $session{'CurrentUser'}) ? ' sidebyside' : '';
+my $etc = qq[ class="\L$style$sbs" ];
 $etc .= qq[ id="comp-$id"] if $id;
 
 </%INIT>
@@ -121,4 +149,6 @@ $RSSAutoDiscovery => undef
 $onload => undef
 $LinkRel => undef
 $JavaScript => 1
+$SkipDoctype => 0
+$RichText => 1
 </%ARGS>