<%$Title%>

From 3a651bfd3784bdbb4367b3d6385ccee33e8ebe5c Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 3 Aug 2007 21:49:03 +0000 Subject: merging RT_3_6_4 to HEAD --- rt/html/Elements/Header | 119 +++++++++++++++++++++++++++++------------------- 1 file changed, 73 insertions(+), 46 deletions(-) (limited to 'rt/html/Elements/Header') diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header index b5512aae9..f40d45ee1 100644 --- a/rt/html/Elements/Header +++ b/rt/html/Elements/Header @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +%# 02110-1301 or visit their web page on the internet at +%# http://www.gnu.org/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -43,59 +45,74 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -%# - - -<%$Title%> + + + + +<%$Title%> + % if ($Refresh && $Refresh > 0) { - + % } - - - - -<& /Elements/Callback, _CallbackName => 'Head', %ARGS &> - - + + +% if ( $RSSAutoDiscovery ) { + % } -> + + + + + + +<& /Elements/Callback, _CallbackName => 'Head', %ARGS &> + + + + > + +% if ($ShowBar) { + @@ -124,22 +141,32 @@ ONLOAD="

<% &RT::URI::freeside::FreesideGetConfig('company_name') || 'ExampleCo' %>

-% if ($session{'CurrentUser'} && $session{'CurrentUser'}->Id && $LoggedIn) { - -<&|/l, "".$session{'CurrentUser'}->Name."" &>Logged in as [_1] -
-%if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf', Object => $RT::System )) { -<&|/l&>Preferences + +

+ +% 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 ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) { -| <&|/l&>Logout + <& /Elements/Callback, %ARGS &> +% unless (!$session{'CurrentUser'}->Name +% or ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth)) { + | <&|/l&>Logout % } -% } else { -<&|/l&>Not logged in. +

% } +

-<%INIT> +<%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; +$id =~ s|\.html$||g; +$id =~ s|index$||g + if $id ne 'index'; +$id =~ s|-$||g; <%ARGS> $Prefs => '/User/Prefs.html' -$Focus => 'focus' +#$Focus => 'focus' +$Focus => '' $Title => 'RT' $Code => undef $Refresh => 0 $Why => undef -$BgColor => '#ffffff' $ShowBar => 1 -$LoggedIn => 1 $URL => undef +$RSSAutoDiscovery => undef +$onload => undef -- cgit v1.2.1