diff options
Diffstat (limited to 'template')
| -rw-r--r-- | template/en/default/admin/flag-type/edit.html.tmpl | 6 | ||||
| -rw-r--r-- | template/en/default/admin/flag-type/list.html.tmpl | 6 | ||||
| -rw-r--r-- | template/en/default/global/js-products.html.tmpl | 10 | ||||
| -rw-r--r-- | template/en/default/request/queue.html.tmpl | 6 | ||||
| -rw-r--r-- | template/en/default/search/form.html.tmpl | 4 |
5 files changed, 17 insertions, 15 deletions
diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl index 4e2edd5a4..d7add7738 100644 --- a/template/en/default/admin/flag-type/edit.html.tmpl +++ b/template/en/default/admin/flag-type/edit.html.tmpl @@ -46,8 +46,8 @@ table#form th { text-align: right; vertical-align: baseline; white-space: nowrap; } table#form td { text-align: left; vertical-align: baseline; } " - onload="selectProduct(document.forms[0], 'product', 'component', '__Any__');" - javascript_urls=["productmenu.js"] + onload="var f = document.forms[0]; selectProduct(f.product, f.component, null, null, '__Any__');" + javascript_urls=["js/productform.js"] %] <form method="post" action="editflagtypes.cgi"> @@ -100,7 +100,7 @@ <tr> <td style="vertical-align: top;"> <b>Product/Component:</b><br> - <select name="product" onchange="selectProduct(this.form, 'product', 'component', '__Any__');"> + <select name="product" onchange="selectProduct(this, this.form.component, null, null, '__Any__');"> <option value="">__Any__</option> [% FOREACH prod = products %] <option value="[% prod.name FILTER html %]" diff --git a/template/en/default/admin/flag-type/list.html.tmpl b/template/en/default/admin/flag-type/list.html.tmpl index 3346f9570..c6046a766 100644 --- a/template/en/default/admin/flag-type/list.html.tmpl +++ b/template/en/default/admin/flag-type/list.html.tmpl @@ -31,8 +31,8 @@ .inactive { color: #787878; } .multiplicable { display: block; } " - onload="selectProduct(document.forms[0], 'product', 'component', '__All__');" - javascript_urls=["productmenu.js"] + onload="var f = document.forms[0]; selectProduct(f.product, f.component, null, null, '__All__');" + javascript_urls=["js/productform.js"] %] <p> @@ -60,7 +60,7 @@ <tr> <th><label for="product">Product:</label></th> <td> - <select name="product" onchange="selectProduct(this.form, 'product', 'component', '__Any__');"> + <select name="product" onchange="selectProduct(this, this.form.component, null, null, '__Any__');"> <option value="">__Any__</option> [% FOREACH prod = products %] <option value="[% prod.name FILTER html %]" diff --git a/template/en/default/global/js-products.html.tmpl b/template/en/default/global/js-products.html.tmpl index 57126f004..dbc1c2e1e 100644 --- a/template/en/default/global/js-products.html.tmpl +++ b/template/en/default/global/js-products.html.tmpl @@ -22,12 +22,14 @@ [%# The javascript block gets used in header.html.tmpl. %] [% javascript = BLOCK %] - var usetms = 0; // do we have target milestone? - var first_load = 1; // is this the first time we load the page? - var last_sel = []; // caches last selection + var useclassification = false; // No classification level in use + var first_load = true; // Is this the first time we load the page? + var last_sel = []; // Caches last selection var cpts = new Array(); + [% n = 1 %] [% FOREACH prod = products %] - cpts['[% prod.name FILTER js %]'] = [ + cpts['[% n %]'] = [ [%- FOREACH comp = prod.components %]'[% comp.name FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%] ]; + [% n = n+1 %] [% END %] [% END %] diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl index c80ecae87..ff143725a 100644 --- a/template/en/default/request/queue.html.tmpl +++ b/template/en/default/request/queue.html.tmpl @@ -32,8 +32,8 @@ table.requests th { text-align: left; } table#filtering th { text-align: right; } " - onload="selectProduct(document.forms[0], 'product', 'component', 'Any');" - javascript_urls=["productmenu.js"] + onload="var f = document.forms[0]; selectProduct(f.product, f.component, null, null, 'Any');" + javascript_urls=["js/productform.js"] %] <p> @@ -53,7 +53,7 @@ to some group are shown by default. title="Requester's email address"></td> <th>Product:</th> <td> - <select name="product" onchange="selectProduct(this.form, 'product', 'component', 'Any');"> + <select name="product" onchange="selectProduct(this, this.form.component, null, null, 'Any');"> <option value="">Any</option> [% FOREACH prod = products %] <option value="[% prod.name FILTER html %]" diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl index 9669eed40..25c17704d 100644 --- a/template/en/default/search/form.html.tmpl +++ b/template/en/default/search/form.html.tmpl @@ -93,12 +93,12 @@ function doOnSelectProduct(selectmode) { if (useclassification && f.classification.selectedIndex > -1) { selectClassification(f.classification, f.product, f.component, f.version, milestone); } else { - selectProduct(f.product, f.component, f.version, milestone); + selectProduct(f.product, f.component, f.version, milestone, null); } } else if (selectmode == 1) { selectClassification(f.classification, f.product, f.component, f.version, milestone); } else { - selectProduct(f.product, f.component, f.version, milestone); + selectProduct(f.product, f.component, f.version, milestone, null); } } |