[Koha-cvs] koha admin/systempreferences.pl koha-tmpl/intra... [rel_2_2]

[paul poulain]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     paul poulain <address@hidden>   06/03/08 16:18:05

Modified files:
        admin          : systempreferences.pl 
        koha-tmpl/intranet-tmpl/default/en/parameters: 
                                                       systempreferences.tmpl 

Log message:
        some changes in systempreference settings

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/admin/systempreferences.pl.diff?only_with_tag=rel_2_2&tr1=1.22.2.13&tr2=1.22.2.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl.diff?only_with_tag=rel_2_2&tr1=1.29.2.3&tr2=1.29.2.4&r1=text&r2=text

Patches:
Index: koha/admin/systempreferences.pl
diff -u koha/admin/systempreferences.pl:1.22.2.13 
koha/admin/systempreferences.pl:1.22.2.14
--- koha/admin/systempreferences.pl:1.22.2.13   Sat Mar  4 06:44:34 2006
+++ koha/admin/systempreferences.pl     Wed Mar  8 16:18:05 2006
@@ -50,48 +50,51 @@
 
 my %tabsysprefs;
 $tabsysprefs{acquisitions}="Acquisitions";
-$tabsysprefs{gist}="Acquisitions";
-$tabsysprefs{authoritysep}="Authorities";
-$tabsysprefs{ISBD}="Catalogue";
-$tabsysprefs{marc}="Catalogue";
-$tabsysprefs{autoBarcode}="Catalogue";
-$tabsysprefs{marcflavour}="Catalogue";
-$tabsysprefs{SubscriptionHistory}="OPAC";
-$tabsysprefs{maxoutstanding}="Circulation";
-$tabsysprefs{printcirculationslips}="Circulation";
-$tabsysprefs{ReturnBeforeExpiry}="Circulation";
-$tabsysprefs{suggestion}="OPAC";
-$tabsysprefs{automembernum}="Members";
-$tabsysprefs{noissuescharge}="Circulation";
-$tabsysprefs{opacthemes}="OPAC";
-$tabsysprefs{opaclanguages}="OPAC";
-$tabsysprefs{LibraryName}="OPAC";
-$tabsysprefs{opacstylesheet}="OPAC";
-$tabsysprefs{opaccolorstylesheet}="OPAC";
-$tabsysprefs{opaclayoutstylesheet}="OPAC";
-$tabsysprefs{BiblioDefaultView}="OPAC";
-$tabsysprefs{opaclargeimage}="OPAC";
-$tabsysprefs{opacsmallimage}="OPAC";
-$tabsysprefs{opaclanguagesdisplay}="OPAC";
-$tabsysprefs{OpacNav}="OPAC";
-$tabsysprefs{opaccredits}="OPAC";
-$tabsysprefs{hidelostitems}="OPAC";
-$tabsysprefs{AnonSuggestions}="OPAC";
 $tabsysprefs{AmazonAssocTag}="OPAC";
 $tabsysprefs{AmazonContent}="OPAC";
 $tabsysprefs{AmazonDevKey}="OPAC";
-$tabsysprefs{KohaAdmin}="Admin";
+$tabsysprefs{AnonSuggestions}="OPAC";
+$tabsysprefs{autoBarcode}="Catalogue";
+$tabsysprefs{automembernum}="Members";
+$tabsysprefs{authoritysep}="Authorities";
+$tabsysprefs{BiblioDefaultView}="OPAC";
 $tabsysprefs{checkdigit}="Members";
 $tabsysprefs{dateformat}="Admin";
+$tabsysprefs{Disable_Dictionary}="OPAC";
+$tabsysprefs{gist}="Acquisitions";
+$tabsysprefs{hidelostitems}="OPAC";
+$tabsysprefs{hide_marc}="Catalogue";
 $tabsysprefs{insecure}="Admin";
-$tabsysprefs{ldapinfos}="Admin";
-$tabsysprefs{ldapserver}="Admin";
 $tabsysprefs{itemcallnumber}="Catalogue";
+$tabsysprefs{ISBD}="Catalogue";
+$tabsysprefs{KohaAdmin}="Admin";
+$tabsysprefs{LabelMARCView}="Catalogue";
+$tabsysprefs{LibraryName}="OPAC";
+$tabsysprefs{marc}="Catalogue";
+$tabsysprefs{marcflavour}="Catalogue";
 $tabsysprefs{maxreserves}="Circulation";
-$tabsysprefs{virtualshelves}="OPAC";
-$tabsysprefs{hide_marc}="Catalogue";
+$tabsysprefs{maxoutstanding}="Circulation";
 $tabsysprefs{NotifyBorrowerDeparture}="Members";
+$tabsysprefs{opaccolorstylesheet}="OPAC";
+$tabsysprefs{opaccredits}="OPAC";
+$tabsysprefs{opaclanguagesdisplay}="OPAC";
+$tabsysprefs{opaclanguages}="OPAC";
+$tabsysprefs{opaclargeimage}="OPAC";
+$tabsysprefs{opaclayoutstylesheet}="OPAC";
+$tabsysprefs{OpacNav}="OPAC";
 $tabsysprefs{OpacPasswordChange}="OPAC";
+$tabsysprefs{opacreadinghistory}="OPAC";
+$tabsysprefs{opacsmallimage}="OPAC";
+$tabsysprefs{opacstylesheet}="OPAC";
+$tabsysprefs{opacthemes}="OPAC";
+$tabsysprefs{noissuescharge}="Circulation";
+$tabsysprefs{printcirculationslips}="Circulation";
+$tabsysprefs{ReturnBeforeExpiry}="Circulation";
+$tabsysprefs{serialsadditems}="Catalogue";
+$tabsysprefs{sortbynonfiling}="Catalogue";
+$tabsysprefs{SubscriptionHistory}="OPAC";
+$tabsysprefs{suggestion}="OPAC";
+$tabsysprefs{virtualshelves}="OPAC";
 
 sub StringSearch  {
        my ($env,$searchstring,$type)address@hidden;
@@ -107,6 +110,9 @@
                                my $sth=$dbh->prepare("Select 
variable,value,explanation,type,options from systempreferences where (variable 
like ?) order by variable");
                                $sth->execute($syspref);
                                while (my $data=$sth->fetchrow_hashref){
+                                       $data->{value} =~ s/</&lt;/g;
+                                       $data->{value} =~ s/>/&lt;/g;
+                                       
$data->{value}=substr($data->{value},0,100)."..." if length($data->{value}) 
>100;
                                        push(@results,$data);
                                        $cnt++;
                                }
@@ -124,6 +130,7 @@
                my $sth=$dbh->prepare($strsth);
                $sth->execute();
                while (my $data=$sth->fetchrow_hashref){
+                       $data->{value}=substr($data->{value},0,100);
                        push(@results,$data);
                        $cnt++;
                }
Index: koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl
diff -u 
koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:1.29.2.3
 
koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:1.29.2.4
--- 
koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:1.29.2.3
  Tue Jun 28 09:37:17 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl   
Wed Mar  8 16:18:05 2006
@@ -212,19 +212,23 @@
                        </td>
                </tr>
        </table>
-       <table border="0" cellspacing="0" cellpadding="2">
-       <tr valign="top" bgcolor="#99cc33">
-               <th>Variable</th>
-               <th>Value</th>
-               <th colspan="3">Explanation</th>
-       </tr>
+       <table>
        <!-- TMPL_LOOP NAME="loop" -->
-       <!-- TMPL_IF NAME="toggle" --><tr valign="top" class="hilighted"><!-- 
TMPL_ELSE --><tr valign="top"><!-- /TMPL_IF -->
-               <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>
+               <!-- TMPL_IF NAME="toggle" -->
+                       <tr valign="top" class="hilighted">
+               <!-- TMPL_ELSE -->
+                       <tr valign="top">
+               <!-- /TMPL_IF -->
+               <td>
+                       <p><b><!-- TMPL_VAR NAME="variable" -->:</b> <!-- 
TMPL_VAR NAME="value" --></p>
+                       <p align="right"><i>(<!-- TMPL_VAR NAME="explanation" 
-->)</i></p>
+               </td>
+               <td>
+                       <p><a href="<!-- TMPL_VAR NAME="edit" -->" 
class="button parameters">Modify</a></p>
+               </td>
+               <td>
+                       <p><a href="<!-- TMPL_VAR NAME="delete" -->" 
class="button parameters">Delete</a></p>
+               </td>
        </tr>
        <!-- /TMPL_LOOP -->
        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">