diff options
| -rw-r--r-- | extensions/BMO/template/en/default/hook/index-additional_links.html.tmpl | 18 | ||||
| -rw-r--r-- | extensions/BMO/template/en/default/hook/index-intro.html.tmpl | 12 | ||||
| -rw-r--r-- | extensions/BMO/template/en/default/pages/get_help.html.tmpl | 42 | ||||
| -rw-r--r-- | skins/contrib/Mozilla-OpenSans/index.css | 2 | ||||
| -rw-r--r-- | skins/contrib/Mozilla/index.css | 2 | ||||
| -rw-r--r-- | skins/custom/index.css | 2 | ||||
| -rw-r--r-- | template/en/default/index.html.tmpl | 55 |
7 files changed, 15 insertions, 118 deletions
diff --git a/extensions/BMO/template/en/default/hook/index-additional_links.html.tmpl b/extensions/BMO/template/en/default/hook/index-additional_links.html.tmpl deleted file mode 100644 index cfc224fcd..000000000 --- a/extensions/BMO/template/en/default/hook/index-additional_links.html.tmpl +++ /dev/null @@ -1,18 +0,0 @@ -[%# 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/. - # - # This Source Code Form is "Incompatible With Secondary Licenses", as - # defined by the Mozilla Public License, v. 2.0. - #%] - -<li> -| -<a href="page.cgi?id=etiquette.html"> - [%- terms.Bugzilla %] Etiquette</a> -</li> -<li> -| -<a href="https://developer.mozilla.org/en/Bug_writing_guidelines"> - [%- terms.Bug %] Writing Guidelines</a> -</li> diff --git a/extensions/BMO/template/en/default/hook/index-intro.html.tmpl b/extensions/BMO/template/en/default/hook/index-intro.html.tmpl index d81d91491..ddee1db2f 100644 --- a/extensions/BMO/template/en/default/hook/index-intro.html.tmpl +++ b/extensions/BMO/template/en/default/hook/index-intro.html.tmpl @@ -1,2 +1,10 @@ -<a id="get_help" class="bz_common_actions" - href="page.cgi?id=get_help.html"><span>Get Help</span></a>
\ No newline at end of file +[%# 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/. + # + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. + #%] + +<a id="docs" class="bz_common_actions" + href="https://bmo.readthedocs.org/"><span>Documentation</span></a> diff --git a/extensions/BMO/template/en/default/pages/get_help.html.tmpl b/extensions/BMO/template/en/default/pages/get_help.html.tmpl deleted file mode 100644 index 70ff0a12b..000000000 --- a/extensions/BMO/template/en/default/pages/get_help.html.tmpl +++ /dev/null @@ -1,42 +0,0 @@ -[%# 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): David Miller <justdave@bugzilla.org> - #%] - -[% PROCESS global/variables.none.tmpl %] -[% INCLUDE global/header.html.tmpl title = "Get Help with Mozilla Products" %] - -<div id="steps"> -<h2>Got a problem?</h2> - -<ul> -<li><a href="http://www.mozilla.org/support/">Get help with your mozilla.org product</a></li> -<li><a href="http://hendrix.mozilla.org/">Leave quick feedback</a></li> -<li><a href="http://input.mozilla.com/feedback">Report a broken website</a></li> -<li><a href="enter_bug.cgi">Report a [% terms.bug %]</a> - latest release only - [% IF NOT user.id %] - (you'll need an - <a href="createaccount.cgi">account</a>) - [% END %] -</li> -</ul> -</div> - -<br> - -[% INCLUDE global/footer.html.tmpl %] diff --git a/skins/contrib/Mozilla-OpenSans/index.css b/skins/contrib/Mozilla-OpenSans/index.css index 3ca1fba51..81f207990 100644 --- a/skins/contrib/Mozilla-OpenSans/index.css +++ b/skins/contrib/Mozilla-OpenSans/index.css @@ -15,6 +15,6 @@ background: url(bugzilla-person-alternate.png) no-repeat; margin-right: 0; } -#get_help { +#docs { background: url(bugzilla-questionmark2.png) no-repeat !important; } diff --git a/skins/contrib/Mozilla/index.css b/skins/contrib/Mozilla/index.css index 3ca1fba51..81f207990 100644 --- a/skins/contrib/Mozilla/index.css +++ b/skins/contrib/Mozilla/index.css @@ -15,6 +15,6 @@ background: url(bugzilla-person-alternate.png) no-repeat; margin-right: 0; } -#get_help { +#docs { background: url(bugzilla-questionmark2.png) no-repeat !important; } diff --git a/skins/custom/index.css b/skins/custom/index.css index 0c6884124..ca2d83dde 100644 --- a/skins/custom/index.css +++ b/skins/custom/index.css @@ -8,7 +8,7 @@ * So we change to inline to make it display a single row. */ #page-index .intro { display: inline; } -#get_help { background: url(../standard/index/help.png) no-repeat; } +#docs { background: url(../standard/index/help.png) no-repeat; } .bz_common_actions { display: block; diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 8493d2b46..e046553c7 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -22,10 +22,6 @@ # Guy Pyrzak <guy.pyrzak@gmail.com> #%] -[%# INTERFACE: - # release: a hash containing data about new releases, if any. - #%] - [% PROCESS global/variables.none.tmpl %] [% USE Bugzilla %] @@ -47,51 +43,6 @@ function checkQuicksearch( form ) { } </script> -[% IF release %] - <div id="new_release"> - [% IF release.data %] - [% IF release.deprecated %] - <p>[% terms.Bugzilla %] [%+ release.deprecated FILTER html %] is no longer - supported. You are highly encouraged to upgrade in order to keep your - system secure.</p> - [% END %] - - <p>A new [% terms.Bugzilla %] version ([% release.data.latest_ver FILTER html %]) - is available at - <a href="[% release.data.url FILTER html %]">[% release.data.url FILTER html %]</a>.<br> - Release date: [% release.data.date FILTER html %]</p> - - <p class="notice">This message is only shown to logged in users with admin privs. - You can configure this notification from the - <a href="editparams.cgi?section=general#upgrade_notification_desc">Parameters</a> page.</p> - [% ELSIF release.error == "cannot_download" %] - <p>The remote file <a href="[% constants.REMOTE_FILE FILTER html %]"> - [%~ constants.REMOTE_FILE FILTER html %]</a> cannot be downloaded - (reason: [% release.reason FILTER html %]).<br> - Either the remote server is temporarily unavailable, or your web server cannot access - the web. If you are behind a proxy, set the - <a href="editparams.cgi?section=advanced#proxy_url_desc">proxy_url</a> parameter correctly.</p> - [% ELSIF release.error == "no_write" %] - <p>The local XML file '[% constants.LOCAL_FILE FILTER html %]' cannot be created - (reason: [% release.reason FILTER html %]).<br> - Please make sure the web server can write into this directory. - [% ELSIF release.error == "no_update" %] - <p>The local XML file '[% constants.LOCAL_FILE FILTER html %]' cannot be updated. - Please make sure the web server can edit this file.</p> - [% ELSIF release.error == "no_access" %] - <p>The local XML file '[% constants.LOCAL_FILE FILTER html %]' cannot be read. - Please make sure this file has the correct rights set on it.</p> - [% ELSIF release.error == "corrupted" %] - <p>The local XML file '[% constants.LOCAL_FILE FILTER html %]' has an invalid XML format. - Please delete it and try accessing this page again.</p> - [% ELSIF release.error == "unknown_parameter" %] - <p>'[% Param("upgrade_notification") FILTER html %]' is not a valid notification - parameter. Please check this parameter in the - <a href="editparams.cgi?section=general#upgrade_notification_desc">Parameters</a> page.</p> - [% END %] - </div> -[% END %] - <div id="page-index"> <table> <tr> @@ -133,12 +84,10 @@ function checkQuicksearch( form ) { </ul> <ul class="additional_links"> <li> - <a id="help" href="[% docs_urlbase FILTER html %]using/index.html"> - [%- terms.Bugzilla %] User's Guide</a> + <a href="page.cgi?id=etiquette.html">[%- terms.Bugzilla %] Etiquette</a> </li> <li> - | - <a href="page.cgi?id=release-notes.html">Release Notes</a> + | <a href="https://developer.mozilla.org/en/Bug_writing_guidelines">[%- terms.Bug %] Writing Guidelines</a> </li> [% Hook.process('additional_links') %] </ul> |