X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fhtml%2FElements%2FHeader;h=a32784e35ac278d7f4b8687dced7b132aa047e6e;hb=a404926bbec025159de0611ce95783488a8bd241;hp=d8db26cb236fa1edbdb35d0e8ee8029ea9d1f3d9;hpb=8103c1fc1b2c27a6855feadf26f91b980a54bc52;p=freeside.git
diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header
index d8db26cb2..a32784e35 100644
--- a/rt/html/Elements/Header
+++ b/rt/html/Elements/Header
@@ -45,70 +45,24 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-
+<% include( '/elements/header.html', {
+ 'title' => $Title,
+ 'head' => $head,
+ 'nobr' => 1,
+ 'nocss' => 1,
+ }) |n
+%>
-
-
-
-
-
<&|/l&>Skip Menu&> |
-% if ($session{'CurrentUser'}->Name) {
- <&|/l, "
".$session{'CurrentUser'}->Name."" &>Logged in as [_1]&>
-% if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf', Object => $RT::System )) {
- |
<&|/l&>Preferences&>
-% }
-% } else {
- <&|/l&>Not logged in.&>
-% }
- <& /Elements/Callback, %ARGS &>
-% unless (!$session{'CurrentUser'}->Name
-% or ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth)) {
- |
"><&|/l&>Logout&>
-% }
-
-% }
+%# if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf', Object => $RT::System )) {
+%# |
<&|/l&>Preferences&>
+%# }
<%INIT>
$r->headers_out->{'Pragma'} = 'no-cache';
$r->headers_out->{'Cache-control'} = 'no-cache';
+require RT::URI::freeside;
+
my $id = $m->request_comp->path;
$id =~ s|^/||g;
$id =~ s|/|-|g;
@@ -116,6 +70,45 @@ $id =~ s|\.html$||g;
$id =~ s|index$||g
if $id ne 'index';
$id =~ s|-$||g;
+
+my $head = '';
+
+if ($Refresh && $Refresh > 0) {
+ $head .= '
';
+}
+
+$head .= <
+
+
+END
+
+if ( $RSSAutoDiscovery ) {
+ $head .= qq(
);
+}
+
+$head .= <
+
+
+';
+
+$head .= $m->scomp( '/Elements/Callback', _CallbackName => 'Head', %ARGS );
+
+my $etc = '';
+$etc .= qq[ id="comp-$id"] if $id;
+
%INIT>
<%ARGS>