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 (executable)
index 35c4e64..0000000
--- 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 <jake@bugzilla.org>
-
-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 cdd657050bc4d03b5a31bd12c5a71346ec637c40..59fa47bf958298c9a32df061c8933df183577f0c 100644 (file)
--- 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 %]</em>
       already exists.
     
-  [% ELSIF error == "sidebar_supports_mozilla_only" %]
-    Sorry - sidebar.cgi currently only supports Mozilla based web browsers.
-    <a href="http://www.mozilla.org">Upgrade today</a>. :-)
-
   [% ELSIF error == "still_unresolved_bugs" %]
     [% IF dependency_count == 1 %]
       [% terms.Bug %]# <a href="show_bug.cgi?id=[% dependencies.0.bug_id FILTER none %]">[% dependencies.0.bug_id FILTER none %]</a>

diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 5e0de5d2d341edb7b134117bc32d559b69a58491..d7b7b1476259351fe078082240c3af5f418c34d2 100644 (file)
--- 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 (file)
index ee409d7..0000000
--- 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 <jake@bugzilla.org>
-  #                 Scott Collins <scc@mozilla.org>
-  #                 Christopher A. Aillon <christopher@aillon.com>
-  #%]
-
-[% PROCESS global/variables.none.tmpl %]
-
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="[% urlbase FILTER xml %]skins/standard/panel.css" type="text/css"?>
-<window
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  orient="vertical"
-  onload="document.getElementById('query-field').addEventListener('keypress', initial_keypress_handler, true)">
-
-<script type="application/x-javascript"><![CDATA[
-
-function load_absolute_url( aAbsoluteURL ) {
-    content.location = aAbsoluteURL;
-}
-
-function load_relative_url( aRelativeURL ) {
-    aRelativeURL = '[% urlbase FILTER xml %]' + aRelativeURL;
-    _content.location = aRelativeURL;
-}
-
-function initial_keypress_handler( aEvent ) {
-    this.removeAttribute("class");
-    this.addEventListener("keypress", normal_keypress_handler, true);
-    this.removeEventListener("keypress", initial_keypress_handler, true);
-}
-
-function normal_keypress_handler( aEvent ) {
-    if ( aEvent.keyCode == 13 )
-      load_relative_url('buglist.cgi?quicksearch=' + this.value);
-}
-
-]]></script>
-
-  <textbox id="query-field" class="descriptive-content" value="enter search" onfocus="this.setSelectionRange(0,this.value.length)"/>
-
-  <separator class="groove"/>
-
-  <box autostretch="never" valign="top">
-    <box orient="vertical" flex="1">
-      <text class="text-link" onclick="load_relative_url('query.cgi')" value="new search"/>
-      <text class="text-link" onclick="load_relative_url('report.cgi')" value="reports"/>
-      <text class="text-link" onclick="load_relative_url('enter_bug.cgi')" value="new [% terms.bug %]"/>
-      <separator class="thin"/>
-
-[% IF user.id %]
-      <text class="text-link" onclick="load_relative_url('userprefs.cgi')" value="edit prefs"/>
-  [%- IF user.in_group('tweakparams') %]
-      <text class="text-link" onclick="load_relative_url('editparams.cgi')" value="edit params"/>
-      <text class="text-link" onclick="load_relative_url('editsettings.cgi')" value="edit default preferences"/>
-  [%- END %]
-  [%- IF user.in_group('editusers') || user.can_bless %]
-      <text class="text-link" onclick="load_relative_url('editusers.cgi')" value="edit users"/>
-  [%- END %]
-  [%- IF Param('useclassification') && user.in_group('editclassifications') %]
-      <text class="text-link" onclick="load_relative_url('editclassifications.cgi')" value="edit classifications"/>
-  [%- END %]
-  [%- IF user.in_group('editcomponents') %]
-      <text class="text-link" onclick="load_relative_url('editcomponents.cgi')" value="edit components"/>
-      <text class="text-link" onclick="load_relative_url('editflagtypes.cgi')" value="edit flags"/>
-      <text class="text-link" onclick="load_relative_url('editvalues.cgi')" value="edit field values"/>
-  [%- END %]
-  [%- IF user.in_group('creategroups') %]
-      <text class="text-link" onclick="load_relative_url('editgroups.cgi')" value="edit groups"/>
-  [%- END %]
-  [%- IF user.in_group('editkeywords') %]
-      <text class="text-link" onclick="load_relative_url('editkeywords.cgi')" value="edit keywords"/>
-  [%- END %]
-  [%- IF user.in_group('bz_canusewhines') %]
-      <text class="text-link" onclick="load_relative_url('editwhines.cgi')" value="edit whining"/>
-  [%- END %]
-  [%- IF user.in_group('editcomponents') %]
-      <text class="text-link" onclick="load_relative_url('sanitycheck.cgi')" value="sanity check"/>
-  [%- END %]
-  [%- IF user.authorizer.can_logout %]
-      <text class="text-link" onclick="load_relative_url('index.cgi?logout=1')"
-            value="log out [% user.login FILTER html %]"/>
-  [%- END %]
-      <separator class="thin"/>
-  [%- IF user.showmybugslink %]
-      [% filtered_username = user.login FILTER uri %]
-      <text class="text-link" onclick="load_relative_url('[% Param('mybugstemplate').replace('%userid%', filtered_username) FILTER js FILTER html %]')" value="my [% terms.bugs %]"/>
-  [%- END %]
-
-  [%- FOREACH q = user.queries %]
-      <text class="text-link" onclick="load_relative_url('buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% q.name FILTER uri %]')" value="[% q.name FILTER html %]"/>
-  [% END %]
-
-[% ELSE %]
-      <text class="text-link" onclick="load_relative_url('createaccount.cgi')" value="new user"/>
-      <text class="text-link" onclick="load_relative_url('index.cgi?GoAheadAndLogIn=1')" value="log in"/>
-[% END %]
-
-    </box>
-  </box>
-
-  <spring flex="1"/>
-  <box orient="horizontal">
-    <spring flex="1"/>
-    <html align="right">
-      <html:a class="text-link" href="[% urlbase FILTER xml %]sidebar.cgi">reload</html:a>
-    </html>
-  </box>
-</window>