[Koha-cvs] koha adminsystempreferences.pl koha-tmpl/intran... [rel_2_2]

[paul poulain]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     paul poulain <tipaul>   06/06/14 16:08:15

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

Log message:
        moving some systempreferences to a correct tab (& adding a librarian 
tab)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/systempreferences.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.22.2.18&r2=1.22.2.19
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.29.2.4&r2=1.29.2.5

Patches:
Index: admin/systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.22.2.18
retrieving revision 1.22.2.19
diff -u -b -r1.22.2.18 -r1.22.2.19
--- admin/systempreferences.pl  27 Apr 2006 17:02:20 -0000      1.22.2.18
+++ admin/systempreferences.pl  14 Jun 2006 16:08:15 -0000      1.22.2.19
@@ -70,6 +70,9 @@
        $tabsysprefs{marcflavour}="Catalogue";
        $tabsysprefs{serialsadditems}="Catalogue";
        $tabsysprefs{sortbynonfiling}="Catalogue";
+       $tabsysprefs{MARCOrgCode}="Catalogue";
+       $tabsysprefs{z3950AuthorAuthFields}="Catalogue";
+       $tabsysprefs{z3950NormalizeAuthor}="Catalogue";
 # Circulation
        $tabsysprefs{maxoutstanding}="Circulation";
        $tabsysprefs{maxreserves}="Circulation";
@@ -77,6 +80,12 @@
        $tabsysprefs{patronimages}="Circulation";
        $tabsysprefs{printcirculationslips}="Circulation";
        $tabsysprefs{ReturnBeforeExpiry}="Circulation";
+# Intranet
+       $tabsysprefs{TemplateEncoding}="Intranet";
+       $tabsysprefs{template}="Intranet";
+       $tabsysprefs{intranetstylesheet}="Intranet";
+       $tabsysprefs{IntranetNav}="Intranet";
+       $tabsysprefs{intranetcolorstylesheet}="Intranet";
 # Members
        $tabsysprefs{automembernum}="Members";
        $tabsysprefs{checkdigit}="Members";
@@ -107,6 +116,7 @@
        $tabsysprefs{SubscriptionHistory}="OPAC";
        $tabsysprefs{suggestion}="OPAC";
        $tabsysprefs{virtualshelves}="OPAC";
+       $tabsysprefs{opacheader}="OPAC";
 
 sub StringSearch  {
        my ($env,$searchstring,$type)address@hidden;

Index: koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v
retrieving revision 1.29.2.4
retrieving revision 1.29.2.5
diff -u -b -r1.29.2.4 -r1.29.2.5
--- koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl        
8 Mar 2006 16:18:05 -0000       1.29.2.4
+++ koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl        
14 Jun 2006 16:08:15 -0000      1.29.2.5
@@ -166,6 +166,15 @@
                                <!--/TMPL_IF-->
                        </td>
                        <td>
+                               <!--TMPL_IF Name="Librarian"-->
+                                       <a 
href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet" 
class="button">Intranet
+                                       </a>
+                               <!--TMPL_ELSE-->
+                                       <a 
href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet">Intranet
+                                       </a>
+                               <!--/TMPL_IF-->
+                       </td>
+                       <td>
                                <!--TMPL_IF Name="Catalogue"-->
                                        <a 
href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue" 
class="button">Catalogue
                                        </a>