Skip to content

bugzilla
bugzilla
Commit f55027e7 authored by myk%mozilla.org's avatar myk%mozilla.org
Browse files
Options

Fix for bug 302702: refactors tabs code into shared file so not only prefs and…

Fix for bug 302702: refactors tabs code into shared file so not only prefs and search but also other pages can use it
parent ab199bf5
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 103 deletions
skins/standard/global.css
View file @ f55027e7
...@@ -313,21 +313,24 @@ body ...@@ -313,21 +313,24 @@ body
padding: 1em 0; padding: 1em 0;
} }
.selected_tab td.tab
{ {
background: #fff; background: #eee;
border: 1px solid black; text-align: center;
border-style: solid;
border-color: black;
border-width: 0px 0px 2px 0px;
} }
.unselected_tab td.tab.selected
{ {
background: #eee; background: white;
border: 1px solid black; border-width: 2px 2px 0px 2px;
} }
.spacer td.tab.spacer
{ {
border: 1px solid black; background: white;
} }
table#flags th, table#flags td { vertical-align: baseline; text-align: left; } table#flags th, table#flags td { vertical-align: baseline; text-align: left; }
template/en/default/account/prefs/prefs.html.tmpl
View file @ f55027e7
...@@ -38,57 +38,33 @@ ...@@ -38,57 +38,33 @@
[% PROCESS global/header.html.tmpl [% PROCESS global/header.html.tmpl
title = "User Preferences" title = "User Preferences"
h2 = filtered_login h2 = filtered_login
style = "td.selected_tab {
border-width: 2px 2px 0px;
border-style: solid;
border-color: black;
}
td.unselected_tab, td.spacer {
border-width: 0px 0px 2px 0px;
border-style: solid;
border-color: black;
}"
%] %]
[% tabs = [ { name => "account", description => "Account Preferences", [% tabs = [ { name => "account", label => "Account Preferences",
saveable => "1" }, link => "userprefs.cgi?tab=account", saveable => "1" },
{ name => "settings", description => "General Preferences", { name => "settings", label => "General Preferences",
saveable => "1" }, link => "userprefs.cgi?tab=settings", saveable => "1" },
{ name => "email", description => "Email Preferences", { name => "email", label => "Email Preferences",
saveable => "1" }, link => "userprefs.cgi?tab=email", saveable => "1" },
{ name => "saved-searches", description => "Saved searches", { name => "saved-searches", label => "Saved searches",
saveable => "1" }, link => "userprefs.cgi?tab=saved-searches", saveable => "1" },
{ name => "permissions", description => "Permissions", { name => "permissions", label => "Permissions",
saveable => "0" } ] %] link => "userprefs.cgi?tab=permissions", saveable => "0" } ] %]
<center> [% FOREACH tab IN tabs %]
<table cellspacing="0" cellpadding="10" border="0" width="100%"> [% IF tab.name == current_tab_name %]
<tr> [% current_tab=tab %]
<td class="spacer">&nbsp;</td> [% LAST %]
[% END %]
[% FOREACH tab = tabs %] [% END %]
[% IF tab.name == current_tab_name %]
[% current_tab = tab %] [% PROCESS global/tabs.html.tmpl %]
<td align="center" bgcolor="lightblue" class="selected_tab">
[% tab.description %]
</td>
[% ELSE %]
<td align="center" bgcolor="#BBBBEE" class="unselected_tab">
<a href="userprefs.cgi?tab=[% tab.name %]">[% tab.description %]</a>
</td>
[% END %]
[% END %]
<td class="spacer">&nbsp;</td>
</tr>
</table>
</center>
[% IF changes_saved %] [% IF changes_saved %]
<p> <p>
<font color="red"> <font color="red">
The changes to your The changes to your
[% current_tab.description FILTER lower %] have been saved. [% current_tab.label FILTER lower %] have been saved.
</font> </font>
</p> </p>
[% IF email_changes_saved %] [% IF email_changes_saved %]
...@@ -99,7 +75,7 @@ ...@@ -99,7 +75,7 @@
[% END %] [% END %]
[% END %] [% END %]
<h3>[% current_tab.description %]</h3> <h3>[% current_tab.label %]</h3>
<form name="userprefsform" method="post" action="userprefs.cgi"> <form name="userprefsform" method="post" action="userprefs.cgi">
<input type="hidden" name="tab" value="[% current_tab.name %]"> <input type="hidden" name="tab" value="[% current_tab.name %]">
......
template/en/default/global/tabs.html.tmpl 0 → 100644
View file @ f55027e7
[%# 1.0@bugzilla.org %]
[%# 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): Gervase Markham <gerv@gerv.net>
# Myk Melez <myk@mozilla.org>
#%]
[%# INTERFACE:
# tabs: List of hashes. Must have at least one item. Each hash has:
# name: string. Name of the tab.
# link: string. relative URL to the tab's resource on this installation.
# label: string. text displayed in the tab.
# current_tab_name: string. name of the currently selected tab
#%]
<center>
<table cellspacing="0" cellpadding="10" border="0" width="100%">
<tr>
<td class="tab spacer">&nbsp;</td>
[% FOREACH tab = tabs %]
[% IF tab.name == current_tab_name %]
<td class="tab selected">[% tab.label %]</td>
[% ELSE %]
<td class="tab"><a href="[% tab.link %]">[% tab.label %]</a></td>
[% END %]
[% END %]
<td class="tab spacer">&nbsp;</td>
</tr>
</table>
</center>
template/en/default/search/search-advanced.html.tmpl
View file @ f55027e7
...@@ -41,17 +41,7 @@ var queryform = "queryform" ...@@ -41,17 +41,7 @@ var queryform = "queryform"
onload = "doOnSelectProduct(0); initHelp();" onload = "doOnSelectProduct(0); initHelp();"
javascript = js_data javascript = js_data
javascript_urls = [ "js/productform.js" ] javascript_urls = [ "js/productform.js" ]
style = "td.selected_tab { style = "dl.bug_changes dt {
border-width: 2px 2px 0px;
border-style: solid;
border-color: black;
}
td.unselected_tab, td.spacer {
border-width: 0px 0px 2px 0px;
border-style: solid;
border-color: black;
}
dl.bug_changes dt {
margin-top: 15px; margin-top: 15px;
}" }"
%] %]
......
template/en/default/search/search-specific.html.tmpl
View file @ f55027e7
...@@ -24,14 +24,6 @@ ...@@ -24,14 +24,6 @@
[% PROCESS global/header.html.tmpl [% PROCESS global/header.html.tmpl
title = "Find a Specific " _ terms.Bug title = "Find a Specific " _ terms.Bug
h1 = "" h1 = ""
style = "td.selected_tab {
border-width: 2px 2px 0px;
border-style: solid;
}
td.unselected_tab, td.spacer {
border-width: 0px 0px 2px 0px;
border-style: solid;
}"
%] %]
[% PROCESS search/tabs.html.tmpl %] [% PROCESS search/tabs.html.tmpl %]
......
template/en/default/search/tabs.html.tmpl
View file @ f55027e7
...@@ -21,36 +21,13 @@ ...@@ -21,36 +21,13 @@
#%] #%]
[%# INTERFACE: [%# INTERFACE:
# tabs: List of hashes. May not be empty. Each hash has two members: # This template has no interface.
# name: string. Name of the tab and the format it represents.
# description: string. Description of the tab (used in tab title).
#%] #%]
[% tabs = [ { name => 'specific', description => "Find a Specific $terms.Bug " }, [% PROCESS global/tabs.html.tmpl
{ name => 'advanced', description => "Advanced Search" } ] %] tabs = [ { name => 'specific', label => "Find a Specific $terms.Bug",
link => "query.cgi?format=specific" },
[% current_tab = query_format || format || "advanced" %] { name => 'advanced', label => "Advanced Search",
link => "query.cgi?format=advanced" } ]
<center> current_tab_name = query_format || format || "advanced"
<table cellspacing="0" cellpadding="10" border="0" width="100%"> %]
<tr>
<td class="spacer">&nbsp;</td>
[% FOREACH tab = tabs %]
[% IF tab.name == current_tab %]
<td align="center" bgcolor="lightblue" class="selected_tab">
[% tab.description %]
</td>
[% ELSE %]
<td align="center" bgcolor="#BBBBEE" class="unselected_tab">
<a href="query.cgi?format=[% tab.name %]" >
[% tab.description %]
</a>
</td>
[% END %]
[% END %]
<td class="spacer">&nbsp;</td>
</tr>
</table>
</center>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment