diff options
| author | Colin Guthrie <colin@mageia.org> | 2014-06-17 17:57:38 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2014-06-17 17:57:38 +0100 |
| commit | ae199be85469c12db3da8ff5818f6eceba2e8944 (patch) | |
| tree | 0481558a480d782d4fdbe1bf7db35051b10ed2d8 | |
| parent | 624744a42671e0951443e140a688213e518776a4 (diff) | |
| download | bugzilla-ae199be85469c12db3da8ff5818f6eceba2e8944.tar bugzilla-ae199be85469c12db3da8ff5818f6eceba2e8944.tar.gz bugzilla-ae199be85469c12db3da8ff5818f6eceba2e8944.tar.bz2 bugzilla-ae199be85469c12db3da8ff5818f6eceba2e8944.tar.xz bugzilla-ae199be85469c12db3da8ff5818f6eceba2e8944.zip | |
Revert "try to fix favicon of bugzilla"
This reverts commit 624744a42671e0951443e140a688213e518776a4.
This appears to break the Guided bug report screen as reported by
David Walser
| -rw-r--r-- | template/en/default/global/header.html.tmpl | 313 | ||||
| -rw-r--r-- | web/favicon.png | bin | 1184 -> 0 bytes |
2 files changed, 0 insertions, 313 deletions
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl deleted file mode 100644 index d01da1a..0000000 --- a/template/en/default/global/header.html.tmpl +++ /dev/null @@ -1,313 +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. - #%] - -[%# INTERFACE: - # (All the below interface elements are optional.) - # title: string. Page title. - # header: string. Main page header. - # subheader: string. Page subheader. - # header_addl_info: string. Additional header information. - # bodyclasses: array of extra CSS classes for the <body> - # onload: string. JavaScript code to run when the page finishes loading. - # javascript: string. Javascript to go in the header. - # javascript_urls: list. List of URLs to Javascript. - # style: string. CSS style. - # style_urls: list. List of URLs to CSS style sheets. - # message: string. A message to display to the user. May contain HTML. - # atomlink: Atom link URL, May contain HTML - #%] - -[% IF message %] - [% PROCESS global/messages.html.tmpl %] -[% END %] - -[% DEFAULT - subheader = "" - header_addl_info = "" - onload = "" - style_urls = [] - yui = [] -%] - -[% SET yui_css = { - autocomplete => 1, - calendar => 1, - datatable => 1, - button => 1, -} %] - -[%# Note: This is simple dependency resolution--you can't have dependencies - # that depend on each other. You have to specify all of a module's deps, - # if that module is going to be specified in "yui". - #%] -[% SET yui_deps = { - autocomplete => ['json', 'connection', 'datasource'], - datatable => ['json', 'connection', 'datasource', 'element'], -} %] - -[%# When using certain YUI modules, we need to process certain - # extra JS templates. - #%] -[% SET yui_templates = { - datatable => ['global/value-descs.js.tmpl'], -} %] - -[%# These are JS URLs that are *always* on the page and come before - # every other JS URL. - #%] -[% SET starting_js_urls = [ - "js/yui/yahoo-dom-event/yahoo-dom-event.js", - "js/yui/cookie/cookie-min.js", -] %] - - -[%# We should be able to set the default value of the header variable - # to the value of the title variable using the DEFAULT directive, - # but that doesn't work if a caller sets header to the empty string - # to avoid header inheriting the value of title, since DEFAULT - # mistakenly treats empty strings as undefined and gives header the - # value of title anyway. To get around that problem we explicitly - # set header's default value here only if it is undefined. %] -[% IF !header.defined %][% header = title %][% END %] - -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> -<html lang="en"> - <head> - [% Hook.process("start") %] - <title>[% title %]</title> - - [% IF Param('utf8') %] - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - [% END %] - -[%# Migration note: contents of the old Param 'headerhtml' would go here %] - - [% PROCESS "global/site-navigation.html.tmpl" %] - - [% PROCESS 'global/setting-descs.none.tmpl' %] - - [% SET yui = yui_resolve_deps(yui, yui_deps) %] - [% SET css_sets = css_files(style_urls, yui, yui_css) %] - - [%# CSS cascade, parts 1 & 2: YUI & Standard Bugzilla stylesheet set (persistent). - # Always present. %] - <link href="[% 'skins/standard/global.css' FILTER mtime FILTER html %]" - rel="alternate stylesheet" - title="[% setting_descs.standard FILTER html %]"> - [% FOREACH style_url = css_sets.standard %] - [% PROCESS format_css_link css_set_name = 'standard' %] - [% END %] - - [%# CSS cascade, part 3: Third-party stylesheet set, per user prefs. %] - [% FOREACH style_url = css_sets.skin %] - [% PROCESS format_css_link css_set_name = user.settings.skin.value %] - [% END %] - - [%# CSS cascade, part 4: page-specific styles. %] - [% IF style %] - <style type="text/css"> - [% style %] - </style> - [% END %] - - [%# CSS cascade, part 5: Custom Bugzilla stylesheet set (persistent). - # Always present. Site administrators may override all other style - # definitions, including skins, using custom stylesheets. - #%] - [% FOREACH style_url = css_sets.custom %] - [% PROCESS format_css_link css_set_name = 'standard' %] - [% END %] - - [%# YUI Scripts %] - [% FOREACH yui_name = yui %] - [% starting_js_urls.push("js/yui/$yui_name/${yui_name}-min.js") %] - [% END %] - [% starting_js_urls.push('js/global.js') %] - - [% FOREACH javascript_url = starting_js_urls %] - [% PROCESS format_js_link %] - [% END %] - - <script type="text/javascript"> - <!-- - YAHOO.namespace('bugzilla'); - YAHOO.util.Event.addListener = function (el, sType, fn, obj, overrideContext) { - if ( ("onpagehide" in window || YAHOO.env.ua.gecko) && sType === "unload") { sType = "pagehide"; }; - var capture = ((sType == "focusin" || sType == "focusout") && !YAHOO.env.ua.ie) ? true : false; - return this._addListener(el, this._getType(sType), fn, obj, overrideContext, capture); - }; - if ( "onpagehide" in window || YAHOO.env.ua.gecko) { - YAHOO.util.Event._simpleRemove(window, "unload", - YAHOO.util.Event._unload); - } - [%# The language selector needs javascript to set its cookie, - # so it is hidden in HTML/CSS by the "bz_default_hidden" class. - # If the browser can run javascript, it will then "unhide" - # the language selector using the following code. - #%] - function unhide_language_selector() { - YAHOO.util.Dom.removeClass( - 'lang_links_container', 'bz_default_hidden' - ); - } - YAHOO.util.Event.onDOMReady(unhide_language_selector); - - [%# Make some Bugzilla information available to all scripts. - # We don't import every parameter and constant because we - # don't want to add a lot of uncached JS to every page. - #%] - var BUGZILLA = { - param: { - cookiepath: '[% Param('cookiepath') FILTER js %]', - maxusermatches: [% Param('maxusermatches') FILTER js %] - }, - constant: { - COMMENT_COLS: [% constants.COMMENT_COLS FILTER js %] - }, - string: { - [%# Please keep these in alphabetical order. %] - - attach_desc_required: - 'You must enter a Description for this attachment.', - component_required: - 'You must select a Component for this [% terms.bug %].', - description_required: - 'You must enter a Description for this [% terms.bug %].', - short_desc_required: - 'You must enter a Summary for this [% terms.bug %].', - version_required: - 'You must select a Version for this [% terms.bug %].' - } - }; - - [% FOREACH yui_name = yui %] - [% FOREACH yui_template = yui_templates.$yui_name %] - [% INCLUDE $yui_template %] - [% END %] - [% END %] - [% IF javascript %] - [% javascript %] - [% END %] - // --> - </script> - - [% FOREACH javascript_url = javascript_urls %] - [% PROCESS format_js_link %] - [% END %] - - [%# this puts the live bookmark up on firefox for the Atom feed %] - [% IF atomlink %] - <link rel="alternate" - type="application/atom+xml" title="Atom feed" - href="[% atomlink FILTER html %]"> - [% END %] - - [%# Required for the 'Autodiscovery' feature in Firefox 2 and IE 7. %] - <link rel="search" type="application/opensearchdescription+xml" - title="[% terms.Bugzilla %]" href="./search_plugin.cgi"> - <link rel="shortcut icon" href="extensions/Mageia/web/favicon.png" > - [% Hook.process("additional_header") %] - </head> - -[%# Migration note: contents of the old Param 'bodyhtml' go in the body tag, - # but set the onload attribute in the DEFAULT directive above. - #%] - - <body onload="[% onload %]" - class="[% urlbase.replace('^https?://','').replace('/$','').replace('[-~@:/.]+','-') FILTER css_class_quote %] - [% FOREACH class = bodyclasses %] - [% ' ' %][% class FILTER css_class_quote %] - [% END %] yui-skin-sam"> - -[%# Migration note: the following file corresponds to the old Param - # 'bannerhtml' - #%] - -<div id="header"> - -[% INCLUDE global/banner.html.tmpl %] - -<table border="0" cellspacing="0" cellpadding="0" id="titles"> -<tr> - <td id="title"> - <p>[% terms.Bugzilla %] - [% " – $header" IF header %]</p> - </td> - - [% IF subheader %] - <td id="subtitle"> - <p class="subheader">[% subheader %]</p> - </td> - [% END %] - - [% IF header_addl_info %] - <td id="information"> - <p class="header_addl_info">[% header_addl_info %]</p> - </td> - [% END %] -</tr> -</table> - -<table id="lang_links_container" cellpadding="0" cellspacing="0" - class="bz_default_hidden"><tr><td> -[% IF Bugzilla.languages.size > 1 %] - <ul class="links"> - [% FOREACH lang = Bugzilla.languages.sort %] - <li>[% IF NOT loop.first %]<span class="separator"> | </span>[% END %] - [% IF lang == current_language %] - <span class="lang_current">[% lang FILTER html FILTER upper %]</span> - [% ELSE %] - <a href="#" onclick="set_language('[% lang FILTER none %]');"> - [%- lang FILTER html FILTER upper %]</a> - [% END %] - </li> - [% END %] - </ul> -[% END %] -</td></tr></table> - -[% PROCESS "global/common-links.html.tmpl" qs_suffix = "_top" %] -</div> [%# header %] - -<div id="bugzilla-body"> - -[% IF Param('announcehtml') %] -[% Param('announcehtml') FILTER none %] -[% END %] - -[% IF message %] - <div id="message">[% message %]</div> -[% END %] - -[% BLOCK format_css_link %] - [% IF style_url.match('/IE-fixes\.css') %] - <!--[if lte IE 7]> - [%# Internet Explorer treats [if IE] HTML comments as uncommented. - # We use it to import CSS fixes so that Bugzilla looks decent on IE 7 - # and below. - #%] - [% END %] - - [% IF css_set_name == 'standard' %] - [% SET css_title_link = '' %] - [% ELSE %] - [% css_title_link = BLOCK ~%] - title="[% setting_descs.${user.settings.skin.value} || user.settings.skin.value FILTER html %]" - [% END %] - [% END %] - - <link href="[% style_url FILTER html %]" rel="stylesheet" - type="text/css" [% css_title_link FILTER none %]> - - [% '<![endif]-->' IF style_url.match('/IE-fixes\.css') %] -[% END %] - -[% BLOCK format_js_link %] - <script type="text/javascript" src="[% javascript_url FILTER mtime FILTER html %]"></script> -[% END %] diff --git a/web/favicon.png b/web/favicon.png Binary files differdeleted file mode 100644 index 5868d96..0000000 --- a/web/favicon.png +++ /dev/null |
