*** empty log message ***

diff --git a/admin/aqbookfund.pl b/admin/aqbookfund.pl
index 955c201..10f70b3 100755 (executable)
--- a/admin/aqbookfund.pl
+++ b/admin/aqbookfund.pl
@@ -120,7 +120,6 @@ if ($op eq 'add_form') {
        $template->param(add_or_modify => $add_or_modify);
        $template->param(bookfundid =>$bookfundid);
        $template->param(bookfundname =>$data->{'bookfundname'});
-       $template->param(bookfundgroup =>$data->{'bookfundgroup'});
 
                                                                                                        # END $OP eq ADD_FORM
 ################## ADD_VALIDATE ##################################
@@ -132,10 +131,9 @@ if ($op eq 'add_form') {
        my $sth=$dbh->prepare($query);
        $sth->execute;
        $sth->finish;
-       $query = "replace aqbookfund (bookfundid,bookfundname,bookfundgroup) values (";
+       $query = "replace aqbookfund (bookfundid,bookfundname) values (";
        $query.= $dbh->quote($input->param('bookfundid')).",";
-       $query.= $dbh->quote($input->param('bookfundname')).",";
-       $query.= $dbh->quote($input->param('bookfundgroup')).")";
+       $query.= $dbh->quote($input->param('bookfundname')).")";
        my $sth=$dbh->prepare($query);
        $sth->execute;
        $sth->finish;
@@ -154,7 +152,6 @@ if ($op eq 'add_form') {
        $sth->finish;
        $template->param(bookfundid => $bookfundid);
        $template->param(bookfundname => $data->{'bookfundname'});
-       $template->param(bookfundgroup => $data->{'bookfundgroup'});
                                                                                                        # END $OP eq DELETE_CONFIRM
 ################## DELETE_CONFIRMED ##################################
 # called by delete_confirm, used to effectively confirm deletion of data in DB
@@ -184,22 +181,19 @@ if ($op eq 'add_form') {
           my @toggle = ();
           my @bookfundid = ();
           my @bookfundname = ();
-          my @bookfundgroup = ();
           push(@toggle,$toggle);
           push(@bookfundid,$results->[$i]{'bookfundid'});
           push(@bookfundname,$results->[$i]{'bookfundname'});
-          push(@bookfundgroup,$results->[$i]{'bookfundgroup'});
           if ($toggle eq 'white'){
                        $toggle="#ffffcc";
                } else {
                        $toggle="white";
                }
-       while (@toggle and @bookfundid and @bookfundname and @bookfundgroup) {
+       while (@toggle and @bookfundid and @bookfundname) {
           my %row_data;
           $row_data{toggle} = shift @toggle;
           $row_data{bookfundid} = shift @bookfundid;
           $row_data{bookfundname} = shift @bookfundname;
-          $row_data{bookfundgroup} = shift @bookfundgroup;
           push(@loop_data, \%row_data);
        }
        }

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl
index ef25355..78c02b3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl
@@ -1,6 +1,6 @@
 <TMPL_INCLUDE NAME="parameters-top.inc">
 <center>
-<FONT SIZE=6><em>Koha admin page</em></FONT><br>
+<FONT SIZE=6><em>System parameters</em></FONT><br>
 <table width=100% cellspacing=0 cellpadding=5 border=1>
 <tr background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">
        <th>Parameters </th>

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl
index c5e8e26..483ea01 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl
@@ -9,7 +9,6 @@
 <tr valign=top bgcolor=#99cc33>
        <td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Book fund</b></td>
        <td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Name</b></td>
-       <td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Group</b></td>
        <td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Budget</b></td>
        <td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Edit</b></td>
        <td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Delete</b></td>
@@ -18,7 +17,6 @@
        <tr valign=top bgcolor="<TMPL_VAR name="toggle">">
                <td><TMPL_VAR name="bookfundid"></td>
                <td><TMPL_VAR name="bookfundname"></td>
-               <td><TMPL_VAR name="bookfundgroup"> &nbsp;</td>
                <td><a href="aqbudget.pl?bookfundid=<TMPL_VAR name="bookfundid"> "><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/filefind.png" width=32 hspace=0 vspace=0 border=0 title="budget"></a></td>
                <td><a href="<TMPL_VAR name="action">?op=add_form&bookfundid=<TMPL_VAR name="bookfundid"> "><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
                <td><a href="<TMPL_VAR name="action">?op=delete_confirm&bookfundid=<TMPL_VAR name="bookfundid">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
@@ -97,7 +95,6 @@
 <tr><td>Book fund</td><td><input type=text name=bookfundid size=5 maxlength=5 onBlur=toUC(this)></td></tr>
 </TMPL_IF>
 <tr><td>Name</td><td><input type=text name=bookfundname size=40 maxlength=80 value='<TMPL_VAR name="bookfundname">'>&nbsp;</td></tr>
-<tr><td>Group</td><td><input type=text name=bookfundgroup value='<TMPL_VAR name="bookfundgroup">'></td></tr>
 <tr><td>&nbsp;</td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
 </table>
 </form>
@@ -114,17 +111,17 @@ Data recorded
 <table border=0 cellspacing=0 cellpadding=5>
 <tr valign=top bgcolor=#99cc33><td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Book fund</b></td><td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b><TMPL_VAR name="bookfundid"></b></td></tr>
 <form action='<TMPL_VAR name="action">' method=post><input type=hidden name=op value=delete_confirmed><input type=hidden name=bookfundid value='<TMPL_VAR name="bookfundid">'>
-<tr><td>Name</td><td><TMPL_VAR name="bookfundname"></td></tr><tr><td>Group</td><td><TMPL_VAR name="bookfundgroup"></td></tr>
+<tr><td>Name</td><td><TMPL_VAR name="bookfundname"></td></tr>
 <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="action">' method=post><input type=submit value=NO></form></td></tr><br clear=all>
 <p> &nbsp; </p>
 </TMPL_IF>
 
 <TMPL_IF name="delete_confirmed">
-data deleted
+Data deleted
 <form action='<TMPL_VAR name="action">' method=post>
 <input type=submit value=OK>
-"</form>"
+</form>
 </TMPL_IF>
 
 <TMPL_INCLUDE NAME="parameters-bottom.inc">

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl
index 0ea39df..26c3b70 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl
@@ -142,7 +142,7 @@ Data recorded
 </TMPL_IF>
 
 <TMPL_IF name="delete_confirmed">
-data deleted
+Data deleted
 <form action='<TMPL_VAR name="action">' method=post>
 <input type=submit value=OK>
 </form>

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl
index dc2eafb..aa84b98 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl
@@ -244,7 +244,7 @@
 </TMPL_IF>
 
 <TMPL_IF NAME=delete_confirmed>
-       data deleted
+       Data deleted
         <form action='<TMPL_VAR NAME=script_name>' method=post>
         <input type=submit value=OK>
         </form>

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl
index fbb29bf..ee62f12 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl
@@ -239,7 +239,7 @@
 </TMPL_IF>
 
 <TMPL_IF NAME=delete_confirmed>
-        data deleted
+        Data deleted
         <form action='<TMPL_VAR NAME=script_name>' method=post>
         <input type=submit value=OK>
         </form>

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl
index 1a49f87..4d45668 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl
@@ -153,7 +153,7 @@
 </TMPL_IF>
 
 <TMPL_IF NAME=delete_confirmed>
-       data deleted
+       Data deleted
        <form action='<TMPL_VAR NAME=script_name>' method=post>
                <input type=submit value=OK>
        </form>

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
index 3cc4b33..124c04e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
@@ -59,7 +59,7 @@
 
 <TMPL_IF name="delete_confirmed">
 <!-------------------------------------------------------------------------------------------------->
-       data deleted
+       Data deleted
        <form action='<TMPL_VAR name="script_name"> method=post><input type="hidden" name="tagfield" value="<TMPL_VAR name="tagfield">">
        <input type=submit value=OK>
        </form>

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
index 4d74934..826c2c2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
@@ -84,7 +84,7 @@
 
 <TMPL_IF name="delete_confirmed">
 <!-------------------------------------------------------------------------------------------------->
-       data deleted
+       Data deleted
        <form action='<TMPL_VAR name="script_name">' method=post>
        <input type=submit value=OK>
        </form>

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl
index b942be0..1eeb62a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl
@@ -144,7 +144,7 @@
 </TMPL_IF>
 
 <TMPL_IF NAME=delete_confirmed>
-       data deleted
+       Data deleted
        <form action='<TMPL_VAR NAME=script_name>' method=post>
                <input type=submit value=OK>
        </form>

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl
index 73b995c..a3eb41f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl
@@ -122,7 +122,7 @@
 </TMPL_IF>
 
 <TMPL_IF NAME=delete_confirmed>
-        data deleted
+        Data deleted
         <form action='<TMPL_VAR NAME=script_name>' method=post>
                 <input type=submit value=OK>
         </form>

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl
index 562907b..df2e32c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl
@@ -99,7 +99,7 @@
 
 <TMPL_IF name="delete_confirmed">
 <!-------------------------------------------------------------------------------------------------->
-       data deleted
+       Data deleted
        <form action='<TMPL_VAR name="script_name">' method=post>
        <input type=submit value=OK>
        </form>

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl
index 585ab00..175c0af 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl
@@ -208,7 +208,7 @@
 </TMPL_IF>
 
 <TMPL_IF NAME=delete_confirmed>
-        data deleted
+        Data deleted
         <form action='<TMPL_VAR NAME=script_name>' method=post>
                 <input type=submit value=OK>
         </form>