merging from 1.2 and templating

diff --git a/admin-home.pl b/admin-home.pl
index 0f6b09e..0d23305 100755 (executable)
--- a/admin-home.pl
+++ b/admin-home.pl
@@ -5,27 +5,12 @@ use CGI;
 use C4::Auth;
 use C4::Output;
 use C4::Database;
-
-my $configfile=configfile();
-my $intranetdir=$configfile->{'intranetdir'};
+use HTML::Template;
 
 my $query = new CGI;
 my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
 
-print $query->header(-cookie => $cookie);
-
-print startpage();
-print startmenu('catalogue');
-
-
-print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
-
-open H, "$intranetdir/htdocs/admin/index.html";
-while (<H>) {
-    print $_;
-}
-close H;
-
+my $template = gettemplate("parameters/admin-home.tmpl");
+$template->param(loggeninuser => $loggedinuser);
 
-print endpage();
-print endmenu('catalogue');
+print $query->header(-cookie => $cookie),$template->output;
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl
new file mode 100644 (file)
index 0000000..2dfee1c
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl
@@ -0,0 +1,23 @@
+<TMPL_INCLUDE NAME="cat-top.inc">
+<center>
+<FONT SIZE=6><em>Koha admin page</em></FONT><br><br><br>
+<table>
+<th bgcolor='#FFFFFF'>Table</th><th bgcolor='#FFFFFF'>Meaning</th>
+<tr><td><li><a href=/cgi-bin/koha/admin/branches.pl>libraries branches</a></li></td><td>the differents branches you manage with this koha server</td></tr>
+<tr><td><li><a href=/cgi-bin/koha/admin/aqbudget.pl>budget</a></li></td><td>the budgets allowed to differents book funds.</td></tr>
+<tr><td><li><a href=/cgi-bin/koha/admin/aqbookfund.pl>book funds</a></li></td><td>the differents book funds.</td></tr>
+<tr><td><li><a href=/cgi-bin/koha/admin/categorie.pl>categories</a></li></td><td>the differents types of borrowers.</td></tr>
+<tr><td><li><a href=/cgi-bin/koha/admin/itemtypes.pl>Item types</a></li></td><td>the supports of an item.</td></tr>
+<tr><td><li><a href=/cgi-bin/koha/admin/currency.pl>Currencies</a></li></td><td>Currencies of booksellers.</td></tr>
+<tr><td><li><a href=/cgi-bin/koha/admin/printers.pl>Printers</a></li></td><td>Printers (UNIX paths).</td></tr>
+<tr><td><li><a href=/cgi-bin/koha/admin/stopwords.pl>stopwords</a></li></td><td>Words deleted during searches</td></tr>
+<tr><td><li><a href=/cgi-bin/koha/admin/systempreferences.pl>systempreferences</a></li></td><td>System preferences</td></tr>
+
+<th bgcolor='#FFFFFF'>Table</th><th bgcolor='#FFFFFF'>Meaning</th>
+
+<tr><td><li><a href=/cgi-bin/koha/admin/marctagstructure.pl>MARC tag structure</a></li></td><td>MARC structure : tag then subfields</td></tr>
+
+
+</table>
+</center>
+<TMPL_INCLUDE NAME="cat-bottom.inc">