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

diff --git a/skins/standard/global.css b/skins/standard/global.css
index f9ac7c96d1d7aebe988f3c2ec5f8b4c45ed30b2b..ab3eabf10fa25e0e68b7031e2250a99961907a60 100644 (file)
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -313,21 +313,24 @@ body
     padding: 1em 0;
 }
 
-.selected_tab
+td.tab
 {
-    background: #fff;
-    border: 1px solid black;
+    background: #eee;
+    text-align: center;
+    border-style: solid;
+    border-color: black;
+    border-width: 0px 0px 2px 0px;
 }
-
-.unselected_tab
+    
+td.tab.selected
 {
-    background: #eee;
-    border: 1px solid black;
+    background: white;
+    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; }

diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl
index d909f3b8ac623c136d31a8bf3a94004382ae2bce..5287ff1e4fa4f9a49968e7723efb5b38067edb38 100644 (file)
--- a/template/en/default/account/prefs/prefs.html.tmpl
+++ b/template/en/default/account/prefs/prefs.html.tmpl
@@ -38,57 +38,33 @@
 [% PROCESS global/header.html.tmpl
    title = "User Preferences"
    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", 
-              saveable => "1" },
-            { name => "settings", description => "General Preferences", 
-              saveable => "1" }, 
-            { name => "email", description => "Email Preferences", 
-              saveable => "1" },
-            { name => "saved-searches", description => "Saved searches", 
-              saveable => "1" },
-            { name => "permissions", description => "Permissions", 
-              saveable => "0" } ] %]
+[% tabs = [ { name => "account", label => "Account Preferences", 
+              link => "userprefs.cgi?tab=account", saveable => "1" },
+            { name => "settings", label => "General Preferences", 
+              link => "userprefs.cgi?tab=settings", saveable => "1" },
+            { name => "email", label => "Email Preferences", 
+              link => "userprefs.cgi?tab=email", saveable => "1" },
+            { name => "saved-searches", label => "Saved searches", 
+              link => "userprefs.cgi?tab=saved-searches", saveable => "1" },
+            { name => "permissions", label => "Permissions", 
+              link => "userprefs.cgi?tab=permissions", saveable => "0" } ] %]
 
-<center>
-  <table cellspacing="0" cellpadding="10" border="0" width="100%">
-    <tr>
-      <td class="spacer">&nbsp;</td>
- 
-      [% FOREACH tab = tabs %]
-        [% IF tab.name == current_tab_name %]
-          [% current_tab = tab %]
-          <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>
+[% FOREACH tab IN tabs %]
+  [% IF tab.name == current_tab_name %]
+    [% current_tab=tab %]
+    [% LAST %]
+  [% END %]
+[% END %]
+
+[% PROCESS global/tabs.html.tmpl %]
 
 [% IF changes_saved %]
   <p>
     <font color="red">
       The changes to your 
-      [% current_tab.description FILTER lower %] have been saved.
+      [% current_tab.label FILTER lower %] have been saved.
     </font>
   </p>
   [% IF email_changes_saved %]
@@ -99,7 +75,7 @@
   [% END %]
 [% END %]
 
-<h3>[% current_tab.description %]</h3>
+<h3>[% current_tab.label %]</h3>
 
 <form name="userprefsform" method="post" action="userprefs.cgi">
   <input type="hidden" name="tab" value="[% current_tab.name %]">

diff --git a/template/en/default/global/tabs.html.tmpl b/template/en/default/global/tabs.html.tmpl
new file mode 100644 (file)
index 0000000..a5140bd
--- /dev/null
+++ b/template/en/default/global/tabs.html.tmpl
@@ -0,0 +1,47 @@
+[%# 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>

diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl
index 4f53c2ce155837ec34964053f666d127d7475144..880715c354bd784000559f93d61d512825964224 100644 (file)
--- a/template/en/default/search/search-advanced.html.tmpl
+++ b/template/en/default/search/search-advanced.html.tmpl
@@ -41,17 +41,7 @@ var queryform = "queryform"
   onload = "doOnSelectProduct(0); initHelp();"
   javascript = js_data
   javascript_urls = [ "js/productform.js" ]
-  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;
-           }
-           dl.bug_changes dt {
+  style = "dl.bug_changes dt {
              margin-top: 15px;
            }"
 %]

diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl
index 8edda69ee2db6dbf27e53e400f5f82192afe57a1..a36be340c39cf9d8113fc6a39d058dc6223bf500 100644 (file)
--- a/template/en/default/search/search-specific.html.tmpl
+++ b/template/en/default/search/search-specific.html.tmpl
@@ -24,14 +24,6 @@
 [% PROCESS global/header.html.tmpl 
   title = "Find a Specific " _ terms.Bug
   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 %]

diff --git a/template/en/default/search/tabs.html.tmpl b/template/en/default/search/tabs.html.tmpl
index 06b22f7a282d082c27fefc699a2f71ff4c06a0f9..00358cb59cb503efc0e26cd8d62c5e733aebd013 100644 (file)
--- a/template/en/default/search/tabs.html.tmpl
+++ b/template/en/default/search/tabs.html.tmpl
@@ -21,36 +21,13 @@
   #%]
 
 [%# INTERFACE:
-  # tabs: List of hashes. May not be empty. Each hash has two members:
-  #   name: string. Name of the tab and the format it represents.
-  #   description: string. Description of the tab (used in tab title).
+  # This template has no interface.
   #%]
 
-[% tabs = [ { name => 'specific', description => "Find a Specific $terms.Bug " },
-            { name => 'advanced', description => "Advanced Search" } ] %]
-
-[% current_tab = query_format || format || "advanced" %]
-
-<center>
-  <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>
+[% PROCESS global/tabs.html.tmpl
+     tabs = [ { name => 'specific', label => "Find a Specific $terms.Bug",
+                link => "query.cgi?format=specific" },
+              { name => 'advanced', label => "Advanced Search",
+                link => "query.cgi?format=advanced" } ]
+     current_tab_name = query_format || format || "advanced"
+%]