commit for holidays and news management.

(some forgotten files)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl
index 05c4beb..375b131 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl
@@ -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>
 
 

diff --git a/mainpage.pl b/mainpage.pl
index c58e505..a2d845f 100755 (executable)
--- a/mainpage.pl
+++ b/mainpage.pl
@@ -9,7 +9,7 @@ use CGI;
 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 @@ my $marc_p = C4::Context->boolean_preference("marc");
 $template->param(NOTMARC => !$marc_p);
 $template->param(authtypesloop => \@authtypesloop);
 
+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;

diff --git a/updater/updatedatabase b/updater/updatedatabase
index 7721788..c03f304 100755 (executable)
--- a/updater/updatedatabase
+++ b/updater/updatedatabase
@@ -334,6 +334,16 @@ my %tabledata = (
             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 @@ sub MARCgetitem {
 exit;
 
 # $Log$
+# 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.
 #