diff options
| -rw-r--r-- | template/en/default/filterexceptions.pl | 2 | ||||
| -rw-r--r-- | template/en/default/reports/create-chart.html.tmpl | 28 | ||||
| -rw-r--r-- | template/en/default/reports/series-common.html.tmpl | 7 | ||||
| -rw-r--r-- | template/en/default/reports/series.html.tmpl | 14 |
4 files changed, 30 insertions, 21 deletions
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index 8d03d1aae..7f8ea18a7 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -187,7 +187,7 @@ 'reports/series-common.html.tmpl' => [ 'sel.name', 'sel.accesskey', - '"onchange=\'$sel.onchange\'" IF sel.onchange', + '"onchange=\"$sel.onchange\"" IF sel.onchange', ], 'reports/chart.csv.tmpl' => [ diff --git a/template/en/default/reports/create-chart.html.tmpl b/template/en/default/reports/create-chart.html.tmpl index 7b5b4c298..445c7b9cb 100644 --- a/template/en/default/reports/create-chart.html.tmpl +++ b/template/en/default/reports/create-chart.html.tmpl @@ -71,9 +71,9 @@ function subcatSelected() { [% ELSE %] <tr> <th>Category:</th> - <noscript><th></th></noscript> + <th></th> <th>Sub-category:</th> - <noscript><th></th></noscript> + <th></th> <th>Name:</th> <th><br> </th> @@ -85,30 +85,34 @@ function subcatSelected() { onchange = "catSelected(); subcatSelected();" } %] - <noscript> - <td> + <td> + <noscript> <input type="submit" name="action-assemble" value="Update -->"> - </td> - </noscript> + </noscript> + </td> [% PROCESS series_select sel = { name => 'subcategory', size => 5, onchange = "subcatSelected()" } %] - <noscript> - <td> - <input type="submit" name="action-assemble" value="Update --%gt;"> - </td> - </noscript> + <td> + <noscript> + <input type="submit" name="action-assemble" value="Update -->"> + </noscript> + </td> <td align="left"> <label for="name" accesskey="N"> <select name="name" id="name" style="width: 15em" size="5" multiple="multiple" + [%+ "disabled=\"disabled\"" UNLESS name.keys.size %]> [% FOREACH x = name.keys.sort %] <option value="[% name.$x FILTER html %]"> [% x FILTER html %]</option> [% END %] + [% UNLESS name.keys.size %] + <option value="" disabled="disabled"></option> + [% END %] </select> </label> </td> @@ -122,6 +126,8 @@ function subcatSelected() { <script language="JavaScript" type="text/javascript"> document.chartform.category[0].selected = true; + document.chartform.subcategory.disabled = ''; + document.chartform.name.disabled = ''; catSelected(); subcatSelected(); </script> diff --git a/template/en/default/reports/series-common.html.tmpl b/template/en/default/reports/series-common.html.tmpl index e10edd9e4..06b6af870 100644 --- a/template/en/default/reports/series-common.html.tmpl +++ b/template/en/default/reports/series-common.html.tmpl @@ -30,7 +30,7 @@ [% subcategory = category.${default.category} %] [% name = subcategory.${default.subcategory} %] -<script> +<script type="text/javascript"> [%# This structure holds details of the series the user can select from. %] var series = { [% FOREACH c = category.keys.sort %] @@ -102,7 +102,8 @@ function checkNewState() { <label for="[% sel.name %]" accesskey="[% sel.accesskey %]"> <select name="[% sel.name %]" id="[% sel.name %]" size="[% sel.size %]" style="width: 15em" - [%+ "onchange='$sel.onchange'" IF sel.onchange %]> + [%+ "disabled=\"disabled\"" UNLESS ${sel.name}.keys.size || newtext %] + [%+ "onchange=\"$sel.onchange\"" IF sel.onchange %]> [% FOREACH x = ${sel.name}.keys.sort %] <option value="[% x FILTER html %]" [% " selected" IF default.${sel.name} == x %]> @@ -110,6 +111,8 @@ function checkNewState() { [% END %] [% IF newtext %] <option value="">[% newtext FILTER html %]</option> + [% ELSIF NOT ${sel.name}.keys.size %] + <option value="" disabled="disabled"></option> [% END %] </select> </label> diff --git a/template/en/default/reports/series.html.tmpl b/template/en/default/reports/series.html.tmpl index c1ad55d1f..d75808070 100644 --- a/template/en/default/reports/series.html.tmpl +++ b/template/en/default/reports/series.html.tmpl @@ -36,7 +36,7 @@ <tbody> <tr> <th>Category:</th> - <noscript><th></th></noscript> + <th></th> <th>Sub-category:</th> <th>Name:</th> <td></td> @@ -45,11 +45,11 @@ [% PROCESS series_select sel = { name => 'category', size => 5, onchange => "catSelected()" } %] - <noscript> - <td> - <input type="submit" name="action-edit" value="Update -->"> - </td> - </noscript> + <td> + <noscript> + <input type="submit" name="action-edit" value="Update -->"> + </noscript> + </td> [% PROCESS series_select sel = { name => 'subcategory', size => 5, @@ -81,7 +81,7 @@ <input type="text" style="width: 100%" name="newcategory" maxlength="64" value="[% default.newcategory.0 FILTER html %]"> </td> - <noscript><td></td></noscript> + <td></td> <td> <input type="text" style="width: 100%" name="newsubcategory" maxlength="64" |