diff options
Diffstat (limited to 'template/en/default/global')
| -rw-r--r-- | template/en/default/global/choose-classification.html.tmpl | 8 | ||||
| -rw-r--r-- | template/en/default/global/choose-product.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/global/common-links.html.tmpl | 71 | ||||
| -rw-r--r-- | template/en/default/global/footer.html.tmpl | 3 | ||||
| -rw-r--r-- | template/en/default/global/header.html.tmpl | 79 | ||||
| -rw-r--r-- | template/en/default/global/per-bug-queries.html.tmpl | 14 | ||||
| -rw-r--r-- | template/en/default/global/tabs.html.tmpl | 24 | ||||
| -rw-r--r-- | template/en/default/global/useful-links.html.tmpl | 125 |
8 files changed, 193 insertions, 135 deletions
diff --git a/template/en/default/global/choose-classification.html.tmpl b/template/en/default/global/choose-classification.html.tmpl index df0c37911..1ef99d4d8 100644 --- a/template/en/default/global/choose-classification.html.tmpl +++ b/template/en/default/global/choose-classification.html.tmpl @@ -23,7 +23,7 @@ [% IF target == "enter_bug.cgi" %] [% title = "Select Classification" %] - [% h2 = "Please select the classification." %] + [% subheader = "Please select the classification." %] [% END %] [% DEFAULT title = "Choose the classification" %] @@ -33,20 +33,20 @@ [% IF Param('showallproducts') %] <tr> - <th align="right" valign="center" height=50> + <th align="right"> <a href="[% target FILTER url_quote %]?classification=__all [% IF cloned_bug_id %]&cloned_bug_id=[% cloned_bug_id FILTER url_quote %][% END -%] [%- IF format %]&format=[% format FILTER url_quote %][% END %]"> All</a>: </th> - <td valign="center"> Show all products</td> + <td valign="top"> Show all products</td> </tr> [% END %] [% FOREACH class = classifications %] <tr> - <th align="right" valign="top"> + <th align="right"> <a href="[% target FILTER url_quote %]?classification=[% class.name FILTER url_quote -%] [%- IF cloned_bug_id %]&cloned_bug_id=[% cloned_bug_id FILTER url_quote %][% END -%] [%- IF format %]&format=[% format FILTER url_quote %][% END %]"> diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl index da47332c2..0d4a451b6 100644 --- a/template/en/default/global/choose-product.html.tmpl +++ b/template/en/default/global/choose-product.html.tmpl @@ -31,10 +31,10 @@ [% IF target == "enter_bug.cgi" %] [% title = "Enter $terms.Bug" %] - [% h2 = BLOCK %]First, you must pick a product on which to enter [% terms.abug %]. [% END %] + [% subheader = BLOCK %]First, you must pick a product on which to enter [% terms.abug %]. [% END %] [% ELSIF target == "describecomponents.cgi" %] [% title = "$terms.Bugzilla Component Descriptions" %] - [% h2 = "Please specify the product whose components you want described." %] + [% subheader = "Please specify the product whose components you want described." %] [% END %] [% DEFAULT title = "Choose a Product" %] diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl index 252b895cb..cfb7458e0 100644 --- a/template/en/default/global/common-links.html.tmpl +++ b/template/en/default/global/common-links.html.tmpl @@ -22,54 +22,63 @@ [% DEFAULT btn_id = "find" %] -<div class="links"> - <a href="./">Home</a> | - <a href="enter_bug.cgi">New</a> | - <a href="query.cgi">Search</a> | +<ul class="links"> + <li><a href="./">Home</a></li> + <li><span class="separator">| </span><a href="enter_bug.cgi">New</a></li> + <li><span class="separator">| </span><a href="query.cgi">Search</a></li> - <form action="buglist.cgi" method="get" + <li class="form"> + <span class="separator">| </span> + <form action="buglist.cgi" method="get" onsubmit="if (this.quicksearch.value == '') { alert('Please enter one or more search terms first.'); return false; } return true;"> <input class="txt" type="text" name="quicksearch"> <input class="btn" type="submit" value="Find" id="[% btn_id FILTER html %]"> - </form> | + [%-# Work around FF bug: keep this on one line %]</form></li> - <a href="report.cgi">Reports</a> + <li><span class="separator">| </span><a href="report.cgi">Reports</a></li> - [% IF user.id %] - [% email = user.login FILTER url_quote %] - | <a href="request.cgi?requester=[% email %]&requestee= - [%- email %]&do_union=1&group=type">My Requests</a> - [% ELSE %] - | <a href="request.cgi">Requests</a> - [% END %] + <li> + <span class="separator">| </span> + [% IF user.id %] + [% email = user.login FILTER url_quote %] + <a href="request.cgi?requester=[% email %]&requestee= + [% email %]&do_union=1&group=type">My Requests</a> + [% ELSE %] + <a href="request.cgi">Requests</a> + [% END %] + [%-# Work around FF bug: keep this on one line %]</li> [% IF user.id && Param('usevotes') %] - | <a href="votes.cgi?action=show_user">My Votes</a> + <li><span class="separator">| </span><a href="votes.cgi?action=show_user">My Votes</a></li> [% END %] [% IF user.login %] - [% ' | <a href="sanitycheck.cgi">Sanity check</a>' IF user.groups.tweakparams %] - [% IF user.authorizer.can_logout %] - | <a href="relogin.cgi">Log out</a> - [% ELSE %] - | Logged in as - [% END %] - [% IF sudoer %] - [%+ sudoer.login FILTER html %] (<b>impersonating - [%+ user.login FILTER html %]</b> - <a href="relogin.cgi?action=end-sudo">end session</a>) - [% ELSE %] - [%+ user.login FILTER html %] - [% END %] + [% '<li><span class="separator">| </span><a href="sanitycheck.cgi">Sanity check</a></li>' + IF user.groups.tweakparams %] + <li> + <span class="separator">| </span> + [% IF user.authorizer.can_logout %] + <a href="relogin.cgi">Log out</a> + [% ELSE %] + Logged in as + [% END %] + [% IF sudoer %] + [%+ sudoer.login FILTER html %] (<b>impersonating + [%+ user.login FILTER html %]</b> + <a href="relogin.cgi?action=end-sudo">end session</a>) + [% ELSE %] + [%+ user.login FILTER html %] + [% END %] + [%-# Work around FF bug: keep this on one line %]</li> [% ELSE %] [% IF Param('createemailregexp') && user.authorizer.user_can_create_account %] - | <a href="createaccount.cgi">New Account</a> + <li><span class="separator">| </span><a href="createaccount.cgi">New Account</a></li> [% END %] [% IF user.authorizer.can_login %] - | <a href="index.cgi?GoAheadAndLogIn=1">Log In</a> + <li><span class="separator">| </span><a href="index.cgi?GoAheadAndLogIn=1">Log In</a></li> [% END %] [% END %] -</div> +</ul> diff --git a/template/en/default/global/footer.html.tmpl b/template/en/default/global/footer.html.tmpl index fc1016621..7de84aa70 100644 --- a/template/en/default/global/footer.html.tmpl +++ b/template/en/default/global/footer.html.tmpl @@ -27,6 +27,8 @@ [% INCLUDE "global/help.html.tmpl" %] +</div> + [%# Migration note: below this point, this file corresponds to the old Param # 'footerhtml' #%] @@ -45,3 +47,4 @@ </body> </html> + diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index 9b9420ced..d629a6c23 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -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. @@ -43,20 +43,20 @@ [% END %] [% DEFAULT - h2 = "" - h3 = "" + subheader = "" + header_addl_info = "" onload = "" style_urls = [] %] -[%# We should be able to set the default value of the h1 variable +[%# 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 h1 to the empty string - # to avoid h1 inheriting the value of title, since DEFAULT - # mistakenly treats empty strings as undefined and gives h1 the + # 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 h1's default value here only if it is undefined. %] -[% IF !h1.defined %][% h1 = title %][% END %] + # 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"> @@ -106,6 +106,14 @@ 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. @@ -117,6 +125,16 @@ 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). @@ -145,6 +163,16 @@ 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 %] @@ -166,6 +194,14 @@ 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 %] @@ -200,19 +236,20 @@ <table border="0" cellspacing="0" cellpadding="0" id="titles"> <tr> - <td id="title"> - [% terms.Bugzilla %][% IF h1 %] - [% h1 %] [% END %] - </td> + <td id="title"> + <p>[% terms.Bugzilla %] + [% " – $header" IF header %]</p> + </td> - [% IF h2 %] + [% IF subheader %] <td id="subtitle"> - [% h2 %] + <p class="subheader">[% subheader %]</p> </td> [% END %] - [% IF h3 %] + [% IF header_addl_info %] <td id="information"> - [% h3 %] + <p class="header_addl_info">[% header_addl_info %]</p> </td> [% END %] </tr> @@ -220,6 +257,10 @@ [% PROCESS "global/common-links.html.tmpl" btn_id = "find_top" %] +</div> + +<div id="bugzilla-body"> + [% IF Param('announcehtml') %] [% Param('announcehtml') FILTER none %] [% END %] @@ -227,5 +268,3 @@ [% IF message %] <div id="message">[% message %]</div> [% END %] - -</div> diff --git a/template/en/default/global/per-bug-queries.html.tmpl b/template/en/default/global/per-bug-queries.html.tmpl index 631fb8509..a9b4e44db 100644 --- a/template/en/default/global/per-bug-queries.html.tmpl +++ b/template/en/default/global/per-bug-queries.html.tmpl @@ -58,10 +58,9 @@ [% lists_of_bugs.push(q.name) %] [% END %] - <div id="links-special"> - <div class="label"> </div> - <div class="links"> - <hr> + <li id="links-special"> + <div class="label"></div> + <ul class="links"><li class="form"> <form id="list_of_bugs" action="buglist.cgi" method="get"> <input type="hidden" name="cmdtype" value="doit"> <input type="hidden" name="remtype" value="asnamed"> @@ -84,11 +83,12 @@ [% END %] <span id="lob_new_query_text"> [% " or to" IF lists_of_bugs.size %] the new saved search: - <input type="text" id="lob_newqueryname" name="newqueryname" size="20" maxlength="64" + <input class="txt" type="text" id="lob_newqueryname" + size="20" maxlength="64" name="newqueryname" onkeyup="manage_old_lists();"> </span> <input type="submit" value="Commit" id="commit_list_of_bugs"> </form> - </div> - </div> + </li></ul> + </li> [% END %] diff --git a/template/en/default/global/tabs.html.tmpl b/template/en/default/global/tabs.html.tmpl index 6f8601b86..25b931de3 100644 --- a/template/en/default/global/tabs.html.tmpl +++ b/template/en/default/global/tabs.html.tmpl @@ -18,6 +18,7 @@ # # Contributor(s): Gervase Markham <gerv@gerv.net> # Myk Melez <myk@mozilla.org> + # Marc Schumann <wurblzap@gmail.com> #%] [%# INTERFACE: @@ -28,20 +29,25 @@ # current_tab_name: string. name of the currently selected tab #%] -<center> - <table cellspacing="0" cellpadding="10" border="0" width="100%"> +<div class="tabbed"> + <table class="tabs" cellspacing="0" cellpadding="10" border="0" width="100%"> <tr> - <td class="tab spacer"> </td> + <td class="spacer"> </td> [% FOREACH tab = tabs %] [% IF tab.name == current_tab_name %] - <td class="tab selected">[% tab.label FILTER html %]</td> + <td class="selected">[% tab.label FILTER html %]</td> [% ELSE %] - <td class="tab"><a href="[% tab.link FILTER html %]">[% tab.label FILTER html %]</a></td> + <td class="clickable_area" onClick="document.location='[% tab.link FILTER html %]'"><a href="[% tab.link FILTER html %]">[% tab.label FILTER html %]</a></td> [% END %] [% END %] - <td class="tab spacer"> </td> - </tr> - </table> -</center> + <td class="spacer"> </td> + </tr> + </table> + + <div class="tabbody"> + [% content %] + </div> + +</div> diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl index e1bb2affe..8faed2875 100644 --- a/template/en/default/global/useful-links.html.tmpl +++ b/template/en/default/global/useful-links.html.tmpl @@ -26,86 +26,87 @@ [% PROCESS global/variables.none.tmpl %] -<div id="useful-links"> - <div id="links-actions"> +<ul id="useful-links"> + <li id="links-actions"> <div class="label">Actions:</div> - [% PROCESS "global/common-links.html.tmpl" btn_id = "find_bottom" %] - </div> + [% PROCESS "global/common-links.html.tmpl" btn_id = "find_bottom" %] + </li> - [% IF user.login %] - <div id="links-edit"> - <div class="label">Edit:</div> - <div class="links"> - - <a href="userprefs.cgi">Prefs</a> - [% ' | <a href="editparams.cgi">Parameters</a> ' _ - ' | <a href="editsettings.cgi">User Preferences</a>' + [% IF user.login %] + <li id="links-edit"> + <div class="label">Edit:</div> + <ul class="links"> + <li><a href="userprefs.cgi">Prefs</a></li> + [% ' <li><span class="separator">| </span><a href="editparams.cgi">Parameters</a></li>' _ + ' <li><span class="separator">| </span><a href="editsettings.cgi">User Preferences</a></li>' IF user.groups.tweakparams %] - [% ' | <a href="editusers.cgi">Users</a>' IF user.groups.editusers + [% ' <li><span class="separator">| </span><a href="editusers.cgi">Users</a></li>' IF user.groups.editusers || user.can_bless %] [% IF Param('useclassification') && user.groups.editclassifications %] - [% ' | <a href="editclassifications.cgi">Classifications</a>' %] - [% END %] - [% ' | <a href="editproducts.cgi">Products</a>' + [% ' <li><span class="separator">| </span><a href="editclassifications.cgi">Classifications</a></li>' %] + [% END %] + [% ' <li><span class="separator">| </span><a href="editproducts.cgi">Products</a></li>' IF user.groups.editcomponents %] - [% ' | <a href="editflagtypes.cgi">Flags</a>' + [% ' <li><span class="separator">| </span><a href="editflagtypes.cgi">Flags</a></li>' IF user.groups.editcomponents %] - [% ' | <a href="editfields.cgi">Custom Fields</a>' + [% ' <li><span class="separator">| </span><a href="editfields.cgi">Custom Fields</a></li>' IF user.groups.admin %] - [% ' | <a href="editvalues.cgi">Field Values</a>' + [% ' <li><span class="separator">| </span><a href="editvalues.cgi">Field Values</a></li>' IF user.groups.editcomponents %] - [% ' | <a href="editgroups.cgi">Groups</a>' + [% ' <li><span class="separator">| </span><a href="editgroups.cgi">Groups</a></li>' IF user.groups.creategroups %] - [% ' | <a href="editkeywords.cgi">Keywords</a>' + [% ' <li><span class="separator">| </span><a href="editkeywords.cgi">Keywords</a></li>' IF user.groups.editkeywords %] - [% ' | <a href="editwhines.cgi">Whining</a>' + [% ' <li><span class="separator">| </span><a href="editwhines.cgi">Whining</a></li>' IF user.groups.bz_canusewhines %] - </div> - </div> - [% END %] + </ul> + </li> + [% END %] - [%# Saved searches %] - <div id="links-saved"> - <div class="label"> - [% IF user.showmybugslink OR user.queries.size %] - Saved Searches: - [% END %] - </div> - <div class="links"> - [% IF user.showmybugslink %] - [% filtered_username = user.login FILTER url_quote %] - <a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">My [% terms.Bugs %]</a> - [% print_pipe = 1 %] - [% END %] - - [% FOREACH q = user.queries %] - [% NEXT IF q.userid != user.id %] - [% IF q.link_in_footer %] - [% " | " IF print_pipe %] - <a href="buglist.cgi?cmdtype=dorem&remaction=run&namedcmd= - [% q.name FILTER url_quote %]">[% q.name FILTER html FILTER no_break %]</a> + [% IF user.showmybugslink OR user.queries.size %] + <li id="links-saved"> + <div class="label"> + Saved Searches: + </div> + <ul class="links"> + [% IF user.showmybugslink %] + [% filtered_username = user.login FILTER url_quote %] + <li><a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">My [% terms.Bugs %]</a></li> [% print_pipe = 1 %] [% END %] - [% END %] - [% " <br> " IF print_pipe %] - [% print_pipe = 0 %] - [% FOREACH q = user.queries %] - [% NEXT IF q.userid == user.id %] - [% IF q.link_in_footer %] - [% " | " IF print_pipe %] - <a href="buglist.cgi?cmdtype=dorem&remaction=run&namedcmd= - [% q.name FILTER url_quote %]&sharer_id= - [% q.userid FILTER url_quote %]" - class="shared" - title="Shared by [% q.user.identity FILTER html %]">[% q.name FILTER html FILTER no_break %]</a> - [% print_pipe = 1 %] + [% FOREACH q = user.queries %] + [% NEXT IF q.userid != user.id %] + [% IF q.link_in_footer %] + <li>[% '<span class="separator">| </span>' IF print_pipe %] + <a href="buglist.cgi?cmdtype=runnamed&namedcmd=[% q.name FILTER url_quote %]">[% q.name FILTER html %]</a></li> + [% print_pipe = 1 %] + [% END %] + [% END %] + [% new_line = print_pipe %] + [% print_pipe = 0 %] + [% FOREACH q = user.queries %] + [% NEXT IF q.userid == user.id %] + [% IF q.link_in_footer %] + [% IF new_line %] + <br> + [% new_line = 0 %] + [% END %] + <li> + [% '<span class="separator">| </span>' IF print_pipe %] + <a href="buglist.cgi?cmdtype=dorem&remaction=run&namedcmd= + [% q.name FILTER url_quote %]&sharer_id= + [% q.userid FILTER url_quote %]" + class="shared" + title="Shared by [% q.user.identity FILTER html %]">[% q.name FILTER html FILTER no_break %]</a></li> + [% print_pipe = 1 %] + [% END %] [% END %] - [% END %] - </div> - </div> + </ul> + </li> + [% END %] [%# Individual bugs addition %] @@ -113,4 +114,4 @@ [%# Sections of links to more things users can do on this installation. %] [% Hook.process("end") %] -</div> +</ul> |