From: Frédéric Buclin Date: Mon, 23 Aug 2010 23:10:09 +0000 (+0200) Subject: Bug 589860: Remove sidebar.cgi, because remote XUL support is going away in Gecko X-Git-Tag: bugzilla-4.1.1~310 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e09c48b2f7668071264c975f9191cf41b493ef1c;p=thirdparty%2Fbugzilla.git Bug 589860: Remove sidebar.cgi, because remote XUL support is going away in Gecko r/a=mkanat --- diff --git a/sidebar.cgi b/sidebar.cgi deleted file mode 100755 index 35c4e64ad5..0000000000 --- a/sidebar.cgi +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/perl -wT -# -*- Mode: perl; indent-tabs-mode: nil -*- -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Bugzilla Bug Tracking System. -# -# Contributor(s): Jacob Steenhagen - -use strict; - -use lib qw(. lib); - -use Bugzilla; -use Bugzilla::Error; - -Bugzilla->login(); -my $cgi = Bugzilla->cgi; -my $template = Bugzilla->template; - -############################################################################### -# Main Body Execution -############################################################################### - -# This sidebar is currently for use with Mozilla based web browsers. -# Internet Explorer 6 is supposed to have a similar feature, but it -# most likely won't support XUL ;) When that does come out, this -# can be expanded to output normal HTML for IE. Until then, I like -# the way Scott's sidebar looks so I'm using that as the base for -# this file. -# http://bugzilla.mozilla.org/show_bug.cgi?id=37339 - -my $useragent = $ENV{HTTP_USER_AGENT}; -if ($useragent =~ m:Mozilla/([1-9][0-9]*):i && $1 >= 5 && $useragent !~ m/compatible/i) { - print $cgi->header("application/vnd.mozilla.xul+xml"); - # Generate and return the XUL from the appropriate template. - $template->process("sidebar.xul.tmpl") - || ThrowTemplateError($template->error()); -} else { - ThrowUserError("sidebar_supports_mozilla_only"); -} diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index cdd657050b..59fa47bf95 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1473,10 +1473,6 @@ [%+ series.name FILTER html %] already exists. - [% ELSIF error == "sidebar_supports_mozilla_only" %] - Sorry - sidebar.cgi currently only supports Mozilla based web browsers. - Upgrade today. :-) - [% ELSIF error == "still_unresolved_bugs" %] [% IF dependency_count == 1 %] [% terms.Bug %]# [% dependencies.0.bug_id FILTER none %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 5e0de5d2d3..d7b7b14762 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -46,12 +46,6 @@ function onLoadActions() { } document.getElementById('quicksearch_top').focus(); } -function addSidebar() { - var sidebarname=window.location.host; - if (!/bug/i.test(sidebarname)) - sidebarname="[% terms.Bugzilla %] "+sidebarname; - window.sidebar.addPanel (sidebarname, "[% urlbase FILTER html %]sidebar.cgi", ""); -} var quicksearch_message = "Enter [% terms.abug %] # or some search terms"; function checkQuicksearch( form ) { diff --git a/template/en/default/sidebar.xul.tmpl b/template/en/default/sidebar.xul.tmpl deleted file mode 100644 index ee409d759f..0000000000 --- a/template/en/default/sidebar.xul.tmpl +++ /dev/null @@ -1,128 +0,0 @@ -[%# -*- mode: sgml -*- %] -[%# The contents of this file are subject to the Mozilla Public - # License Version 1.1 (the "License"); you may not use this file - # except in compliance with the License. You may obtain a copy of - # the License at http://www.mozilla.org/MPL/ - # - # Software distributed under the License is distributed on an "AS - # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - # implied. See the License for the specific language governing - # rights and limitations under the License. - # - # The Original Code is the Bugzilla Bug Tracking System. - # - # The Initial Developer of the Original Code is Netscape Communications - # Corporation. Portions created by Netscape are - # Copyright (C) 1998 Netscape Communications Corporation. All - # Rights Reserved. - # - # Contributor(s): Jacob Steenhagen - # Scott Collins - # Christopher A. Aillon - #%] - -[% PROCESS global/variables.none.tmpl %] - - - - - - - - - - - - - - - - - - - -[% IF user.id %] - - [%- IF user.in_group('tweakparams') %] - - - [%- END %] - [%- IF user.in_group('editusers') || user.can_bless %] - - [%- END %] - [%- IF Param('useclassification') && user.in_group('editclassifications') %] - - [%- END %] - [%- IF user.in_group('editcomponents') %] - - - - [%- END %] - [%- IF user.in_group('creategroups') %] - - [%- END %] - [%- IF user.in_group('editkeywords') %] - - [%- END %] - [%- IF user.in_group('bz_canusewhines') %] - - [%- END %] - [%- IF user.in_group('editcomponents') %] - - [%- END %] - [%- IF user.authorizer.can_logout %] - - [%- END %] - - [%- IF user.showmybugslink %] - [% filtered_username = user.login FILTER uri %] - - [%- END %] - - [%- FOREACH q = user.queries %] - - [% END %] - -[% ELSE %] - - -[% END %] - - - - - - - - - reload - - -