aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2013-05-23 21:32:53 +0200
committerChristian Ruppert <idl0r@gentoo.org>2013-05-23 21:32:53 +0200
commitb03977a81c683c170d5d30bbd7316544beeb4f2a (patch)
treee6481973e6e7a7bb37f8229e2452a188cf4feb44 /template/en/default/global/common-links.html.tmpl
parentInlineHistory and SecureMail update (diff)
parentUpdate to 4.4 (diff)
downloadbugzilla-b03977a81c683c170d5d30bbd7316544beeb4f2a.tar.gz
bugzilla-b03977a81c683c170d5d30bbd7316544beeb4f2a.tar.bz2
bugzilla-b03977a81c683c170d5d30bbd7316544beeb4f2a.zip
Merge branch 'upstream'
Update to 4.4 Conflicts: show_bug.cgi template/en/default/admin/users/list.html.tmpl template/en/default/bug/show-header.html.tmpl template/en/default/email/bugmail-header.txt.tmpl template/en/default/email/bugmail.txt.tmpl
Diffstat (limited to 'template/en/default/global/common-links.html.tmpl')
-rw-r--r--template/en/default/global/common-links.html.tmpl30
1 files changed, 12 insertions, 18 deletions
diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
index a050e144f..1c135cf01 100644
--- a/template/en/default/global/common-links.html.tmpl
+++ b/template/en/default/global/common-links.html.tmpl
@@ -1,22 +1,9 @@
-[%# 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/
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
- # 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): Gervase Markham <gerv@gerv.net>
- # Svetlana Harisova <light@rathedg.com>
+ # This Source Code Form is "Incompatible With Secondary Licenses", as
+ # defined by the Mozilla Public License, v. 2.0.
#%]
[% DEFAULT qs_suffix = "" %]
@@ -34,6 +21,13 @@
onsubmit="if (this.quicksearch.value == '')
{ alert('Please enter one or more search terms first.');
return false; } return true;">
+ <input type="hidden" id="no_redirect[% qs_suffix FILTER html %]" name="no_redirect" value="0">
+ <script type="text/javascript">
+ if (history && history.replaceState) {
+ var no_redirect = document.getElementById("no_redirect[% qs_suffix FILTER js %]");
+ no_redirect.value = 1;
+ }
+ </script>
<input class="txt" type="text" id="quicksearch[% qs_suffix FILTER html %]" name="quicksearch"
title="Quick Search" value="[% quicksearch FILTER html %]">
<input class="btn" type="submit" value="Search"