[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/admin/admi...

[paul poulain]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         
Changes by:     paul poulain <address@hidden>   06/03/03 17:02:22

Modified files:
        koha-tmpl/intranet-tmpl/prog/en/admin: admin-home.tmpl 
        updater        : updatedatabase 
        .              : mainpage.pl 

Log message:
        commit for holidays and news management.
        (some forgotten files)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/updater/updatedatabase.diff?tr1=1.130&tr2=1.131&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/mainpage.pl.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: koha/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl:1.2 
koha/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl:1.3
--- koha/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl:1.2      Fri Feb 
24 11:55:40 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl  Fri Mar  3 
17:02:22 2006
@@ -102,6 +102,16 @@
                <td>the barcode generator deals with generating barcodes for 
items you acquire
                </td>
        </tr>
+       
+       <tr>
+               <th><a href="/cgi-bin/koha/tools/holidays.pl">Holidays</a></th>
+               <td>Holidays (closed days for the library)
+               </td>
+       </tr>
+       <tr>
+               <th><a href="/cgi-bin/koha/tools/koha-news.pl">Basic news 
system</a></th>
+               <td>A basic news system to put news on OPAC or library 
staff</td>
+       </tr>
 </table>
 
 
Index: koha/mainpage.pl
diff -u koha/mainpage.pl:1.10 koha/mainpage.pl:1.11
--- koha/mainpage.pl:1.10       Mon Jun 20 14:37:52 2005
+++ koha/mainpage.pl    Fri Mar  3 17:02:22 2006
@@ -9,7 +9,7 @@
 use C4::Auth;
 use C4::AuthoritiesMarc;
 use C4::Koha;
-
+use C4::NewsChannels;
 my $query = new CGI;
 my $authtypes = getauthtypes;
 my @authtypesloop;
@@ -37,4 +37,8 @@
 $template->param(NOTMARC => !$marc_p);
 $template->param(authtypesloop => address@hidden);
 
+my ($koha_news_count, $all_koha_news) = &get_opac_news(undef, 'koha');
+$template->param(koha_news        => $all_koha_news);
+$template->param(koha_news_count  => $koha_news_count);
+
 output_html_with_http_headers $query, $cookie, $template->output;
Index: koha/updater/updatedatabase
diff -u koha/updater/updatedatabase:1.130 koha/updater/updatedatabase:1.131
--- koha/updater/updatedatabase:1.130   Fri Mar  3 16:35:21 2006
+++ koha/updater/updatedatabase Fri Mar  3 17:02:22 2006
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: updatedatabase,v 1.130 2006/03/03 16:35:21 tipaul Exp $
+# $Id: updatedatabase,v 1.131 2006/03/03 17:02:22 tipaul Exp $
 
 # Database Updater
 # This script checks for required updates to the database.
@@ -334,6 +334,16 @@
             explanation         => 'Enable/Disable password change in OPAC 
(disable it when using LDAP auth)',
             type                => 'YesNo',
         },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'useDaysMode',
+            value               => 'Calendar',
+            forceupdate         => { 'explanation' => 1,
+                                     'type' => 1},
+            explanation                        => 'How to calculate return 
dates : Calendar means holidays will be controled, Days means the return date 
don\'t depend on holidays',
+               type            => 'Choice',
+               options         => 'Calendar|Days'
+        },
     ],
 
 );
@@ -1271,6 +1281,10 @@
 exit;
 
 # $Log: updatedatabase,v $
+# Revision 1.131  2006/03/03 17:02:22  tipaul
+# commit for holidays and news management.
+# (some forgotten files)
+#
 # Revision 1.130  2006/03/03 16:35:21  tipaul
 # commit for holidays and news management.
 #