koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/tools/view... [rel_3_0]


From: Antoine Farnault
Subject: [Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/tools/view... [rel_3_0]
Date: Wed, 10 Jan 2007 16:57:47 +0000

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Antoine Farnault <toins>        07/01/10 16:57:47

Added files:
        koha-tmpl/intranet-tmpl/prog/en/tools: viewlog.tmpl 
        tools          : viewlog.pl 
Removed files:
        admin          : viewlog.pl 
        koha-tmpl/intranet-tmpl/prog/en/admin: viewlog.tmpl 

Log message:
        moving admin/viewlog.(tm)?pl to tools/

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/viewlog.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/viewlog.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/tools/viewlog.tmpl?cvsroot=koha&only_with_tag=rel_3_0&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/tools/viewlog.pl?cvsroot=koha&only_with_tag=rel_3_0&rev=1.1.2.1

Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/tools/viewlog.tmpl
===================================================================
RCS file: koha-tmpl/intranet-tmpl/prog/en/tools/viewlog.tmpl
diff -N koha-tmpl/intranet-tmpl/prog/en/tools/viewlog.tmpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ koha-tmpl/intranet-tmpl/prog/en/tools/viewlog.tmpl  10 Jan 2007 16:57:47 
-0000      1.1.2.1
@@ -0,0 +1,243 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Log viewer<!-- 
TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+
+<!-- TMPL_IF NAME="do_it" -->
+<script language="JavaScript" type="text/javascript">
+function Dopop(link) {
+       
newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
+}
+</script>
+               <h1>Koha : LogView for <!-- TMPL_VAR NAME="modulename"--> </h1>
+               <!-- TMPL_IF NAME="loopfilter"-->
+                       <p>Filtered on</p>
+                       <!-- TMPL_LOOP NAME="loopfilter" -->
+                                       <p><!-- TMPL_IF NAME="err" --> <font 
color="red"> <b><!--/TMPL_IF --><label class="label100"> <!-- TMPL_VAR 
NAME="name"--> =</label><!-- TMPL_VAR NAME="value"--><!-- TMPL_IF NAME="err" 
--> </font> </b><!--/TMPL_IF --></p>
+                       <!-- /TMPL_LOOP -->
+               <!-- /TMPL_IF NAME="loopfilter"-->
+               <br>
+               <table>
+                       <!-- TMPL_IF NAME="catalogue" -->
+                               <tr >
+                                                       <th>Timestamp
+                                                       </th>
+                                                       <th>Firstname
+                                                       </th>
+                                                       <th>Surname
+                                                       </th>
+                                                       <th>Action
+                                                       </th>
+                                                       <th>Info
+                                                       </th>
+                                                       <th>Title
+                                                       </th>
+                                                       <th>Author
+                                                       </th>
+                               </tr>
+                               <!-- TMPL_LOOP NAME="looprow" -->
+                                       <!-- TMPL_IF NAME="hilighted" --><tr 
class="higlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+                                               <td><!-- TMPL_IF 
NAME="timestamp" --><!-- TMPL_VAR NAME="timestamp" --><!-- /TMPL_IF -->
+                                               </td>
+                                               <td><!-- TMPL_IF 
NAME="firstname" --><!-- TMPL_VAR NAME="firstname" --><!-- /TMPL_IF -->
+                                               </td>
+                                               <td><!-- TMPL_IF NAME="surname" 
--><!-- TMPL_VAR NAME="surname" --><!-- /TMPL_IF -->
+                                               </td>
+                                               <td><!-- TMPL_IF NAME="action" 
--><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
+                                               </td>
+                                               <td><!-- TMPL_IF NAME="info" 
--><!-- TMPL_VAR NAME="info" --><!-- /TMPL_IF -->
+                                               </td>
+                                               <td><!-- TMPL_IF NAME="title" 
--><!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF -->
+                                               </td>
+                                               <td><!-- TMPL_IF NAME="author" 
--><!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
+                                               </td>
+                                       </tr>
+                               <!-- /TMPL_LOOP -->
+                               <!-- /TMPL_IF -->
+                               <!-- TMPL_IF NAME="acqui" -->
+                               <tr >
+                                                       <th>Timestamp
+                                                       </th>
+                                                       <th>Firstname
+                                                       </th>
+                                                       <th>Surname
+                                                       </th>
+                                                       <th>Action
+                                                       </th>
+                                                       <th>Info
+                                                       </th>
+                                                       <th>Title
+                                                       </th>
+                                                       <th>Author
+                                                       </th>
+                               </tr>
+                               <!-- TMPL_LOOP NAME="looprow" -->
+                                       <!-- TMPL_IF NAME="hilighted" --><tr 
class="higlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF NAME="hilighted" 
--><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
+                                               <!-- TMPL_VAR NAME="rowtitle" 
--></td>
+                                               <!-- TMPL_LOOP NAME="loopcell" 
-->
+                                                       <!-- TMPL_IF 
NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td ><!-- /TMPL_IF 
-->
+                                                               <!-- TMPL_IF 
NAME="reference" --><a 
href="javascript:Dopop('../members/moremember.pl?borrowernumber=<!-- TMPL_VAR 
NAME="reference" -->')" ><!-- /TMPL_IF -->
+                                                               <!-- TMPL_IF 
NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
+                                                               <!-- TMPL_IF 
NAME="reference" --></a><!-- /TMPL_IF -->
+                                                       </td>
+                                                       <!-- TMPL_IF 
NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td ><!-- /TMPL_IF 
-->
+                                                               <!-- TMPL_IF 
NAME="count" --><!-- TMPL_VAR NAME="count" --><!-- /TMPL_IF -->
+                                                       </td>
+                                               <!-- /TMPL_LOOP -->
+                                       </tr>
+                               <!-- /TMPL_LOOP NAME="looprow" -->
+                               <!-- /TMPL_IF -->
+                               <!-- TMPL_IF NAME="members" -->
+                               <tr >
+                                                       <th>Timestamp
+                                                       </th>
+                                                       <th>Firstname
+                                                       </th>
+                                                       <th>Surname
+                                                       </th>
+                                                       <th>Action
+                                                       </th>
+                                                       <th>Info
+                                                       </th>
+                                                       <th>Title
+                                                       </th>
+                                                       <th>Author
+                                                       </th>
+                               </tr>
+                               <!-- TMPL_LOOP NAME="looprow" -->
+                                       <!-- TMPL_IF NAME="hilighted" --><tr 
class="higlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+                                               <td><!-- TMPL_IF 
NAME="timestamp" --><!-- TMPL_VAR NAME="timestamp" --><!-- /TMPL_IF -->
+                                               </td>
+                                               <td><!-- TMPL_IF NAME="value" 
--><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
+                                               </td>
+                                               <td><!-- TMPL_IF NAME="value" 
--><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
+                                               </td>
+                                               <td><!-- TMPL_IF NAME="value" 
--><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
+                                               </td>
+                                               <td><!-- TMPL_IF NAME="value" 
--><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
+                                               </td>
+                                               <td><!-- TMPL_IF NAME="value" 
--><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
+                                               </td>
+                                               <td><!-- TMPL_IF NAME="value" 
--><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
+                                               </td>
+                                               <td><!-- TMPL_IF NAME="value" 
--><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
+                                               </td>
+                                       </tr>
+                               <!-- /TMPL_LOOP NAME="looprow" -->
+                               <!-- /TMPL_IF -->
+               </table>
+<!-- TMPL_ELSE -->
+       <h1 class = "parameters">Koha : Display Logs </h1>
+       <form method="post">
+       
+       <table>
+               <thead>
+                       <tr>
+                       <th>On Module</th>
+                       <th>User/Action Filters</th>
+                       <th>Object Filter</th>
+                       </tr>
+               </thead>
+               <tbody>
+                       <tr>
+                               <td>
+                                       <select name="module">
+                                               <option value ="catalogue" 
checked>Catalogue</option>
+                                               <option value 
="members">Borrowers</option>
+                                               <option value 
="acqui">Acquisitions</option>
+                                       </select>
+                               </td>
+                               <td>
+                               <p>
+                                       Koha User : <input type="text" 
name="user" value="">
+                               </p>
+                               <p>     Action type : <select name="action">
+                                               <option value ="">All</option>
+                                               <option value 
="add">Add</option>
+                                               <option value 
="del">Delete</option>
+                                               <option value 
="mod">Modify</option>
+                                       </select>
+                               </p>
+                               <p> From <input type="text" readonly="readonly" 
size="10" id="from" name="from" >
+                                                       <img src="<!-- TMPL_VAR 
Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" 
vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
+                                                               <script 
language="JavaScript" type="text/javascript">
+                                                                       
function validate1(date) {
+                                                                               
var day = date.getDate();
+                                                                               
var month = date.getMonth() + 1;
+                                                                               
var year = date.getFullYear();
+                                                                               
var weekDay = date.getDay();
+                                                                               
var dayMonth = month + '-' + day;
+                                                                               
var dateString = year + '-' + month + '-' + day;
+                                                                               
var dateTo = document.getElementById('to').value.split("-");
+                                                                               
var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
+                                                                               
if (date > limitDate) {
+                                                                               
        return true;
+                                                                               
} else {
+                                                                               
        return false;
+                                                                               
}
+                                                                       }
+                                       
+                                                                       
Calendar.setup(
+                                                                               
{
+                                                                               
        inputField : "from",
+                                                                               
        ifFormat : "%Y-%m-%d",
+                                                                               
        button : "openCalendarFrom",
+                                                                               
        disableFunc : validate1,
+                                                                               
        dateStatusFunc : validate1
+                                                                               
}
+                                                                       );
+                                                               </script>
+                                       To <input readonly="readonly" size="10" 
id="to" name="Filter" value="" type="to">
+                                               <img src="<!-- TMPL_VAR 
Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" 
style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+                                                       <script 
type="text/javascript">
+                                                               function 
validate2(date) {
+                                                                       var day 
= date.getDate();
+                                                                       var 
month = date.getMonth() + 1;
+                                                                       var 
year = date.getFullYear();
+                                                                       var 
weekDay = date.getDay();
+                                                                       var 
dayMonth = month + '-' + day;
+                                                                       var 
dateString = year + '-' + month + '-' + day;
+                                                                       var 
dateFrom = document.getElementById('from').value.split("-");
+                                                                       var 
limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
+                                                                       if 
(limitDate > date) {
+                                                                               
return true;
+                                                                       } else {
+                                                                               
return false;
+                                                                       }
+                                                               }
+               
+                                                               Calendar.setup(
+                                                                       {
+                                                                               
inputField : "to",
+                                                                               
ifFormat : "%Y-%m-%d",
+                                                                               
button : "openCalendarTo",
+                                                                               
disableFunc : validate2,
+                                                                               
dateStatusFunc : validate2
+                                                                       }
+                                                               );
+                                                       </script>
+                               </td>
+                       </tr>
+       </table>
+       
+       <div>
+               <h3>Output</h3>
+               <input type="radio" checked name="output" value="screen" > To 
screen into the browser
+               <br>
+               <input type="radio" name="output" value="file"> To file <input 
type="text" name="basename" value="Export"> into an application  
+               <!-- TMPL_VAR NAME="CGIextChoice" -->
+               <!-- TMPL_VAR NAME="CGIsepChoice" -->
+       </p>
+       </div>
+       <p>
+       <input TYPE="submit" value="OK" class="button parameters">
+       <input type="hidden" name="report_name" value="<!--TMPL_VAR 
NAME="report_name" -->">
+       <input type="hidden" name="do_it" value="1">
+       </form>
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
+
+

Index: tools/viewlog.pl
===================================================================
RCS file: tools/viewlog.pl
diff -N tools/viewlog.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tools/viewlog.pl    10 Jan 2007 16:57:47 -0000      1.1.2.1
@@ -0,0 +1,170 @@
+#!/usr/bin/perl
+
+# $Id: viewlog.pl,v 1.1.2.1 2007/01/10 16:57:47 toins Exp $
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+use strict;
+use C4::Auth;
+use CGI;
+use C4::Context;
+use C4::Koha;
+use C4::Interface::CGI::Output;
+use C4::Log;
+use Date::Manip;
+
+=head1 NAME
+
+plugin that shows a stats on borrowers
+
+=head1 DESCRIPTION
+
+
+=over2
+
+=cut
+
+my $input          = new CGI;
+my $do_it          = $input->param('do_it');
+my $fullreportname = "admin/viewlog.tmpl";
+my $modulename     = $input->param("module");
+my $userfilter     = $input->param("user");
+my $actionfilter   = $input->param("action");
+my $fromfilter     = $input->param("from");
+my $tofilter       = $input->param("to");
+my $basename       = $input->param("basename");
+my $mime           = $input->param("MIME");
+my $del            = $input->param("sep");
+my $output         = $input->param("output");
+
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => $fullreportname,
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { editcatalogue => 1 },
+        debug           => 1,
+    }
+);
+$template->param( do_it => $do_it );
+if ($do_it) {
+
+    # Displaying results
+    #building filters
+    my @filters;
+    push @filters, { name => 'user', value => $userfilter } if ($userfilter);
+    push @filters, { name => 'action', value => $actionfilter }
+      if ($actionfilter);
+    push @filters, { name => 'from', value => $fromfilter } if ($fromfilter);
+    push @filters, { name => 'to',   value => $tofilter }   if ($tofilter);
+    if ( $modulename eq "catalogue" ) {
+        my $titlefilter      = $input->param("title");
+        my $authorfilter     = $input->param("author");
+        my $publisherfilter  = $input->param("publisher");
+        my $callnumberfilter = $input->param("itemcallnumber");
+
+        push @filters, { name => 'title', value => $titlefilter }
+          if ($titlefilter);
+        push @filters, { name => 'author', value => $authorfilter }
+          if ($authorfilter);
+        push @filters, { name => 'publisher', value => $publisherfilter }
+          if ($publisherfilter);
+        push @filters, { name => 'callnumber', value => $callnumberfilter }
+          if ($callnumberfilter);
+    }
+
+    my ( $count, $results ) = displaylog( $modulename, @filters );
+    if ( $output eq "screen" ) {
+
+        # Printing results to screen
+        $template->param(
+            modulename  => $modulename,
+            $modulename => 1,
+            looprow     => $results
+        );
+        output_html_with_http_headers $input, $cookie, $template->output;
+        exit(1);
+    }
+    else {
+
+        # Printing to a csv file
+        print $input->header(
+            -type       => 'application/vnd.sun.xml.calc',
+            -attachment => "$basename.csv",
+            -filename   => "$basename.csv"
+        );
+        my $sep;
+        $sep = C4::Context->preference("delimiter");
+
+        # header top-right
+        # Other header
+        # Table
+        foreach my $line (@$results) {
+            if ( $modulename eq "catalogue" ) {
+                print $line->{timestamp} . $sep;
+                print $line->{firstname} . $sep;
+                print $line->{surname} . $sep;
+                print $line->{action} . $sep;
+                print $line->{info} . $sep;
+                print $line->{title} . $sep;
+                print $line->{author} . $sep;
+            }
+            print "\n";
+        }
+
+        # footer
+        exit(1);
+    }
+}
+else {
+    my $dbh = C4::Context->dbh;
+    my @values;
+    my %labels;
+    my %select;
+    my $req;
+
+    my @mime = ( C4::Context->preference("MIME") );
+
+    #  foreach my $mime (@mime){
+    #          warn "".$mime;
+    #  }
+
+    my $CGIextChoice = CGI::scrolling_list(
+        -name     => 'MIME',
+        -id       => 'MIME',
+        -values   => address@hidden,
+        -size     => 1,
+        -multiple => 0
+    );
+
+    my @dels         = ( C4::Context->preference("delimiter") );
+    my $CGIsepChoice = CGI::scrolling_list(
+        -name     => 'sep',
+        -id       => 'sep',
+        -values   => address@hidden,
+        -size     => 1,
+        -multiple => 0
+    );
+
+    $template->param(
+        CGIextChoice => $CGIextChoice,
+        CGIsepChoice => $CGIsepChoice
+    );
+    output_html_with_http_headers $input, $cookie, $template->output;
+}

Index: admin/viewlog.pl
===================================================================
RCS file: admin/viewlog.pl
diff -N admin/viewlog.pl
--- admin/viewlog.pl    18 Dec 2006 16:35:17 -0000      1.2.2.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,149 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: viewlog.pl,v 1.2.2.1 2006/12/18 16:35:17 toins Exp $
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use C4::Auth;
-use CGI;
-use C4::Context;
-
-use C4::Koha;
-use C4::Interface::CGI::Output;
-use C4::Log;
-use Date::Manip;
-
-=head1 NAME
-
-plugin that shows a stats on borrowers
-
-=head1 DESCRIPTION
-
-
-=over2
-
-=cut
-
-my $input = new CGI;
-my $do_it=$input->param('do_it');
-my $fullreportname = "admin/viewlog.tmpl";
-my $modulename = $input->param("module");
-my $userfilter = $input->param("user");
-my $actionfilter = $input->param("action");
-my $fromfilter = $input->param("from");
-my $tofilter = $input->param("to");
-my $basename = $input->param("basename");
-my $mime = $input->param("MIME");
-my $del = $input->param("sep");
-my $output = $input->param("output");
-
-#warn "module : ".$modulename;
-my ($template, $borrowernumber, $cookie)
-       = get_template_and_user({template_name => $fullreportname,
-                               query => $input,
-                               type => "intranet",
-                               authnotrequired => 0,
-                               flagsrequired => {editcatalogue => 1},
-                               debug => 1,
-                               });
-$template->param(do_it => $do_it);
-if ($do_it) {
-# Displaying results
-       #building filters
-       my @filters;
-       push @filters, {name=> 'user', value=> $userfilter} if ($userfilter);
-       push @filters, {name=> 'action', value=> $actionfilter} if 
($actionfilter);
-       push @filters, {name=> 'from', value=> $fromfilter} if ($fromfilter);
-       push @filters, {name=> 'to', value=> $tofilter} if ($tofilter);
-       if ($modulename eq "catalogue"){
-               my $titlefilter = $input->param("title");
-               my $authorfilter = $input->param("author");
-               my $publisherfilter = $input->param("publisher");
-               my $callnumberfilter = $input->param("itemcallnumber");
-               
-               push @filters, {name=> 'title', value=> $titlefilter} if 
($titlefilter);
-               push @filters, {name=> 'author', value=> $authorfilter} if 
($authorfilter);
-               push @filters, {name=> 'publisher', value=> $publisherfilter} 
if ($publisherfilter);
-               push @filters, {name=> 'callnumber', value=> $callnumberfilter} 
if ($callnumberfilter);
-       }
-       
-       my ($count, $results) = displaylog( $modulename, @filters);
-       if ($output eq "screen"){
-# Printing results to screen
-               $template->param(modulename =>$modulename, $modulename => 1, 
looprow => $results);
-               output_html_with_http_headers $input, $cookie, 
$template->output;
-               exit(1);
-       } else {
-# Printing to a csv file
-               print $input->header(-type => 'application/vnd.sun.xml.calc',
-                       -attachment=>"$basename.csv",
-                       -filename=>"$basename.csv" );
-               my $sep;
-               $sep =C4::Context->preference("delimiter");
-# header top-right
-# Other header
-# Table
-               foreach my $line ( @$results ) {
-                       if ($modulename eq "catalogue"){
-                               print $line->{timestamp}.$sep;
-                               print $line->{firstname}.$sep;
-                               print $line->{surname}.$sep;
-                               print $line->{action}.$sep;
-                               print $line->{info}.$sep;
-                               print $line->{title}.$sep;
-                               print $line->{author}.$sep;
-                       }
-                       print "\n";
-               }
-# footer
-               exit(1);
-       }
-} else {
-       my $dbh = C4::Context->dbh;
-       my @values;
-       my %labels;
-       my %select;
-       my $req;
-       
-       my @mime = ( C4::Context->preference("MIME") );
-#      foreach my $mime (@mime){
-#              warn "".$mime;
-#      }
-       
-       my $CGIextChoice=CGI::scrolling_list(
-                               -name     => 'MIME',
-                               -id       => 'MIME',
-                               -values   => address@hidden,
-                               -size     => 1,
-                               -multiple => 0 );
-       
-       my @dels = ( C4::Context->preference("delimiter") );
-       my $CGIsepChoice=CGI::scrolling_list(
-                               -name     => 'sep',
-                               -id       => 'sep',
-                               -values   => address@hidden,
-                               -size     => 1,
-                               -multiple => 0 );
-       
-       $template->param(
-                                       CGIextChoice => $CGIextChoice,
-                                       CGIsepChoice => $CGIsepChoice
-                                       );
-output_html_with_http_headers $input, $cookie, $template->output;
-}

Index: koha-tmpl/intranet-tmpl/prog/en/admin/viewlog.tmpl
===================================================================
RCS file: koha-tmpl/intranet-tmpl/prog/en/admin/viewlog.tmpl
diff -N koha-tmpl/intranet-tmpl/prog/en/admin/viewlog.tmpl
--- koha-tmpl/intranet-tmpl/prog/en/admin/viewlog.tmpl  17 Nov 2006 14:57:21 
-0000      1.1.2.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,242 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Log viewer<!-- 
TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
-<!-- TMPL_IF NAME="do_it" -->
-<script language="JavaScript" type="text/javascript">
-function Dopop(link) {
-       
newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
-}
-</script>
-               <h1>Koha : LogView for <!-- TMPL_VAR NAME="modulename"--> </h1>
-               <!-- TMPL_IF NAME="loopfilter"-->
-                       <p>Filtered on</p>
-                       <!-- TMPL_LOOP NAME="loopfilter" -->
-                                       <p><!-- TMPL_IF NAME="err" --> <font 
color="red"> <b><!--/TMPL_IF --><label class="label100"> <!-- TMPL_VAR 
NAME="name"--> =</label><!-- TMPL_VAR NAME="value"--><!-- TMPL_IF NAME="err" 
--> </font> </b><!--/TMPL_IF --></p>
-                       <!-- /TMPL_LOOP -->
-               <!-- /TMPL_IF NAME="loopfilter"-->
-               <br>
-               <table>
-                       <!-- TMPL_IF NAME="catalogue" -->
-                               <tr >
-                                                       <th>Timestamp
-                                                       </th>
-                                                       <th>Firstname
-                                                       </th>
-                                                       <th>Surname
-                                                       </th>
-                                                       <th>Action
-                                                       </th>
-                                                       <th>Info
-                                                       </th>
-                                                       <th>Title
-                                                       </th>
-                                                       <th>Author
-                                                       </th>
-                               </tr>
-                               <!-- TMPL_LOOP NAME="looprow" -->
-                                       <!-- TMPL_IF NAME="hilighted" --><tr 
class="higlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-                                               <td><!-- TMPL_IF 
NAME="timestamp" --><!-- TMPL_VAR NAME="timestamp" --><!-- /TMPL_IF -->
-                                               </td>
-                                               <td><!-- TMPL_IF 
NAME="firstname" --><!-- TMPL_VAR NAME="firstname" --><!-- /TMPL_IF -->
-                                               </td>
-                                               <td><!-- TMPL_IF NAME="surname" 
--><!-- TMPL_VAR NAME="surname" --><!-- /TMPL_IF -->
-                                               </td>
-                                               <td><!-- TMPL_IF NAME="action" 
--><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
-                                               </td>
-                                               <td><!-- TMPL_IF NAME="info" 
--><!-- TMPL_VAR NAME="info" --><!-- /TMPL_IF -->
-                                               </td>
-                                               <td><!-- TMPL_IF NAME="title" 
--><!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF -->
-                                               </td>
-                                               <td><!-- TMPL_IF NAME="author" 
--><!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
-                                               </td>
-                                       </tr>
-                               <!-- /TMPL_LOOP -->
-                               <!-- /TMPL_IF -->
-                               <!-- TMPL_IF NAME="acqui" -->
-                               <tr >
-                                                       <th>Timestamp
-                                                       </th>
-                                                       <th>Firstname
-                                                       </th>
-                                                       <th>Surname
-                                                       </th>
-                                                       <th>Action
-                                                       </th>
-                                                       <th>Info
-                                                       </th>
-                                                       <th>Title
-                                                       </th>
-                                                       <th>Author
-                                                       </th>
-                               </tr>
-                               <!-- TMPL_LOOP NAME="looprow" -->
-                                       <!-- TMPL_IF NAME="hilighted" --><tr 
class="higlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-                                               <!-- TMPL_IF NAME="hilighted" 
--><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-                                               <!-- TMPL_VAR NAME="rowtitle" 
--></td>
-                                               <!-- TMPL_LOOP NAME="loopcell" 
-->
-                                                       <!-- TMPL_IF 
NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td ><!-- /TMPL_IF 
-->
-                                                               <!-- TMPL_IF 
NAME="reference" --><a 
href="javascript:Dopop('../members/moremember.pl?borrowernumber=<!-- TMPL_VAR 
NAME="reference" -->')" ><!-- /TMPL_IF -->
-                                                               <!-- TMPL_IF 
NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
-                                                               <!-- TMPL_IF 
NAME="reference" --></a><!-- /TMPL_IF -->
-                                                       </td>
-                                                       <!-- TMPL_IF 
NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td ><!-- /TMPL_IF 
-->
-                                                               <!-- TMPL_IF 
NAME="count" --><!-- TMPL_VAR NAME="count" --><!-- /TMPL_IF -->
-                                                       </td>
-                                               <!-- /TMPL_LOOP -->
-                                       </tr>
-                               <!-- /TMPL_LOOP NAME="looprow" -->
-                               <!-- /TMPL_IF -->
-                               <!-- TMPL_IF NAME="members" -->
-                               <tr >
-                                                       <th>Timestamp
-                                                       </th>
-                                                       <th>Firstname
-                                                       </th>
-                                                       <th>Surname
-                                                       </th>
-                                                       <th>Action
-                                                       </th>
-                                                       <th>Info
-                                                       </th>
-                                                       <th>Title
-                                                       </th>
-                                                       <th>Author
-                                                       </th>
-                               </tr>
-                               <!-- TMPL_LOOP NAME="looprow" -->
-                                       <!-- TMPL_IF NAME="hilighted" --><tr 
class="higlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-                                               <td><!-- TMPL_IF 
NAME="timestamp" --><!-- TMPL_VAR NAME="timestamp" --><!-- /TMPL_IF -->
-                                               </td>
-                                               <td><!-- TMPL_IF NAME="value" 
--><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
-                                               </td>
-                                               <td><!-- TMPL_IF NAME="value" 
--><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
-                                               </td>
-                                               <td><!-- TMPL_IF NAME="value" 
--><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
-                                               </td>
-                                               <td><!-- TMPL_IF NAME="value" 
--><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
-                                               </td>
-                                               <td><!-- TMPL_IF NAME="value" 
--><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
-                                               </td>
-                                               <td><!-- TMPL_IF NAME="value" 
--><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
-                                               </td>
-                                               <td><!-- TMPL_IF NAME="value" 
--><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
-                                               </td>
-                                       </tr>
-                               <!-- /TMPL_LOOP NAME="looprow" -->
-                               <!-- /TMPL_IF -->
-               </table>
-<!-- TMPL_ELSE -->
-       <h1 class = "parameters">Koha : Display Logs </h1>
-       <form method="post">
-       
-       <table>
-               <thead>
-                       <tr>
-                       <th>On Module</th>
-                       <th>User/Action Filters</th>
-                       <th>Object Filter</th>
-                       </tr>
-               </thead>
-               <tbody>
-                       <tr>
-                               <td>
-                                       <select name="module">
-                                               <option value ="catalogue" 
checked>Catalogue</option>
-                                               <option value 
="members">Borrowers</option>
-                                               <option value 
="acqui">Acquisitions</option>
-                                       </select>
-                               </td>
-                               <td>
-                               <p>
-                                       Koha User : <input type="text" 
name="user" value="">
-                               </p>
-                               <p>     Action type : <select name="action">
-                                               <option value ="">All</option>
-                                               <option value 
="add">Add</option>
-                                               <option value 
="del">Delete</option>
-                                               <option value 
="mod">Modify</option>
-                                       </select>
-                               </p>
-                               <p> From <input type="text" readonly="readonly" 
size="10" id="from" name="from" >
-                                                       <img src="<!-- TMPL_VAR 
Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" 
vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
-                                                               <script 
language="JavaScript" type="text/javascript">
-                                                                       
function validate1(date) {
-                                                                               
var day = date.getDate();
-                                                                               
var month = date.getMonth() + 1;
-                                                                               
var year = date.getFullYear();
-                                                                               
var weekDay = date.getDay();
-                                                                               
var dayMonth = month + '-' + day;
-                                                                               
var dateString = year + '-' + month + '-' + day;
-                                                                               
var dateTo = document.getElementById('to').value.split("-");
-                                                                               
var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
-                                                                               
if (date > limitDate) {
-                                                                               
        return true;
-                                                                               
} else {
-                                                                               
        return false;
-                                                                               
}
-                                                                       }
-                                       
-                                                                       
Calendar.setup(
-                                                                               
{
-                                                                               
        inputField : "from",
-                                                                               
        ifFormat : "%Y-%m-%d",
-                                                                               
        button : "openCalendarFrom",
-                                                                               
        disableFunc : validate1,
-                                                                               
        dateStatusFunc : validate1
-                                                                               
}
-                                                                       );
-                                                               </script>
-                                       To <input readonly="readonly" size="10" 
id="to" name="Filter" value="" type="to">
-                                               <img src="<!-- TMPL_VAR 
Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" 
style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
-                                                       <script 
type="text/javascript">
-                                                               function 
validate2(date) {
-                                                                       var day 
= date.getDate();
-                                                                       var 
month = date.getMonth() + 1;
-                                                                       var 
year = date.getFullYear();
-                                                                       var 
weekDay = date.getDay();
-                                                                       var 
dayMonth = month + '-' + day;
-                                                                       var 
dateString = year + '-' + month + '-' + day;
-                                                                       var 
dateFrom = document.getElementById('from').value.split("-");
-                                                                       var 
limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
-                                                                       if 
(limitDate > date) {
-                                                                               
return true;
-                                                                       } else {
-                                                                               
return false;
-                                                                       }
-                                                               }
-               
-                                                               Calendar.setup(
-                                                                       {
-                                                                               
inputField : "to",
-                                                                               
ifFormat : "%Y-%m-%d",
-                                                                               
button : "openCalendarTo",
-                                                                               
disableFunc : validate2,
-                                                                               
dateStatusFunc : validate2
-                                                                       }
-                                                               );
-                                                       </script>
-                               </td>
-                       </tr>
-       </table>
-       
-       <div>
-               <h3>Output</h3>
-               <input type="radio" checked name="output" value="screen" > To 
screen into the browser
-               <br>
-               <input type="radio" name="output" value="file"> To file <input 
type="text" name="basename" value="Export"> into an application  
-               <!-- TMPL_VAR NAME="CGIextChoice" -->
-               <!-- TMPL_VAR NAME="CGIsepChoice" -->
-       </p>
-       </div>
-       <p>
-       <input TYPE="submit" value="OK" class="button parameters">
-       <input type="hidden" name="report_name" value="<!--TMPL_VAR 
NAME="report_name" -->">
-       <input type="hidden" name="do_it" value="1">
-       </form>
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
-
-




reply via email to

[Prev in Thread] Current Thread [Next in Thread]