From 8103c1fc1b2c27a6855feadf26f91b980a54bc52 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 2 Mar 2008 04:11:51 +0000 Subject: import rt 3.6.6 --- rt/html/NoAuth/Logout.html | 36 ++++++++++++--------- rt/html/NoAuth/Reminder.html | 6 ++-- rt/html/NoAuth/css/3.5-default/titlebox.css | 14 ++------ rt/html/NoAuth/css/dhandler | 30 +++++++++++++++++ rt/html/NoAuth/images/autohandler | 20 +++++++----- rt/html/NoAuth/images/bplogo.gif | Bin 825 -> 755 bytes rt/html/NoAuth/images/css/fieldbg-autocomplete.gif | Bin 0 -> 1164 bytes rt/html/NoAuth/js/scriptaculous/controls.js | 0 rt/html/NoAuth/js/scriptaculous/effects.js | 0 rt/html/NoAuth/js/scriptaculous/prototype.js | 0 rt/html/NoAuth/js/scriptaculous/scriptaculous.js | 0 11 files changed, 69 insertions(+), 37 deletions(-) create mode 100644 rt/html/NoAuth/css/dhandler create mode 100644 rt/html/NoAuth/images/css/fieldbg-autocomplete.gif create mode 100644 rt/html/NoAuth/js/scriptaculous/controls.js create mode 100644 rt/html/NoAuth/js/scriptaculous/effects.js create mode 100644 rt/html/NoAuth/js/scriptaculous/prototype.js create mode 100644 rt/html/NoAuth/js/scriptaculous/scriptaculous.js (limited to 'rt/html/NoAuth') diff --git a/rt/html/NoAuth/Logout.html b/rt/html/NoAuth/Logout.html index b6a238bac..49b7a4e59 100644 --- a/rt/html/NoAuth/Logout.html +++ b/rt/html/NoAuth/Logout.html @@ -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,25 +45,29 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} - - -RT: Logout - - - + + +RT: Logout + + +

<&|/l&>You have been logged out of RT. -
-
-<&|/l&>You're welcome to login again +
+
+<&|/l&>You're welcome to login again. +% $m->abort(); + +<%INIT> +$m->comp('/Elements/Callback', _CallbackName => 'BeforeSessionDelete', %ARGS); -<%PERL> if (defined %session) { - tied(%session)->delete; + tied(%session)->delete; } -$m->abort(); - + +$m->comp('/Elements/Callback', _CallbackName => 'AfterSessionDelete', %ARGS); + <%ARGS> $URL => $RT::WebPath."/" diff --git a/rt/html/NoAuth/Reminder.html b/rt/html/NoAuth/Reminder.html index 0793f6c96..dc935d45e 100644 --- a/rt/html/NoAuth/Reminder.html +++ b/rt/html/NoAuth/Reminder.html @@ -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: diff --git a/rt/html/NoAuth/css/3.5-default/titlebox.css b/rt/html/NoAuth/css/3.5-default/titlebox.css index d4320c090..79d8040a7 100644 --- a/rt/html/NoAuth/css/3.5-default/titlebox.css +++ b/rt/html/NoAuth/css/3.5-default/titlebox.css @@ -51,22 +51,12 @@ .titlebox .titlebox-content { margin-top: -1px; + padding: 1em 2em 0.5em 2em; margin: 0; /*margin: 1em 2em 0.5em 2em;*/ } -.titlebox .titlebox-content .titlebox-content table { - margin: 1em 2em 0.5em 2em; -} -.titlebox th { - font-size: 0.8em; - -} - -.titlebox .titlebox-content table { - -} - +.titlebox th { font-size: 0.8em; } %# TRS: I wish there was a more elegant way to do this... I essentially need to %# select all elements X that do NOT have element Y as a descendant... which I can diff --git a/rt/html/NoAuth/css/dhandler b/rt/html/NoAuth/css/dhandler new file mode 100644 index 000000000..4c8ba3405 --- /dev/null +++ b/rt/html/NoAuth/css/dhandler @@ -0,0 +1,30 @@ +<%ONCE> +my $squisher; + +<%INIT> +my $arg = $m->dhandler_arg; +my $path; +if ( $arg =~ m{^(.*)-squished(\.[^\.]+)$} ) { + $path = $m->current_comp->dir_path .'/'. $1 . $2; +} +else { + return $m->decline; +} + +$squisher = new RT::CSS::Squish unless $squisher; +$squisher->{'mason'} = $m; + +$m->out( $squisher->concatenate( $path ) ); + +package RT::CSS::Squish; +use CSS::Squish '0.06'; +use base qw(CSS::Squish); +sub file_handle { + my $self = shift; + my $file = shift; + my $content = $self->{'mason'}->scomp($file); + open my $fh, '<', \$content or die "$!"; + return $fh; +} + + diff --git a/rt/html/NoAuth/images/autohandler b/rt/html/NoAuth/images/autohandler index 2e428c157..720979830 100644 --- a/rt/html/NoAuth/images/autohandler +++ b/rt/html/NoAuth/images/autohandler @@ -1,24 +1,28 @@ -<%init> +<%INIT> +&RT::Interface::Web::StaticFileHeaders(); # This autohandler will spit out RT's images if the user hasn't # properly configured their webserver to stop RT from passing # images through the mason handler. - my $file = $m->base_comp->source_file; -my $type = "application/octet-stream"; + +my $type = "application/octet-stream"; if ($file =~ /\.(gif|png|jpe?g)$/i) { $type = "image/$1"; $type =~ s/jpg/jpeg/gi; } -die unless (-f $file && -r $file); +die "file not found" unless -f $file && -r _; + $r->content_type($type); -open (FILE, "<$file") || die; +open my $fh, "<$file" or die "couldn't open file: $!"; +binmode($fh); { local $/ = \16384; - $m->out($_) while (); - close(FILE); + $m->out($_) while (<$fh>); + $m->flush_buffer; } +close $fh; $m->abort; - + diff --git a/rt/html/NoAuth/images/bplogo.gif b/rt/html/NoAuth/images/bplogo.gif index e2cf49c42..1bb0adfb4 100644 Binary files a/rt/html/NoAuth/images/bplogo.gif and b/rt/html/NoAuth/images/bplogo.gif differ diff --git a/rt/html/NoAuth/images/css/fieldbg-autocomplete.gif b/rt/html/NoAuth/images/css/fieldbg-autocomplete.gif new file mode 100644 index 000000000..aa7eed061 Binary files /dev/null and b/rt/html/NoAuth/images/css/fieldbg-autocomplete.gif differ diff --git a/rt/html/NoAuth/js/scriptaculous/controls.js b/rt/html/NoAuth/js/scriptaculous/controls.js new file mode 100644 index 000000000..e69de29bb diff --git a/rt/html/NoAuth/js/scriptaculous/effects.js b/rt/html/NoAuth/js/scriptaculous/effects.js new file mode 100644 index 000000000..e69de29bb diff --git a/rt/html/NoAuth/js/scriptaculous/prototype.js b/rt/html/NoAuth/js/scriptaculous/prototype.js new file mode 100644 index 000000000..e69de29bb diff --git a/rt/html/NoAuth/js/scriptaculous/scriptaculous.js b/rt/html/NoAuth/js/scriptaculous/scriptaculous.js new file mode 100644 index 000000000..e69de29bb -- cgit v1.2.1