synch'ing with 2.0 branch
authortipaul <tipaul>
Tue, 16 Mar 2004 13:39:50 +0000 (13:39 +0000)
committertipaul <tipaul>
Tue, 16 Mar 2004 13:39:50 +0000 (13:39 +0000)
acqui/newbasket2.pl
admin/authorised_values.pl
admin/marc_subfields_structure.pl
koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl
koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl
koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl

index f3fcd75..2d4ea65 100755 (executable)
@@ -138,6 +138,7 @@ while ($i < $count2){
 
                my $itemcount;
        my $location='';
+       my $location_only='';
        my $word=$result->{'author'};
        $word=~ s/([a-z]) +([a-z])/$1%20$2/ig;
        $word=~ s/  //g;
@@ -154,27 +155,37 @@ while ($i < $count2){
                        $location .= " ($nacount)";
                }
                $location.=" ";
+               $lineres{'on-loan-p'}=1;
        }
        if ($lcount > 0){
                $location .= "Levin";
+               $location_only .= "Levin";
                if ($lcount >1 ){
                        $location .= " ($lcount)";
+                       $location_only .= " ($lcount)";
                }
                $location.=" ";
+               $location_only.=" ";
        }
        if ($fcount > 0){
                $location .= "Foxton";
+               $location_only .= "Foxton";
                if ($fcount >1 ){
                        $location .= " ($fcount)";
+                       $location_only .= " ($fcount)";
                }
                $location.=" ";
+               $location_only.=" ";
        }
        if ($scount > 0){
                $location .= "Shannon";
+               $location_only .= "Shannon";
                if ($scount >1 ){
                        $location .= " ($scount)";
+                       $location_only .= " ($scount)";
                }
                $location.=" ";
+               $location_only.=" ";
        }
        if ($lostcount > 0){
                $location .= "Lost";
@@ -182,6 +193,7 @@ while ($i < $count2){
                        $location .= " ($lostcount)";
                }
                $location.=" ";
+               $lineres{'lost-p'}=1;
        }
        if ($mending > 0){
                $location .= "Mending";
@@ -189,6 +201,7 @@ while ($i < $count2){
                        $location .= " ($mending)";
                }
                $location.=" ";
+               $lineres{'mending-p'}=1;
        }
        if ($transit > 0){
                $location .= "In Transit";
@@ -196,6 +209,7 @@ while ($i < $count2){
                        $location .= " ($transit)";
                }
                $location.=" ";
+               $lineres{'in-transit-p'}=1;
        }
        if ($colour == 1){
                $toggle='#ffffcc';
@@ -216,6 +230,7 @@ while ($i < $count2){
        $lineres{toggle}=$toggle;
        $lineres{itemcount}=$count;
        $lineres{location}=$location;
+       $lineres{'location-only'}=$location_only;
        push(@loopresult,\%lineres);
        $i++;
 }
@@ -238,6 +253,7 @@ $template->param(   bookselname => $booksellers[0]->{'name'},
                                                                title => $title,
                                                                author => $author,
                                                                loopsearch =>\@loopsearch,
-                                                               loopresult =>\@loopresult);
+                                                               loopresult =>\@loopresult,
+                                                               'use-location-flags-p' => 1);
 
 output_html_with_http_headers $input, $cookie, $template->output;
index 9faa930..762476b 100755 (executable)
@@ -62,7 +62,7 @@ my ($template, $borrowernumber, $cookie)
                             flagsrequired => {parameters => 1},
                             debug => 1,
                             });
-my $pagesize=5;
+my $pagesize=20;
 my $op = $input->param('op');
 
 if ($op) {
index bf34830..44f52ab 100755 (executable)
@@ -33,7 +33,7 @@ sub StringSearch  {
        $searchstring=~ s/\'/\\\'/g;
        my @data=split(' ',$searchstring);
        my $count=@data;
-       my $sth=$dbh->prepare("Select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,thesaurus_category,value_builder from marc_subfield_structure where (tagfield like ?) order by tagfield");
+       my $sth=$dbh->prepare("Select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,thesaurus_category,value_builder from marc_subfield_structure where (tagfield like ?) order by tagfield");
        $sth->execute("$searchstring%");
        my @results;
        my $cnt=0;
@@ -137,7 +137,7 @@ if ($op eq 'add_form') {
        closedir DIR;
 
        # build values list
-       my $sth=$dbh->prepare("select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,thesaurus_category,value_builder from marc_subfield_structure where tagfield=?"); # and tagsubfield='$tagsubfield'");
+       my $sth=$dbh->prepare("select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,thesaurus_category,value_builder from marc_subfield_structure where tagfield=?"); # and tagsubfield='$tagsubfield'");
        $sth->execute($tagfield);
        my @loop_data = ();
        my $toggle="white";
@@ -163,6 +163,7 @@ if ($op eq 'add_form') {
                $row_data{tagsubfield} =$data->{'tagsubfield'}."<input type='hidden' name='tagsubfield' value='".$data->{'tagsubfield'}."'>";
                $row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'});
                $row_data{libopac} = CGI::escapeHTML($data->{'libopac'});
+               $row_data{seealso} = CGI::escapeHTML($data->{'seealso'});
                $row_data{kohafield}= CGI::scrolling_list( -name=>"kohafield",
                                        -values=> \@kohafields,
                                        -default=> "$data->{'kohafield'}",
@@ -187,7 +188,6 @@ if ($op eq 'add_form') {
                                        -size=>1,
                                        -multiple=>0,
                                        );
-#              $row_data{kohafield} = $data->{'kohafield'};
                $row_data{repeatable} = CGI::checkbox("repeatable$i",$data->{'repeatable'}?'checked':'',1,'');
                $row_data{mandatory} = CGI::checkbox("mandatory$i",$data->{'mandatory'}?'checked':'',1,'');
                $row_data{bgcolor} = $toggle;
@@ -211,6 +211,7 @@ if ($op eq 'add_form') {
                $row_data{tagsubfield} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"3\" maxlength=\"1\">";
                $row_data{liblibrarian} = "";
                $row_data{libopac} = "";
+               $row_data{seealso} = "";
                $row_data{repeatable} = CGI::checkbox('repeatable','',1,'');
                $row_data{mandatory} = CGI::checkbox('mandatory','',1,'');
                $row_data{kohafield}= CGI::scrolling_list( -name=>'kohafield',
@@ -244,13 +245,14 @@ if ($op eq 'add_form') {
 } elsif ($op eq 'add_validate') {
        my $dbh = C4::Context->dbh;
        $template->param(tagfield => "$input->param('tagfield')");
-       my $sth=$dbh->prepare("replace marc_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,thesaurus_category,value_builder)
-                                                                       values (?,?,?,?,?,?,?,?,?,?,?)");
+       my $sth=$dbh->prepare("replace marc_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,thesaurus_category,value_builder)
+                                                                       values (?,?,?,?,?,?,?,?,?,?,?,?)");
        my @tagsubfield = $input->param('tagsubfield');
        my @liblibrarian        = $input->param('liblibrarian');
        my @libopac             = $input->param('libopac');
        my @kohafield           = $input->param('kohafield');
        my @tab                         = $input->param('tab');
+       my @seealso             = $input->param('seealso');
        my @authorised_values   = $input->param('authorised_value');
        my @thesaurus_category  = $input->param('thesaurus_category');
        my @value_builder       =$input->param('value_builder');
@@ -264,6 +266,7 @@ if ($op eq 'add_form') {
                my $mandatory           =$input->param("mandatory$i")?1:0;
                my $kohafield           =$kohafield[$i];
                my $tab                         =$tab[$i];
+               my $seealso                             =$seealso[$i];
                my $authorised_value            =$authorised_values[$i];
                my $thesaurus_category          =$thesaurus_category[$i];
                my $value_builder=$value_builder[$i];
@@ -277,6 +280,7 @@ if ($op eq 'add_form') {
                                                                        $mandatory,
                                                                        $kohafield,
                                                                        $tab,
+                                                                       $seealso,
                                                                        $authorised_value,
                                                                        $thesaurus_category,
                                                                        $value_builder);
@@ -336,6 +340,7 @@ if ($op eq 'add_form') {
                $row_data{repeatable} = $results->[$i]{'repeatable'};
                $row_data{mandatory} = $results->[$i]{'mandatory'};
                $row_data{tab} = $results->[$i]{'tab'};
+               $row_data{seealso} = $results->[$i]{'seealso'};
                $row_data{authorised_value} = $results->[$i]{'authorised_value'};
                $row_data{thesaurus_category}   = $results->[$i]{'thesaurus_category'};
                $row_data{value_builder}        = $results->[$i]{'value_builder'};
index 8249a05..fddad9d 100755 (executable)
@@ -3,15 +3,15 @@
  <H1>Shopping Basket For: <!-- TMPL_VAR name="bookselname" --></H1>
 
 <!-- TMPL_IF name ="testdonation" -->
-       <a href="newbiblio.pl?id=<!-- TMPL_VAR ESCAPE=URL name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR ESCAPE=URL name="parsub" -->">
-       <img src="<!-- TMPL_VAR ESCAPE=URL name="interface" -->/<!-- TMPL_VAR ESCAPE=URL name="theme" -->/images/filenew.png" border=0 align=right alt="Add New Biblio"></a>
+       <a href="newbiblio.pl?id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR name="parsub" -->">
+       <img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filenew.png" border=0 align=right alt="Add New Biblio"></a>
 <!-- TMPL_ELSE -->
-       <a href="newdonation.pl?id=<!-- TMPL_VAR ESCAPE=URL name="id" -->&basket=<!-- TMPL_VAR ESCAPE=URL name="basket" -->&sub=<!-- TMPL_VAR ESCAPE=URL name="parsub" -->">
-       <img src="<!-- TMPL_VAR ESCAPE=URL name="interface" -->/<!-- TMPL_VAR ESCAPE=URL name="theme" -->/images/filenew.png"  border=0 align=right alt="Add New Biblio"></a>
+       <a href="newdonation.pl?id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR name="parsub" -->">
+       <img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filenew.png"  border=0 align=right alt="Add New Biblio"></a>
 <!-- /TMPL_IF -->
 
-<a href="basket.pl?basket=<!-- TMPL_VAR ESCAPE=URL name="basket" -->">
-<img src="<!-- TMPL_VAR ESCAPE=URL name="interface" -->/<!-- TMPL_VAR ESCAPE=URL name="theme" -->/images/1uparrow.png"  border=0 align=right alt="View Basket"></a>
+<a href="basket.pl?basket=<!-- TMPL_VAR name="basket" -->">
+<img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1uparrow.png"  border=0 align=right alt="View Basket"></a>
 <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl">
 <input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
 <input type=hidden name=basket value=<!-- TMPL_VAR name="basket" -->>
@@ -65,7 +65,15 @@ You searched on
                        <!-- TMPL_VAR name="itemcount" -->
                </TD>
                <TD>
+                       <!-- TMPL_IF name="use-location-flags-p" -->
+                       <!-- TMPL_IF name="location-only" --><!-- TMPL_VAR name="location-only" --><br><!-- /TMPL_IF -->
+                       <!-- TMPL_IF name="on-loan-p" -->On Loan<br><!-- /TMPL_IF -->
+                       <!-- TMPL_IF name="lost-p" -->Lost<br><!-- /TMPL_IF -->
+                       <!-- TMPL_IF name="mending-p" -->Mending<br><!-- /TMPL_IF -->
+                       <!-- TMPL_IF name="in-transit-p" -->In Transit<br><!-- /TMPL_IF -->
+                       <!-- TMPL_ELSE -->
                        <!-- TMPL_VAR name="location" -->
+                       <!-- /TMPL_IF -->
                </TD>
        </TR>
 
index eb90dbc..3d31751 100644 (file)
                                                <!-- TMPL_IF NAME="branchaddress3" -->
                                                        <br><!-- TMPL_VAR NAME="branchaddress3" escape="HTML" --><!-- /TMPL_IF -->
                                                <!-- TMPL_IF NAME="branchphone" -->
-                                                       <br>Ph: <!-- TMPL_VAR NAME="branchphone" escape="HTML" --><!-- /TMPL_IF -->
+                                                       <br>Phone: <!-- TMPL_VAR NAME="branchphone" escape="HTML" --><!-- /TMPL_IF -->
                                                <!-- TMPL_IF NAME="branchfax" -->
                                                        <br>Fax: <!-- TMPL_VAR NAME="branchfax" escape="HTML" --><!-- /TMPL_IF -->
                                                <!-- TMPL_IF NAME="branchemail" -->
index 9194f28..e912b86 100644 (file)
@@ -15,6 +15,7 @@
                <th>Mand</th>
                <th>Koha field</th>
                <th>Tab</th>
+               <th>See also (in searches)</th>
                <th>Authorised value or<br/>
                                Thesaurus category</th>
        </tr>
@@ -27,6 +28,7 @@
                <td><!-- TMPL_VAR name="mandatory" --></td>
                <td><!-- TMPL_VAR name="kohafield" --></td>
                <td><!-- TMPL_VAR name="tab" --></td>
+               <td><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20 maxlength=80></td>
                <td><!-- TMPL_VAR name="authorised_value" --><br/>
                                or <!-- TMPL_VAR name="thesaurus_category" --><br/>
                                or <!-- TMPL_VAR name="value_builder" --></td>
@@ -79,6 +81,7 @@
        <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>Rep</b> <span style="font-size:8;color:red" title="subfield may be repeated (1=yes, 0=no)">?</span></td>
        <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>Mand</b> <span style="font-size:8;color:red" title="subfield is mandatory (1=yes, 0=no)">?</span></td>
        <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>Tab</b> <span style="font-size:8;color:red" title="subfield is shown in which tab (0-9 or item)">?</span></td>
+       <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>See also</b> <span style="font-size:8;color:red" title="if subfields entered here, searches on this field will also be done on seealso subfields (syntax 200a,300e)">?</span></td>
        <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>Auth value</b> <span style="font-size:8;color:red" title="values authorised for this subfield">?</span></td>
        <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>Thesaurus</b> <span style="font-size:8;color:red" title="Thesaurus linked to this subfield">?</span></td>
        <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>Val build</b> <span style="font-size:8;color:red" title="Value builder">?</span></td>
@@ -91,6 +94,7 @@
        <td><!-- TMPL_IF name="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
        <td><!-- TMPL_IF name="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
        <td><!-- TMPL_VAR name="tab" --></td>
+       <td><!-- TMPL_VAR name="seealso" --></td>
        <td><!-- TMPL_VAR name="authorised_value" --></td>
        <td><!-- TMPL_VAR name="thesaurus_category" --></td>
        <td><!-- TMPL_VAR name="value_builder" --></td>
index 9787e17..3e53e20 100644 (file)
@@ -1,21 +1,21 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<script>
-       function _(s) { return s } // dummy function for gettext
-       /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+<script language="JavaScript" type="text/javascript">
+       function _(s) { return s } // dummy function for gettext
+       //
        function isNotNull(f,noalert) {
                if (f.value.length ==0) {
    return false;
                }
                return true;
        }
-       /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+       //
        function toUC(f) {
                var x=f.value.toUpperCase();
                f.value=x;
                return true;
        }
-       /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+       //
        function isNum(v,maybenull) {
        var n = new Number(v.value);
        if (isNaN(n)) {
        }
        return true;
        }
-       /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+       //
        function isDate(f) {
                var t = Date.parse(f.value);
                if (isNaN(t)) {
                        return false;
                }
        }
-       /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+       //
        function Check(f) {
                var ok=1;
                var _alertString="";
                        alert(alertString2);
                }
        }
-       </SCRIPT>
+       </script>
 
 <!-- TMPL_IF name="add_form" -->
-<!------------------------------------------------------------------------------------------------>
+
        <!-- TMPL_IF NAME=modify -->
                <h1>Modify a system preference</h1>
        <!-- TMPL_ELSE -->
-               <H1>Add a system preference</H1>
+               <h1>Add a system preference</h1>
        <!-- /TMPL_IF -->
-       <form action='<!-- TMPL_VAR name="script_name" -->' name=Aform method=post>
-       <input type=hidden name=op value='add_validate'>
+       <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
+       <input type="hidden" name="op" value="add_validate">
        <table>
-       <!-- TMPL_IF NAME=searchfield -->
-               <tr><td>Variable</td><td><!-- TMPL_VAR name="searchfield" --><input type=hidden name=variable value='<!-- TMPL_VAR NAME=searchfield -->'></td></tr>
+       <!-- TMPL_IF NAME="searchfield" -->
+               <tr><td>Variable</td><td><!-- TMPL_VAR name="searchfield" --><input type="hidden" name="variable" value="<!-- TMPL_VAR NAME="searchfield" -->"></td></tr>
        <!-- TMPL_ELSE -->
-               <tr><td>Variable</td><td><input type=text name=variable></td></tr>
+               <tr><td>Variable</td><td><input type="text" name="variable" size="60"></td></tr>
        <!-- /TMPL_IF -->
-       <tr><td>Value</td><td><input type=text name=value value="<!-- TMPL_VAR name="value" escape=HTML -->"></td></tr>
-       <tr><td>Explanation</td><td><input type=text name=explanation size=80 value="<!-- TMPL_VAR name="explanation" escape=HTML -->"></td></tr>
-       <tr><td>&nbsp;</td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
+       <tr><td>Value</td><td><input type="text" name="value" value="<!-- TMPL_VAR name="value" escape="HTML" -->" size="60"></td></tr>
+       <tr><td>Explanation</td><td><input type="text" name="explanation" size="60" value="<!-- TMPL_VAR name="explanation" escape="HTML" -->"></td></tr>
+       <tr><td>&nbsp;</td><td><INPUT type="button" value="OK" onclick="Check(this.form)"></td></tr>
        </table>
        </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="add_validate" -->
-<!------------------------------------------------------------------------------------------------>
+
        Data recorded
-       <form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-       <input type=submit value=OK>
+       <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+       <input type="submit" value="OK">
        </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_confirm" -->
-<!------------------------------------------------------------------------------------------------>
-<table border=0 cellspacing=0 cellpadding=2>
-       <tr valign=top bgcolor="#99cc33">
+
+<table border="0" cellspacing="0" cellpadding="2">
+       <tr valign="top" bgcolor="#99cc33">
                <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Variable</b></td>
                <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b><!-- TMPL_VAR name="searchfield" --></b></td>
        </tr>
        <tr><td>Value</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
-       <form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=hidden name=op value=delete_confirmed><input type=hidden name=searchfield value='<!-- TMPL_VAR name="searchfield" -->'>
-       <tr><td colspan=2 align=center>CONFIRM DELETION</td></tr>
-       <tr><td><INPUT type=submit value='YES'></form></td><td><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=submit value=NO></form></td></tr>
+       <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->">
+       <tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
+       <tr><td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="NO"></form></td></tr>
 </table>
 
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_confirmed" -->
-<!------------------------------------------------------------------------------------------------>
+
        Data deleted
-       <form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-       <input type=submit value=OK>
+       <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+       <input type="submit" value="OK">
        </form>
 <!-- /TMPL_IF -->
 
-<!------------------------------------------------------------------------------------------------>
 <!-- TMPL_IF name="else" -->
 <h1>System preferences admin</h1>
-<form action=/cgi-bin/koha/admin/systempreferences.pl method=post>
-       <input type=text name=searchfield value="">
-       <input type=reset name=reset value="clr">
+<form action="/cgi-bin/koha/admin/systempreferences.pl" method="post">
+       <input type="text" name="searchfield" value="">
+       <input type="reset" name="reset" value="clr">
 </form>
 <!-- TMPL_VAR name="searchfield" -->
-<table border=0 cellspacing=0 cellpadding=2>
-<tr valign=top bgcolor="#99cc33">
+<table border="0" cellspacing="0" cellpadding="2">
+<tr valign="top" bgcolor="#99cc33">
        <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Variable</b></td>
        <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Value</b></td>
        <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Explanation</b></td>
        <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">&nbsp;</td>
-       <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">&nbsp;</td>
+       <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">&nbsp;</td></tr>
 <!-- TMPL_LOOP name="loop" -->
-</tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
+<tr valign="top" bgcolor="<!-- TMPL_VAR name="bgcolor" -->">
        <td><!-- TMPL_VAR name="variable" --></td>
        <td><!-- TMPL_VAR name="value" --></td>
        <td><!-- TMPL_VAR name="explanation" --></td>
-       <td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0><br>Edit</a></td>
-       <td><a href="<!-- TMPL_VAR name="delete" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0><br>Delete</a></td>
+       <td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"><br>Edit</a></td>
+       <td><a href="<!-- TMPL_VAR name="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"><br>Delete</a></td>
 </tr>
 <!-- /TMPL_LOOP -->
-<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-<input type=hidden name=op value=add_form>
+<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+<input type="hidden" name="op" value="add_form">
 </table>
-<table width=40%>
+<table width="40%">
        <tr>
-               <td width=50%><!-- TMPL_VAR name="previous" --></td>
-               <td width=50%><!-- TMPL_VAR name="next" --></td>
+               <td width="50%"><!-- TMPL_VAR name="previous" --></td>
+               <td width="50%"><!-- TMPL_VAR name="next" --></td>
        </tr>
 </table>
 </form>
 
-<form action=<!-- TMPL_VAR name="script_name" --> method=post>
-        <input type='hidden' name='op' value='add_form'>
-        <input type=submit class="button" value='Add System preference'>
+<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+        <input type="hidden" name="op" value="add_form">
+        <input type="submit" class="button" value="Add System preference">
 </form>
 
 <!-- /TMPL_IF -->