[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: bugs/3.0/template
From: Dirk Mueller <mueller () kde ! org>
Date: 2008-08-18 17:22:35
Message-ID: 1219080155.828724.13006.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 848895 by mueller:
more skinning fixes
D global/choose-classification.html.tmpl
D global/choose-product.html.tmpl
M +122 -13 global/header.html.tmpl
M +1 -1 list/list.html.tmpl
--- trunk/bugs/3.0/template/global/header.html.tmpl #848894:848895
@@ -25,9 +25,9 @@
[%# INTERFACE:
# (All the below interface elements are optional.)
# title: string. Page title.
- # h1: string. Main page header.
- # h2: string. Page subheader.
- # h3: string. Right-aligned subheader.
+ # 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.
@@ -35,7 +35,7 @@
# 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
+ # atomlink: Atom link URL, May contain HTML
#%]
[% IF message %]
@@ -43,8 +43,8 @@
[% END %]
[% DEFAULT
- h2 = ""
- h3 = ""
+ subheader = ""
+ header_addl_info = ""
onload = ""
style_urls = '/skins/custom/global.css'
%]
@@ -68,6 +68,8 @@
[% PROCESS "global/site-navigation.html.tmpl" %]
+ [% PROCESS 'global/setting-descs.none.tmpl' %]
+
[% IF javascript %]
<script type="text/javascript">
[% javascript %]
@@ -82,22 +84,124 @@
[%+ INCLUDE "global/help-header.html.tmpl" %]
+ [%# Set up the skin CSS cascade:
+ # 1. Standard Bugzilla stylesheet set (persistent)
+ # 2. Standard Bugzilla stylesheet set (selectable)
+ # 3. All third-party "skin" stylesheet sets (selectable)
+ # 4. Page-specific styles
+ # 5. Custom Bugzilla stylesheet set (persistent)
+ # "Selectable" skin file sets may be either preferred or alternate.
+ # Exactly one is preferred, determined by the "skin" user preference.
+ #%]
+ [% IF user.settings.skin.value != 'standard' %]
+ [% user_skin = user.settings.skin.value %]
+ [% END %]
+ [% style_urls.unshift('skins/standard/global.css') %]
+ [%# CSS cascade, part 1: Standard Bugzilla stylesheet set (persistent).
+ # Always present.
+ #%]
+ [% FOREACH style_url = style_urls %]
+ <link href="[% style_url FILTER html %]"
+ rel="stylesheet"
+ type="text/css">
+ [% END %]
+ <!--[if IE]>
+ [%# Internet Explorer treats [if IE] HTML comments as uncommented.
+ # Use it to import CSS fixes so that Bugzilla looks decent on IE, too.
+ #%]
+ <link href="skins/standard/IE-fixes.css"
+ rel="stylesheet"
+ type="text/css">
+ <![endif]-->
+
+ [%# CSS cascade, part 2: Standard Bugzilla stylesheet set (selectable)
+ # Present if skin selection is enabled.
+ #%]
+ [% IF user.settings.skin.is_enabled %]
+ [% FOREACH style_url = style_urls %]
+ <link href="[% style_url FILTER html %]"
+ rel="[% 'alternate ' IF user_skin %]stylesheet"
+ title="[% setting_descs.standard FILTER html %]"
+ type="text/css">
+ [% END %]
+ <!--[if IE]>
+ [%# Internet Explorer treats [if IE] HTML comments as uncommented.
+ # Use it to import CSS fixes so that Bugzilla looks decent on IE,
+ # too.
+ #%]
+ <link href="skins/standard/IE-fixes.css"
+ rel="[% 'alternate ' IF user_skin %]stylesheet"
+ title="[% setting_descs.standard FILTER html %]"
+ type="text/css">
+ <![endif]-->
+ [% END %]
+
+ [%# CSS cascade, part 3: Third-party stylesheet set (selectable).
+ # All third-party skins are present if skin selection is enabled.
+ # The admin-selected skin is always present.
+ #%]
+ [% FOREACH contrib_skin = user.settings.skin.legal_values %]
+ [% NEXT IF contrib_skin == 'standard' %]
+ [% NEXT UNLESS contrib_skin == user_skin
+ OR user.settings.skin.is_enabled %]
+ [% contrib_skin = contrib_skin FILTER url_quote %]
+ [% IF contrib_skin.match('\.css$') %]
+ [%# 1st skin variant: single-file stylesheet %]
+ <link href="[% "skins/contrib/$contrib_skin" %]"
+ rel="[% 'alternate ' UNLESS contrib_skin == user_skin %]stylesheet"
+ title="[% contrib_skin FILTER html %]"
+ type="text/css">
+ [% ELSE %]
+ [%# 2nd skin variant: stylesheet set %]
+ [% FOREACH style_url = style_urls %]
+ [% IF style_url.match('^skins/standard/') %]
+ <link href="[% style_url.replace('^skins/standard/',
+ "skins/contrib/$contrib_skin/") %]"
+ rel="[% 'alternate ' UNLESS contrib_skin == user_skin %]stylesheet"
+ title="[% contrib_skin FILTER html %]"
+ type="text/css">
+ [% END %]
+ [% END %]
+ <!--[if IE]>
+ [%# Internet Explorer treats [if IE] HTML comments as uncommented.
+ # Use it to import CSS fixes so that Bugzilla looks decent on IE,
+ # too.
+ #%]
+ <link href="skins/contrib/[% contrib_skin FILTER html %]/IE-fixes.css"
+ rel="[% 'alternate ' UNLESS contrib_skin == user_skin %]stylesheet"
+ title="[% contrib_skin FILTER html %]"
+ type="text/css">
+ <![endif]-->
+ [% END %]
+ [% END %]
+
+ [%# CSS cascade, part 4: page-specific styles.
+ #%]
[% IF style %]
<style type="text/css">
[% style %]
</style>
[% END %]
- [% IF style_urls %]
- [% FOREACH style_url = style_urls %]
- <link href="[% style_url FILTER html %]" rel="stylesheet" type="text/css">
- [% IF style_url.match('^skins/standard/') %]
- <link href="[% style_url.replace('^skins/standard/', 'skins/custom/')
- FILTER html %]" rel="stylesheet" type="text/css">
- [% 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 = style_urls %]
+ [% IF style_url.match('^skins/standard/') %]
+ <link href="[% style_url.replace('^skins/standard/', "skins/custom/")
+ FILTER html %]" rel="stylesheet" type="text/css">
[% END %]
[% END %]
+ <!--[if IE]>
+ [%# Internet Explorer treats [if IE] HTML comments as uncommented.
+ # Use it to import CSS fixes so that Bugzilla looks decent on IE, too.
+ #%]
+ <link href="skins/custom/IE-fixes.css"
+ rel="stylesheet"
+ type="text/css">
+ <![endif]-->
[%# this puts the live bookmark up on firefox for the Atom feed %]
[% IF atomlink %]
@@ -106,6 +210,11 @@
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">
+
+ [% Hook.process("additional_header") %]
</head>
[%# Migration note: contents of the old Param 'bodyhtml' go in the body tag,
--- trunk/bugs/3.0/template/list/list.html.tmpl #848894:848895
@@ -36,7 +36,7 @@
[% title = title _ ": " _ (searchname OR defaultsavename) FILTER html %]
[% END %]
-[%# style_urls = [ "skins/standard/buglist.css" ] #%]
+[% style_urls = [ "skins/standard/buglist.css", "skins/custom/buglist.css" ] %]
[% qorder = order FILTER url_quote IF order %]
[% message = "buglist_sorted_by_relevance" IF sorted_by_relevance %]
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic