diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-04-08 17:59:51 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-04-08 17:59:51 +0200 |
| commit | 3cf92acb65f76fd5a922a6fbba4ef936cb01b2c3 (patch) | |
| tree | cab8da7430ea1fb1fe5647940d65dbeaaf9e0a98 /template/en/default/global | |
| parent | f6013b2b6a26a23c6d06c1ee6748bc4515e83903 (diff) | |
| parent | 755bc194dcea3481fa41b5884a98a5aa086fe09e (diff) | |
| download | bugzilla-3cf92acb65f76fd5a922a6fbba4ef936cb01b2c3.tar.gz bugzilla-3cf92acb65f76fd5a922a6fbba4ef936cb01b2c3.tar.xz | |
Merge remote-tracking branch 'bmo/master' into unstable
Diffstat (limited to 'template/en/default/global')
| -rw-r--r-- | template/en/default/global/code-error.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/global/header.html.tmpl | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index cf32548b6..bf1ff5ad3 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -313,6 +313,10 @@ to the <code>JOB_MAP</code> constant in <code>Bugzilla::JobQueue</code>, perhaps by using the 'job_map' hook. + [% ELSIF error == "jobqueue_status_error" %] + An error occurred while checking the job queue status. Try again at a + later time. + [% ELSIF error == "ldap_bind_failed" %] Failed to bind to the LDAP server. The error message was: <code>[% errstr FILTER html %]</code> diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index ded28d186..1d304ad04 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -244,7 +244,7 @@ <header id="header" role="banner"> <div class="inner"> <h1 id="header-title" class="title"><a href="./" title="Go to home page">[% terms.Bugzilla %]</a></h1> - <form role="search" id="header-search" class="quicksearch" action="buglist.cgi"> + <form role="search" id="header-search" class="quicksearch" action="buglist.cgi" data-no-csrf> <section class="searchbox-outer dropdown" role="combobox" aria-expanded="false" aria-haspopup="listbox" aria-owns="header-search-dropdown"> <h2>Quick Search</h2> |